Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions tracer/missing-nullability-files.csv
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ src/Datadog.Trace/TracerConstants.cs
src/Datadog.Trace/TracerManager.cs
src/Datadog.Trace/TracerManagerFactory.cs
src/Datadog.Trace/Agent/Api.cs
src/Datadog.Trace/Agent/ApiOtlp.cs
src/Datadog.Trace/Agent/ClientStatsPayload.cs
src/Datadog.Trace/Agent/IApi.cs
src/Datadog.Trace/Agent/IApiRequest.cs
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -55,9 +55,11 @@

<ItemGroup>
<Compile Include="..\Datadog.Trace\TracerConstants.cs" Link="TracerConstants.cs" />
<Compile Include="..\Datadog.Trace\Agent\TracesEncoding.cs" Link="TracesEncoding.cs" />
<Compile Include="..\Datadog.Trace\Agent\TracesTransportType.cs" Link="TracesTransportType.cs" />
<Compile Include="..\Datadog.Trace\Configuration\DeprecationMessages.cs" Link="DeprecationMessages.cs" />
<Compile Include="..\Datadog.Trace\Configuration\ExporterSettings.Shared.cs" Link="ExporterSettings.Shared.cs" />
<Compile Include="..\Datadog.Trace\Configuration\OtlpProtocol.cs" Link="OtlpProtocol.cs" />
<!-- Link to generated ConfigurationKeys from Datadog.Trace project -->
<Compile Include="..\Datadog.Trace\Generated\netstandard2.0\Datadog.Trace.SourceGenerators\ConfigurationKeysGenerator\ConfigurationKeys*.g.cs" LinkBase="Configuration" />
</ItemGroup>
Expand Down
15 changes: 10 additions & 5 deletions tracer/src/Datadog.Trace/Agent/AgentWriter.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// <copyright file="AgentWriter.cs" company="Datadog">
// <copyright file="AgentWriter.cs" company="Datadog">
// Unless explicitly stated otherwise all files in this repository are licensed under the Apache 2 License.
// This product includes software developed at Datadog (https://www.datadoghq.com/). Copyright 2017 Datadog, Inc.
// </copyright>
Expand All @@ -14,6 +14,7 @@
using Datadog.Trace.Configuration;
using Datadog.Trace.DogStatsd;
using Datadog.Trace.Logging;
using Datadog.Trace.OpenTelemetry.Traces;
using Datadog.Trace.Telemetry;
using Datadog.Trace.Telemetry.Metrics;

Expand Down Expand Up @@ -95,12 +96,16 @@ internal AgentWriter(IApi api, IStatsAggregator? statsAggregator, IStatsdManager
_batchInterval = batchInterval;
_traceKeepRateCalculator = traceKeepRateCalculator;

var formatterResolver = SpanFormatterResolver.Instance;
ISpanBufferSerializer spanBufferSerializer = api.TracesEncoding switch
{
TracesEncoding.OtlpJson => new OtlpTracesJsonSerializer(),
_ => new SpanBufferMessagePackSerializer(SpanFormatterResolver.Instance),
Comment on lines +101 to +102

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P1 Badge Avoid MessagePack serialization for OTLP protobuf mode

When TracesEncoding is OtlpProtobuf (for grpc/http/protobuf protocol settings), this switch falls back to SpanBufferMessagePackSerializer instead of an OTLP serializer. That causes OTLP protobuf configurations to emit Datadog MessagePack payloads, which OTLP collectors will not parse correctly.

Useful? React with 👍 / 👎.

};

_forceFlush = new TaskCompletionSource<bool>(TaskOptions);

_frontBuffer = new SpanBuffer(maxBufferSize, formatterResolver);
_backBuffer = new SpanBuffer(maxBufferSize, formatterResolver);
_frontBuffer = new SpanBuffer(maxBufferSize, spanBufferSerializer);
_backBuffer = new SpanBuffer(maxBufferSize, spanBufferSerializer);
_activeBuffer = _frontBuffer;

_apmTracingEnabled = apmTracingEnabled;
Expand All @@ -126,7 +131,7 @@ internal AgentWriter(IApi api, IStatsAggregator? statsAggregator, IStatsdManager

public bool CanComputeStats => _apmTracingEnabled && _statsAggregator?.CanComputeStats == true;

public Task<bool> Ping() => _api.SendTracesAsync(EmptyPayload, 0, false, 0, 0);
public Task<bool> Ping() => _api.Ping();

public void WriteTrace(in SpanCollection trace)
{
Expand Down
7 changes: 6 additions & 1 deletion tracer/src/Datadog.Trace/Agent/Api.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// <copyright file="Api.cs" company="Datadog">
// <copyright file="Api.cs" company="Datadog">
// Unless explicitly stated otherwise all files in this repository are licensed under the Apache 2 License.
// This product includes software developed at Datadog (https://www.datadoghq.com/). Copyright 2017 Datadog, Inc.
// </copyright>
Expand Down Expand Up @@ -31,6 +31,7 @@ internal sealed class Api : IApi
internal const string FailedToSendMessageTemplate = "An error occurred while sending data to the agent at {AgentEndpoint}. If the error isn't transient, please check https://docs.datadoghq.com/tracing/troubleshooting/connection_errors/?code-lang=dotnet for guidance.";

private static readonly IDatadogLogger StaticLog = DatadogLogging.GetLoggerFor<Api>();
private static readonly ArraySegment<byte> EmptyPayload = new([0x90]);

private readonly IDatadogLogger _log;
private readonly IApiRequestFactory _apiRequestFactory;
Expand Down Expand Up @@ -85,13 +86,17 @@ private enum SendResult
Failed_DontRetry,
}

public TracesEncoding TracesEncoding => TracesEncoding.DatadogV0_4;

[MemberNotNull(nameof(_statsd))]
public void ToggleTracerHealthMetrics(bool enabled)
{
Volatile.Write(ref _healthMetricsEnabled, enabled);
_statsd.SetRequired(StatsdConsumer.TraceApi, enabled);
}

public Task<bool> Ping() => SendTracesAsync(EmptyPayload, 0, false, 0, 0);

public Task<bool> SendStatsAsync(StatsBuffer stats, long bucketDuration)
{
_log.Debug("Sending stats to the Datadog Agent.");
Expand Down
Loading
Loading