diff --git a/tracer/src/Datadog.Trace.SourceGenerators/TagsListGenerator/Sources.cs b/tracer/src/Datadog.Trace.SourceGenerators/TagsListGenerator/Sources.cs index a231e7095833..9beafb737349 100644 --- a/tracer/src/Datadog.Trace.SourceGenerators/TagsListGenerator/Sources.cs +++ b/tracer/src/Datadog.Trace.SourceGenerators/TagsListGenerator/Sources.cs @@ -32,6 +32,11 @@ public TagAttribute(string tagName) => /// Gets the name of the datadog tag the property corresponds to /// public string TagName { get; } + + /// + /// Gets or sets the OpenTelemetry semantic convention name that aliases . + /// + public string? OtelName { get; set; } } /// @@ -118,6 +123,27 @@ partial class ") .Append(@"Bytes => [") .Append(tagByteArray) .AppendLine(@"];"); + + if (property.OtelTagValue is not null) + { + var oTelTagByteArray = string.Join(", ", MessagePackHelper.GetValueInRawMessagePackIEnumerable(property.OtelTagValue)); + + sb.Append( + @" + // ") + .Append(property.PropertyName) + .Append(@"OtelBytes = MessagePack.Serialize(""") + .Append(property.OtelTagValue) + .Append(@""");"); + + sb.Append( + @" + private static ReadOnlySpan ") + .Append(property.PropertyName) + .Append(@"OtelBytes => [") + .Append(oTelTagByteArray) + .AppendLine(@"];"); + } } sb.Append( @@ -148,6 +174,27 @@ partial class ") sb.Append( @", "); + + if (property.OtelTagValue is not null) + { + sb.Append('"') + .Append(property.OtelTagValue) + .Append(@""" => ") + .Append(property.PropertyName); + + switch (property.PropertyType) + { + case TagListGenerator.PropertyType.NullableInt: + sb.Append(" is null ? null : Datadog.Trace.Util.IntStringCache.ToInvariantString(") + .Append(property.PropertyName) + .Append(".Value)"); + break; + } + + sb.Append( + @", + "); + } } sb.Append( @@ -169,11 +216,26 @@ public override void SetTag(string key, string? value) continue; } - sb.Append(@"case """) - .Append(property.TagValue) - .Append( - @""": + if (property.OtelTagValue is not null) + { + sb.Append(@"case """) + .Append(property.TagValue) + .Append(@""":") + .Append(@" + case """) + .Append(property.OtelTagValue) + .Append( + @""": "); + } + else + { + sb.Append(@"case """) + .Append(property.TagValue) + .Append( + @""": + "); + } if (property.PropertyType is TagListGenerator.PropertyType.NullableInt) { @@ -223,6 +285,15 @@ public override void SetTag(string key, string? value) .Append( @""": "); + + if (property.OtelTagValue is not null) + { + sb.Append(@"case """) + .Append(property.OtelTagValue) + .Append( + @""": + "); + } } } @@ -244,7 +315,7 @@ public override void SetTag(string key, string? value) } } - public override void EnumerateTags(ref TProcessor processor) + public override void EnumerateTags(ref TProcessor processor, bool openTelemetrySemanticsEnabled) { "); foreach (var property in tagList.TagProperties) @@ -256,13 +327,40 @@ public override void EnumerateTags(ref TProcessor processor) .Append(property.PropertyName) .Append(@" is not null) { - processor.Process(new TagItem(""") + "); + + if (property.OtelTagValue is not null) + { + sb.Append(@"if (openTelemetrySemanticsEnabled) + { + processor.Process(new TagItem(""") + .Append(property.OtelTagValue) + .Append(@""", ") + .Append(property.PropertyName) + .Append(@".Value, ") + .Append(property.PropertyName) + .Append(@"OtelBytes)); + } + else + { + "); + } + + sb.Append(@"processor.Process(new TagItem(""") .Append(property.TagValue) .Append(@""", ") .Append(property.PropertyName) .Append(@".Value, ") .Append(property.PropertyName) - .Append(@"Bytes)); + .Append(@"Bytes));"); + + if (property.OtelTagValue is not null) + { + sb.Append(@" + }"); + } + + sb.Append(@" } "); @@ -272,13 +370,40 @@ public override void EnumerateTags(ref TProcessor processor) .Append(property.PropertyName) .Append(@" is not null) { - processor.Process(new TagItem(""") + "); + + if (property.OtelTagValue is not null) + { + sb.Append(@"if (openTelemetrySemanticsEnabled) + { + processor.Process(new TagItem(""") + .Append(property.OtelTagValue) + .Append(@""", ") + .Append(property.PropertyName) + .Append(@", ") + .Append(property.PropertyName) + .Append(@"OtelBytes)); + } + else + { + "); + } + + sb.Append(@"processor.Process(new TagItem(""") .Append(property.TagValue) .Append(@""", ") .Append(property.PropertyName) .Append(@", ") .Append(property.PropertyName) - .Append(@"Bytes)); + .Append(@"Bytes));"); + + if (property.OtelTagValue is not null) + { + sb.Append(@" + }"); + } + + sb.Append(@" } "); @@ -287,7 +412,7 @@ public override void EnumerateTags(ref TProcessor processor) } sb.Append( - @"base.EnumerateTags(ref processor); + @"base.EnumerateTags(ref processor, openTelemetrySemanticsEnabled); } protected override void WriteAdditionalTags(System.Text.StringBuilder sb) diff --git a/tracer/src/Datadog.Trace.SourceGenerators/TagsListGenerator/TagListGenerator.cs b/tracer/src/Datadog.Trace.SourceGenerators/TagsListGenerator/TagListGenerator.cs index 21d42310de58..4204b2d4f5a3 100644 --- a/tracer/src/Datadog.Trace.SourceGenerators/TagsListGenerator/TagListGenerator.cs +++ b/tracer/src/Datadog.Trace.SourceGenerators/TagsListGenerator/TagListGenerator.cs @@ -139,6 +139,7 @@ private static IEnumerable GetTagLists(ImmutableArray tagP List? diagnostics = null; bool hasMisconfiguredInput = false; string? key = null; + string? otelKey = null; foreach (AttributeData attributeData in propertySymbol!.GetAttributes()) { @@ -191,6 +192,48 @@ private static IEnumerable GetTagLists(ImmutableArray tagP hasMisconfiguredInput = true; break; } + + if (isTag) + { + foreach (var namedArgument in attributeData.NamedArguments) + { + if (namedArgument.Key != "OtelName") + { + continue; + } + + if (namedArgument.Value.Kind == TypedConstantKind.Error) + { + hasMisconfiguredInput = true; + break; + } + + otelKey = (string?)namedArgument.Value.Value; + if (string.IsNullOrEmpty(otelKey)) + { + diagnostics ??= new List(); + diagnostics.Add(InvalidKeyDiagnostic.CreateInfo(attributeData.ApplicationSyntaxReference?.GetSyntax())); + hasMisconfiguredInput = true; + break; + } + + if (otelKey == "_dd.origin") + { + diagnostics ??= new List(); + diagnostics.Add(InvalidUseOfOriginDiagnostic.CreateInfo(attributeData.ApplicationSyntaxReference?.GetSyntax())); + hasMisconfiguredInput = true; + break; + } + + if (otelKey == "language") + { + diagnostics ??= new List(); + diagnostics.Add(InvalidUseOfLanguageDiagnostic.CreateInfo(attributeData.ApplicationSyntaxReference?.GetSyntax())); + hasMisconfiguredInput = true; + break; + } + } + } } } @@ -242,6 +285,7 @@ private static IEnumerable GetTagLists(ImmutableArray tagP isReadOnly: propertySymbol!.IsReadOnly, propertyName: propertySymbol.Name, tagValue: key!, + otelTagValue: otelKey, isTag: isTag, propertyType: propertyType); @@ -304,14 +348,16 @@ internal readonly record struct PropertyTag public readonly bool IsReadOnly; public readonly string PropertyName; public readonly string TagValue; + public readonly string? OtelTagValue; public readonly bool IsTag; public readonly PropertyType PropertyType; - public PropertyTag(string nameSpace, string className, bool isReadOnly, string propertyName, string tagValue, bool isTag, PropertyType propertyType) + public PropertyTag(string nameSpace, string className, bool isReadOnly, string propertyName, string tagValue, string? otelTagValue, bool isTag, PropertyType propertyType) { IsReadOnly = isReadOnly; PropertyName = propertyName; TagValue = tagValue; + OtelTagValue = otelTagValue; IsTag = isTag; Namespace = nameSpace; ClassName = className; diff --git a/tracer/src/Datadog.Trace/Agent/AgentWriter.cs b/tracer/src/Datadog.Trace/Agent/AgentWriter.cs index 2fdc75f87339..a85e6cbb1ea5 100644 --- a/tracer/src/Datadog.Trace/Agent/AgentWriter.cs +++ b/tracer/src/Datadog.Trace/Agent/AgentWriter.cs @@ -69,7 +69,7 @@ internal sealed class AgentWriter : IAgentWriter private bool _traceMetricsEnabled; public AgentWriter(IApi api, IStatsAggregator? statsAggregator, IStatsdManager statsd, TracerSettings settings) - : this(api, statsAggregator, statsd, maxBufferSize: settings.TraceBufferSize, batchInterval: settings.TraceBatchInterval, apmTracingEnabled: settings.ApmTracingEnabled, initialTracerMetricsEnabled: settings.Manager.InitialMutableSettings.TracerMetricsEnabled, openTelemetrySemanticsEnabled: settings.OtelSemanticsEnabled) + : this(api, statsAggregator, statsd, maxBufferSize: settings.TraceBufferSize, batchInterval: settings.TraceBatchInterval, apmTracingEnabled: settings.ApmTracingEnabled, initialTracerMetricsEnabled: settings.Manager.InitialMutableSettings.TracerMetricsEnabled) { settings.Manager.SubscribeToChanges(changes => { @@ -82,12 +82,12 @@ public AgentWriter(IApi api, IStatsAggregator? statsAggregator, IStatsdManager s }); } - public AgentWriter(IApi api, IStatsAggregator? statsAggregator, IStatsdManager statsd, bool automaticFlush = true, int maxBufferSize = 1024 * 1024 * 10, int batchInterval = 100, bool apmTracingEnabled = true, bool initialTracerMetricsEnabled = false, bool openTelemetrySemanticsEnabled = false) - : this(api, statsAggregator, statsd, MovingAverageKeepRateCalculator.CreateDefaultKeepRateCalculator(), automaticFlush, maxBufferSize, batchInterval, apmTracingEnabled, initialTracerMetricsEnabled, openTelemetrySemanticsEnabled) + public AgentWriter(IApi api, IStatsAggregator? statsAggregator, IStatsdManager statsd, bool automaticFlush = true, int maxBufferSize = 1024 * 1024 * 10, int batchInterval = 100, bool apmTracingEnabled = true, bool initialTracerMetricsEnabled = false) + : this(api, statsAggregator, statsd, MovingAverageKeepRateCalculator.CreateDefaultKeepRateCalculator(), automaticFlush, maxBufferSize, batchInterval, apmTracingEnabled, initialTracerMetricsEnabled) { } - internal AgentWriter(IApi api, IStatsAggregator? statsAggregator, IStatsdManager statsd, IKeepRateCalculator traceKeepRateCalculator, bool automaticFlush, int maxBufferSize, int batchInterval, bool apmTracingEnabled, bool initialTracerMetricsEnabled, bool openTelemetrySemanticsEnabled) + internal AgentWriter(IApi api, IStatsAggregator? statsAggregator, IStatsdManager statsd, IKeepRateCalculator traceKeepRateCalculator, bool automaticFlush, int maxBufferSize, int batchInterval, bool apmTracingEnabled, bool initialTracerMetricsEnabled) { _statsAggregator = statsAggregator ?? new NullStatsAggregator(); @@ -98,8 +98,8 @@ internal AgentWriter(IApi api, IStatsAggregator? statsAggregator, IStatsdManager ISpanBufferSerializer CreateSpanSerializer() => api.TracesEncoding switch { - TracesEncoding.OtlpJson => new OtlpTracesJsonSerializer(openTelemetrySemanticsEnabled), - TracesEncoding.OtlpProtobuf => new OtlpTracesProtobufSerializer(openTelemetrySemanticsEnabled), + TracesEncoding.OtlpJson => new OtlpTracesJsonSerializer(), + TracesEncoding.OtlpProtobuf => new OtlpTracesProtobufSerializer(), _ => new SpanBufferMessagePackSerializer(SpanFormatterResolver.Instance), }; diff --git a/tracer/src/Datadog.Trace/Agent/MessagePack/SpanMessagePackFormatter.cs b/tracer/src/Datadog.Trace/Agent/MessagePack/SpanMessagePackFormatter.cs index 2a8ce9207562..c590473a7ea2 100644 --- a/tracer/src/Datadog.Trace/Agent/MessagePack/SpanMessagePackFormatter.cs +++ b/tracer/src/Datadog.Trace/Agent/MessagePack/SpanMessagePackFormatter.cs @@ -510,7 +510,7 @@ private int WriteTags(ref byte[] bytes, int offset, in SpanModel model, ITagProc // Write span tags var tagWriter = new TagWriter(this, tagProcessors, bytes, offset); - span.Tags.EnumerateTags(ref tagWriter); + span.Tags.EnumerateTags(ref tagWriter, span.OpenTelemetrySemanticsEnabled); bytes = tagWriter.Bytes; offset = tagWriter.Offset; count += tagWriter.Count; diff --git a/tracer/src/Datadog.Trace/Agent/TraceSamplers/TraceFilter.cs b/tracer/src/Datadog.Trace/Agent/TraceSamplers/TraceFilter.cs index 14147410a47c..46af8f02b50e 100644 --- a/tracer/src/Datadog.Trace/Agent/TraceSamplers/TraceFilter.cs +++ b/tracer/src/Datadog.Trace/Agent/TraceSamplers/TraceFilter.cs @@ -74,6 +74,10 @@ static void BuildFilterTags(List? filters, out List keyFilters, /// /// Returns true if the trace should be kept, false if it should be rejected. /// Evaluation is based on the root span only. + /// Note: When a tag has both a DD and OTel name and is strongly typed in our ITags implementations, + /// there are two diverging behaviors: + /// - When applying a filter tag, the search checks both DD and OTel tag keys (and the singular tag value) + /// - When applying a filter tag regex, the search only checks one tag key (DD or Otel) based on the span's configured semantics setting. /// public bool ShouldKeepTrace(Span rootSpan) { @@ -95,6 +99,7 @@ public bool ShouldKeepTrace(Span rootSpan) } // 2a. Reject filtering: reject if any tag matches reject filters + // With DD vs OTel semantics: Simple tag names check both key names and the (singular) value. foreach (var filter in _filterTagKeysReject) { // Key-only filter: matches if tag key exists with any value @@ -159,7 +164,7 @@ public bool ShouldKeepTrace(Span rootSpan) private static bool MatchesRegexTagFilter(Span span, RegexTagFilter filter) { var processor = new RegexTagFilterProcessor(filter); - span.Tags.EnumerateTags(ref processor); + span.Tags.EnumerateTags(ref processor, span.OpenTelemetrySemanticsEnabled); return processor.Matched; } diff --git a/tracer/src/Datadog.Trace/Ci/Agent/MessagePack/SpanMessagePackFormatter.cs b/tracer/src/Datadog.Trace/Ci/Agent/MessagePack/SpanMessagePackFormatter.cs index 537725cd4223..e341e2952769 100644 --- a/tracer/src/Datadog.Trace/Ci/Agent/MessagePack/SpanMessagePackFormatter.cs +++ b/tracer/src/Datadog.Trace/Ci/Agent/MessagePack/SpanMessagePackFormatter.cs @@ -220,7 +220,7 @@ private int WriteTags(ref byte[] bytes, int offset, Span span, ITags tags, ITagP // Write span tags var tagWriter = new TagWriter(this, tagProcessors, bytes, offset); - tags.EnumerateTags(ref tagWriter); + tags.EnumerateTags(ref tagWriter, span.OpenTelemetrySemanticsEnabled); bytes = tagWriter.Bytes; offset = tagWriter.Offset; count += tagWriter.Count; diff --git a/tracer/src/Datadog.Trace/ExtensionMethods/SpanExtensions.cs b/tracer/src/Datadog.Trace/ExtensionMethods/SpanExtensions.cs index 86dd16973731..f36f8db92474 100644 --- a/tracer/src/Datadog.Trace/ExtensionMethods/SpanExtensions.cs +++ b/tracer/src/Datadog.Trace/ExtensionMethods/SpanExtensions.cs @@ -88,10 +88,13 @@ internal static bool HasHttpStatusCode(this Span span) } else { - return span.GetTag(Tags.HttpStatusCode) is not null; + return span.GetTag(Tags.HttpStatusCode) is not null || span.GetTag(Tags.HttpResponseStatusCode) is not null; } } + internal static string GetHttpStatusCodeString(this Span span) + => span.GetTag(Tags.HttpStatusCode) ?? span.GetTag(Tags.HttpResponseStatusCode); + internal static int? GetHttpStatusCode(this Span span) { if (span.Tags is IHasStatusCode statusCodeTags) @@ -100,7 +103,7 @@ internal static bool HasHttpStatusCode(this Span span) } else { - var rawHttpStatusCode = span.GetTag(Tags.HttpStatusCode); + var rawHttpStatusCode = span.GetHttpStatusCodeString(); if (rawHttpStatusCode == null || !int.TryParse(rawHttpStatusCode, out var httpStatusCode)) { return null; diff --git a/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TagListGenerator/AerospikeTags.g.cs b/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TagListGenerator/AerospikeTags.g.cs index ea4558a93691..e6b67ece8851 100644 --- a/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TagListGenerator/AerospikeTags.g.cs +++ b/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TagListGenerator/AerospikeTags.g.cs @@ -72,7 +72,7 @@ public override void SetTag(string key, string? value) } } - public override void EnumerateTags(ref TProcessor processor) + public override void EnumerateTags(ref TProcessor processor, bool openTelemetrySemanticsEnabled) { if (SpanKind is not null) { @@ -104,7 +104,7 @@ public override void EnumerateTags(ref TProcessor processor) processor.Process(new TagItem("aerospike.userkey", UserKey, UserKeyBytes)); } - base.EnumerateTags(ref processor); + base.EnumerateTags(ref processor, openTelemetrySemanticsEnabled); } protected override void WriteAdditionalTags(System.Text.StringBuilder sb) diff --git a/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TagListGenerator/AerospikeV1Tags.g.cs b/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TagListGenerator/AerospikeV1Tags.g.cs index 38446d61fa14..73a3e3cc8f3c 100644 --- a/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TagListGenerator/AerospikeV1Tags.g.cs +++ b/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TagListGenerator/AerospikeV1Tags.g.cs @@ -46,7 +46,7 @@ public override void SetTag(string key, string? value) } } - public override void EnumerateTags(ref TProcessor processor) + public override void EnumerateTags(ref TProcessor processor, bool openTelemetrySemanticsEnabled) { if (PeerService is not null) { @@ -58,7 +58,7 @@ public override void EnumerateTags(ref TProcessor processor) processor.Process(new TagItem("_dd.peer.service.source", PeerServiceSource, PeerServiceSourceBytes)); } - base.EnumerateTags(ref processor); + base.EnumerateTags(ref processor, openTelemetrySemanticsEnabled); } protected override void WriteAdditionalTags(System.Text.StringBuilder sb) diff --git a/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TagListGenerator/AspNetCoreEndpointTags.g.cs b/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TagListGenerator/AspNetCoreEndpointTags.g.cs index 57f2de401d7e..49c57fc27ca3 100644 --- a/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TagListGenerator/AspNetCoreEndpointTags.g.cs +++ b/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TagListGenerator/AspNetCoreEndpointTags.g.cs @@ -39,14 +39,14 @@ public override void SetTag(string key, string? value) } } - public override void EnumerateTags(ref TProcessor processor) + public override void EnumerateTags(ref TProcessor processor, bool openTelemetrySemanticsEnabled) { if (AspNetCoreEndpoint is not null) { processor.Process(new TagItem("aspnet_core.endpoint", AspNetCoreEndpoint, AspNetCoreEndpointBytes)); } - base.EnumerateTags(ref processor); + base.EnumerateTags(ref processor, openTelemetrySemanticsEnabled); } protected override void WriteAdditionalTags(System.Text.StringBuilder sb) diff --git a/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TagListGenerator/AspNetCoreMvcTags.g.cs b/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TagListGenerator/AspNetCoreMvcTags.g.cs index 0e7aa5558682..c9ef75bc22ee 100644 --- a/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TagListGenerator/AspNetCoreMvcTags.g.cs +++ b/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TagListGenerator/AspNetCoreMvcTags.g.cs @@ -79,7 +79,7 @@ public override void SetTag(string key, string? value) } } - public override void EnumerateTags(ref TProcessor processor) + public override void EnumerateTags(ref TProcessor processor, bool openTelemetrySemanticsEnabled) { if (SpanKind is not null) { @@ -116,7 +116,7 @@ public override void EnumerateTags(ref TProcessor processor) processor.Process(new TagItem("aspnet_core.route", AspNetCoreRoute, AspNetCoreRouteBytes)); } - base.EnumerateTags(ref processor); + base.EnumerateTags(ref processor, openTelemetrySemanticsEnabled); } protected override void WriteAdditionalTags(System.Text.StringBuilder sb) diff --git a/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TagListGenerator/AspNetCoreSingleSpanTags.g.cs b/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TagListGenerator/AspNetCoreSingleSpanTags.g.cs index 268236edb742..b54ba8c3fb36 100644 --- a/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TagListGenerator/AspNetCoreSingleSpanTags.g.cs +++ b/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TagListGenerator/AspNetCoreSingleSpanTags.g.cs @@ -107,7 +107,7 @@ public override void SetTag(string key, string? value) } } - public override void EnumerateTags(ref TProcessor processor) + public override void EnumerateTags(ref TProcessor processor, bool openTelemetrySemanticsEnabled) { if (InstrumentationName is not null) { @@ -164,7 +164,7 @@ public override void EnumerateTags(ref TProcessor processor) processor.Process(new TagItem("_dd.code_origin.frames.0.column", CodeOriginFrameColumn, CodeOriginFrameColumnBytes)); } - base.EnumerateTags(ref processor); + base.EnumerateTags(ref processor, openTelemetrySemanticsEnabled); } protected override void WriteAdditionalTags(System.Text.StringBuilder sb) diff --git a/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TagListGenerator/AspNetCoreTags.g.cs b/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TagListGenerator/AspNetCoreTags.g.cs index 2ab87d9d28d3..9674b3c620fc 100644 --- a/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TagListGenerator/AspNetCoreTags.g.cs +++ b/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TagListGenerator/AspNetCoreTags.g.cs @@ -102,7 +102,7 @@ public override void SetTag(string key, string? value) } } - public override void EnumerateTags(ref TProcessor processor) + public override void EnumerateTags(ref TProcessor processor, bool openTelemetrySemanticsEnabled) { if (InstrumentationName is not null) { @@ -154,7 +154,7 @@ public override void EnumerateTags(ref TProcessor processor) processor.Process(new TagItem("_dd.code_origin.frames.0.column", CodeOriginFrameColumn, CodeOriginFrameColumnBytes)); } - base.EnumerateTags(ref processor); + base.EnumerateTags(ref processor, openTelemetrySemanticsEnabled); } protected override void WriteAdditionalTags(System.Text.StringBuilder sb) diff --git a/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TagListGenerator/AspNetTags.g.cs b/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TagListGenerator/AspNetTags.g.cs index 1493deadadd2..f87275c9d138 100644 --- a/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TagListGenerator/AspNetTags.g.cs +++ b/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TagListGenerator/AspNetTags.g.cs @@ -74,7 +74,7 @@ public override void SetTag(string key, string? value) } } - public override void EnumerateTags(ref TProcessor processor) + public override void EnumerateTags(ref TProcessor processor, bool openTelemetrySemanticsEnabled) { if (AspNetRoute is not null) { @@ -106,7 +106,7 @@ public override void EnumerateTags(ref TProcessor processor) processor.Process(new TagItem("component", InstrumentationName, InstrumentationNameBytes)); } - base.EnumerateTags(ref processor); + base.EnumerateTags(ref processor, openTelemetrySemanticsEnabled); } protected override void WriteAdditionalTags(System.Text.StringBuilder sb) diff --git a/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TagListGenerator/AwsDynamoDbTags.g.cs b/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TagListGenerator/AwsDynamoDbTags.g.cs index 6b4094015296..fabde3fd5416 100644 --- a/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TagListGenerator/AwsDynamoDbTags.g.cs +++ b/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TagListGenerator/AwsDynamoDbTags.g.cs @@ -46,7 +46,7 @@ public override void SetTag(string key, string? value) } } - public override void EnumerateTags(ref TProcessor processor) + public override void EnumerateTags(ref TProcessor processor, bool openTelemetrySemanticsEnabled) { if (TableName is not null) { @@ -58,7 +58,7 @@ public override void EnumerateTags(ref TProcessor processor) processor.Process(new TagItem("span.kind", SpanKind, SpanKindBytes)); } - base.EnumerateTags(ref processor); + base.EnumerateTags(ref processor, openTelemetrySemanticsEnabled); } protected override void WriteAdditionalTags(System.Text.StringBuilder sb) diff --git a/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TagListGenerator/AwsEventBridgeTags.g.cs b/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TagListGenerator/AwsEventBridgeTags.g.cs index af149744d93d..c194f4868294 100644 --- a/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TagListGenerator/AwsEventBridgeTags.g.cs +++ b/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TagListGenerator/AwsEventBridgeTags.g.cs @@ -46,7 +46,7 @@ public override void SetTag(string key, string? value) } } - public override void EnumerateTags(ref TProcessor processor) + public override void EnumerateTags(ref TProcessor processor, bool openTelemetrySemanticsEnabled) { if (RuleName is not null) { @@ -58,7 +58,7 @@ public override void EnumerateTags(ref TProcessor processor) processor.Process(new TagItem("span.kind", SpanKind, SpanKindBytes)); } - base.EnumerateTags(ref processor); + base.EnumerateTags(ref processor, openTelemetrySemanticsEnabled); } protected override void WriteAdditionalTags(System.Text.StringBuilder sb) diff --git a/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TagListGenerator/AwsKinesisTags.g.cs b/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TagListGenerator/AwsKinesisTags.g.cs index cdb8a4e6793c..9a01c7b53b21 100644 --- a/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TagListGenerator/AwsKinesisTags.g.cs +++ b/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TagListGenerator/AwsKinesisTags.g.cs @@ -46,7 +46,7 @@ public override void SetTag(string key, string? value) } } - public override void EnumerateTags(ref TProcessor processor) + public override void EnumerateTags(ref TProcessor processor, bool openTelemetrySemanticsEnabled) { if (StreamName is not null) { @@ -58,7 +58,7 @@ public override void EnumerateTags(ref TProcessor processor) processor.Process(new TagItem("span.kind", SpanKind, SpanKindBytes)); } - base.EnumerateTags(ref processor); + base.EnumerateTags(ref processor, openTelemetrySemanticsEnabled); } protected override void WriteAdditionalTags(System.Text.StringBuilder sb) diff --git a/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TagListGenerator/AwsS3Tags.g.cs b/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TagListGenerator/AwsS3Tags.g.cs index 834732e88bb4..a6159664e1cd 100644 --- a/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TagListGenerator/AwsS3Tags.g.cs +++ b/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TagListGenerator/AwsS3Tags.g.cs @@ -53,7 +53,7 @@ public override void SetTag(string key, string? value) } } - public override void EnumerateTags(ref TProcessor processor) + public override void EnumerateTags(ref TProcessor processor, bool openTelemetrySemanticsEnabled) { if (BucketName is not null) { @@ -70,7 +70,7 @@ public override void EnumerateTags(ref TProcessor processor) processor.Process(new TagItem("span.kind", SpanKind, SpanKindBytes)); } - base.EnumerateTags(ref processor); + base.EnumerateTags(ref processor, openTelemetrySemanticsEnabled); } protected override void WriteAdditionalTags(System.Text.StringBuilder sb) diff --git a/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TagListGenerator/AwsSdkTags.g.cs b/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TagListGenerator/AwsSdkTags.g.cs index 6b5d2d3193a5..3bb3d26b6f5c 100644 --- a/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TagListGenerator/AwsSdkTags.g.cs +++ b/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TagListGenerator/AwsSdkTags.g.cs @@ -53,6 +53,9 @@ partial class AwsSdkTags // HttpStatusCodeBytes = MessagePack.Serialize("http.status_code"); private static ReadOnlySpan HttpStatusCodeBytes => [176, 104, 116, 116, 112, 46, 115, 116, 97, 116, 117, 115, 95, 99, 111, 100, 101]; + // HttpStatusCodeOtelBytes = MessagePack.Serialize("http.response.status_code"); + private static ReadOnlySpan HttpStatusCodeOtelBytes => [185, 104, 116, 116, 112, 46, 114, 101, 115, 112, 111, 110, 115, 101, 46, 115, 116, 97, 116, 117, 115, 95, 99, 111, 100, 101]; + public override string? GetTag(string key) { return key switch @@ -70,6 +73,7 @@ partial class AwsSdkTags "http.method" => HttpMethod, "http.url" => HttpUrl, "http.status_code" => HttpStatusCode is null ? null : Datadog.Trace.Util.IntStringCache.ToInvariantString(HttpStatusCode.Value), + "http.response.status_code" => HttpStatusCode is null ? null : Datadog.Trace.Util.IntStringCache.ToInvariantString(HttpStatusCode.Value), _ => base.GetTag(key), }; } @@ -102,7 +106,8 @@ public override void SetTag(string key, string? value) case "http.url": HttpUrl = value; break; - case "http.status_code": + case "http.status_code": + case "http.response.status_code": if (int.TryParse(value, System.Globalization.NumberStyles.Integer, System.Globalization.CultureInfo.InvariantCulture, out var parsedHttpStatusCode)) { HttpStatusCode = parsedHttpStatusCode; @@ -125,7 +130,7 @@ public override void SetTag(string key, string? value) } } - public override void EnumerateTags(ref TProcessor processor) + public override void EnumerateTags(ref TProcessor processor, bool openTelemetrySemanticsEnabled) { if (InstrumentationName is not null) { @@ -189,10 +194,17 @@ public override void EnumerateTags(ref TProcessor processor) if (HttpStatusCode is not null) { - processor.Process(new TagItem("http.status_code", HttpStatusCode.Value, HttpStatusCodeBytes)); + if (openTelemetrySemanticsEnabled) + { + processor.Process(new TagItem("http.response.status_code", HttpStatusCode.Value, HttpStatusCodeOtelBytes)); + } + else + { + processor.Process(new TagItem("http.status_code", HttpStatusCode.Value, HttpStatusCodeBytes)); + } } - base.EnumerateTags(ref processor); + base.EnumerateTags(ref processor, openTelemetrySemanticsEnabled); } protected override void WriteAdditionalTags(System.Text.StringBuilder sb) diff --git a/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TagListGenerator/AwsSnsTags.g.cs b/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TagListGenerator/AwsSnsTags.g.cs index 0f6ee97e8ff0..33e5bf5e2ece 100644 --- a/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TagListGenerator/AwsSnsTags.g.cs +++ b/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TagListGenerator/AwsSnsTags.g.cs @@ -58,7 +58,7 @@ public override void SetTag(string key, string? value) } } - public override void EnumerateTags(ref TProcessor processor) + public override void EnumerateTags(ref TProcessor processor, bool openTelemetrySemanticsEnabled) { if (AwsTopicName is not null) { @@ -80,7 +80,7 @@ public override void EnumerateTags(ref TProcessor processor) processor.Process(new TagItem("span.kind", SpanKind, SpanKindBytes)); } - base.EnumerateTags(ref processor); + base.EnumerateTags(ref processor, openTelemetrySemanticsEnabled); } protected override void WriteAdditionalTags(System.Text.StringBuilder sb) diff --git a/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TagListGenerator/AwsSqsTags.g.cs b/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TagListGenerator/AwsSqsTags.g.cs index ab84a58d85a3..f92531146146 100644 --- a/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TagListGenerator/AwsSqsTags.g.cs +++ b/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TagListGenerator/AwsSqsTags.g.cs @@ -58,7 +58,7 @@ public override void SetTag(string key, string? value) } } - public override void EnumerateTags(ref TProcessor processor) + public override void EnumerateTags(ref TProcessor processor, bool openTelemetrySemanticsEnabled) { if (AwsQueueName is not null) { @@ -80,7 +80,7 @@ public override void EnumerateTags(ref TProcessor processor) processor.Process(new TagItem("span.kind", SpanKind, SpanKindBytes)); } - base.EnumerateTags(ref processor); + base.EnumerateTags(ref processor, openTelemetrySemanticsEnabled); } protected override void WriteAdditionalTags(System.Text.StringBuilder sb) diff --git a/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TagListGenerator/AwsStepFunctionsTags.g.cs b/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TagListGenerator/AwsStepFunctionsTags.g.cs index d35e46e0688b..7f30da9df1c4 100644 --- a/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TagListGenerator/AwsStepFunctionsTags.g.cs +++ b/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TagListGenerator/AwsStepFunctionsTags.g.cs @@ -46,7 +46,7 @@ public override void SetTag(string key, string? value) } } - public override void EnumerateTags(ref TProcessor processor) + public override void EnumerateTags(ref TProcessor processor, bool openTelemetrySemanticsEnabled) { if (StateMachineName is not null) { @@ -58,7 +58,7 @@ public override void EnumerateTags(ref TProcessor processor) processor.Process(new TagItem("span.kind", SpanKind, SpanKindBytes)); } - base.EnumerateTags(ref processor); + base.EnumerateTags(ref processor, openTelemetrySemanticsEnabled); } protected override void WriteAdditionalTags(System.Text.StringBuilder sb) diff --git a/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TagListGenerator/AzureEventHubsTags.g.cs b/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TagListGenerator/AzureEventHubsTags.g.cs index 31b548dd2865..b4574999458c 100644 --- a/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TagListGenerator/AzureEventHubsTags.g.cs +++ b/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TagListGenerator/AzureEventHubsTags.g.cs @@ -115,7 +115,7 @@ public override void SetTag(string key, string? value) } } - public override void EnumerateTags(ref TProcessor processor) + public override void EnumerateTags(ref TProcessor processor, bool openTelemetrySemanticsEnabled) { if (SpanKind is not null) { @@ -177,7 +177,7 @@ public override void EnumerateTags(ref TProcessor processor) processor.Process(new TagItem("messaging.message_id", MessagingMessageId, MessagingMessageIdBytes)); } - base.EnumerateTags(ref processor); + base.EnumerateTags(ref processor, openTelemetrySemanticsEnabled); } protected override void WriteAdditionalTags(System.Text.StringBuilder sb) diff --git a/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TagListGenerator/AzureEventHubsV1Tags.g.cs b/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TagListGenerator/AzureEventHubsV1Tags.g.cs index b6580fed8efd..2631ff833fb6 100644 --- a/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TagListGenerator/AzureEventHubsV1Tags.g.cs +++ b/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TagListGenerator/AzureEventHubsV1Tags.g.cs @@ -46,7 +46,7 @@ public override void SetTag(string key, string? value) } } - public override void EnumerateTags(ref TProcessor processor) + public override void EnumerateTags(ref TProcessor processor, bool openTelemetrySemanticsEnabled) { if (PeerService is not null) { @@ -58,7 +58,7 @@ public override void EnumerateTags(ref TProcessor processor) processor.Process(new TagItem("_dd.peer.service.source", PeerServiceSource, PeerServiceSourceBytes)); } - base.EnumerateTags(ref processor); + base.EnumerateTags(ref processor, openTelemetrySemanticsEnabled); } protected override void WriteAdditionalTags(System.Text.StringBuilder sb) diff --git a/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TagListGenerator/AzureFunctionsTags.g.cs b/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TagListGenerator/AzureFunctionsTags.g.cs index 685fd8163817..805fa37f033b 100644 --- a/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TagListGenerator/AzureFunctionsTags.g.cs +++ b/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TagListGenerator/AzureFunctionsTags.g.cs @@ -72,7 +72,7 @@ public override void SetTag(string key, string? value) } } - public override void EnumerateTags(ref TProcessor processor) + public override void EnumerateTags(ref TProcessor processor, bool openTelemetrySemanticsEnabled) { if (SpanKind is not null) { @@ -104,7 +104,7 @@ public override void EnumerateTags(ref TProcessor processor) processor.Process(new TagItem("aas.function.trigger", TriggerType, TriggerTypeBytes)); } - base.EnumerateTags(ref processor); + base.EnumerateTags(ref processor, openTelemetrySemanticsEnabled); } protected override void WriteAdditionalTags(System.Text.StringBuilder sb) diff --git a/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TagListGenerator/AzureServiceBusTags.g.cs b/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TagListGenerator/AzureServiceBusTags.g.cs index b6cfb5de3e3c..647d086d0be8 100644 --- a/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TagListGenerator/AzureServiceBusTags.g.cs +++ b/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TagListGenerator/AzureServiceBusTags.g.cs @@ -101,7 +101,7 @@ public override void SetTag(string key, string? value) } } - public override void EnumerateTags(ref TProcessor processor) + public override void EnumerateTags(ref TProcessor processor, bool openTelemetrySemanticsEnabled) { if (InstrumentationName is not null) { @@ -148,7 +148,7 @@ public override void EnumerateTags(ref TProcessor processor) processor.Process(new TagItem("server.address", ServerAddress, ServerAddressBytes)); } - base.EnumerateTags(ref processor); + base.EnumerateTags(ref processor, openTelemetrySemanticsEnabled); } protected override void WriteAdditionalTags(System.Text.StringBuilder sb) diff --git a/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TagListGenerator/AzureServiceBusV1Tags.g.cs b/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TagListGenerator/AzureServiceBusV1Tags.g.cs index 602423d8a83f..63fcff43d898 100644 --- a/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TagListGenerator/AzureServiceBusV1Tags.g.cs +++ b/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TagListGenerator/AzureServiceBusV1Tags.g.cs @@ -46,7 +46,7 @@ public override void SetTag(string key, string? value) } } - public override void EnumerateTags(ref TProcessor processor) + public override void EnumerateTags(ref TProcessor processor, bool openTelemetrySemanticsEnabled) { if (PeerService is not null) { @@ -58,7 +58,7 @@ public override void EnumerateTags(ref TProcessor processor) processor.Process(new TagItem("_dd.peer.service.source", PeerServiceSource, PeerServiceSourceBytes)); } - base.EnumerateTags(ref processor); + base.EnumerateTags(ref processor, openTelemetrySemanticsEnabled); } protected override void WriteAdditionalTags(System.Text.StringBuilder sb) diff --git a/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TagListGenerator/CosmosDbTags.g.cs b/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TagListGenerator/CosmosDbTags.g.cs index a72ebf93e4e6..aa2d8e1efb33 100644 --- a/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TagListGenerator/CosmosDbTags.g.cs +++ b/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TagListGenerator/CosmosDbTags.g.cs @@ -98,7 +98,7 @@ public override void SetTag(string key, string? value) } } - public override void EnumerateTags(ref TProcessor processor) + public override void EnumerateTags(ref TProcessor processor, bool openTelemetrySemanticsEnabled) { if (SpanKind is not null) { @@ -150,7 +150,7 @@ public override void EnumerateTags(ref TProcessor processor) processor.Process(new TagItem("cosmosdb.connection.mode", ConnectionMode, ConnectionModeBytes)); } - base.EnumerateTags(ref processor); + base.EnumerateTags(ref processor, openTelemetrySemanticsEnabled); } protected override void WriteAdditionalTags(System.Text.StringBuilder sb) diff --git a/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TagListGenerator/CosmosDbV1Tags.g.cs b/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TagListGenerator/CosmosDbV1Tags.g.cs index 58b46d58b982..eea36b6406d8 100644 --- a/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TagListGenerator/CosmosDbV1Tags.g.cs +++ b/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TagListGenerator/CosmosDbV1Tags.g.cs @@ -53,7 +53,7 @@ public override void SetTag(string key, string? value) } } - public override void EnumerateTags(ref TProcessor processor) + public override void EnumerateTags(ref TProcessor processor, bool openTelemetrySemanticsEnabled) { if (Port is not null) { @@ -70,7 +70,7 @@ public override void EnumerateTags(ref TProcessor processor) processor.Process(new TagItem("_dd.peer.service.source", PeerServiceSource, PeerServiceSourceBytes)); } - base.EnumerateTags(ref processor); + base.EnumerateTags(ref processor, openTelemetrySemanticsEnabled); } protected override void WriteAdditionalTags(System.Text.StringBuilder sb) diff --git a/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TagListGenerator/CouchbaseTags.g.cs b/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TagListGenerator/CouchbaseTags.g.cs index 95f10b3803ca..d34b1182ea0a 100644 --- a/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TagListGenerator/CouchbaseTags.g.cs +++ b/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TagListGenerator/CouchbaseTags.g.cs @@ -86,7 +86,7 @@ public override void SetTag(string key, string? value) } } - public override void EnumerateTags(ref TProcessor processor) + public override void EnumerateTags(ref TProcessor processor, bool openTelemetrySemanticsEnabled) { if (SpanKind is not null) { @@ -128,7 +128,7 @@ public override void EnumerateTags(ref TProcessor processor) processor.Process(new TagItem("out.port", Port, PortBytes)); } - base.EnumerateTags(ref processor); + base.EnumerateTags(ref processor, openTelemetrySemanticsEnabled); } protected override void WriteAdditionalTags(System.Text.StringBuilder sb) diff --git a/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TagListGenerator/CouchbaseV1Tags.g.cs b/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TagListGenerator/CouchbaseV1Tags.g.cs index 6b6a2e602e23..44450d38b10e 100644 --- a/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TagListGenerator/CouchbaseV1Tags.g.cs +++ b/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TagListGenerator/CouchbaseV1Tags.g.cs @@ -46,7 +46,7 @@ public override void SetTag(string key, string? value) } } - public override void EnumerateTags(ref TProcessor processor) + public override void EnumerateTags(ref TProcessor processor, bool openTelemetrySemanticsEnabled) { if (PeerService is not null) { @@ -58,7 +58,7 @@ public override void EnumerateTags(ref TProcessor processor) processor.Process(new TagItem("_dd.peer.service.source", PeerServiceSource, PeerServiceSourceBytes)); } - base.EnumerateTags(ref processor); + base.EnumerateTags(ref processor, openTelemetrySemanticsEnabled); } protected override void WriteAdditionalTags(System.Text.StringBuilder sb) diff --git a/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TagListGenerator/ElasticsearchTags.g.cs b/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TagListGenerator/ElasticsearchTags.g.cs index d0a973383095..9a372195b4ab 100644 --- a/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TagListGenerator/ElasticsearchTags.g.cs +++ b/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TagListGenerator/ElasticsearchTags.g.cs @@ -72,7 +72,7 @@ public override void SetTag(string key, string? value) } } - public override void EnumerateTags(ref TProcessor processor) + public override void EnumerateTags(ref TProcessor processor, bool openTelemetrySemanticsEnabled) { if (SpanKind is not null) { @@ -104,7 +104,7 @@ public override void EnumerateTags(ref TProcessor processor) processor.Process(new TagItem("out.host", Host, HostBytes)); } - base.EnumerateTags(ref processor); + base.EnumerateTags(ref processor, openTelemetrySemanticsEnabled); } protected override void WriteAdditionalTags(System.Text.StringBuilder sb) diff --git a/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TagListGenerator/ElasticsearchV1Tags.g.cs b/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TagListGenerator/ElasticsearchV1Tags.g.cs index 154659ca0134..db538ee95417 100644 --- a/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TagListGenerator/ElasticsearchV1Tags.g.cs +++ b/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TagListGenerator/ElasticsearchV1Tags.g.cs @@ -46,7 +46,7 @@ public override void SetTag(string key, string? value) } } - public override void EnumerateTags(ref TProcessor processor) + public override void EnumerateTags(ref TProcessor processor, bool openTelemetrySemanticsEnabled) { if (PeerService is not null) { @@ -58,7 +58,7 @@ public override void EnumerateTags(ref TProcessor processor) processor.Process(new TagItem("_dd.peer.service.source", PeerServiceSource, PeerServiceSourceBytes)); } - base.EnumerateTags(ref processor); + base.EnumerateTags(ref processor, openTelemetrySemanticsEnabled); } protected override void WriteAdditionalTags(System.Text.StringBuilder sb) diff --git a/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TagListGenerator/GraphQLTags.g.cs b/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TagListGenerator/GraphQLTags.g.cs index fa648637efa9..b37ad74308c6 100644 --- a/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TagListGenerator/GraphQLTags.g.cs +++ b/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TagListGenerator/GraphQLTags.g.cs @@ -65,7 +65,7 @@ public override void SetTag(string key, string? value) } } - public override void EnumerateTags(ref TProcessor processor) + public override void EnumerateTags(ref TProcessor processor, bool openTelemetrySemanticsEnabled) { if (SpanKind is not null) { @@ -92,7 +92,7 @@ public override void EnumerateTags(ref TProcessor processor) processor.Process(new TagItem("graphql.operation.type", OperationType, OperationTypeBytes)); } - base.EnumerateTags(ref processor); + base.EnumerateTags(ref processor, openTelemetrySemanticsEnabled); } protected override void WriteAdditionalTags(System.Text.StringBuilder sb) diff --git a/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TagListGenerator/GrpcClientTags.g.cs b/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TagListGenerator/GrpcClientTags.g.cs index 2446a6bf023a..bd93cc0038f7 100644 --- a/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TagListGenerator/GrpcClientTags.g.cs +++ b/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TagListGenerator/GrpcClientTags.g.cs @@ -46,7 +46,7 @@ public override void SetTag(string key, string? value) } } - public override void EnumerateTags(ref TProcessor processor) + public override void EnumerateTags(ref TProcessor processor, bool openTelemetrySemanticsEnabled) { if (Host is not null) { @@ -58,7 +58,7 @@ public override void EnumerateTags(ref TProcessor processor) processor.Process(new TagItem("peer.hostname", PeerHostname, PeerHostnameBytes)); } - base.EnumerateTags(ref processor); + base.EnumerateTags(ref processor, openTelemetrySemanticsEnabled); } protected override void WriteAdditionalTags(System.Text.StringBuilder sb) diff --git a/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TagListGenerator/GrpcClientV1Tags.g.cs b/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TagListGenerator/GrpcClientV1Tags.g.cs index 4f9cc28c3cce..f39c5be4711f 100644 --- a/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TagListGenerator/GrpcClientV1Tags.g.cs +++ b/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TagListGenerator/GrpcClientV1Tags.g.cs @@ -46,7 +46,7 @@ public override void SetTag(string key, string? value) } } - public override void EnumerateTags(ref TProcessor processor) + public override void EnumerateTags(ref TProcessor processor, bool openTelemetrySemanticsEnabled) { if (PeerService is not null) { @@ -58,7 +58,7 @@ public override void EnumerateTags(ref TProcessor processor) processor.Process(new TagItem("_dd.peer.service.source", PeerServiceSource, PeerServiceSourceBytes)); } - base.EnumerateTags(ref processor); + base.EnumerateTags(ref processor, openTelemetrySemanticsEnabled); } protected override void WriteAdditionalTags(System.Text.StringBuilder sb) diff --git a/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TagListGenerator/GrpcTags.g.cs b/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TagListGenerator/GrpcTags.g.cs index 4c01218928a4..8ec123c6e7df 100644 --- a/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TagListGenerator/GrpcTags.g.cs +++ b/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TagListGenerator/GrpcTags.g.cs @@ -86,7 +86,7 @@ public override void SetTag(string key, string? value) } } - public override void EnumerateTags(ref TProcessor processor) + public override void EnumerateTags(ref TProcessor processor, bool openTelemetrySemanticsEnabled) { if (SpanKind is not null) { @@ -128,7 +128,7 @@ public override void EnumerateTags(ref TProcessor processor) processor.Process(new TagItem("grpc.status.code", StatusCode, StatusCodeBytes)); } - base.EnumerateTags(ref processor); + base.EnumerateTags(ref processor, openTelemetrySemanticsEnabled); } protected override void WriteAdditionalTags(System.Text.StringBuilder sb) diff --git a/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TagListGenerator/HangfireTags.g.cs b/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TagListGenerator/HangfireTags.g.cs index adcd5af61841..ea3e826dad35 100644 --- a/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TagListGenerator/HangfireTags.g.cs +++ b/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TagListGenerator/HangfireTags.g.cs @@ -58,7 +58,7 @@ public override void SetTag(string key, string? value) } } - public override void EnumerateTags(ref TProcessor processor) + public override void EnumerateTags(ref TProcessor processor, bool openTelemetrySemanticsEnabled) { if (InstrumentationName is not null) { @@ -80,7 +80,7 @@ public override void EnumerateTags(ref TProcessor processor) processor.Process(new TagItem("job.ID", JobId, JobIdBytes)); } - base.EnumerateTags(ref processor); + base.EnumerateTags(ref processor, openTelemetrySemanticsEnabled); } protected override void WriteAdditionalTags(System.Text.StringBuilder sb) diff --git a/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TagListGenerator/HttpTags.g.cs b/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TagListGenerator/HttpTags.g.cs index 1414cda04601..7406088379c3 100644 --- a/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TagListGenerator/HttpTags.g.cs +++ b/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TagListGenerator/HttpTags.g.cs @@ -32,6 +32,9 @@ partial class HttpTags // HttpStatusCodeBytes = MessagePack.Serialize("http.status_code"); private static ReadOnlySpan HttpStatusCodeBytes => [176, 104, 116, 116, 112, 46, 115, 116, 97, 116, 117, 115, 95, 99, 111, 100, 101]; + // HttpStatusCodeOtelBytes = MessagePack.Serialize("http.response.status_code"); + private static ReadOnlySpan HttpStatusCodeOtelBytes => [185, 104, 116, 116, 112, 46, 114, 101, 115, 112, 111, 110, 115, 101, 46, 115, 116, 97, 116, 117, 115, 95, 99, 111, 100, 101]; + // HostBytes = MessagePack.Serialize("out.host"); private static ReadOnlySpan HostBytes => [168, 111, 117, 116, 46, 104, 111, 115, 116]; @@ -45,6 +48,7 @@ partial class HttpTags "http.url" => HttpUrl, "http-client-handler-type" => HttpClientHandlerType, "http.status_code" => HttpStatusCode is null ? null : Datadog.Trace.Util.IntStringCache.ToInvariantString(HttpStatusCode.Value), + "http.response.status_code" => HttpStatusCode is null ? null : Datadog.Trace.Util.IntStringCache.ToInvariantString(HttpStatusCode.Value), "out.host" => Host, _ => base.GetTag(key), }; @@ -66,7 +70,8 @@ public override void SetTag(string key, string? value) case "http-client-handler-type": HttpClientHandlerType = value; break; - case "http.status_code": + case "http.status_code": + case "http.response.status_code": if (int.TryParse(value, System.Globalization.NumberStyles.Integer, System.Globalization.CultureInfo.InvariantCulture, out var parsedHttpStatusCode)) { HttpStatusCode = parsedHttpStatusCode; @@ -89,7 +94,7 @@ public override void SetTag(string key, string? value) } } - public override void EnumerateTags(ref TProcessor processor) + public override void EnumerateTags(ref TProcessor processor, bool openTelemetrySemanticsEnabled) { if (SpanKind is not null) { @@ -118,7 +123,14 @@ public override void EnumerateTags(ref TProcessor processor) if (HttpStatusCode is not null) { - processor.Process(new TagItem("http.status_code", HttpStatusCode.Value, HttpStatusCodeBytes)); + if (openTelemetrySemanticsEnabled) + { + processor.Process(new TagItem("http.response.status_code", HttpStatusCode.Value, HttpStatusCodeOtelBytes)); + } + else + { + processor.Process(new TagItem("http.status_code", HttpStatusCode.Value, HttpStatusCodeBytes)); + } } if (Host is not null) @@ -126,7 +138,7 @@ public override void EnumerateTags(ref TProcessor processor) processor.Process(new TagItem("out.host", Host, HostBytes)); } - base.EnumerateTags(ref processor); + base.EnumerateTags(ref processor, openTelemetrySemanticsEnabled); } protected override void WriteAdditionalTags(System.Text.StringBuilder sb) diff --git a/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TagListGenerator/HttpV1Tags.g.cs b/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TagListGenerator/HttpV1Tags.g.cs index 36e594313021..8fc26c308117 100644 --- a/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TagListGenerator/HttpV1Tags.g.cs +++ b/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TagListGenerator/HttpV1Tags.g.cs @@ -46,7 +46,7 @@ public override void SetTag(string key, string? value) } } - public override void EnumerateTags(ref TProcessor processor) + public override void EnumerateTags(ref TProcessor processor, bool openTelemetrySemanticsEnabled) { if (PeerService is not null) { @@ -58,7 +58,7 @@ public override void EnumerateTags(ref TProcessor processor) processor.Process(new TagItem("_dd.peer.service.source", PeerServiceSource, PeerServiceSourceBytes)); } - base.EnumerateTags(ref processor); + base.EnumerateTags(ref processor, openTelemetrySemanticsEnabled); } protected override void WriteAdditionalTags(System.Text.StringBuilder sb) diff --git a/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TagListGenerator/IastTags.g.cs b/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TagListGenerator/IastTags.g.cs index e8d2bf22fcb9..98882fc5a048 100644 --- a/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TagListGenerator/IastTags.g.cs +++ b/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TagListGenerator/IastTags.g.cs @@ -46,7 +46,7 @@ public override void SetTag(string key, string? value) } } - public override void EnumerateTags(ref TProcessor processor) + public override void EnumerateTags(ref TProcessor processor, bool openTelemetrySemanticsEnabled) { if (IastJson is not null) { @@ -58,7 +58,7 @@ public override void EnumerateTags(ref TProcessor processor) processor.Process(new TagItem("_dd.iast.enabled", IastEnabled, IastEnabledBytes)); } - base.EnumerateTags(ref processor); + base.EnumerateTags(ref processor, openTelemetrySemanticsEnabled); } protected override void WriteAdditionalTags(System.Text.StringBuilder sb) diff --git a/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TagListGenerator/IbmMqTags.g.cs b/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TagListGenerator/IbmMqTags.g.cs index 232f669c54c6..47e81e1d5383 100644 --- a/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TagListGenerator/IbmMqTags.g.cs +++ b/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TagListGenerator/IbmMqTags.g.cs @@ -51,7 +51,7 @@ public override void SetTag(string key, string? value) } } - public override void EnumerateTags(ref TProcessor processor) + public override void EnumerateTags(ref TProcessor processor, bool openTelemetrySemanticsEnabled) { if (SpanKind is not null) { @@ -68,7 +68,7 @@ public override void EnumerateTags(ref TProcessor processor) processor.Process(new TagItem("topicname", TopicName, TopicNameBytes)); } - base.EnumerateTags(ref processor); + base.EnumerateTags(ref processor, openTelemetrySemanticsEnabled); } protected override void WriteAdditionalTags(System.Text.StringBuilder sb) diff --git a/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TagListGenerator/InferredProxyTags.g.cs b/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TagListGenerator/InferredProxyTags.g.cs index a80c57e07420..dafae6dcf60d 100644 --- a/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TagListGenerator/InferredProxyTags.g.cs +++ b/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TagListGenerator/InferredProxyTags.g.cs @@ -35,6 +35,9 @@ partial class InferredProxyTags // HttpStatusCodeBytes = MessagePack.Serialize("http.status_code"); private static ReadOnlySpan HttpStatusCodeBytes => [176, 104, 116, 116, 112, 46, 115, 116, 97, 116, 117, 115, 95, 99, 111, 100, 101]; + // HttpStatusCodeOtelBytes = MessagePack.Serialize("http.response.status_code"); + private static ReadOnlySpan HttpStatusCodeOtelBytes => [185, 104, 116, 116, 112, 46, 114, 101, 115, 112, 111, 110, 115, 101, 46, 115, 116, 97, 116, 117, 115, 95, 99, 111, 100, 101]; + // StageBytes = MessagePack.Serialize("stage"); private static ReadOnlySpan StageBytes => [165, 115, 116, 97, 103, 101]; @@ -51,6 +54,7 @@ partial class InferredProxyTags "http.url" => HttpUrl, "http.route" => HttpRoute, "http.status_code" => HttpStatusCode is null ? null : Datadog.Trace.Util.IntStringCache.ToInvariantString(HttpStatusCode.Value), + "http.response.status_code" => HttpStatusCode is null ? null : Datadog.Trace.Util.IntStringCache.ToInvariantString(HttpStatusCode.Value), "stage" => Stage, "region" => Region, _ => base.GetTag(key), @@ -73,7 +77,8 @@ public override void SetTag(string key, string? value) case "http.route": HttpRoute = value; break; - case "http.status_code": + case "http.status_code": + case "http.response.status_code": if (int.TryParse(value, System.Globalization.NumberStyles.Integer, System.Globalization.CultureInfo.InvariantCulture, out var parsedHttpStatusCode)) { HttpStatusCode = parsedHttpStatusCode; @@ -99,7 +104,7 @@ public override void SetTag(string key, string? value) } } - public override void EnumerateTags(ref TProcessor processor) + public override void EnumerateTags(ref TProcessor processor, bool openTelemetrySemanticsEnabled) { if (SpanKind is not null) { @@ -128,7 +133,14 @@ public override void EnumerateTags(ref TProcessor processor) if (HttpStatusCode is not null) { - processor.Process(new TagItem("http.status_code", HttpStatusCode.Value, HttpStatusCodeBytes)); + if (openTelemetrySemanticsEnabled) + { + processor.Process(new TagItem("http.response.status_code", HttpStatusCode.Value, HttpStatusCodeOtelBytes)); + } + else + { + processor.Process(new TagItem("http.status_code", HttpStatusCode.Value, HttpStatusCodeBytes)); + } } if (Stage is not null) @@ -141,7 +153,7 @@ public override void EnumerateTags(ref TProcessor processor) processor.Process(new TagItem("region", Region, RegionBytes)); } - base.EnumerateTags(ref processor); + base.EnumerateTags(ref processor, openTelemetrySemanticsEnabled); } protected override void WriteAdditionalTags(System.Text.StringBuilder sb) diff --git a/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TagListGenerator/KafkaTags.g.cs b/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TagListGenerator/KafkaTags.g.cs index b2b1acea9ca2..899d9ef0948f 100644 --- a/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TagListGenerator/KafkaTags.g.cs +++ b/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TagListGenerator/KafkaTags.g.cs @@ -96,7 +96,7 @@ public override void SetTag(string key, string? value) } } - public override void EnumerateTags(ref TProcessor processor) + public override void EnumerateTags(ref TProcessor processor, bool openTelemetrySemanticsEnabled) { if (SpanKind is not null) { @@ -143,7 +143,7 @@ public override void EnumerateTags(ref TProcessor processor) processor.Process(new TagItem("kafka.group", ConsumerGroup, ConsumerGroupBytes)); } - base.EnumerateTags(ref processor); + base.EnumerateTags(ref processor, openTelemetrySemanticsEnabled); } protected override void WriteAdditionalTags(System.Text.StringBuilder sb) diff --git a/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TagListGenerator/KafkaV1Tags.g.cs b/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TagListGenerator/KafkaV1Tags.g.cs index 3fc177b7f28e..f35d93fb3deb 100644 --- a/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TagListGenerator/KafkaV1Tags.g.cs +++ b/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TagListGenerator/KafkaV1Tags.g.cs @@ -46,7 +46,7 @@ public override void SetTag(string key, string? value) } } - public override void EnumerateTags(ref TProcessor processor) + public override void EnumerateTags(ref TProcessor processor, bool openTelemetrySemanticsEnabled) { if (PeerService is not null) { @@ -58,7 +58,7 @@ public override void EnumerateTags(ref TProcessor processor) processor.Process(new TagItem("_dd.peer.service.source", PeerServiceSource, PeerServiceSourceBytes)); } - base.EnumerateTags(ref processor); + base.EnumerateTags(ref processor, openTelemetrySemanticsEnabled); } protected override void WriteAdditionalTags(System.Text.StringBuilder sb) diff --git a/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TagListGenerator/MongoDbTags.g.cs b/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TagListGenerator/MongoDbTags.g.cs index f49ad1d1c1b3..cd4e96d5e641 100644 --- a/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TagListGenerator/MongoDbTags.g.cs +++ b/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TagListGenerator/MongoDbTags.g.cs @@ -79,7 +79,7 @@ public override void SetTag(string key, string? value) } } - public override void EnumerateTags(ref TProcessor processor) + public override void EnumerateTags(ref TProcessor processor, bool openTelemetrySemanticsEnabled) { if (SpanKind is not null) { @@ -116,7 +116,7 @@ public override void EnumerateTags(ref TProcessor processor) processor.Process(new TagItem("out.port", Port, PortBytes)); } - base.EnumerateTags(ref processor); + base.EnumerateTags(ref processor, openTelemetrySemanticsEnabled); } protected override void WriteAdditionalTags(System.Text.StringBuilder sb) diff --git a/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TagListGenerator/MongoDbV1Tags.g.cs b/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TagListGenerator/MongoDbV1Tags.g.cs index c0a2519aaa8c..f16d424525f3 100644 --- a/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TagListGenerator/MongoDbV1Tags.g.cs +++ b/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TagListGenerator/MongoDbV1Tags.g.cs @@ -46,7 +46,7 @@ public override void SetTag(string key, string? value) } } - public override void EnumerateTags(ref TProcessor processor) + public override void EnumerateTags(ref TProcessor processor, bool openTelemetrySemanticsEnabled) { if (PeerService is not null) { @@ -58,7 +58,7 @@ public override void EnumerateTags(ref TProcessor processor) processor.Process(new TagItem("_dd.peer.service.source", PeerServiceSource, PeerServiceSourceBytes)); } - base.EnumerateTags(ref processor); + base.EnumerateTags(ref processor, openTelemetrySemanticsEnabled); } protected override void WriteAdditionalTags(System.Text.StringBuilder sb) diff --git a/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TagListGenerator/MsmqTags.g.cs b/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TagListGenerator/MsmqTags.g.cs index 8608949ad59c..efbad3b04760 100644 --- a/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TagListGenerator/MsmqTags.g.cs +++ b/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TagListGenerator/MsmqTags.g.cs @@ -79,7 +79,7 @@ public override void SetTag(string key, string? value) } } - public override void EnumerateTags(ref TProcessor processor) + public override void EnumerateTags(ref TProcessor processor, bool openTelemetrySemanticsEnabled) { if (Command is not null) { @@ -116,7 +116,7 @@ public override void EnumerateTags(ref TProcessor processor) processor.Process(new TagItem("msmq.queue.transactional", IsTransactionalQueue, IsTransactionalQueueBytes)); } - base.EnumerateTags(ref processor); + base.EnumerateTags(ref processor, openTelemetrySemanticsEnabled); } protected override void WriteAdditionalTags(System.Text.StringBuilder sb) diff --git a/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TagListGenerator/MsmqV1Tags.g.cs b/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TagListGenerator/MsmqV1Tags.g.cs index 78fee57665fc..29cee9a54f04 100644 --- a/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TagListGenerator/MsmqV1Tags.g.cs +++ b/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TagListGenerator/MsmqV1Tags.g.cs @@ -46,7 +46,7 @@ public override void SetTag(string key, string? value) } } - public override void EnumerateTags(ref TProcessor processor) + public override void EnumerateTags(ref TProcessor processor, bool openTelemetrySemanticsEnabled) { if (PeerService is not null) { @@ -58,7 +58,7 @@ public override void EnumerateTags(ref TProcessor processor) processor.Process(new TagItem("_dd.peer.service.source", PeerServiceSource, PeerServiceSourceBytes)); } - base.EnumerateTags(ref processor); + base.EnumerateTags(ref processor, openTelemetrySemanticsEnabled); } protected override void WriteAdditionalTags(System.Text.StringBuilder sb) diff --git a/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TagListGenerator/OpenTelemetryTags.g.cs b/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TagListGenerator/OpenTelemetryTags.g.cs index 5599a863b297..e064e2179266 100644 --- a/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TagListGenerator/OpenTelemetryTags.g.cs +++ b/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TagListGenerator/OpenTelemetryTags.g.cs @@ -67,7 +67,7 @@ public override void SetTag(string key, string? value) } } - public override void EnumerateTags(ref TProcessor processor) + public override void EnumerateTags(ref TProcessor processor, bool openTelemetrySemanticsEnabled) { if (SpanKind is not null) { @@ -94,7 +94,7 @@ public override void EnumerateTags(ref TProcessor processor) processor.Process(new TagItem("otel.status_code", OtelStatusCode, OtelStatusCodeBytes)); } - base.EnumerateTags(ref processor); + base.EnumerateTags(ref processor, openTelemetrySemanticsEnabled); } protected override void WriteAdditionalTags(System.Text.StringBuilder sb) diff --git a/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TagListGenerator/ProcessCommandStartTags.g.cs b/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TagListGenerator/ProcessCommandStartTags.g.cs index 92f0a0649b5d..53322d01c0f7 100644 --- a/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TagListGenerator/ProcessCommandStartTags.g.cs +++ b/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TagListGenerator/ProcessCommandStartTags.g.cs @@ -72,7 +72,7 @@ public override void SetTag(string key, string? value) } } - public override void EnumerateTags(ref TProcessor processor) + public override void EnumerateTags(ref TProcessor processor, bool openTelemetrySemanticsEnabled) { if (Component is not null) { @@ -104,7 +104,7 @@ public override void EnumerateTags(ref TProcessor processor) processor.Process(new TagItem("cmd.truncated", Truncated, TruncatedBytes)); } - base.EnumerateTags(ref processor); + base.EnumerateTags(ref processor, openTelemetrySemanticsEnabled); } protected override void WriteAdditionalTags(System.Text.StringBuilder sb) diff --git a/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TagListGenerator/RabbitMQTags.g.cs b/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TagListGenerator/RabbitMQTags.g.cs index 1c7208f59de7..0abf2ed4f716 100644 --- a/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TagListGenerator/RabbitMQTags.g.cs +++ b/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TagListGenerator/RabbitMQTags.g.cs @@ -93,7 +93,7 @@ public override void SetTag(string key, string? value) } } - public override void EnumerateTags(ref TProcessor processor) + public override void EnumerateTags(ref TProcessor processor, bool openTelemetrySemanticsEnabled) { if (SpanKind is not null) { @@ -140,7 +140,7 @@ public override void EnumerateTags(ref TProcessor processor) processor.Process(new TagItem("out.host", OutHost, OutHostBytes)); } - base.EnumerateTags(ref processor); + base.EnumerateTags(ref processor, openTelemetrySemanticsEnabled); } protected override void WriteAdditionalTags(System.Text.StringBuilder sb) diff --git a/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TagListGenerator/RabbitMQV1Tags.g.cs b/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TagListGenerator/RabbitMQV1Tags.g.cs index 75851ba4d8d6..6cebdb522d7d 100644 --- a/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TagListGenerator/RabbitMQV1Tags.g.cs +++ b/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TagListGenerator/RabbitMQV1Tags.g.cs @@ -46,7 +46,7 @@ public override void SetTag(string key, string? value) } } - public override void EnumerateTags(ref TProcessor processor) + public override void EnumerateTags(ref TProcessor processor, bool openTelemetrySemanticsEnabled) { if (PeerService is not null) { @@ -58,7 +58,7 @@ public override void EnumerateTags(ref TProcessor processor) processor.Process(new TagItem("_dd.peer.service.source", PeerServiceSource, PeerServiceSourceBytes)); } - base.EnumerateTags(ref processor); + base.EnumerateTags(ref processor, openTelemetrySemanticsEnabled); } protected override void WriteAdditionalTags(System.Text.StringBuilder sb) diff --git a/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TagListGenerator/RedisTags.g.cs b/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TagListGenerator/RedisTags.g.cs index e812be841d36..db7ecc3c7fd6 100644 --- a/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TagListGenerator/RedisTags.g.cs +++ b/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TagListGenerator/RedisTags.g.cs @@ -70,7 +70,7 @@ public override void SetTag(string key, string? value) } } - public override void EnumerateTags(ref TProcessor processor) + public override void EnumerateTags(ref TProcessor processor, bool openTelemetrySemanticsEnabled) { if (SpanKind is not null) { @@ -97,7 +97,7 @@ public override void EnumerateTags(ref TProcessor processor) processor.Process(new TagItem("out.port", Port, PortBytes)); } - base.EnumerateTags(ref processor); + base.EnumerateTags(ref processor, openTelemetrySemanticsEnabled); } protected override void WriteAdditionalTags(System.Text.StringBuilder sb) diff --git a/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TagListGenerator/RedisV1Tags.g.cs b/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TagListGenerator/RedisV1Tags.g.cs index 11317f7a92c1..69f39339e993 100644 --- a/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TagListGenerator/RedisV1Tags.g.cs +++ b/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TagListGenerator/RedisV1Tags.g.cs @@ -46,7 +46,7 @@ public override void SetTag(string key, string? value) } } - public override void EnumerateTags(ref TProcessor processor) + public override void EnumerateTags(ref TProcessor processor, bool openTelemetrySemanticsEnabled) { if (PeerService is not null) { @@ -58,7 +58,7 @@ public override void EnumerateTags(ref TProcessor processor) processor.Process(new TagItem("_dd.peer.service.source", PeerServiceSource, PeerServiceSourceBytes)); } - base.EnumerateTags(ref processor); + base.EnumerateTags(ref processor, openTelemetrySemanticsEnabled); } protected override void WriteAdditionalTags(System.Text.StringBuilder sb) diff --git a/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TagListGenerator/RemotingClientV1Tags.g.cs b/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TagListGenerator/RemotingClientV1Tags.g.cs index 2d4946deb561..7bf5882637b2 100644 --- a/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TagListGenerator/RemotingClientV1Tags.g.cs +++ b/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TagListGenerator/RemotingClientV1Tags.g.cs @@ -46,7 +46,7 @@ public override void SetTag(string key, string? value) } } - public override void EnumerateTags(ref TProcessor processor) + public override void EnumerateTags(ref TProcessor processor, bool openTelemetrySemanticsEnabled) { if (PeerService is not null) { @@ -58,7 +58,7 @@ public override void EnumerateTags(ref TProcessor processor) processor.Process(new TagItem("_dd.peer.service.source", PeerServiceSource, PeerServiceSourceBytes)); } - base.EnumerateTags(ref processor); + base.EnumerateTags(ref processor, openTelemetrySemanticsEnabled); } protected override void WriteAdditionalTags(System.Text.StringBuilder sb) diff --git a/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TagListGenerator/RemotingTags.g.cs b/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TagListGenerator/RemotingTags.g.cs index 33446c86d899..0677a2937661 100644 --- a/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TagListGenerator/RemotingTags.g.cs +++ b/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TagListGenerator/RemotingTags.g.cs @@ -63,7 +63,7 @@ public override void SetTag(string key, string? value) } } - public override void EnumerateTags(ref TProcessor processor) + public override void EnumerateTags(ref TProcessor processor, bool openTelemetrySemanticsEnabled) { if (SpanKind is not null) { @@ -90,7 +90,7 @@ public override void EnumerateTags(ref TProcessor processor) processor.Process(new TagItem("rpc.system", RpcSystem, RpcSystemBytes)); } - base.EnumerateTags(ref processor); + base.EnumerateTags(ref processor, openTelemetrySemanticsEnabled); } protected override void WriteAdditionalTags(System.Text.StringBuilder sb) diff --git a/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TagListGenerator/ServiceRemotingClientV1Tags.g.cs b/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TagListGenerator/ServiceRemotingClientV1Tags.g.cs index 1959416b21c7..41253e26f8c1 100644 --- a/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TagListGenerator/ServiceRemotingClientV1Tags.g.cs +++ b/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TagListGenerator/ServiceRemotingClientV1Tags.g.cs @@ -46,7 +46,7 @@ public override void SetTag(string key, string? value) } } - public override void EnumerateTags(ref TProcessor processor) + public override void EnumerateTags(ref TProcessor processor, bool openTelemetrySemanticsEnabled) { if (PeerService is not null) { @@ -58,7 +58,7 @@ public override void EnumerateTags(ref TProcessor processor) processor.Process(new TagItem("_dd.peer.service.source", PeerServiceSource, PeerServiceSourceBytes)); } - base.EnumerateTags(ref processor); + base.EnumerateTags(ref processor, openTelemetrySemanticsEnabled); } protected override void WriteAdditionalTags(System.Text.StringBuilder sb) diff --git a/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TagListGenerator/ServiceRemotingTags.g.cs b/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TagListGenerator/ServiceRemotingTags.g.cs index 75b61e70e456..47a2eeff6e2a 100644 --- a/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TagListGenerator/ServiceRemotingTags.g.cs +++ b/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TagListGenerator/ServiceRemotingTags.g.cs @@ -123,7 +123,7 @@ public override void SetTag(string key, string? value) } } - public override void EnumerateTags(ref TProcessor processor) + public override void EnumerateTags(ref TProcessor processor, bool openTelemetrySemanticsEnabled) { if (SpanKind is not null) { @@ -190,7 +190,7 @@ public override void EnumerateTags(ref TProcessor processor) processor.Process(new TagItem("service-fabric.service-remoting.invocation-id", RemotingInvocationId, RemotingInvocationIdBytes)); } - base.EnumerateTags(ref processor); + base.EnumerateTags(ref processor, openTelemetrySemanticsEnabled); } protected override void WriteAdditionalTags(System.Text.StringBuilder sb) diff --git a/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TagListGenerator/SqlTags.g.cs b/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TagListGenerator/SqlTags.g.cs index 5fa99249f899..fe5ad1d586fb 100644 --- a/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TagListGenerator/SqlTags.g.cs +++ b/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TagListGenerator/SqlTags.g.cs @@ -88,7 +88,7 @@ public override void SetTag(string key, string? value) } } - public override void EnumerateTags(ref TProcessor processor) + public override void EnumerateTags(ref TProcessor processor, bool openTelemetrySemanticsEnabled) { if (SpanKind is not null) { @@ -130,7 +130,7 @@ public override void EnumerateTags(ref TProcessor processor) processor.Process(new TagItem("_dd.propagated_hash", BaseHash, BaseHashBytes)); } - base.EnumerateTags(ref processor); + base.EnumerateTags(ref processor, openTelemetrySemanticsEnabled); } protected override void WriteAdditionalTags(System.Text.StringBuilder sb) diff --git a/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TagListGenerator/SqlV1Tags.g.cs b/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TagListGenerator/SqlV1Tags.g.cs index 9751da7af7a3..87d74064a129 100644 --- a/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TagListGenerator/SqlV1Tags.g.cs +++ b/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TagListGenerator/SqlV1Tags.g.cs @@ -46,7 +46,7 @@ public override void SetTag(string key, string? value) } } - public override void EnumerateTags(ref TProcessor processor) + public override void EnumerateTags(ref TProcessor processor, bool openTelemetrySemanticsEnabled) { if (PeerService is not null) { @@ -58,7 +58,7 @@ public override void EnumerateTags(ref TProcessor processor) processor.Process(new TagItem("_dd.peer.service.source", PeerServiceSource, PeerServiceSourceBytes)); } - base.EnumerateTags(ref processor); + base.EnumerateTags(ref processor, openTelemetrySemanticsEnabled); } protected override void WriteAdditionalTags(System.Text.StringBuilder sb) diff --git a/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TagListGenerator/TagAttribute.g.cs b/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TagListGenerator/TagAttribute.g.cs index 0020d1490683..d678d06ab096 100644 --- a/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TagListGenerator/TagAttribute.g.cs +++ b/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TagListGenerator/TagAttribute.g.cs @@ -27,6 +27,11 @@ public TagAttribute(string tagName) => /// Gets the name of the datadog tag the property corresponds to /// public string TagName { get; } + + /// + /// Gets or sets the OpenTelemetry semantic convention name that aliases . + /// + public string? OtelName { get; set; } } /// diff --git a/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TagListGenerator/TestModuleSpanTags.g.cs b/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TagListGenerator/TestModuleSpanTags.g.cs index 61d1c47ac52f..7809da282493 100644 --- a/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TagListGenerator/TestModuleSpanTags.g.cs +++ b/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TagListGenerator/TestModuleSpanTags.g.cs @@ -112,7 +112,7 @@ public override void SetTag(string key, string? value) } } - public override void EnumerateTags(ref TProcessor processor) + public override void EnumerateTags(ref TProcessor processor, bool openTelemetrySemanticsEnabled) { if (Type is not null) { @@ -169,7 +169,7 @@ public override void EnumerateTags(ref TProcessor processor) processor.Process(new TagItem("os.version", OSVersion, OSVersionBytes)); } - base.EnumerateTags(ref processor); + base.EnumerateTags(ref processor, openTelemetrySemanticsEnabled); } protected override void WriteAdditionalTags(System.Text.StringBuilder sb) diff --git a/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TagListGenerator/TestSessionSpanTags.g.cs b/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TagListGenerator/TestSessionSpanTags.g.cs index 13a5d04d49da..37b566d3f8d4 100644 --- a/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TagListGenerator/TestSessionSpanTags.g.cs +++ b/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TagListGenerator/TestSessionSpanTags.g.cs @@ -350,7 +350,7 @@ public override void SetTag(string key, string? value) } } - public override void EnumerateTags(ref TProcessor processor) + public override void EnumerateTags(ref TProcessor processor, bool openTelemetrySemanticsEnabled) { if (Command is not null) { @@ -577,7 +577,7 @@ public override void EnumerateTags(ref TProcessor processor) processor.Process(new TagItem("git.commit.head.message", GitHeadCommitMessage, GitHeadCommitMessageBytes)); } - base.EnumerateTags(ref processor); + base.EnumerateTags(ref processor, openTelemetrySemanticsEnabled); } protected override void WriteAdditionalTags(System.Text.StringBuilder sb) diff --git a/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TagListGenerator/TestSpanTags.g.cs b/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TagListGenerator/TestSpanTags.g.cs index 97ef1c5c81a8..1e08fb410a81 100644 --- a/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TagListGenerator/TestSpanTags.g.cs +++ b/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TagListGenerator/TestSpanTags.g.cs @@ -234,7 +234,7 @@ public override void SetTag(string key, string? value) } } - public override void EnumerateTags(ref TProcessor processor) + public override void EnumerateTags(ref TProcessor processor, bool openTelemetrySemanticsEnabled) { if (Name is not null) { @@ -376,7 +376,7 @@ public override void EnumerateTags(ref TProcessor processor) processor.Process(new TagItem("_dd.library_capabilities.test_management.attempt_to_fix", CapabilitiesTestManagementAttemptToFix, CapabilitiesTestManagementAttemptToFixBytes)); } - base.EnumerateTags(ref processor); + base.EnumerateTags(ref processor, openTelemetrySemanticsEnabled); } protected override void WriteAdditionalTags(System.Text.StringBuilder sb) diff --git a/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TagListGenerator/TestSuiteSpanTags.g.cs b/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TagListGenerator/TestSuiteSpanTags.g.cs index b1d3aa6eaf67..14eccb5e013b 100644 --- a/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TagListGenerator/TestSuiteSpanTags.g.cs +++ b/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TagListGenerator/TestSuiteSpanTags.g.cs @@ -53,7 +53,7 @@ public override void SetTag(string key, string? value) } } - public override void EnumerateTags(ref TProcessor processor) + public override void EnumerateTags(ref TProcessor processor, bool openTelemetrySemanticsEnabled) { if (Suite is not null) { @@ -70,7 +70,7 @@ public override void EnumerateTags(ref TProcessor processor) processor.Process(new TagItem("test.codeowners", CodeOwners, CodeOwnersBytes)); } - base.EnumerateTags(ref processor); + base.EnumerateTags(ref processor, openTelemetrySemanticsEnabled); } protected override void WriteAdditionalTags(System.Text.StringBuilder sb) diff --git a/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TagListGenerator/TraceAnnotationTags.g.cs b/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TagListGenerator/TraceAnnotationTags.g.cs index 67f69361144c..984350404d53 100644 --- a/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TagListGenerator/TraceAnnotationTags.g.cs +++ b/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TagListGenerator/TraceAnnotationTags.g.cs @@ -39,14 +39,14 @@ public override void SetTag(string key, string? value) } } - public override void EnumerateTags(ref TProcessor processor) + public override void EnumerateTags(ref TProcessor processor, bool openTelemetrySemanticsEnabled) { if (InstrumentationName is not null) { processor.Process(new TagItem("component", InstrumentationName, InstrumentationNameBytes)); } - base.EnumerateTags(ref processor); + base.EnumerateTags(ref processor, openTelemetrySemanticsEnabled); } protected override void WriteAdditionalTags(System.Text.StringBuilder sb) diff --git a/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TagListGenerator/WcfTags.g.cs b/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TagListGenerator/WcfTags.g.cs index b8d5c42bb58a..f0125208b5bc 100644 --- a/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TagListGenerator/WcfTags.g.cs +++ b/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TagListGenerator/WcfTags.g.cs @@ -39,14 +39,14 @@ public override void SetTag(string key, string? value) } } - public override void EnumerateTags(ref TProcessor processor) + public override void EnumerateTags(ref TProcessor processor, bool openTelemetrySemanticsEnabled) { if (InstrumentationName is not null) { processor.Process(new TagItem("component", InstrumentationName, InstrumentationNameBytes)); } - base.EnumerateTags(ref processor); + base.EnumerateTags(ref processor, openTelemetrySemanticsEnabled); } protected override void WriteAdditionalTags(System.Text.StringBuilder sb) diff --git a/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TagListGenerator/WebTags.g.cs b/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TagListGenerator/WebTags.g.cs index 0d0922839d45..8e05ef465dde 100644 --- a/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TagListGenerator/WebTags.g.cs +++ b/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TagListGenerator/WebTags.g.cs @@ -32,6 +32,9 @@ partial class WebTags // HttpStatusCodeBytes = MessagePack.Serialize("http.status_code"); private static ReadOnlySpan HttpStatusCodeBytes => [176, 104, 116, 116, 112, 46, 115, 116, 97, 116, 117, 115, 95, 99, 111, 100, 101]; + // HttpStatusCodeOtelBytes = MessagePack.Serialize("http.response.status_code"); + private static ReadOnlySpan HttpStatusCodeOtelBytes => [185, 104, 116, 116, 112, 46, 114, 101, 115, 112, 111, 110, 115, 101, 46, 115, 116, 97, 116, 117, 115, 95, 99, 111, 100, 101]; + // NetworkClientIpBytes = MessagePack.Serialize("network.client.ip"); private static ReadOnlySpan NetworkClientIpBytes => [177, 110, 101, 116, 119, 111, 114, 107, 46, 99, 108, 105, 101, 110, 116, 46, 105, 112]; @@ -48,6 +51,7 @@ partial class WebTags "http.request.headers.host" => HttpRequestHeadersHost, "http.url" => HttpUrl, "http.status_code" => HttpStatusCode is null ? null : Datadog.Trace.Util.IntStringCache.ToInvariantString(HttpStatusCode.Value), + "http.response.status_code" => HttpStatusCode is null ? null : Datadog.Trace.Util.IntStringCache.ToInvariantString(HttpStatusCode.Value), "network.client.ip" => NetworkClientIp, "http.client_ip" => HttpClientIp, _ => base.GetTag(key), @@ -70,7 +74,8 @@ public override void SetTag(string key, string? value) case "http.url": HttpUrl = value; break; - case "http.status_code": + case "http.status_code": + case "http.response.status_code": if (int.TryParse(value, System.Globalization.NumberStyles.Integer, System.Globalization.CultureInfo.InvariantCulture, out var parsedHttpStatusCode)) { HttpStatusCode = parsedHttpStatusCode; @@ -96,7 +101,7 @@ public override void SetTag(string key, string? value) } } - public override void EnumerateTags(ref TProcessor processor) + public override void EnumerateTags(ref TProcessor processor, bool openTelemetrySemanticsEnabled) { if (SpanKind is not null) { @@ -125,7 +130,14 @@ public override void EnumerateTags(ref TProcessor processor) if (HttpStatusCode is not null) { - processor.Process(new TagItem("http.status_code", HttpStatusCode.Value, HttpStatusCodeBytes)); + if (openTelemetrySemanticsEnabled) + { + processor.Process(new TagItem("http.response.status_code", HttpStatusCode.Value, HttpStatusCodeOtelBytes)); + } + else + { + processor.Process(new TagItem("http.status_code", HttpStatusCode.Value, HttpStatusCodeBytes)); + } } if (NetworkClientIp is not null) @@ -138,7 +150,7 @@ public override void EnumerateTags(ref TProcessor processor) processor.Process(new TagItem("http.client_ip", HttpClientIp, HttpClientIpBytes)); } - base.EnumerateTags(ref processor); + base.EnumerateTags(ref processor, openTelemetrySemanticsEnabled); } protected override void WriteAdditionalTags(System.Text.StringBuilder sb) diff --git a/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TagListGenerator/AerospikeTags.g.cs b/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TagListGenerator/AerospikeTags.g.cs index ea4558a93691..e6b67ece8851 100644 --- a/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TagListGenerator/AerospikeTags.g.cs +++ b/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TagListGenerator/AerospikeTags.g.cs @@ -72,7 +72,7 @@ public override void SetTag(string key, string? value) } } - public override void EnumerateTags(ref TProcessor processor) + public override void EnumerateTags(ref TProcessor processor, bool openTelemetrySemanticsEnabled) { if (SpanKind is not null) { @@ -104,7 +104,7 @@ public override void EnumerateTags(ref TProcessor processor) processor.Process(new TagItem("aerospike.userkey", UserKey, UserKeyBytes)); } - base.EnumerateTags(ref processor); + base.EnumerateTags(ref processor, openTelemetrySemanticsEnabled); } protected override void WriteAdditionalTags(System.Text.StringBuilder sb) diff --git a/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TagListGenerator/AerospikeV1Tags.g.cs b/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TagListGenerator/AerospikeV1Tags.g.cs index 38446d61fa14..73a3e3cc8f3c 100644 --- a/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TagListGenerator/AerospikeV1Tags.g.cs +++ b/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TagListGenerator/AerospikeV1Tags.g.cs @@ -46,7 +46,7 @@ public override void SetTag(string key, string? value) } } - public override void EnumerateTags(ref TProcessor processor) + public override void EnumerateTags(ref TProcessor processor, bool openTelemetrySemanticsEnabled) { if (PeerService is not null) { @@ -58,7 +58,7 @@ public override void EnumerateTags(ref TProcessor processor) processor.Process(new TagItem("_dd.peer.service.source", PeerServiceSource, PeerServiceSourceBytes)); } - base.EnumerateTags(ref processor); + base.EnumerateTags(ref processor, openTelemetrySemanticsEnabled); } protected override void WriteAdditionalTags(System.Text.StringBuilder sb) diff --git a/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TagListGenerator/AspNetCoreEndpointTags.g.cs b/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TagListGenerator/AspNetCoreEndpointTags.g.cs index 57f2de401d7e..49c57fc27ca3 100644 --- a/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TagListGenerator/AspNetCoreEndpointTags.g.cs +++ b/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TagListGenerator/AspNetCoreEndpointTags.g.cs @@ -39,14 +39,14 @@ public override void SetTag(string key, string? value) } } - public override void EnumerateTags(ref TProcessor processor) + public override void EnumerateTags(ref TProcessor processor, bool openTelemetrySemanticsEnabled) { if (AspNetCoreEndpoint is not null) { processor.Process(new TagItem("aspnet_core.endpoint", AspNetCoreEndpoint, AspNetCoreEndpointBytes)); } - base.EnumerateTags(ref processor); + base.EnumerateTags(ref processor, openTelemetrySemanticsEnabled); } protected override void WriteAdditionalTags(System.Text.StringBuilder sb) diff --git a/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TagListGenerator/AspNetCoreMvcTags.g.cs b/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TagListGenerator/AspNetCoreMvcTags.g.cs index 0e7aa5558682..c9ef75bc22ee 100644 --- a/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TagListGenerator/AspNetCoreMvcTags.g.cs +++ b/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TagListGenerator/AspNetCoreMvcTags.g.cs @@ -79,7 +79,7 @@ public override void SetTag(string key, string? value) } } - public override void EnumerateTags(ref TProcessor processor) + public override void EnumerateTags(ref TProcessor processor, bool openTelemetrySemanticsEnabled) { if (SpanKind is not null) { @@ -116,7 +116,7 @@ public override void EnumerateTags(ref TProcessor processor) processor.Process(new TagItem("aspnet_core.route", AspNetCoreRoute, AspNetCoreRouteBytes)); } - base.EnumerateTags(ref processor); + base.EnumerateTags(ref processor, openTelemetrySemanticsEnabled); } protected override void WriteAdditionalTags(System.Text.StringBuilder sb) diff --git a/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TagListGenerator/AspNetCoreSingleSpanTags.g.cs b/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TagListGenerator/AspNetCoreSingleSpanTags.g.cs index 268236edb742..b54ba8c3fb36 100644 --- a/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TagListGenerator/AspNetCoreSingleSpanTags.g.cs +++ b/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TagListGenerator/AspNetCoreSingleSpanTags.g.cs @@ -107,7 +107,7 @@ public override void SetTag(string key, string? value) } } - public override void EnumerateTags(ref TProcessor processor) + public override void EnumerateTags(ref TProcessor processor, bool openTelemetrySemanticsEnabled) { if (InstrumentationName is not null) { @@ -164,7 +164,7 @@ public override void EnumerateTags(ref TProcessor processor) processor.Process(new TagItem("_dd.code_origin.frames.0.column", CodeOriginFrameColumn, CodeOriginFrameColumnBytes)); } - base.EnumerateTags(ref processor); + base.EnumerateTags(ref processor, openTelemetrySemanticsEnabled); } protected override void WriteAdditionalTags(System.Text.StringBuilder sb) diff --git a/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TagListGenerator/AspNetCoreTags.g.cs b/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TagListGenerator/AspNetCoreTags.g.cs index 2ab87d9d28d3..9674b3c620fc 100644 --- a/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TagListGenerator/AspNetCoreTags.g.cs +++ b/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TagListGenerator/AspNetCoreTags.g.cs @@ -102,7 +102,7 @@ public override void SetTag(string key, string? value) } } - public override void EnumerateTags(ref TProcessor processor) + public override void EnumerateTags(ref TProcessor processor, bool openTelemetrySemanticsEnabled) { if (InstrumentationName is not null) { @@ -154,7 +154,7 @@ public override void EnumerateTags(ref TProcessor processor) processor.Process(new TagItem("_dd.code_origin.frames.0.column", CodeOriginFrameColumn, CodeOriginFrameColumnBytes)); } - base.EnumerateTags(ref processor); + base.EnumerateTags(ref processor, openTelemetrySemanticsEnabled); } protected override void WriteAdditionalTags(System.Text.StringBuilder sb) diff --git a/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TagListGenerator/AspNetTags.g.cs b/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TagListGenerator/AspNetTags.g.cs index 1493deadadd2..f87275c9d138 100644 --- a/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TagListGenerator/AspNetTags.g.cs +++ b/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TagListGenerator/AspNetTags.g.cs @@ -74,7 +74,7 @@ public override void SetTag(string key, string? value) } } - public override void EnumerateTags(ref TProcessor processor) + public override void EnumerateTags(ref TProcessor processor, bool openTelemetrySemanticsEnabled) { if (AspNetRoute is not null) { @@ -106,7 +106,7 @@ public override void EnumerateTags(ref TProcessor processor) processor.Process(new TagItem("component", InstrumentationName, InstrumentationNameBytes)); } - base.EnumerateTags(ref processor); + base.EnumerateTags(ref processor, openTelemetrySemanticsEnabled); } protected override void WriteAdditionalTags(System.Text.StringBuilder sb) diff --git a/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TagListGenerator/AwsDynamoDbTags.g.cs b/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TagListGenerator/AwsDynamoDbTags.g.cs index 6b4094015296..fabde3fd5416 100644 --- a/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TagListGenerator/AwsDynamoDbTags.g.cs +++ b/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TagListGenerator/AwsDynamoDbTags.g.cs @@ -46,7 +46,7 @@ public override void SetTag(string key, string? value) } } - public override void EnumerateTags(ref TProcessor processor) + public override void EnumerateTags(ref TProcessor processor, bool openTelemetrySemanticsEnabled) { if (TableName is not null) { @@ -58,7 +58,7 @@ public override void EnumerateTags(ref TProcessor processor) processor.Process(new TagItem("span.kind", SpanKind, SpanKindBytes)); } - base.EnumerateTags(ref processor); + base.EnumerateTags(ref processor, openTelemetrySemanticsEnabled); } protected override void WriteAdditionalTags(System.Text.StringBuilder sb) diff --git a/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TagListGenerator/AwsEventBridgeTags.g.cs b/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TagListGenerator/AwsEventBridgeTags.g.cs index af149744d93d..c194f4868294 100644 --- a/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TagListGenerator/AwsEventBridgeTags.g.cs +++ b/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TagListGenerator/AwsEventBridgeTags.g.cs @@ -46,7 +46,7 @@ public override void SetTag(string key, string? value) } } - public override void EnumerateTags(ref TProcessor processor) + public override void EnumerateTags(ref TProcessor processor, bool openTelemetrySemanticsEnabled) { if (RuleName is not null) { @@ -58,7 +58,7 @@ public override void EnumerateTags(ref TProcessor processor) processor.Process(new TagItem("span.kind", SpanKind, SpanKindBytes)); } - base.EnumerateTags(ref processor); + base.EnumerateTags(ref processor, openTelemetrySemanticsEnabled); } protected override void WriteAdditionalTags(System.Text.StringBuilder sb) diff --git a/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TagListGenerator/AwsKinesisTags.g.cs b/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TagListGenerator/AwsKinesisTags.g.cs index cdb8a4e6793c..9a01c7b53b21 100644 --- a/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TagListGenerator/AwsKinesisTags.g.cs +++ b/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TagListGenerator/AwsKinesisTags.g.cs @@ -46,7 +46,7 @@ public override void SetTag(string key, string? value) } } - public override void EnumerateTags(ref TProcessor processor) + public override void EnumerateTags(ref TProcessor processor, bool openTelemetrySemanticsEnabled) { if (StreamName is not null) { @@ -58,7 +58,7 @@ public override void EnumerateTags(ref TProcessor processor) processor.Process(new TagItem("span.kind", SpanKind, SpanKindBytes)); } - base.EnumerateTags(ref processor); + base.EnumerateTags(ref processor, openTelemetrySemanticsEnabled); } protected override void WriteAdditionalTags(System.Text.StringBuilder sb) diff --git a/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TagListGenerator/AwsS3Tags.g.cs b/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TagListGenerator/AwsS3Tags.g.cs index 834732e88bb4..a6159664e1cd 100644 --- a/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TagListGenerator/AwsS3Tags.g.cs +++ b/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TagListGenerator/AwsS3Tags.g.cs @@ -53,7 +53,7 @@ public override void SetTag(string key, string? value) } } - public override void EnumerateTags(ref TProcessor processor) + public override void EnumerateTags(ref TProcessor processor, bool openTelemetrySemanticsEnabled) { if (BucketName is not null) { @@ -70,7 +70,7 @@ public override void EnumerateTags(ref TProcessor processor) processor.Process(new TagItem("span.kind", SpanKind, SpanKindBytes)); } - base.EnumerateTags(ref processor); + base.EnumerateTags(ref processor, openTelemetrySemanticsEnabled); } protected override void WriteAdditionalTags(System.Text.StringBuilder sb) diff --git a/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TagListGenerator/AwsSdkTags.g.cs b/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TagListGenerator/AwsSdkTags.g.cs index 6b5d2d3193a5..3bb3d26b6f5c 100644 --- a/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TagListGenerator/AwsSdkTags.g.cs +++ b/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TagListGenerator/AwsSdkTags.g.cs @@ -53,6 +53,9 @@ partial class AwsSdkTags // HttpStatusCodeBytes = MessagePack.Serialize("http.status_code"); private static ReadOnlySpan HttpStatusCodeBytes => [176, 104, 116, 116, 112, 46, 115, 116, 97, 116, 117, 115, 95, 99, 111, 100, 101]; + // HttpStatusCodeOtelBytes = MessagePack.Serialize("http.response.status_code"); + private static ReadOnlySpan HttpStatusCodeOtelBytes => [185, 104, 116, 116, 112, 46, 114, 101, 115, 112, 111, 110, 115, 101, 46, 115, 116, 97, 116, 117, 115, 95, 99, 111, 100, 101]; + public override string? GetTag(string key) { return key switch @@ -70,6 +73,7 @@ partial class AwsSdkTags "http.method" => HttpMethod, "http.url" => HttpUrl, "http.status_code" => HttpStatusCode is null ? null : Datadog.Trace.Util.IntStringCache.ToInvariantString(HttpStatusCode.Value), + "http.response.status_code" => HttpStatusCode is null ? null : Datadog.Trace.Util.IntStringCache.ToInvariantString(HttpStatusCode.Value), _ => base.GetTag(key), }; } @@ -102,7 +106,8 @@ public override void SetTag(string key, string? value) case "http.url": HttpUrl = value; break; - case "http.status_code": + case "http.status_code": + case "http.response.status_code": if (int.TryParse(value, System.Globalization.NumberStyles.Integer, System.Globalization.CultureInfo.InvariantCulture, out var parsedHttpStatusCode)) { HttpStatusCode = parsedHttpStatusCode; @@ -125,7 +130,7 @@ public override void SetTag(string key, string? value) } } - public override void EnumerateTags(ref TProcessor processor) + public override void EnumerateTags(ref TProcessor processor, bool openTelemetrySemanticsEnabled) { if (InstrumentationName is not null) { @@ -189,10 +194,17 @@ public override void EnumerateTags(ref TProcessor processor) if (HttpStatusCode is not null) { - processor.Process(new TagItem("http.status_code", HttpStatusCode.Value, HttpStatusCodeBytes)); + if (openTelemetrySemanticsEnabled) + { + processor.Process(new TagItem("http.response.status_code", HttpStatusCode.Value, HttpStatusCodeOtelBytes)); + } + else + { + processor.Process(new TagItem("http.status_code", HttpStatusCode.Value, HttpStatusCodeBytes)); + } } - base.EnumerateTags(ref processor); + base.EnumerateTags(ref processor, openTelemetrySemanticsEnabled); } protected override void WriteAdditionalTags(System.Text.StringBuilder sb) diff --git a/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TagListGenerator/AwsSnsTags.g.cs b/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TagListGenerator/AwsSnsTags.g.cs index 0f6ee97e8ff0..33e5bf5e2ece 100644 --- a/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TagListGenerator/AwsSnsTags.g.cs +++ b/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TagListGenerator/AwsSnsTags.g.cs @@ -58,7 +58,7 @@ public override void SetTag(string key, string? value) } } - public override void EnumerateTags(ref TProcessor processor) + public override void EnumerateTags(ref TProcessor processor, bool openTelemetrySemanticsEnabled) { if (AwsTopicName is not null) { @@ -80,7 +80,7 @@ public override void EnumerateTags(ref TProcessor processor) processor.Process(new TagItem("span.kind", SpanKind, SpanKindBytes)); } - base.EnumerateTags(ref processor); + base.EnumerateTags(ref processor, openTelemetrySemanticsEnabled); } protected override void WriteAdditionalTags(System.Text.StringBuilder sb) diff --git a/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TagListGenerator/AwsSqsTags.g.cs b/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TagListGenerator/AwsSqsTags.g.cs index ab84a58d85a3..f92531146146 100644 --- a/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TagListGenerator/AwsSqsTags.g.cs +++ b/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TagListGenerator/AwsSqsTags.g.cs @@ -58,7 +58,7 @@ public override void SetTag(string key, string? value) } } - public override void EnumerateTags(ref TProcessor processor) + public override void EnumerateTags(ref TProcessor processor, bool openTelemetrySemanticsEnabled) { if (AwsQueueName is not null) { @@ -80,7 +80,7 @@ public override void EnumerateTags(ref TProcessor processor) processor.Process(new TagItem("span.kind", SpanKind, SpanKindBytes)); } - base.EnumerateTags(ref processor); + base.EnumerateTags(ref processor, openTelemetrySemanticsEnabled); } protected override void WriteAdditionalTags(System.Text.StringBuilder sb) diff --git a/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TagListGenerator/AwsStepFunctionsTags.g.cs b/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TagListGenerator/AwsStepFunctionsTags.g.cs index d35e46e0688b..7f30da9df1c4 100644 --- a/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TagListGenerator/AwsStepFunctionsTags.g.cs +++ b/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TagListGenerator/AwsStepFunctionsTags.g.cs @@ -46,7 +46,7 @@ public override void SetTag(string key, string? value) } } - public override void EnumerateTags(ref TProcessor processor) + public override void EnumerateTags(ref TProcessor processor, bool openTelemetrySemanticsEnabled) { if (StateMachineName is not null) { @@ -58,7 +58,7 @@ public override void EnumerateTags(ref TProcessor processor) processor.Process(new TagItem("span.kind", SpanKind, SpanKindBytes)); } - base.EnumerateTags(ref processor); + base.EnumerateTags(ref processor, openTelemetrySemanticsEnabled); } protected override void WriteAdditionalTags(System.Text.StringBuilder sb) diff --git a/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TagListGenerator/AzureEventHubsTags.g.cs b/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TagListGenerator/AzureEventHubsTags.g.cs index 31b548dd2865..b4574999458c 100644 --- a/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TagListGenerator/AzureEventHubsTags.g.cs +++ b/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TagListGenerator/AzureEventHubsTags.g.cs @@ -115,7 +115,7 @@ public override void SetTag(string key, string? value) } } - public override void EnumerateTags(ref TProcessor processor) + public override void EnumerateTags(ref TProcessor processor, bool openTelemetrySemanticsEnabled) { if (SpanKind is not null) { @@ -177,7 +177,7 @@ public override void EnumerateTags(ref TProcessor processor) processor.Process(new TagItem("messaging.message_id", MessagingMessageId, MessagingMessageIdBytes)); } - base.EnumerateTags(ref processor); + base.EnumerateTags(ref processor, openTelemetrySemanticsEnabled); } protected override void WriteAdditionalTags(System.Text.StringBuilder sb) diff --git a/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TagListGenerator/AzureEventHubsV1Tags.g.cs b/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TagListGenerator/AzureEventHubsV1Tags.g.cs index b6580fed8efd..2631ff833fb6 100644 --- a/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TagListGenerator/AzureEventHubsV1Tags.g.cs +++ b/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TagListGenerator/AzureEventHubsV1Tags.g.cs @@ -46,7 +46,7 @@ public override void SetTag(string key, string? value) } } - public override void EnumerateTags(ref TProcessor processor) + public override void EnumerateTags(ref TProcessor processor, bool openTelemetrySemanticsEnabled) { if (PeerService is not null) { @@ -58,7 +58,7 @@ public override void EnumerateTags(ref TProcessor processor) processor.Process(new TagItem("_dd.peer.service.source", PeerServiceSource, PeerServiceSourceBytes)); } - base.EnumerateTags(ref processor); + base.EnumerateTags(ref processor, openTelemetrySemanticsEnabled); } protected override void WriteAdditionalTags(System.Text.StringBuilder sb) diff --git a/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TagListGenerator/AzureFunctionsTags.g.cs b/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TagListGenerator/AzureFunctionsTags.g.cs index 685fd8163817..805fa37f033b 100644 --- a/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TagListGenerator/AzureFunctionsTags.g.cs +++ b/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TagListGenerator/AzureFunctionsTags.g.cs @@ -72,7 +72,7 @@ public override void SetTag(string key, string? value) } } - public override void EnumerateTags(ref TProcessor processor) + public override void EnumerateTags(ref TProcessor processor, bool openTelemetrySemanticsEnabled) { if (SpanKind is not null) { @@ -104,7 +104,7 @@ public override void EnumerateTags(ref TProcessor processor) processor.Process(new TagItem("aas.function.trigger", TriggerType, TriggerTypeBytes)); } - base.EnumerateTags(ref processor); + base.EnumerateTags(ref processor, openTelemetrySemanticsEnabled); } protected override void WriteAdditionalTags(System.Text.StringBuilder sb) diff --git a/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TagListGenerator/AzureServiceBusTags.g.cs b/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TagListGenerator/AzureServiceBusTags.g.cs index b6cfb5de3e3c..647d086d0be8 100644 --- a/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TagListGenerator/AzureServiceBusTags.g.cs +++ b/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TagListGenerator/AzureServiceBusTags.g.cs @@ -101,7 +101,7 @@ public override void SetTag(string key, string? value) } } - public override void EnumerateTags(ref TProcessor processor) + public override void EnumerateTags(ref TProcessor processor, bool openTelemetrySemanticsEnabled) { if (InstrumentationName is not null) { @@ -148,7 +148,7 @@ public override void EnumerateTags(ref TProcessor processor) processor.Process(new TagItem("server.address", ServerAddress, ServerAddressBytes)); } - base.EnumerateTags(ref processor); + base.EnumerateTags(ref processor, openTelemetrySemanticsEnabled); } protected override void WriteAdditionalTags(System.Text.StringBuilder sb) diff --git a/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TagListGenerator/AzureServiceBusV1Tags.g.cs b/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TagListGenerator/AzureServiceBusV1Tags.g.cs index 602423d8a83f..63fcff43d898 100644 --- a/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TagListGenerator/AzureServiceBusV1Tags.g.cs +++ b/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TagListGenerator/AzureServiceBusV1Tags.g.cs @@ -46,7 +46,7 @@ public override void SetTag(string key, string? value) } } - public override void EnumerateTags(ref TProcessor processor) + public override void EnumerateTags(ref TProcessor processor, bool openTelemetrySemanticsEnabled) { if (PeerService is not null) { @@ -58,7 +58,7 @@ public override void EnumerateTags(ref TProcessor processor) processor.Process(new TagItem("_dd.peer.service.source", PeerServiceSource, PeerServiceSourceBytes)); } - base.EnumerateTags(ref processor); + base.EnumerateTags(ref processor, openTelemetrySemanticsEnabled); } protected override void WriteAdditionalTags(System.Text.StringBuilder sb) diff --git a/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TagListGenerator/CosmosDbTags.g.cs b/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TagListGenerator/CosmosDbTags.g.cs index a72ebf93e4e6..aa2d8e1efb33 100644 --- a/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TagListGenerator/CosmosDbTags.g.cs +++ b/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TagListGenerator/CosmosDbTags.g.cs @@ -98,7 +98,7 @@ public override void SetTag(string key, string? value) } } - public override void EnumerateTags(ref TProcessor processor) + public override void EnumerateTags(ref TProcessor processor, bool openTelemetrySemanticsEnabled) { if (SpanKind is not null) { @@ -150,7 +150,7 @@ public override void EnumerateTags(ref TProcessor processor) processor.Process(new TagItem("cosmosdb.connection.mode", ConnectionMode, ConnectionModeBytes)); } - base.EnumerateTags(ref processor); + base.EnumerateTags(ref processor, openTelemetrySemanticsEnabled); } protected override void WriteAdditionalTags(System.Text.StringBuilder sb) diff --git a/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TagListGenerator/CosmosDbV1Tags.g.cs b/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TagListGenerator/CosmosDbV1Tags.g.cs index 58b46d58b982..eea36b6406d8 100644 --- a/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TagListGenerator/CosmosDbV1Tags.g.cs +++ b/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TagListGenerator/CosmosDbV1Tags.g.cs @@ -53,7 +53,7 @@ public override void SetTag(string key, string? value) } } - public override void EnumerateTags(ref TProcessor processor) + public override void EnumerateTags(ref TProcessor processor, bool openTelemetrySemanticsEnabled) { if (Port is not null) { @@ -70,7 +70,7 @@ public override void EnumerateTags(ref TProcessor processor) processor.Process(new TagItem("_dd.peer.service.source", PeerServiceSource, PeerServiceSourceBytes)); } - base.EnumerateTags(ref processor); + base.EnumerateTags(ref processor, openTelemetrySemanticsEnabled); } protected override void WriteAdditionalTags(System.Text.StringBuilder sb) diff --git a/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TagListGenerator/CouchbaseTags.g.cs b/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TagListGenerator/CouchbaseTags.g.cs index 95f10b3803ca..d34b1182ea0a 100644 --- a/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TagListGenerator/CouchbaseTags.g.cs +++ b/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TagListGenerator/CouchbaseTags.g.cs @@ -86,7 +86,7 @@ public override void SetTag(string key, string? value) } } - public override void EnumerateTags(ref TProcessor processor) + public override void EnumerateTags(ref TProcessor processor, bool openTelemetrySemanticsEnabled) { if (SpanKind is not null) { @@ -128,7 +128,7 @@ public override void EnumerateTags(ref TProcessor processor) processor.Process(new TagItem("out.port", Port, PortBytes)); } - base.EnumerateTags(ref processor); + base.EnumerateTags(ref processor, openTelemetrySemanticsEnabled); } protected override void WriteAdditionalTags(System.Text.StringBuilder sb) diff --git a/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TagListGenerator/CouchbaseV1Tags.g.cs b/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TagListGenerator/CouchbaseV1Tags.g.cs index 6b6a2e602e23..44450d38b10e 100644 --- a/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TagListGenerator/CouchbaseV1Tags.g.cs +++ b/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TagListGenerator/CouchbaseV1Tags.g.cs @@ -46,7 +46,7 @@ public override void SetTag(string key, string? value) } } - public override void EnumerateTags(ref TProcessor processor) + public override void EnumerateTags(ref TProcessor processor, bool openTelemetrySemanticsEnabled) { if (PeerService is not null) { @@ -58,7 +58,7 @@ public override void EnumerateTags(ref TProcessor processor) processor.Process(new TagItem("_dd.peer.service.source", PeerServiceSource, PeerServiceSourceBytes)); } - base.EnumerateTags(ref processor); + base.EnumerateTags(ref processor, openTelemetrySemanticsEnabled); } protected override void WriteAdditionalTags(System.Text.StringBuilder sb) diff --git a/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TagListGenerator/ElasticsearchTags.g.cs b/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TagListGenerator/ElasticsearchTags.g.cs index d0a973383095..9a372195b4ab 100644 --- a/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TagListGenerator/ElasticsearchTags.g.cs +++ b/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TagListGenerator/ElasticsearchTags.g.cs @@ -72,7 +72,7 @@ public override void SetTag(string key, string? value) } } - public override void EnumerateTags(ref TProcessor processor) + public override void EnumerateTags(ref TProcessor processor, bool openTelemetrySemanticsEnabled) { if (SpanKind is not null) { @@ -104,7 +104,7 @@ public override void EnumerateTags(ref TProcessor processor) processor.Process(new TagItem("out.host", Host, HostBytes)); } - base.EnumerateTags(ref processor); + base.EnumerateTags(ref processor, openTelemetrySemanticsEnabled); } protected override void WriteAdditionalTags(System.Text.StringBuilder sb) diff --git a/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TagListGenerator/ElasticsearchV1Tags.g.cs b/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TagListGenerator/ElasticsearchV1Tags.g.cs index 154659ca0134..db538ee95417 100644 --- a/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TagListGenerator/ElasticsearchV1Tags.g.cs +++ b/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TagListGenerator/ElasticsearchV1Tags.g.cs @@ -46,7 +46,7 @@ public override void SetTag(string key, string? value) } } - public override void EnumerateTags(ref TProcessor processor) + public override void EnumerateTags(ref TProcessor processor, bool openTelemetrySemanticsEnabled) { if (PeerService is not null) { @@ -58,7 +58,7 @@ public override void EnumerateTags(ref TProcessor processor) processor.Process(new TagItem("_dd.peer.service.source", PeerServiceSource, PeerServiceSourceBytes)); } - base.EnumerateTags(ref processor); + base.EnumerateTags(ref processor, openTelemetrySemanticsEnabled); } protected override void WriteAdditionalTags(System.Text.StringBuilder sb) diff --git a/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TagListGenerator/GraphQLTags.g.cs b/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TagListGenerator/GraphQLTags.g.cs index fa648637efa9..b37ad74308c6 100644 --- a/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TagListGenerator/GraphQLTags.g.cs +++ b/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TagListGenerator/GraphQLTags.g.cs @@ -65,7 +65,7 @@ public override void SetTag(string key, string? value) } } - public override void EnumerateTags(ref TProcessor processor) + public override void EnumerateTags(ref TProcessor processor, bool openTelemetrySemanticsEnabled) { if (SpanKind is not null) { @@ -92,7 +92,7 @@ public override void EnumerateTags(ref TProcessor processor) processor.Process(new TagItem("graphql.operation.type", OperationType, OperationTypeBytes)); } - base.EnumerateTags(ref processor); + base.EnumerateTags(ref processor, openTelemetrySemanticsEnabled); } protected override void WriteAdditionalTags(System.Text.StringBuilder sb) diff --git a/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TagListGenerator/GrpcClientTags.g.cs b/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TagListGenerator/GrpcClientTags.g.cs index 2446a6bf023a..bd93cc0038f7 100644 --- a/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TagListGenerator/GrpcClientTags.g.cs +++ b/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TagListGenerator/GrpcClientTags.g.cs @@ -46,7 +46,7 @@ public override void SetTag(string key, string? value) } } - public override void EnumerateTags(ref TProcessor processor) + public override void EnumerateTags(ref TProcessor processor, bool openTelemetrySemanticsEnabled) { if (Host is not null) { @@ -58,7 +58,7 @@ public override void EnumerateTags(ref TProcessor processor) processor.Process(new TagItem("peer.hostname", PeerHostname, PeerHostnameBytes)); } - base.EnumerateTags(ref processor); + base.EnumerateTags(ref processor, openTelemetrySemanticsEnabled); } protected override void WriteAdditionalTags(System.Text.StringBuilder sb) diff --git a/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TagListGenerator/GrpcClientV1Tags.g.cs b/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TagListGenerator/GrpcClientV1Tags.g.cs index 4f9cc28c3cce..f39c5be4711f 100644 --- a/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TagListGenerator/GrpcClientV1Tags.g.cs +++ b/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TagListGenerator/GrpcClientV1Tags.g.cs @@ -46,7 +46,7 @@ public override void SetTag(string key, string? value) } } - public override void EnumerateTags(ref TProcessor processor) + public override void EnumerateTags(ref TProcessor processor, bool openTelemetrySemanticsEnabled) { if (PeerService is not null) { @@ -58,7 +58,7 @@ public override void EnumerateTags(ref TProcessor processor) processor.Process(new TagItem("_dd.peer.service.source", PeerServiceSource, PeerServiceSourceBytes)); } - base.EnumerateTags(ref processor); + base.EnumerateTags(ref processor, openTelemetrySemanticsEnabled); } protected override void WriteAdditionalTags(System.Text.StringBuilder sb) diff --git a/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TagListGenerator/GrpcTags.g.cs b/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TagListGenerator/GrpcTags.g.cs index 4c01218928a4..8ec123c6e7df 100644 --- a/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TagListGenerator/GrpcTags.g.cs +++ b/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TagListGenerator/GrpcTags.g.cs @@ -86,7 +86,7 @@ public override void SetTag(string key, string? value) } } - public override void EnumerateTags(ref TProcessor processor) + public override void EnumerateTags(ref TProcessor processor, bool openTelemetrySemanticsEnabled) { if (SpanKind is not null) { @@ -128,7 +128,7 @@ public override void EnumerateTags(ref TProcessor processor) processor.Process(new TagItem("grpc.status.code", StatusCode, StatusCodeBytes)); } - base.EnumerateTags(ref processor); + base.EnumerateTags(ref processor, openTelemetrySemanticsEnabled); } protected override void WriteAdditionalTags(System.Text.StringBuilder sb) diff --git a/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TagListGenerator/HangfireTags.g.cs b/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TagListGenerator/HangfireTags.g.cs index adcd5af61841..ea3e826dad35 100644 --- a/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TagListGenerator/HangfireTags.g.cs +++ b/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TagListGenerator/HangfireTags.g.cs @@ -58,7 +58,7 @@ public override void SetTag(string key, string? value) } } - public override void EnumerateTags(ref TProcessor processor) + public override void EnumerateTags(ref TProcessor processor, bool openTelemetrySemanticsEnabled) { if (InstrumentationName is not null) { @@ -80,7 +80,7 @@ public override void EnumerateTags(ref TProcessor processor) processor.Process(new TagItem("job.ID", JobId, JobIdBytes)); } - base.EnumerateTags(ref processor); + base.EnumerateTags(ref processor, openTelemetrySemanticsEnabled); } protected override void WriteAdditionalTags(System.Text.StringBuilder sb) diff --git a/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TagListGenerator/HttpTags.g.cs b/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TagListGenerator/HttpTags.g.cs index 1414cda04601..7406088379c3 100644 --- a/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TagListGenerator/HttpTags.g.cs +++ b/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TagListGenerator/HttpTags.g.cs @@ -32,6 +32,9 @@ partial class HttpTags // HttpStatusCodeBytes = MessagePack.Serialize("http.status_code"); private static ReadOnlySpan HttpStatusCodeBytes => [176, 104, 116, 116, 112, 46, 115, 116, 97, 116, 117, 115, 95, 99, 111, 100, 101]; + // HttpStatusCodeOtelBytes = MessagePack.Serialize("http.response.status_code"); + private static ReadOnlySpan HttpStatusCodeOtelBytes => [185, 104, 116, 116, 112, 46, 114, 101, 115, 112, 111, 110, 115, 101, 46, 115, 116, 97, 116, 117, 115, 95, 99, 111, 100, 101]; + // HostBytes = MessagePack.Serialize("out.host"); private static ReadOnlySpan HostBytes => [168, 111, 117, 116, 46, 104, 111, 115, 116]; @@ -45,6 +48,7 @@ partial class HttpTags "http.url" => HttpUrl, "http-client-handler-type" => HttpClientHandlerType, "http.status_code" => HttpStatusCode is null ? null : Datadog.Trace.Util.IntStringCache.ToInvariantString(HttpStatusCode.Value), + "http.response.status_code" => HttpStatusCode is null ? null : Datadog.Trace.Util.IntStringCache.ToInvariantString(HttpStatusCode.Value), "out.host" => Host, _ => base.GetTag(key), }; @@ -66,7 +70,8 @@ public override void SetTag(string key, string? value) case "http-client-handler-type": HttpClientHandlerType = value; break; - case "http.status_code": + case "http.status_code": + case "http.response.status_code": if (int.TryParse(value, System.Globalization.NumberStyles.Integer, System.Globalization.CultureInfo.InvariantCulture, out var parsedHttpStatusCode)) { HttpStatusCode = parsedHttpStatusCode; @@ -89,7 +94,7 @@ public override void SetTag(string key, string? value) } } - public override void EnumerateTags(ref TProcessor processor) + public override void EnumerateTags(ref TProcessor processor, bool openTelemetrySemanticsEnabled) { if (SpanKind is not null) { @@ -118,7 +123,14 @@ public override void EnumerateTags(ref TProcessor processor) if (HttpStatusCode is not null) { - processor.Process(new TagItem("http.status_code", HttpStatusCode.Value, HttpStatusCodeBytes)); + if (openTelemetrySemanticsEnabled) + { + processor.Process(new TagItem("http.response.status_code", HttpStatusCode.Value, HttpStatusCodeOtelBytes)); + } + else + { + processor.Process(new TagItem("http.status_code", HttpStatusCode.Value, HttpStatusCodeBytes)); + } } if (Host is not null) @@ -126,7 +138,7 @@ public override void EnumerateTags(ref TProcessor processor) processor.Process(new TagItem("out.host", Host, HostBytes)); } - base.EnumerateTags(ref processor); + base.EnumerateTags(ref processor, openTelemetrySemanticsEnabled); } protected override void WriteAdditionalTags(System.Text.StringBuilder sb) diff --git a/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TagListGenerator/HttpV1Tags.g.cs b/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TagListGenerator/HttpV1Tags.g.cs index 36e594313021..8fc26c308117 100644 --- a/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TagListGenerator/HttpV1Tags.g.cs +++ b/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TagListGenerator/HttpV1Tags.g.cs @@ -46,7 +46,7 @@ public override void SetTag(string key, string? value) } } - public override void EnumerateTags(ref TProcessor processor) + public override void EnumerateTags(ref TProcessor processor, bool openTelemetrySemanticsEnabled) { if (PeerService is not null) { @@ -58,7 +58,7 @@ public override void EnumerateTags(ref TProcessor processor) processor.Process(new TagItem("_dd.peer.service.source", PeerServiceSource, PeerServiceSourceBytes)); } - base.EnumerateTags(ref processor); + base.EnumerateTags(ref processor, openTelemetrySemanticsEnabled); } protected override void WriteAdditionalTags(System.Text.StringBuilder sb) diff --git a/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TagListGenerator/IastTags.g.cs b/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TagListGenerator/IastTags.g.cs index e8d2bf22fcb9..98882fc5a048 100644 --- a/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TagListGenerator/IastTags.g.cs +++ b/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TagListGenerator/IastTags.g.cs @@ -46,7 +46,7 @@ public override void SetTag(string key, string? value) } } - public override void EnumerateTags(ref TProcessor processor) + public override void EnumerateTags(ref TProcessor processor, bool openTelemetrySemanticsEnabled) { if (IastJson is not null) { @@ -58,7 +58,7 @@ public override void EnumerateTags(ref TProcessor processor) processor.Process(new TagItem("_dd.iast.enabled", IastEnabled, IastEnabledBytes)); } - base.EnumerateTags(ref processor); + base.EnumerateTags(ref processor, openTelemetrySemanticsEnabled); } protected override void WriteAdditionalTags(System.Text.StringBuilder sb) diff --git a/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TagListGenerator/IbmMqTags.g.cs b/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TagListGenerator/IbmMqTags.g.cs index 232f669c54c6..47e81e1d5383 100644 --- a/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TagListGenerator/IbmMqTags.g.cs +++ b/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TagListGenerator/IbmMqTags.g.cs @@ -51,7 +51,7 @@ public override void SetTag(string key, string? value) } } - public override void EnumerateTags(ref TProcessor processor) + public override void EnumerateTags(ref TProcessor processor, bool openTelemetrySemanticsEnabled) { if (SpanKind is not null) { @@ -68,7 +68,7 @@ public override void EnumerateTags(ref TProcessor processor) processor.Process(new TagItem("topicname", TopicName, TopicNameBytes)); } - base.EnumerateTags(ref processor); + base.EnumerateTags(ref processor, openTelemetrySemanticsEnabled); } protected override void WriteAdditionalTags(System.Text.StringBuilder sb) diff --git a/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TagListGenerator/InferredProxyTags.g.cs b/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TagListGenerator/InferredProxyTags.g.cs index a80c57e07420..dafae6dcf60d 100644 --- a/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TagListGenerator/InferredProxyTags.g.cs +++ b/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TagListGenerator/InferredProxyTags.g.cs @@ -35,6 +35,9 @@ partial class InferredProxyTags // HttpStatusCodeBytes = MessagePack.Serialize("http.status_code"); private static ReadOnlySpan HttpStatusCodeBytes => [176, 104, 116, 116, 112, 46, 115, 116, 97, 116, 117, 115, 95, 99, 111, 100, 101]; + // HttpStatusCodeOtelBytes = MessagePack.Serialize("http.response.status_code"); + private static ReadOnlySpan HttpStatusCodeOtelBytes => [185, 104, 116, 116, 112, 46, 114, 101, 115, 112, 111, 110, 115, 101, 46, 115, 116, 97, 116, 117, 115, 95, 99, 111, 100, 101]; + // StageBytes = MessagePack.Serialize("stage"); private static ReadOnlySpan StageBytes => [165, 115, 116, 97, 103, 101]; @@ -51,6 +54,7 @@ partial class InferredProxyTags "http.url" => HttpUrl, "http.route" => HttpRoute, "http.status_code" => HttpStatusCode is null ? null : Datadog.Trace.Util.IntStringCache.ToInvariantString(HttpStatusCode.Value), + "http.response.status_code" => HttpStatusCode is null ? null : Datadog.Trace.Util.IntStringCache.ToInvariantString(HttpStatusCode.Value), "stage" => Stage, "region" => Region, _ => base.GetTag(key), @@ -73,7 +77,8 @@ public override void SetTag(string key, string? value) case "http.route": HttpRoute = value; break; - case "http.status_code": + case "http.status_code": + case "http.response.status_code": if (int.TryParse(value, System.Globalization.NumberStyles.Integer, System.Globalization.CultureInfo.InvariantCulture, out var parsedHttpStatusCode)) { HttpStatusCode = parsedHttpStatusCode; @@ -99,7 +104,7 @@ public override void SetTag(string key, string? value) } } - public override void EnumerateTags(ref TProcessor processor) + public override void EnumerateTags(ref TProcessor processor, bool openTelemetrySemanticsEnabled) { if (SpanKind is not null) { @@ -128,7 +133,14 @@ public override void EnumerateTags(ref TProcessor processor) if (HttpStatusCode is not null) { - processor.Process(new TagItem("http.status_code", HttpStatusCode.Value, HttpStatusCodeBytes)); + if (openTelemetrySemanticsEnabled) + { + processor.Process(new TagItem("http.response.status_code", HttpStatusCode.Value, HttpStatusCodeOtelBytes)); + } + else + { + processor.Process(new TagItem("http.status_code", HttpStatusCode.Value, HttpStatusCodeBytes)); + } } if (Stage is not null) @@ -141,7 +153,7 @@ public override void EnumerateTags(ref TProcessor processor) processor.Process(new TagItem("region", Region, RegionBytes)); } - base.EnumerateTags(ref processor); + base.EnumerateTags(ref processor, openTelemetrySemanticsEnabled); } protected override void WriteAdditionalTags(System.Text.StringBuilder sb) diff --git a/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TagListGenerator/KafkaTags.g.cs b/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TagListGenerator/KafkaTags.g.cs index b2b1acea9ca2..899d9ef0948f 100644 --- a/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TagListGenerator/KafkaTags.g.cs +++ b/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TagListGenerator/KafkaTags.g.cs @@ -96,7 +96,7 @@ public override void SetTag(string key, string? value) } } - public override void EnumerateTags(ref TProcessor processor) + public override void EnumerateTags(ref TProcessor processor, bool openTelemetrySemanticsEnabled) { if (SpanKind is not null) { @@ -143,7 +143,7 @@ public override void EnumerateTags(ref TProcessor processor) processor.Process(new TagItem("kafka.group", ConsumerGroup, ConsumerGroupBytes)); } - base.EnumerateTags(ref processor); + base.EnumerateTags(ref processor, openTelemetrySemanticsEnabled); } protected override void WriteAdditionalTags(System.Text.StringBuilder sb) diff --git a/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TagListGenerator/KafkaV1Tags.g.cs b/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TagListGenerator/KafkaV1Tags.g.cs index 3fc177b7f28e..f35d93fb3deb 100644 --- a/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TagListGenerator/KafkaV1Tags.g.cs +++ b/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TagListGenerator/KafkaV1Tags.g.cs @@ -46,7 +46,7 @@ public override void SetTag(string key, string? value) } } - public override void EnumerateTags(ref TProcessor processor) + public override void EnumerateTags(ref TProcessor processor, bool openTelemetrySemanticsEnabled) { if (PeerService is not null) { @@ -58,7 +58,7 @@ public override void EnumerateTags(ref TProcessor processor) processor.Process(new TagItem("_dd.peer.service.source", PeerServiceSource, PeerServiceSourceBytes)); } - base.EnumerateTags(ref processor); + base.EnumerateTags(ref processor, openTelemetrySemanticsEnabled); } protected override void WriteAdditionalTags(System.Text.StringBuilder sb) diff --git a/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TagListGenerator/MongoDbTags.g.cs b/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TagListGenerator/MongoDbTags.g.cs index f49ad1d1c1b3..cd4e96d5e641 100644 --- a/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TagListGenerator/MongoDbTags.g.cs +++ b/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TagListGenerator/MongoDbTags.g.cs @@ -79,7 +79,7 @@ public override void SetTag(string key, string? value) } } - public override void EnumerateTags(ref TProcessor processor) + public override void EnumerateTags(ref TProcessor processor, bool openTelemetrySemanticsEnabled) { if (SpanKind is not null) { @@ -116,7 +116,7 @@ public override void EnumerateTags(ref TProcessor processor) processor.Process(new TagItem("out.port", Port, PortBytes)); } - base.EnumerateTags(ref processor); + base.EnumerateTags(ref processor, openTelemetrySemanticsEnabled); } protected override void WriteAdditionalTags(System.Text.StringBuilder sb) diff --git a/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TagListGenerator/MongoDbV1Tags.g.cs b/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TagListGenerator/MongoDbV1Tags.g.cs index c0a2519aaa8c..f16d424525f3 100644 --- a/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TagListGenerator/MongoDbV1Tags.g.cs +++ b/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TagListGenerator/MongoDbV1Tags.g.cs @@ -46,7 +46,7 @@ public override void SetTag(string key, string? value) } } - public override void EnumerateTags(ref TProcessor processor) + public override void EnumerateTags(ref TProcessor processor, bool openTelemetrySemanticsEnabled) { if (PeerService is not null) { @@ -58,7 +58,7 @@ public override void EnumerateTags(ref TProcessor processor) processor.Process(new TagItem("_dd.peer.service.source", PeerServiceSource, PeerServiceSourceBytes)); } - base.EnumerateTags(ref processor); + base.EnumerateTags(ref processor, openTelemetrySemanticsEnabled); } protected override void WriteAdditionalTags(System.Text.StringBuilder sb) diff --git a/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TagListGenerator/MsmqTags.g.cs b/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TagListGenerator/MsmqTags.g.cs index 8608949ad59c..efbad3b04760 100644 --- a/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TagListGenerator/MsmqTags.g.cs +++ b/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TagListGenerator/MsmqTags.g.cs @@ -79,7 +79,7 @@ public override void SetTag(string key, string? value) } } - public override void EnumerateTags(ref TProcessor processor) + public override void EnumerateTags(ref TProcessor processor, bool openTelemetrySemanticsEnabled) { if (Command is not null) { @@ -116,7 +116,7 @@ public override void EnumerateTags(ref TProcessor processor) processor.Process(new TagItem("msmq.queue.transactional", IsTransactionalQueue, IsTransactionalQueueBytes)); } - base.EnumerateTags(ref processor); + base.EnumerateTags(ref processor, openTelemetrySemanticsEnabled); } protected override void WriteAdditionalTags(System.Text.StringBuilder sb) diff --git a/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TagListGenerator/MsmqV1Tags.g.cs b/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TagListGenerator/MsmqV1Tags.g.cs index 78fee57665fc..29cee9a54f04 100644 --- a/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TagListGenerator/MsmqV1Tags.g.cs +++ b/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TagListGenerator/MsmqV1Tags.g.cs @@ -46,7 +46,7 @@ public override void SetTag(string key, string? value) } } - public override void EnumerateTags(ref TProcessor processor) + public override void EnumerateTags(ref TProcessor processor, bool openTelemetrySemanticsEnabled) { if (PeerService is not null) { @@ -58,7 +58,7 @@ public override void EnumerateTags(ref TProcessor processor) processor.Process(new TagItem("_dd.peer.service.source", PeerServiceSource, PeerServiceSourceBytes)); } - base.EnumerateTags(ref processor); + base.EnumerateTags(ref processor, openTelemetrySemanticsEnabled); } protected override void WriteAdditionalTags(System.Text.StringBuilder sb) diff --git a/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TagListGenerator/OpenTelemetryTags.g.cs b/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TagListGenerator/OpenTelemetryTags.g.cs index 5599a863b297..e064e2179266 100644 --- a/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TagListGenerator/OpenTelemetryTags.g.cs +++ b/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TagListGenerator/OpenTelemetryTags.g.cs @@ -67,7 +67,7 @@ public override void SetTag(string key, string? value) } } - public override void EnumerateTags(ref TProcessor processor) + public override void EnumerateTags(ref TProcessor processor, bool openTelemetrySemanticsEnabled) { if (SpanKind is not null) { @@ -94,7 +94,7 @@ public override void EnumerateTags(ref TProcessor processor) processor.Process(new TagItem("otel.status_code", OtelStatusCode, OtelStatusCodeBytes)); } - base.EnumerateTags(ref processor); + base.EnumerateTags(ref processor, openTelemetrySemanticsEnabled); } protected override void WriteAdditionalTags(System.Text.StringBuilder sb) diff --git a/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TagListGenerator/ProcessCommandStartTags.g.cs b/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TagListGenerator/ProcessCommandStartTags.g.cs index 92f0a0649b5d..53322d01c0f7 100644 --- a/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TagListGenerator/ProcessCommandStartTags.g.cs +++ b/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TagListGenerator/ProcessCommandStartTags.g.cs @@ -72,7 +72,7 @@ public override void SetTag(string key, string? value) } } - public override void EnumerateTags(ref TProcessor processor) + public override void EnumerateTags(ref TProcessor processor, bool openTelemetrySemanticsEnabled) { if (Component is not null) { @@ -104,7 +104,7 @@ public override void EnumerateTags(ref TProcessor processor) processor.Process(new TagItem("cmd.truncated", Truncated, TruncatedBytes)); } - base.EnumerateTags(ref processor); + base.EnumerateTags(ref processor, openTelemetrySemanticsEnabled); } protected override void WriteAdditionalTags(System.Text.StringBuilder sb) diff --git a/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TagListGenerator/RabbitMQTags.g.cs b/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TagListGenerator/RabbitMQTags.g.cs index 1c7208f59de7..0abf2ed4f716 100644 --- a/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TagListGenerator/RabbitMQTags.g.cs +++ b/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TagListGenerator/RabbitMQTags.g.cs @@ -93,7 +93,7 @@ public override void SetTag(string key, string? value) } } - public override void EnumerateTags(ref TProcessor processor) + public override void EnumerateTags(ref TProcessor processor, bool openTelemetrySemanticsEnabled) { if (SpanKind is not null) { @@ -140,7 +140,7 @@ public override void EnumerateTags(ref TProcessor processor) processor.Process(new TagItem("out.host", OutHost, OutHostBytes)); } - base.EnumerateTags(ref processor); + base.EnumerateTags(ref processor, openTelemetrySemanticsEnabled); } protected override void WriteAdditionalTags(System.Text.StringBuilder sb) diff --git a/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TagListGenerator/RabbitMQV1Tags.g.cs b/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TagListGenerator/RabbitMQV1Tags.g.cs index 75851ba4d8d6..6cebdb522d7d 100644 --- a/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TagListGenerator/RabbitMQV1Tags.g.cs +++ b/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TagListGenerator/RabbitMQV1Tags.g.cs @@ -46,7 +46,7 @@ public override void SetTag(string key, string? value) } } - public override void EnumerateTags(ref TProcessor processor) + public override void EnumerateTags(ref TProcessor processor, bool openTelemetrySemanticsEnabled) { if (PeerService is not null) { @@ -58,7 +58,7 @@ public override void EnumerateTags(ref TProcessor processor) processor.Process(new TagItem("_dd.peer.service.source", PeerServiceSource, PeerServiceSourceBytes)); } - base.EnumerateTags(ref processor); + base.EnumerateTags(ref processor, openTelemetrySemanticsEnabled); } protected override void WriteAdditionalTags(System.Text.StringBuilder sb) diff --git a/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TagListGenerator/RedisTags.g.cs b/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TagListGenerator/RedisTags.g.cs index e812be841d36..db7ecc3c7fd6 100644 --- a/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TagListGenerator/RedisTags.g.cs +++ b/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TagListGenerator/RedisTags.g.cs @@ -70,7 +70,7 @@ public override void SetTag(string key, string? value) } } - public override void EnumerateTags(ref TProcessor processor) + public override void EnumerateTags(ref TProcessor processor, bool openTelemetrySemanticsEnabled) { if (SpanKind is not null) { @@ -97,7 +97,7 @@ public override void EnumerateTags(ref TProcessor processor) processor.Process(new TagItem("out.port", Port, PortBytes)); } - base.EnumerateTags(ref processor); + base.EnumerateTags(ref processor, openTelemetrySemanticsEnabled); } protected override void WriteAdditionalTags(System.Text.StringBuilder sb) diff --git a/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TagListGenerator/RedisV1Tags.g.cs b/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TagListGenerator/RedisV1Tags.g.cs index 11317f7a92c1..69f39339e993 100644 --- a/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TagListGenerator/RedisV1Tags.g.cs +++ b/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TagListGenerator/RedisV1Tags.g.cs @@ -46,7 +46,7 @@ public override void SetTag(string key, string? value) } } - public override void EnumerateTags(ref TProcessor processor) + public override void EnumerateTags(ref TProcessor processor, bool openTelemetrySemanticsEnabled) { if (PeerService is not null) { @@ -58,7 +58,7 @@ public override void EnumerateTags(ref TProcessor processor) processor.Process(new TagItem("_dd.peer.service.source", PeerServiceSource, PeerServiceSourceBytes)); } - base.EnumerateTags(ref processor); + base.EnumerateTags(ref processor, openTelemetrySemanticsEnabled); } protected override void WriteAdditionalTags(System.Text.StringBuilder sb) diff --git a/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TagListGenerator/RemotingClientV1Tags.g.cs b/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TagListGenerator/RemotingClientV1Tags.g.cs index 2d4946deb561..7bf5882637b2 100644 --- a/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TagListGenerator/RemotingClientV1Tags.g.cs +++ b/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TagListGenerator/RemotingClientV1Tags.g.cs @@ -46,7 +46,7 @@ public override void SetTag(string key, string? value) } } - public override void EnumerateTags(ref TProcessor processor) + public override void EnumerateTags(ref TProcessor processor, bool openTelemetrySemanticsEnabled) { if (PeerService is not null) { @@ -58,7 +58,7 @@ public override void EnumerateTags(ref TProcessor processor) processor.Process(new TagItem("_dd.peer.service.source", PeerServiceSource, PeerServiceSourceBytes)); } - base.EnumerateTags(ref processor); + base.EnumerateTags(ref processor, openTelemetrySemanticsEnabled); } protected override void WriteAdditionalTags(System.Text.StringBuilder sb) diff --git a/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TagListGenerator/RemotingTags.g.cs b/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TagListGenerator/RemotingTags.g.cs index 33446c86d899..0677a2937661 100644 --- a/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TagListGenerator/RemotingTags.g.cs +++ b/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TagListGenerator/RemotingTags.g.cs @@ -63,7 +63,7 @@ public override void SetTag(string key, string? value) } } - public override void EnumerateTags(ref TProcessor processor) + public override void EnumerateTags(ref TProcessor processor, bool openTelemetrySemanticsEnabled) { if (SpanKind is not null) { @@ -90,7 +90,7 @@ public override void EnumerateTags(ref TProcessor processor) processor.Process(new TagItem("rpc.system", RpcSystem, RpcSystemBytes)); } - base.EnumerateTags(ref processor); + base.EnumerateTags(ref processor, openTelemetrySemanticsEnabled); } protected override void WriteAdditionalTags(System.Text.StringBuilder sb) diff --git a/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TagListGenerator/ServiceRemotingClientV1Tags.g.cs b/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TagListGenerator/ServiceRemotingClientV1Tags.g.cs index 1959416b21c7..41253e26f8c1 100644 --- a/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TagListGenerator/ServiceRemotingClientV1Tags.g.cs +++ b/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TagListGenerator/ServiceRemotingClientV1Tags.g.cs @@ -46,7 +46,7 @@ public override void SetTag(string key, string? value) } } - public override void EnumerateTags(ref TProcessor processor) + public override void EnumerateTags(ref TProcessor processor, bool openTelemetrySemanticsEnabled) { if (PeerService is not null) { @@ -58,7 +58,7 @@ public override void EnumerateTags(ref TProcessor processor) processor.Process(new TagItem("_dd.peer.service.source", PeerServiceSource, PeerServiceSourceBytes)); } - base.EnumerateTags(ref processor); + base.EnumerateTags(ref processor, openTelemetrySemanticsEnabled); } protected override void WriteAdditionalTags(System.Text.StringBuilder sb) diff --git a/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TagListGenerator/ServiceRemotingTags.g.cs b/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TagListGenerator/ServiceRemotingTags.g.cs index 75b61e70e456..47a2eeff6e2a 100644 --- a/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TagListGenerator/ServiceRemotingTags.g.cs +++ b/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TagListGenerator/ServiceRemotingTags.g.cs @@ -123,7 +123,7 @@ public override void SetTag(string key, string? value) } } - public override void EnumerateTags(ref TProcessor processor) + public override void EnumerateTags(ref TProcessor processor, bool openTelemetrySemanticsEnabled) { if (SpanKind is not null) { @@ -190,7 +190,7 @@ public override void EnumerateTags(ref TProcessor processor) processor.Process(new TagItem("service-fabric.service-remoting.invocation-id", RemotingInvocationId, RemotingInvocationIdBytes)); } - base.EnumerateTags(ref processor); + base.EnumerateTags(ref processor, openTelemetrySemanticsEnabled); } protected override void WriteAdditionalTags(System.Text.StringBuilder sb) diff --git a/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TagListGenerator/SqlTags.g.cs b/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TagListGenerator/SqlTags.g.cs index 5fa99249f899..fe5ad1d586fb 100644 --- a/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TagListGenerator/SqlTags.g.cs +++ b/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TagListGenerator/SqlTags.g.cs @@ -88,7 +88,7 @@ public override void SetTag(string key, string? value) } } - public override void EnumerateTags(ref TProcessor processor) + public override void EnumerateTags(ref TProcessor processor, bool openTelemetrySemanticsEnabled) { if (SpanKind is not null) { @@ -130,7 +130,7 @@ public override void EnumerateTags(ref TProcessor processor) processor.Process(new TagItem("_dd.propagated_hash", BaseHash, BaseHashBytes)); } - base.EnumerateTags(ref processor); + base.EnumerateTags(ref processor, openTelemetrySemanticsEnabled); } protected override void WriteAdditionalTags(System.Text.StringBuilder sb) diff --git a/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TagListGenerator/SqlV1Tags.g.cs b/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TagListGenerator/SqlV1Tags.g.cs index 9751da7af7a3..87d74064a129 100644 --- a/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TagListGenerator/SqlV1Tags.g.cs +++ b/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TagListGenerator/SqlV1Tags.g.cs @@ -46,7 +46,7 @@ public override void SetTag(string key, string? value) } } - public override void EnumerateTags(ref TProcessor processor) + public override void EnumerateTags(ref TProcessor processor, bool openTelemetrySemanticsEnabled) { if (PeerService is not null) { @@ -58,7 +58,7 @@ public override void EnumerateTags(ref TProcessor processor) processor.Process(new TagItem("_dd.peer.service.source", PeerServiceSource, PeerServiceSourceBytes)); } - base.EnumerateTags(ref processor); + base.EnumerateTags(ref processor, openTelemetrySemanticsEnabled); } protected override void WriteAdditionalTags(System.Text.StringBuilder sb) diff --git a/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TagListGenerator/TagAttribute.g.cs b/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TagListGenerator/TagAttribute.g.cs index 0020d1490683..d678d06ab096 100644 --- a/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TagListGenerator/TagAttribute.g.cs +++ b/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TagListGenerator/TagAttribute.g.cs @@ -27,6 +27,11 @@ public TagAttribute(string tagName) => /// Gets the name of the datadog tag the property corresponds to /// public string TagName { get; } + + /// + /// Gets or sets the OpenTelemetry semantic convention name that aliases . + /// + public string? OtelName { get; set; } } /// diff --git a/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TagListGenerator/TestModuleSpanTags.g.cs b/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TagListGenerator/TestModuleSpanTags.g.cs index 61d1c47ac52f..7809da282493 100644 --- a/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TagListGenerator/TestModuleSpanTags.g.cs +++ b/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TagListGenerator/TestModuleSpanTags.g.cs @@ -112,7 +112,7 @@ public override void SetTag(string key, string? value) } } - public override void EnumerateTags(ref TProcessor processor) + public override void EnumerateTags(ref TProcessor processor, bool openTelemetrySemanticsEnabled) { if (Type is not null) { @@ -169,7 +169,7 @@ public override void EnumerateTags(ref TProcessor processor) processor.Process(new TagItem("os.version", OSVersion, OSVersionBytes)); } - base.EnumerateTags(ref processor); + base.EnumerateTags(ref processor, openTelemetrySemanticsEnabled); } protected override void WriteAdditionalTags(System.Text.StringBuilder sb) diff --git a/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TagListGenerator/TestSessionSpanTags.g.cs b/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TagListGenerator/TestSessionSpanTags.g.cs index 13a5d04d49da..37b566d3f8d4 100644 --- a/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TagListGenerator/TestSessionSpanTags.g.cs +++ b/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TagListGenerator/TestSessionSpanTags.g.cs @@ -350,7 +350,7 @@ public override void SetTag(string key, string? value) } } - public override void EnumerateTags(ref TProcessor processor) + public override void EnumerateTags(ref TProcessor processor, bool openTelemetrySemanticsEnabled) { if (Command is not null) { @@ -577,7 +577,7 @@ public override void EnumerateTags(ref TProcessor processor) processor.Process(new TagItem("git.commit.head.message", GitHeadCommitMessage, GitHeadCommitMessageBytes)); } - base.EnumerateTags(ref processor); + base.EnumerateTags(ref processor, openTelemetrySemanticsEnabled); } protected override void WriteAdditionalTags(System.Text.StringBuilder sb) diff --git a/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TagListGenerator/TestSpanTags.g.cs b/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TagListGenerator/TestSpanTags.g.cs index 97ef1c5c81a8..1e08fb410a81 100644 --- a/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TagListGenerator/TestSpanTags.g.cs +++ b/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TagListGenerator/TestSpanTags.g.cs @@ -234,7 +234,7 @@ public override void SetTag(string key, string? value) } } - public override void EnumerateTags(ref TProcessor processor) + public override void EnumerateTags(ref TProcessor processor, bool openTelemetrySemanticsEnabled) { if (Name is not null) { @@ -376,7 +376,7 @@ public override void EnumerateTags(ref TProcessor processor) processor.Process(new TagItem("_dd.library_capabilities.test_management.attempt_to_fix", CapabilitiesTestManagementAttemptToFix, CapabilitiesTestManagementAttemptToFixBytes)); } - base.EnumerateTags(ref processor); + base.EnumerateTags(ref processor, openTelemetrySemanticsEnabled); } protected override void WriteAdditionalTags(System.Text.StringBuilder sb) diff --git a/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TagListGenerator/TestSuiteSpanTags.g.cs b/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TagListGenerator/TestSuiteSpanTags.g.cs index b1d3aa6eaf67..14eccb5e013b 100644 --- a/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TagListGenerator/TestSuiteSpanTags.g.cs +++ b/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TagListGenerator/TestSuiteSpanTags.g.cs @@ -53,7 +53,7 @@ public override void SetTag(string key, string? value) } } - public override void EnumerateTags(ref TProcessor processor) + public override void EnumerateTags(ref TProcessor processor, bool openTelemetrySemanticsEnabled) { if (Suite is not null) { @@ -70,7 +70,7 @@ public override void EnumerateTags(ref TProcessor processor) processor.Process(new TagItem("test.codeowners", CodeOwners, CodeOwnersBytes)); } - base.EnumerateTags(ref processor); + base.EnumerateTags(ref processor, openTelemetrySemanticsEnabled); } protected override void WriteAdditionalTags(System.Text.StringBuilder sb) diff --git a/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TagListGenerator/TraceAnnotationTags.g.cs b/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TagListGenerator/TraceAnnotationTags.g.cs index 67f69361144c..984350404d53 100644 --- a/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TagListGenerator/TraceAnnotationTags.g.cs +++ b/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TagListGenerator/TraceAnnotationTags.g.cs @@ -39,14 +39,14 @@ public override void SetTag(string key, string? value) } } - public override void EnumerateTags(ref TProcessor processor) + public override void EnumerateTags(ref TProcessor processor, bool openTelemetrySemanticsEnabled) { if (InstrumentationName is not null) { processor.Process(new TagItem("component", InstrumentationName, InstrumentationNameBytes)); } - base.EnumerateTags(ref processor); + base.EnumerateTags(ref processor, openTelemetrySemanticsEnabled); } protected override void WriteAdditionalTags(System.Text.StringBuilder sb) diff --git a/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TagListGenerator/WcfTags.g.cs b/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TagListGenerator/WcfTags.g.cs index b8d5c42bb58a..f0125208b5bc 100644 --- a/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TagListGenerator/WcfTags.g.cs +++ b/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TagListGenerator/WcfTags.g.cs @@ -39,14 +39,14 @@ public override void SetTag(string key, string? value) } } - public override void EnumerateTags(ref TProcessor processor) + public override void EnumerateTags(ref TProcessor processor, bool openTelemetrySemanticsEnabled) { if (InstrumentationName is not null) { processor.Process(new TagItem("component", InstrumentationName, InstrumentationNameBytes)); } - base.EnumerateTags(ref processor); + base.EnumerateTags(ref processor, openTelemetrySemanticsEnabled); } protected override void WriteAdditionalTags(System.Text.StringBuilder sb) diff --git a/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TagListGenerator/WebTags.g.cs b/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TagListGenerator/WebTags.g.cs index 0d0922839d45..8e05ef465dde 100644 --- a/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TagListGenerator/WebTags.g.cs +++ b/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TagListGenerator/WebTags.g.cs @@ -32,6 +32,9 @@ partial class WebTags // HttpStatusCodeBytes = MessagePack.Serialize("http.status_code"); private static ReadOnlySpan HttpStatusCodeBytes => [176, 104, 116, 116, 112, 46, 115, 116, 97, 116, 117, 115, 95, 99, 111, 100, 101]; + // HttpStatusCodeOtelBytes = MessagePack.Serialize("http.response.status_code"); + private static ReadOnlySpan HttpStatusCodeOtelBytes => [185, 104, 116, 116, 112, 46, 114, 101, 115, 112, 111, 110, 115, 101, 46, 115, 116, 97, 116, 117, 115, 95, 99, 111, 100, 101]; + // NetworkClientIpBytes = MessagePack.Serialize("network.client.ip"); private static ReadOnlySpan NetworkClientIpBytes => [177, 110, 101, 116, 119, 111, 114, 107, 46, 99, 108, 105, 101, 110, 116, 46, 105, 112]; @@ -48,6 +51,7 @@ partial class WebTags "http.request.headers.host" => HttpRequestHeadersHost, "http.url" => HttpUrl, "http.status_code" => HttpStatusCode is null ? null : Datadog.Trace.Util.IntStringCache.ToInvariantString(HttpStatusCode.Value), + "http.response.status_code" => HttpStatusCode is null ? null : Datadog.Trace.Util.IntStringCache.ToInvariantString(HttpStatusCode.Value), "network.client.ip" => NetworkClientIp, "http.client_ip" => HttpClientIp, _ => base.GetTag(key), @@ -70,7 +74,8 @@ public override void SetTag(string key, string? value) case "http.url": HttpUrl = value; break; - case "http.status_code": + case "http.status_code": + case "http.response.status_code": if (int.TryParse(value, System.Globalization.NumberStyles.Integer, System.Globalization.CultureInfo.InvariantCulture, out var parsedHttpStatusCode)) { HttpStatusCode = parsedHttpStatusCode; @@ -96,7 +101,7 @@ public override void SetTag(string key, string? value) } } - public override void EnumerateTags(ref TProcessor processor) + public override void EnumerateTags(ref TProcessor processor, bool openTelemetrySemanticsEnabled) { if (SpanKind is not null) { @@ -125,7 +130,14 @@ public override void EnumerateTags(ref TProcessor processor) if (HttpStatusCode is not null) { - processor.Process(new TagItem("http.status_code", HttpStatusCode.Value, HttpStatusCodeBytes)); + if (openTelemetrySemanticsEnabled) + { + processor.Process(new TagItem("http.response.status_code", HttpStatusCode.Value, HttpStatusCodeOtelBytes)); + } + else + { + processor.Process(new TagItem("http.status_code", HttpStatusCode.Value, HttpStatusCodeBytes)); + } } if (NetworkClientIp is not null) @@ -138,7 +150,7 @@ public override void EnumerateTags(ref TProcessor processor) processor.Process(new TagItem("http.client_ip", HttpClientIp, HttpClientIpBytes)); } - base.EnumerateTags(ref processor); + base.EnumerateTags(ref processor, openTelemetrySemanticsEnabled); } protected override void WriteAdditionalTags(System.Text.StringBuilder sb) diff --git a/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TagListGenerator/AerospikeTags.g.cs b/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TagListGenerator/AerospikeTags.g.cs index ea4558a93691..e6b67ece8851 100644 --- a/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TagListGenerator/AerospikeTags.g.cs +++ b/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TagListGenerator/AerospikeTags.g.cs @@ -72,7 +72,7 @@ public override void SetTag(string key, string? value) } } - public override void EnumerateTags(ref TProcessor processor) + public override void EnumerateTags(ref TProcessor processor, bool openTelemetrySemanticsEnabled) { if (SpanKind is not null) { @@ -104,7 +104,7 @@ public override void EnumerateTags(ref TProcessor processor) processor.Process(new TagItem("aerospike.userkey", UserKey, UserKeyBytes)); } - base.EnumerateTags(ref processor); + base.EnumerateTags(ref processor, openTelemetrySemanticsEnabled); } protected override void WriteAdditionalTags(System.Text.StringBuilder sb) diff --git a/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TagListGenerator/AerospikeV1Tags.g.cs b/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TagListGenerator/AerospikeV1Tags.g.cs index 38446d61fa14..73a3e3cc8f3c 100644 --- a/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TagListGenerator/AerospikeV1Tags.g.cs +++ b/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TagListGenerator/AerospikeV1Tags.g.cs @@ -46,7 +46,7 @@ public override void SetTag(string key, string? value) } } - public override void EnumerateTags(ref TProcessor processor) + public override void EnumerateTags(ref TProcessor processor, bool openTelemetrySemanticsEnabled) { if (PeerService is not null) { @@ -58,7 +58,7 @@ public override void EnumerateTags(ref TProcessor processor) processor.Process(new TagItem("_dd.peer.service.source", PeerServiceSource, PeerServiceSourceBytes)); } - base.EnumerateTags(ref processor); + base.EnumerateTags(ref processor, openTelemetrySemanticsEnabled); } protected override void WriteAdditionalTags(System.Text.StringBuilder sb) diff --git a/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TagListGenerator/AspNetCoreEndpointTags.g.cs b/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TagListGenerator/AspNetCoreEndpointTags.g.cs index 57f2de401d7e..49c57fc27ca3 100644 --- a/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TagListGenerator/AspNetCoreEndpointTags.g.cs +++ b/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TagListGenerator/AspNetCoreEndpointTags.g.cs @@ -39,14 +39,14 @@ public override void SetTag(string key, string? value) } } - public override void EnumerateTags(ref TProcessor processor) + public override void EnumerateTags(ref TProcessor processor, bool openTelemetrySemanticsEnabled) { if (AspNetCoreEndpoint is not null) { processor.Process(new TagItem("aspnet_core.endpoint", AspNetCoreEndpoint, AspNetCoreEndpointBytes)); } - base.EnumerateTags(ref processor); + base.EnumerateTags(ref processor, openTelemetrySemanticsEnabled); } protected override void WriteAdditionalTags(System.Text.StringBuilder sb) diff --git a/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TagListGenerator/AspNetCoreMvcTags.g.cs b/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TagListGenerator/AspNetCoreMvcTags.g.cs index 0e7aa5558682..c9ef75bc22ee 100644 --- a/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TagListGenerator/AspNetCoreMvcTags.g.cs +++ b/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TagListGenerator/AspNetCoreMvcTags.g.cs @@ -79,7 +79,7 @@ public override void SetTag(string key, string? value) } } - public override void EnumerateTags(ref TProcessor processor) + public override void EnumerateTags(ref TProcessor processor, bool openTelemetrySemanticsEnabled) { if (SpanKind is not null) { @@ -116,7 +116,7 @@ public override void EnumerateTags(ref TProcessor processor) processor.Process(new TagItem("aspnet_core.route", AspNetCoreRoute, AspNetCoreRouteBytes)); } - base.EnumerateTags(ref processor); + base.EnumerateTags(ref processor, openTelemetrySemanticsEnabled); } protected override void WriteAdditionalTags(System.Text.StringBuilder sb) diff --git a/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TagListGenerator/AspNetCoreSingleSpanTags.g.cs b/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TagListGenerator/AspNetCoreSingleSpanTags.g.cs index 268236edb742..b54ba8c3fb36 100644 --- a/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TagListGenerator/AspNetCoreSingleSpanTags.g.cs +++ b/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TagListGenerator/AspNetCoreSingleSpanTags.g.cs @@ -107,7 +107,7 @@ public override void SetTag(string key, string? value) } } - public override void EnumerateTags(ref TProcessor processor) + public override void EnumerateTags(ref TProcessor processor, bool openTelemetrySemanticsEnabled) { if (InstrumentationName is not null) { @@ -164,7 +164,7 @@ public override void EnumerateTags(ref TProcessor processor) processor.Process(new TagItem("_dd.code_origin.frames.0.column", CodeOriginFrameColumn, CodeOriginFrameColumnBytes)); } - base.EnumerateTags(ref processor); + base.EnumerateTags(ref processor, openTelemetrySemanticsEnabled); } protected override void WriteAdditionalTags(System.Text.StringBuilder sb) diff --git a/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TagListGenerator/AspNetCoreTags.g.cs b/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TagListGenerator/AspNetCoreTags.g.cs index 2ab87d9d28d3..9674b3c620fc 100644 --- a/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TagListGenerator/AspNetCoreTags.g.cs +++ b/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TagListGenerator/AspNetCoreTags.g.cs @@ -102,7 +102,7 @@ public override void SetTag(string key, string? value) } } - public override void EnumerateTags(ref TProcessor processor) + public override void EnumerateTags(ref TProcessor processor, bool openTelemetrySemanticsEnabled) { if (InstrumentationName is not null) { @@ -154,7 +154,7 @@ public override void EnumerateTags(ref TProcessor processor) processor.Process(new TagItem("_dd.code_origin.frames.0.column", CodeOriginFrameColumn, CodeOriginFrameColumnBytes)); } - base.EnumerateTags(ref processor); + base.EnumerateTags(ref processor, openTelemetrySemanticsEnabled); } protected override void WriteAdditionalTags(System.Text.StringBuilder sb) diff --git a/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TagListGenerator/AspNetTags.g.cs b/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TagListGenerator/AspNetTags.g.cs index 1493deadadd2..f87275c9d138 100644 --- a/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TagListGenerator/AspNetTags.g.cs +++ b/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TagListGenerator/AspNetTags.g.cs @@ -74,7 +74,7 @@ public override void SetTag(string key, string? value) } } - public override void EnumerateTags(ref TProcessor processor) + public override void EnumerateTags(ref TProcessor processor, bool openTelemetrySemanticsEnabled) { if (AspNetRoute is not null) { @@ -106,7 +106,7 @@ public override void EnumerateTags(ref TProcessor processor) processor.Process(new TagItem("component", InstrumentationName, InstrumentationNameBytes)); } - base.EnumerateTags(ref processor); + base.EnumerateTags(ref processor, openTelemetrySemanticsEnabled); } protected override void WriteAdditionalTags(System.Text.StringBuilder sb) diff --git a/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TagListGenerator/AwsDynamoDbTags.g.cs b/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TagListGenerator/AwsDynamoDbTags.g.cs index 6b4094015296..fabde3fd5416 100644 --- a/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TagListGenerator/AwsDynamoDbTags.g.cs +++ b/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TagListGenerator/AwsDynamoDbTags.g.cs @@ -46,7 +46,7 @@ public override void SetTag(string key, string? value) } } - public override void EnumerateTags(ref TProcessor processor) + public override void EnumerateTags(ref TProcessor processor, bool openTelemetrySemanticsEnabled) { if (TableName is not null) { @@ -58,7 +58,7 @@ public override void EnumerateTags(ref TProcessor processor) processor.Process(new TagItem("span.kind", SpanKind, SpanKindBytes)); } - base.EnumerateTags(ref processor); + base.EnumerateTags(ref processor, openTelemetrySemanticsEnabled); } protected override void WriteAdditionalTags(System.Text.StringBuilder sb) diff --git a/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TagListGenerator/AwsEventBridgeTags.g.cs b/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TagListGenerator/AwsEventBridgeTags.g.cs index af149744d93d..c194f4868294 100644 --- a/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TagListGenerator/AwsEventBridgeTags.g.cs +++ b/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TagListGenerator/AwsEventBridgeTags.g.cs @@ -46,7 +46,7 @@ public override void SetTag(string key, string? value) } } - public override void EnumerateTags(ref TProcessor processor) + public override void EnumerateTags(ref TProcessor processor, bool openTelemetrySemanticsEnabled) { if (RuleName is not null) { @@ -58,7 +58,7 @@ public override void EnumerateTags(ref TProcessor processor) processor.Process(new TagItem("span.kind", SpanKind, SpanKindBytes)); } - base.EnumerateTags(ref processor); + base.EnumerateTags(ref processor, openTelemetrySemanticsEnabled); } protected override void WriteAdditionalTags(System.Text.StringBuilder sb) diff --git a/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TagListGenerator/AwsKinesisTags.g.cs b/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TagListGenerator/AwsKinesisTags.g.cs index cdb8a4e6793c..9a01c7b53b21 100644 --- a/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TagListGenerator/AwsKinesisTags.g.cs +++ b/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TagListGenerator/AwsKinesisTags.g.cs @@ -46,7 +46,7 @@ public override void SetTag(string key, string? value) } } - public override void EnumerateTags(ref TProcessor processor) + public override void EnumerateTags(ref TProcessor processor, bool openTelemetrySemanticsEnabled) { if (StreamName is not null) { @@ -58,7 +58,7 @@ public override void EnumerateTags(ref TProcessor processor) processor.Process(new TagItem("span.kind", SpanKind, SpanKindBytes)); } - base.EnumerateTags(ref processor); + base.EnumerateTags(ref processor, openTelemetrySemanticsEnabled); } protected override void WriteAdditionalTags(System.Text.StringBuilder sb) diff --git a/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TagListGenerator/AwsS3Tags.g.cs b/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TagListGenerator/AwsS3Tags.g.cs index 834732e88bb4..a6159664e1cd 100644 --- a/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TagListGenerator/AwsS3Tags.g.cs +++ b/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TagListGenerator/AwsS3Tags.g.cs @@ -53,7 +53,7 @@ public override void SetTag(string key, string? value) } } - public override void EnumerateTags(ref TProcessor processor) + public override void EnumerateTags(ref TProcessor processor, bool openTelemetrySemanticsEnabled) { if (BucketName is not null) { @@ -70,7 +70,7 @@ public override void EnumerateTags(ref TProcessor processor) processor.Process(new TagItem("span.kind", SpanKind, SpanKindBytes)); } - base.EnumerateTags(ref processor); + base.EnumerateTags(ref processor, openTelemetrySemanticsEnabled); } protected override void WriteAdditionalTags(System.Text.StringBuilder sb) diff --git a/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TagListGenerator/AwsSdkTags.g.cs b/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TagListGenerator/AwsSdkTags.g.cs index 6b5d2d3193a5..3bb3d26b6f5c 100644 --- a/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TagListGenerator/AwsSdkTags.g.cs +++ b/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TagListGenerator/AwsSdkTags.g.cs @@ -53,6 +53,9 @@ partial class AwsSdkTags // HttpStatusCodeBytes = MessagePack.Serialize("http.status_code"); private static ReadOnlySpan HttpStatusCodeBytes => [176, 104, 116, 116, 112, 46, 115, 116, 97, 116, 117, 115, 95, 99, 111, 100, 101]; + // HttpStatusCodeOtelBytes = MessagePack.Serialize("http.response.status_code"); + private static ReadOnlySpan HttpStatusCodeOtelBytes => [185, 104, 116, 116, 112, 46, 114, 101, 115, 112, 111, 110, 115, 101, 46, 115, 116, 97, 116, 117, 115, 95, 99, 111, 100, 101]; + public override string? GetTag(string key) { return key switch @@ -70,6 +73,7 @@ partial class AwsSdkTags "http.method" => HttpMethod, "http.url" => HttpUrl, "http.status_code" => HttpStatusCode is null ? null : Datadog.Trace.Util.IntStringCache.ToInvariantString(HttpStatusCode.Value), + "http.response.status_code" => HttpStatusCode is null ? null : Datadog.Trace.Util.IntStringCache.ToInvariantString(HttpStatusCode.Value), _ => base.GetTag(key), }; } @@ -102,7 +106,8 @@ public override void SetTag(string key, string? value) case "http.url": HttpUrl = value; break; - case "http.status_code": + case "http.status_code": + case "http.response.status_code": if (int.TryParse(value, System.Globalization.NumberStyles.Integer, System.Globalization.CultureInfo.InvariantCulture, out var parsedHttpStatusCode)) { HttpStatusCode = parsedHttpStatusCode; @@ -125,7 +130,7 @@ public override void SetTag(string key, string? value) } } - public override void EnumerateTags(ref TProcessor processor) + public override void EnumerateTags(ref TProcessor processor, bool openTelemetrySemanticsEnabled) { if (InstrumentationName is not null) { @@ -189,10 +194,17 @@ public override void EnumerateTags(ref TProcessor processor) if (HttpStatusCode is not null) { - processor.Process(new TagItem("http.status_code", HttpStatusCode.Value, HttpStatusCodeBytes)); + if (openTelemetrySemanticsEnabled) + { + processor.Process(new TagItem("http.response.status_code", HttpStatusCode.Value, HttpStatusCodeOtelBytes)); + } + else + { + processor.Process(new TagItem("http.status_code", HttpStatusCode.Value, HttpStatusCodeBytes)); + } } - base.EnumerateTags(ref processor); + base.EnumerateTags(ref processor, openTelemetrySemanticsEnabled); } protected override void WriteAdditionalTags(System.Text.StringBuilder sb) diff --git a/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TagListGenerator/AwsSnsTags.g.cs b/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TagListGenerator/AwsSnsTags.g.cs index 0f6ee97e8ff0..33e5bf5e2ece 100644 --- a/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TagListGenerator/AwsSnsTags.g.cs +++ b/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TagListGenerator/AwsSnsTags.g.cs @@ -58,7 +58,7 @@ public override void SetTag(string key, string? value) } } - public override void EnumerateTags(ref TProcessor processor) + public override void EnumerateTags(ref TProcessor processor, bool openTelemetrySemanticsEnabled) { if (AwsTopicName is not null) { @@ -80,7 +80,7 @@ public override void EnumerateTags(ref TProcessor processor) processor.Process(new TagItem("span.kind", SpanKind, SpanKindBytes)); } - base.EnumerateTags(ref processor); + base.EnumerateTags(ref processor, openTelemetrySemanticsEnabled); } protected override void WriteAdditionalTags(System.Text.StringBuilder sb) diff --git a/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TagListGenerator/AwsSqsTags.g.cs b/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TagListGenerator/AwsSqsTags.g.cs index ab84a58d85a3..f92531146146 100644 --- a/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TagListGenerator/AwsSqsTags.g.cs +++ b/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TagListGenerator/AwsSqsTags.g.cs @@ -58,7 +58,7 @@ public override void SetTag(string key, string? value) } } - public override void EnumerateTags(ref TProcessor processor) + public override void EnumerateTags(ref TProcessor processor, bool openTelemetrySemanticsEnabled) { if (AwsQueueName is not null) { @@ -80,7 +80,7 @@ public override void EnumerateTags(ref TProcessor processor) processor.Process(new TagItem("span.kind", SpanKind, SpanKindBytes)); } - base.EnumerateTags(ref processor); + base.EnumerateTags(ref processor, openTelemetrySemanticsEnabled); } protected override void WriteAdditionalTags(System.Text.StringBuilder sb) diff --git a/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TagListGenerator/AwsStepFunctionsTags.g.cs b/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TagListGenerator/AwsStepFunctionsTags.g.cs index d35e46e0688b..7f30da9df1c4 100644 --- a/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TagListGenerator/AwsStepFunctionsTags.g.cs +++ b/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TagListGenerator/AwsStepFunctionsTags.g.cs @@ -46,7 +46,7 @@ public override void SetTag(string key, string? value) } } - public override void EnumerateTags(ref TProcessor processor) + public override void EnumerateTags(ref TProcessor processor, bool openTelemetrySemanticsEnabled) { if (StateMachineName is not null) { @@ -58,7 +58,7 @@ public override void EnumerateTags(ref TProcessor processor) processor.Process(new TagItem("span.kind", SpanKind, SpanKindBytes)); } - base.EnumerateTags(ref processor); + base.EnumerateTags(ref processor, openTelemetrySemanticsEnabled); } protected override void WriteAdditionalTags(System.Text.StringBuilder sb) diff --git a/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TagListGenerator/AzureEventHubsTags.g.cs b/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TagListGenerator/AzureEventHubsTags.g.cs index 31b548dd2865..b4574999458c 100644 --- a/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TagListGenerator/AzureEventHubsTags.g.cs +++ b/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TagListGenerator/AzureEventHubsTags.g.cs @@ -115,7 +115,7 @@ public override void SetTag(string key, string? value) } } - public override void EnumerateTags(ref TProcessor processor) + public override void EnumerateTags(ref TProcessor processor, bool openTelemetrySemanticsEnabled) { if (SpanKind is not null) { @@ -177,7 +177,7 @@ public override void EnumerateTags(ref TProcessor processor) processor.Process(new TagItem("messaging.message_id", MessagingMessageId, MessagingMessageIdBytes)); } - base.EnumerateTags(ref processor); + base.EnumerateTags(ref processor, openTelemetrySemanticsEnabled); } protected override void WriteAdditionalTags(System.Text.StringBuilder sb) diff --git a/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TagListGenerator/AzureEventHubsV1Tags.g.cs b/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TagListGenerator/AzureEventHubsV1Tags.g.cs index b6580fed8efd..2631ff833fb6 100644 --- a/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TagListGenerator/AzureEventHubsV1Tags.g.cs +++ b/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TagListGenerator/AzureEventHubsV1Tags.g.cs @@ -46,7 +46,7 @@ public override void SetTag(string key, string? value) } } - public override void EnumerateTags(ref TProcessor processor) + public override void EnumerateTags(ref TProcessor processor, bool openTelemetrySemanticsEnabled) { if (PeerService is not null) { @@ -58,7 +58,7 @@ public override void EnumerateTags(ref TProcessor processor) processor.Process(new TagItem("_dd.peer.service.source", PeerServiceSource, PeerServiceSourceBytes)); } - base.EnumerateTags(ref processor); + base.EnumerateTags(ref processor, openTelemetrySemanticsEnabled); } protected override void WriteAdditionalTags(System.Text.StringBuilder sb) diff --git a/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TagListGenerator/AzureFunctionsTags.g.cs b/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TagListGenerator/AzureFunctionsTags.g.cs index 685fd8163817..805fa37f033b 100644 --- a/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TagListGenerator/AzureFunctionsTags.g.cs +++ b/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TagListGenerator/AzureFunctionsTags.g.cs @@ -72,7 +72,7 @@ public override void SetTag(string key, string? value) } } - public override void EnumerateTags(ref TProcessor processor) + public override void EnumerateTags(ref TProcessor processor, bool openTelemetrySemanticsEnabled) { if (SpanKind is not null) { @@ -104,7 +104,7 @@ public override void EnumerateTags(ref TProcessor processor) processor.Process(new TagItem("aas.function.trigger", TriggerType, TriggerTypeBytes)); } - base.EnumerateTags(ref processor); + base.EnumerateTags(ref processor, openTelemetrySemanticsEnabled); } protected override void WriteAdditionalTags(System.Text.StringBuilder sb) diff --git a/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TagListGenerator/AzureServiceBusTags.g.cs b/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TagListGenerator/AzureServiceBusTags.g.cs index b6cfb5de3e3c..647d086d0be8 100644 --- a/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TagListGenerator/AzureServiceBusTags.g.cs +++ b/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TagListGenerator/AzureServiceBusTags.g.cs @@ -101,7 +101,7 @@ public override void SetTag(string key, string? value) } } - public override void EnumerateTags(ref TProcessor processor) + public override void EnumerateTags(ref TProcessor processor, bool openTelemetrySemanticsEnabled) { if (InstrumentationName is not null) { @@ -148,7 +148,7 @@ public override void EnumerateTags(ref TProcessor processor) processor.Process(new TagItem("server.address", ServerAddress, ServerAddressBytes)); } - base.EnumerateTags(ref processor); + base.EnumerateTags(ref processor, openTelemetrySemanticsEnabled); } protected override void WriteAdditionalTags(System.Text.StringBuilder sb) diff --git a/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TagListGenerator/AzureServiceBusV1Tags.g.cs b/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TagListGenerator/AzureServiceBusV1Tags.g.cs index 602423d8a83f..63fcff43d898 100644 --- a/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TagListGenerator/AzureServiceBusV1Tags.g.cs +++ b/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TagListGenerator/AzureServiceBusV1Tags.g.cs @@ -46,7 +46,7 @@ public override void SetTag(string key, string? value) } } - public override void EnumerateTags(ref TProcessor processor) + public override void EnumerateTags(ref TProcessor processor, bool openTelemetrySemanticsEnabled) { if (PeerService is not null) { @@ -58,7 +58,7 @@ public override void EnumerateTags(ref TProcessor processor) processor.Process(new TagItem("_dd.peer.service.source", PeerServiceSource, PeerServiceSourceBytes)); } - base.EnumerateTags(ref processor); + base.EnumerateTags(ref processor, openTelemetrySemanticsEnabled); } protected override void WriteAdditionalTags(System.Text.StringBuilder sb) diff --git a/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TagListGenerator/CosmosDbTags.g.cs b/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TagListGenerator/CosmosDbTags.g.cs index a72ebf93e4e6..aa2d8e1efb33 100644 --- a/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TagListGenerator/CosmosDbTags.g.cs +++ b/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TagListGenerator/CosmosDbTags.g.cs @@ -98,7 +98,7 @@ public override void SetTag(string key, string? value) } } - public override void EnumerateTags(ref TProcessor processor) + public override void EnumerateTags(ref TProcessor processor, bool openTelemetrySemanticsEnabled) { if (SpanKind is not null) { @@ -150,7 +150,7 @@ public override void EnumerateTags(ref TProcessor processor) processor.Process(new TagItem("cosmosdb.connection.mode", ConnectionMode, ConnectionModeBytes)); } - base.EnumerateTags(ref processor); + base.EnumerateTags(ref processor, openTelemetrySemanticsEnabled); } protected override void WriteAdditionalTags(System.Text.StringBuilder sb) diff --git a/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TagListGenerator/CosmosDbV1Tags.g.cs b/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TagListGenerator/CosmosDbV1Tags.g.cs index 58b46d58b982..eea36b6406d8 100644 --- a/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TagListGenerator/CosmosDbV1Tags.g.cs +++ b/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TagListGenerator/CosmosDbV1Tags.g.cs @@ -53,7 +53,7 @@ public override void SetTag(string key, string? value) } } - public override void EnumerateTags(ref TProcessor processor) + public override void EnumerateTags(ref TProcessor processor, bool openTelemetrySemanticsEnabled) { if (Port is not null) { @@ -70,7 +70,7 @@ public override void EnumerateTags(ref TProcessor processor) processor.Process(new TagItem("_dd.peer.service.source", PeerServiceSource, PeerServiceSourceBytes)); } - base.EnumerateTags(ref processor); + base.EnumerateTags(ref processor, openTelemetrySemanticsEnabled); } protected override void WriteAdditionalTags(System.Text.StringBuilder sb) diff --git a/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TagListGenerator/CouchbaseTags.g.cs b/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TagListGenerator/CouchbaseTags.g.cs index 95f10b3803ca..d34b1182ea0a 100644 --- a/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TagListGenerator/CouchbaseTags.g.cs +++ b/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TagListGenerator/CouchbaseTags.g.cs @@ -86,7 +86,7 @@ public override void SetTag(string key, string? value) } } - public override void EnumerateTags(ref TProcessor processor) + public override void EnumerateTags(ref TProcessor processor, bool openTelemetrySemanticsEnabled) { if (SpanKind is not null) { @@ -128,7 +128,7 @@ public override void EnumerateTags(ref TProcessor processor) processor.Process(new TagItem("out.port", Port, PortBytes)); } - base.EnumerateTags(ref processor); + base.EnumerateTags(ref processor, openTelemetrySemanticsEnabled); } protected override void WriteAdditionalTags(System.Text.StringBuilder sb) diff --git a/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TagListGenerator/CouchbaseV1Tags.g.cs b/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TagListGenerator/CouchbaseV1Tags.g.cs index 6b6a2e602e23..44450d38b10e 100644 --- a/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TagListGenerator/CouchbaseV1Tags.g.cs +++ b/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TagListGenerator/CouchbaseV1Tags.g.cs @@ -46,7 +46,7 @@ public override void SetTag(string key, string? value) } } - public override void EnumerateTags(ref TProcessor processor) + public override void EnumerateTags(ref TProcessor processor, bool openTelemetrySemanticsEnabled) { if (PeerService is not null) { @@ -58,7 +58,7 @@ public override void EnumerateTags(ref TProcessor processor) processor.Process(new TagItem("_dd.peer.service.source", PeerServiceSource, PeerServiceSourceBytes)); } - base.EnumerateTags(ref processor); + base.EnumerateTags(ref processor, openTelemetrySemanticsEnabled); } protected override void WriteAdditionalTags(System.Text.StringBuilder sb) diff --git a/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TagListGenerator/ElasticsearchTags.g.cs b/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TagListGenerator/ElasticsearchTags.g.cs index d0a973383095..9a372195b4ab 100644 --- a/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TagListGenerator/ElasticsearchTags.g.cs +++ b/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TagListGenerator/ElasticsearchTags.g.cs @@ -72,7 +72,7 @@ public override void SetTag(string key, string? value) } } - public override void EnumerateTags(ref TProcessor processor) + public override void EnumerateTags(ref TProcessor processor, bool openTelemetrySemanticsEnabled) { if (SpanKind is not null) { @@ -104,7 +104,7 @@ public override void EnumerateTags(ref TProcessor processor) processor.Process(new TagItem("out.host", Host, HostBytes)); } - base.EnumerateTags(ref processor); + base.EnumerateTags(ref processor, openTelemetrySemanticsEnabled); } protected override void WriteAdditionalTags(System.Text.StringBuilder sb) diff --git a/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TagListGenerator/ElasticsearchV1Tags.g.cs b/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TagListGenerator/ElasticsearchV1Tags.g.cs index 154659ca0134..db538ee95417 100644 --- a/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TagListGenerator/ElasticsearchV1Tags.g.cs +++ b/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TagListGenerator/ElasticsearchV1Tags.g.cs @@ -46,7 +46,7 @@ public override void SetTag(string key, string? value) } } - public override void EnumerateTags(ref TProcessor processor) + public override void EnumerateTags(ref TProcessor processor, bool openTelemetrySemanticsEnabled) { if (PeerService is not null) { @@ -58,7 +58,7 @@ public override void EnumerateTags(ref TProcessor processor) processor.Process(new TagItem("_dd.peer.service.source", PeerServiceSource, PeerServiceSourceBytes)); } - base.EnumerateTags(ref processor); + base.EnumerateTags(ref processor, openTelemetrySemanticsEnabled); } protected override void WriteAdditionalTags(System.Text.StringBuilder sb) diff --git a/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TagListGenerator/GraphQLTags.g.cs b/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TagListGenerator/GraphQLTags.g.cs index fa648637efa9..b37ad74308c6 100644 --- a/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TagListGenerator/GraphQLTags.g.cs +++ b/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TagListGenerator/GraphQLTags.g.cs @@ -65,7 +65,7 @@ public override void SetTag(string key, string? value) } } - public override void EnumerateTags(ref TProcessor processor) + public override void EnumerateTags(ref TProcessor processor, bool openTelemetrySemanticsEnabled) { if (SpanKind is not null) { @@ -92,7 +92,7 @@ public override void EnumerateTags(ref TProcessor processor) processor.Process(new TagItem("graphql.operation.type", OperationType, OperationTypeBytes)); } - base.EnumerateTags(ref processor); + base.EnumerateTags(ref processor, openTelemetrySemanticsEnabled); } protected override void WriteAdditionalTags(System.Text.StringBuilder sb) diff --git a/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TagListGenerator/GrpcClientTags.g.cs b/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TagListGenerator/GrpcClientTags.g.cs index 2446a6bf023a..bd93cc0038f7 100644 --- a/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TagListGenerator/GrpcClientTags.g.cs +++ b/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TagListGenerator/GrpcClientTags.g.cs @@ -46,7 +46,7 @@ public override void SetTag(string key, string? value) } } - public override void EnumerateTags(ref TProcessor processor) + public override void EnumerateTags(ref TProcessor processor, bool openTelemetrySemanticsEnabled) { if (Host is not null) { @@ -58,7 +58,7 @@ public override void EnumerateTags(ref TProcessor processor) processor.Process(new TagItem("peer.hostname", PeerHostname, PeerHostnameBytes)); } - base.EnumerateTags(ref processor); + base.EnumerateTags(ref processor, openTelemetrySemanticsEnabled); } protected override void WriteAdditionalTags(System.Text.StringBuilder sb) diff --git a/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TagListGenerator/GrpcClientV1Tags.g.cs b/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TagListGenerator/GrpcClientV1Tags.g.cs index 4f9cc28c3cce..f39c5be4711f 100644 --- a/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TagListGenerator/GrpcClientV1Tags.g.cs +++ b/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TagListGenerator/GrpcClientV1Tags.g.cs @@ -46,7 +46,7 @@ public override void SetTag(string key, string? value) } } - public override void EnumerateTags(ref TProcessor processor) + public override void EnumerateTags(ref TProcessor processor, bool openTelemetrySemanticsEnabled) { if (PeerService is not null) { @@ -58,7 +58,7 @@ public override void EnumerateTags(ref TProcessor processor) processor.Process(new TagItem("_dd.peer.service.source", PeerServiceSource, PeerServiceSourceBytes)); } - base.EnumerateTags(ref processor); + base.EnumerateTags(ref processor, openTelemetrySemanticsEnabled); } protected override void WriteAdditionalTags(System.Text.StringBuilder sb) diff --git a/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TagListGenerator/GrpcTags.g.cs b/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TagListGenerator/GrpcTags.g.cs index 4c01218928a4..8ec123c6e7df 100644 --- a/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TagListGenerator/GrpcTags.g.cs +++ b/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TagListGenerator/GrpcTags.g.cs @@ -86,7 +86,7 @@ public override void SetTag(string key, string? value) } } - public override void EnumerateTags(ref TProcessor processor) + public override void EnumerateTags(ref TProcessor processor, bool openTelemetrySemanticsEnabled) { if (SpanKind is not null) { @@ -128,7 +128,7 @@ public override void EnumerateTags(ref TProcessor processor) processor.Process(new TagItem("grpc.status.code", StatusCode, StatusCodeBytes)); } - base.EnumerateTags(ref processor); + base.EnumerateTags(ref processor, openTelemetrySemanticsEnabled); } protected override void WriteAdditionalTags(System.Text.StringBuilder sb) diff --git a/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TagListGenerator/HangfireTags.g.cs b/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TagListGenerator/HangfireTags.g.cs index adcd5af61841..ea3e826dad35 100644 --- a/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TagListGenerator/HangfireTags.g.cs +++ b/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TagListGenerator/HangfireTags.g.cs @@ -58,7 +58,7 @@ public override void SetTag(string key, string? value) } } - public override void EnumerateTags(ref TProcessor processor) + public override void EnumerateTags(ref TProcessor processor, bool openTelemetrySemanticsEnabled) { if (InstrumentationName is not null) { @@ -80,7 +80,7 @@ public override void EnumerateTags(ref TProcessor processor) processor.Process(new TagItem("job.ID", JobId, JobIdBytes)); } - base.EnumerateTags(ref processor); + base.EnumerateTags(ref processor, openTelemetrySemanticsEnabled); } protected override void WriteAdditionalTags(System.Text.StringBuilder sb) diff --git a/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TagListGenerator/HttpTags.g.cs b/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TagListGenerator/HttpTags.g.cs index 1414cda04601..7406088379c3 100644 --- a/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TagListGenerator/HttpTags.g.cs +++ b/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TagListGenerator/HttpTags.g.cs @@ -32,6 +32,9 @@ partial class HttpTags // HttpStatusCodeBytes = MessagePack.Serialize("http.status_code"); private static ReadOnlySpan HttpStatusCodeBytes => [176, 104, 116, 116, 112, 46, 115, 116, 97, 116, 117, 115, 95, 99, 111, 100, 101]; + // HttpStatusCodeOtelBytes = MessagePack.Serialize("http.response.status_code"); + private static ReadOnlySpan HttpStatusCodeOtelBytes => [185, 104, 116, 116, 112, 46, 114, 101, 115, 112, 111, 110, 115, 101, 46, 115, 116, 97, 116, 117, 115, 95, 99, 111, 100, 101]; + // HostBytes = MessagePack.Serialize("out.host"); private static ReadOnlySpan HostBytes => [168, 111, 117, 116, 46, 104, 111, 115, 116]; @@ -45,6 +48,7 @@ partial class HttpTags "http.url" => HttpUrl, "http-client-handler-type" => HttpClientHandlerType, "http.status_code" => HttpStatusCode is null ? null : Datadog.Trace.Util.IntStringCache.ToInvariantString(HttpStatusCode.Value), + "http.response.status_code" => HttpStatusCode is null ? null : Datadog.Trace.Util.IntStringCache.ToInvariantString(HttpStatusCode.Value), "out.host" => Host, _ => base.GetTag(key), }; @@ -66,7 +70,8 @@ public override void SetTag(string key, string? value) case "http-client-handler-type": HttpClientHandlerType = value; break; - case "http.status_code": + case "http.status_code": + case "http.response.status_code": if (int.TryParse(value, System.Globalization.NumberStyles.Integer, System.Globalization.CultureInfo.InvariantCulture, out var parsedHttpStatusCode)) { HttpStatusCode = parsedHttpStatusCode; @@ -89,7 +94,7 @@ public override void SetTag(string key, string? value) } } - public override void EnumerateTags(ref TProcessor processor) + public override void EnumerateTags(ref TProcessor processor, bool openTelemetrySemanticsEnabled) { if (SpanKind is not null) { @@ -118,7 +123,14 @@ public override void EnumerateTags(ref TProcessor processor) if (HttpStatusCode is not null) { - processor.Process(new TagItem("http.status_code", HttpStatusCode.Value, HttpStatusCodeBytes)); + if (openTelemetrySemanticsEnabled) + { + processor.Process(new TagItem("http.response.status_code", HttpStatusCode.Value, HttpStatusCodeOtelBytes)); + } + else + { + processor.Process(new TagItem("http.status_code", HttpStatusCode.Value, HttpStatusCodeBytes)); + } } if (Host is not null) @@ -126,7 +138,7 @@ public override void EnumerateTags(ref TProcessor processor) processor.Process(new TagItem("out.host", Host, HostBytes)); } - base.EnumerateTags(ref processor); + base.EnumerateTags(ref processor, openTelemetrySemanticsEnabled); } protected override void WriteAdditionalTags(System.Text.StringBuilder sb) diff --git a/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TagListGenerator/HttpV1Tags.g.cs b/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TagListGenerator/HttpV1Tags.g.cs index 36e594313021..8fc26c308117 100644 --- a/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TagListGenerator/HttpV1Tags.g.cs +++ b/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TagListGenerator/HttpV1Tags.g.cs @@ -46,7 +46,7 @@ public override void SetTag(string key, string? value) } } - public override void EnumerateTags(ref TProcessor processor) + public override void EnumerateTags(ref TProcessor processor, bool openTelemetrySemanticsEnabled) { if (PeerService is not null) { @@ -58,7 +58,7 @@ public override void EnumerateTags(ref TProcessor processor) processor.Process(new TagItem("_dd.peer.service.source", PeerServiceSource, PeerServiceSourceBytes)); } - base.EnumerateTags(ref processor); + base.EnumerateTags(ref processor, openTelemetrySemanticsEnabled); } protected override void WriteAdditionalTags(System.Text.StringBuilder sb) diff --git a/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TagListGenerator/IastTags.g.cs b/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TagListGenerator/IastTags.g.cs index e8d2bf22fcb9..98882fc5a048 100644 --- a/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TagListGenerator/IastTags.g.cs +++ b/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TagListGenerator/IastTags.g.cs @@ -46,7 +46,7 @@ public override void SetTag(string key, string? value) } } - public override void EnumerateTags(ref TProcessor processor) + public override void EnumerateTags(ref TProcessor processor, bool openTelemetrySemanticsEnabled) { if (IastJson is not null) { @@ -58,7 +58,7 @@ public override void EnumerateTags(ref TProcessor processor) processor.Process(new TagItem("_dd.iast.enabled", IastEnabled, IastEnabledBytes)); } - base.EnumerateTags(ref processor); + base.EnumerateTags(ref processor, openTelemetrySemanticsEnabled); } protected override void WriteAdditionalTags(System.Text.StringBuilder sb) diff --git a/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TagListGenerator/IbmMqTags.g.cs b/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TagListGenerator/IbmMqTags.g.cs index 232f669c54c6..47e81e1d5383 100644 --- a/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TagListGenerator/IbmMqTags.g.cs +++ b/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TagListGenerator/IbmMqTags.g.cs @@ -51,7 +51,7 @@ public override void SetTag(string key, string? value) } } - public override void EnumerateTags(ref TProcessor processor) + public override void EnumerateTags(ref TProcessor processor, bool openTelemetrySemanticsEnabled) { if (SpanKind is not null) { @@ -68,7 +68,7 @@ public override void EnumerateTags(ref TProcessor processor) processor.Process(new TagItem("topicname", TopicName, TopicNameBytes)); } - base.EnumerateTags(ref processor); + base.EnumerateTags(ref processor, openTelemetrySemanticsEnabled); } protected override void WriteAdditionalTags(System.Text.StringBuilder sb) diff --git a/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TagListGenerator/InferredProxyTags.g.cs b/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TagListGenerator/InferredProxyTags.g.cs index a80c57e07420..dafae6dcf60d 100644 --- a/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TagListGenerator/InferredProxyTags.g.cs +++ b/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TagListGenerator/InferredProxyTags.g.cs @@ -35,6 +35,9 @@ partial class InferredProxyTags // HttpStatusCodeBytes = MessagePack.Serialize("http.status_code"); private static ReadOnlySpan HttpStatusCodeBytes => [176, 104, 116, 116, 112, 46, 115, 116, 97, 116, 117, 115, 95, 99, 111, 100, 101]; + // HttpStatusCodeOtelBytes = MessagePack.Serialize("http.response.status_code"); + private static ReadOnlySpan HttpStatusCodeOtelBytes => [185, 104, 116, 116, 112, 46, 114, 101, 115, 112, 111, 110, 115, 101, 46, 115, 116, 97, 116, 117, 115, 95, 99, 111, 100, 101]; + // StageBytes = MessagePack.Serialize("stage"); private static ReadOnlySpan StageBytes => [165, 115, 116, 97, 103, 101]; @@ -51,6 +54,7 @@ partial class InferredProxyTags "http.url" => HttpUrl, "http.route" => HttpRoute, "http.status_code" => HttpStatusCode is null ? null : Datadog.Trace.Util.IntStringCache.ToInvariantString(HttpStatusCode.Value), + "http.response.status_code" => HttpStatusCode is null ? null : Datadog.Trace.Util.IntStringCache.ToInvariantString(HttpStatusCode.Value), "stage" => Stage, "region" => Region, _ => base.GetTag(key), @@ -73,7 +77,8 @@ public override void SetTag(string key, string? value) case "http.route": HttpRoute = value; break; - case "http.status_code": + case "http.status_code": + case "http.response.status_code": if (int.TryParse(value, System.Globalization.NumberStyles.Integer, System.Globalization.CultureInfo.InvariantCulture, out var parsedHttpStatusCode)) { HttpStatusCode = parsedHttpStatusCode; @@ -99,7 +104,7 @@ public override void SetTag(string key, string? value) } } - public override void EnumerateTags(ref TProcessor processor) + public override void EnumerateTags(ref TProcessor processor, bool openTelemetrySemanticsEnabled) { if (SpanKind is not null) { @@ -128,7 +133,14 @@ public override void EnumerateTags(ref TProcessor processor) if (HttpStatusCode is not null) { - processor.Process(new TagItem("http.status_code", HttpStatusCode.Value, HttpStatusCodeBytes)); + if (openTelemetrySemanticsEnabled) + { + processor.Process(new TagItem("http.response.status_code", HttpStatusCode.Value, HttpStatusCodeOtelBytes)); + } + else + { + processor.Process(new TagItem("http.status_code", HttpStatusCode.Value, HttpStatusCodeBytes)); + } } if (Stage is not null) @@ -141,7 +153,7 @@ public override void EnumerateTags(ref TProcessor processor) processor.Process(new TagItem("region", Region, RegionBytes)); } - base.EnumerateTags(ref processor); + base.EnumerateTags(ref processor, openTelemetrySemanticsEnabled); } protected override void WriteAdditionalTags(System.Text.StringBuilder sb) diff --git a/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TagListGenerator/KafkaTags.g.cs b/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TagListGenerator/KafkaTags.g.cs index b2b1acea9ca2..899d9ef0948f 100644 --- a/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TagListGenerator/KafkaTags.g.cs +++ b/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TagListGenerator/KafkaTags.g.cs @@ -96,7 +96,7 @@ public override void SetTag(string key, string? value) } } - public override void EnumerateTags(ref TProcessor processor) + public override void EnumerateTags(ref TProcessor processor, bool openTelemetrySemanticsEnabled) { if (SpanKind is not null) { @@ -143,7 +143,7 @@ public override void EnumerateTags(ref TProcessor processor) processor.Process(new TagItem("kafka.group", ConsumerGroup, ConsumerGroupBytes)); } - base.EnumerateTags(ref processor); + base.EnumerateTags(ref processor, openTelemetrySemanticsEnabled); } protected override void WriteAdditionalTags(System.Text.StringBuilder sb) diff --git a/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TagListGenerator/KafkaV1Tags.g.cs b/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TagListGenerator/KafkaV1Tags.g.cs index 3fc177b7f28e..f35d93fb3deb 100644 --- a/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TagListGenerator/KafkaV1Tags.g.cs +++ b/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TagListGenerator/KafkaV1Tags.g.cs @@ -46,7 +46,7 @@ public override void SetTag(string key, string? value) } } - public override void EnumerateTags(ref TProcessor processor) + public override void EnumerateTags(ref TProcessor processor, bool openTelemetrySemanticsEnabled) { if (PeerService is not null) { @@ -58,7 +58,7 @@ public override void EnumerateTags(ref TProcessor processor) processor.Process(new TagItem("_dd.peer.service.source", PeerServiceSource, PeerServiceSourceBytes)); } - base.EnumerateTags(ref processor); + base.EnumerateTags(ref processor, openTelemetrySemanticsEnabled); } protected override void WriteAdditionalTags(System.Text.StringBuilder sb) diff --git a/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TagListGenerator/MongoDbTags.g.cs b/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TagListGenerator/MongoDbTags.g.cs index f49ad1d1c1b3..cd4e96d5e641 100644 --- a/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TagListGenerator/MongoDbTags.g.cs +++ b/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TagListGenerator/MongoDbTags.g.cs @@ -79,7 +79,7 @@ public override void SetTag(string key, string? value) } } - public override void EnumerateTags(ref TProcessor processor) + public override void EnumerateTags(ref TProcessor processor, bool openTelemetrySemanticsEnabled) { if (SpanKind is not null) { @@ -116,7 +116,7 @@ public override void EnumerateTags(ref TProcessor processor) processor.Process(new TagItem("out.port", Port, PortBytes)); } - base.EnumerateTags(ref processor); + base.EnumerateTags(ref processor, openTelemetrySemanticsEnabled); } protected override void WriteAdditionalTags(System.Text.StringBuilder sb) diff --git a/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TagListGenerator/MongoDbV1Tags.g.cs b/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TagListGenerator/MongoDbV1Tags.g.cs index c0a2519aaa8c..f16d424525f3 100644 --- a/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TagListGenerator/MongoDbV1Tags.g.cs +++ b/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TagListGenerator/MongoDbV1Tags.g.cs @@ -46,7 +46,7 @@ public override void SetTag(string key, string? value) } } - public override void EnumerateTags(ref TProcessor processor) + public override void EnumerateTags(ref TProcessor processor, bool openTelemetrySemanticsEnabled) { if (PeerService is not null) { @@ -58,7 +58,7 @@ public override void EnumerateTags(ref TProcessor processor) processor.Process(new TagItem("_dd.peer.service.source", PeerServiceSource, PeerServiceSourceBytes)); } - base.EnumerateTags(ref processor); + base.EnumerateTags(ref processor, openTelemetrySemanticsEnabled); } protected override void WriteAdditionalTags(System.Text.StringBuilder sb) diff --git a/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TagListGenerator/MsmqTags.g.cs b/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TagListGenerator/MsmqTags.g.cs index 8608949ad59c..efbad3b04760 100644 --- a/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TagListGenerator/MsmqTags.g.cs +++ b/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TagListGenerator/MsmqTags.g.cs @@ -79,7 +79,7 @@ public override void SetTag(string key, string? value) } } - public override void EnumerateTags(ref TProcessor processor) + public override void EnumerateTags(ref TProcessor processor, bool openTelemetrySemanticsEnabled) { if (Command is not null) { @@ -116,7 +116,7 @@ public override void EnumerateTags(ref TProcessor processor) processor.Process(new TagItem("msmq.queue.transactional", IsTransactionalQueue, IsTransactionalQueueBytes)); } - base.EnumerateTags(ref processor); + base.EnumerateTags(ref processor, openTelemetrySemanticsEnabled); } protected override void WriteAdditionalTags(System.Text.StringBuilder sb) diff --git a/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TagListGenerator/MsmqV1Tags.g.cs b/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TagListGenerator/MsmqV1Tags.g.cs index 78fee57665fc..29cee9a54f04 100644 --- a/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TagListGenerator/MsmqV1Tags.g.cs +++ b/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TagListGenerator/MsmqV1Tags.g.cs @@ -46,7 +46,7 @@ public override void SetTag(string key, string? value) } } - public override void EnumerateTags(ref TProcessor processor) + public override void EnumerateTags(ref TProcessor processor, bool openTelemetrySemanticsEnabled) { if (PeerService is not null) { @@ -58,7 +58,7 @@ public override void EnumerateTags(ref TProcessor processor) processor.Process(new TagItem("_dd.peer.service.source", PeerServiceSource, PeerServiceSourceBytes)); } - base.EnumerateTags(ref processor); + base.EnumerateTags(ref processor, openTelemetrySemanticsEnabled); } protected override void WriteAdditionalTags(System.Text.StringBuilder sb) diff --git a/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TagListGenerator/OpenTelemetryTags.g.cs b/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TagListGenerator/OpenTelemetryTags.g.cs index 5599a863b297..e064e2179266 100644 --- a/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TagListGenerator/OpenTelemetryTags.g.cs +++ b/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TagListGenerator/OpenTelemetryTags.g.cs @@ -67,7 +67,7 @@ public override void SetTag(string key, string? value) } } - public override void EnumerateTags(ref TProcessor processor) + public override void EnumerateTags(ref TProcessor processor, bool openTelemetrySemanticsEnabled) { if (SpanKind is not null) { @@ -94,7 +94,7 @@ public override void EnumerateTags(ref TProcessor processor) processor.Process(new TagItem("otel.status_code", OtelStatusCode, OtelStatusCodeBytes)); } - base.EnumerateTags(ref processor); + base.EnumerateTags(ref processor, openTelemetrySemanticsEnabled); } protected override void WriteAdditionalTags(System.Text.StringBuilder sb) diff --git a/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TagListGenerator/ProcessCommandStartTags.g.cs b/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TagListGenerator/ProcessCommandStartTags.g.cs index 92f0a0649b5d..53322d01c0f7 100644 --- a/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TagListGenerator/ProcessCommandStartTags.g.cs +++ b/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TagListGenerator/ProcessCommandStartTags.g.cs @@ -72,7 +72,7 @@ public override void SetTag(string key, string? value) } } - public override void EnumerateTags(ref TProcessor processor) + public override void EnumerateTags(ref TProcessor processor, bool openTelemetrySemanticsEnabled) { if (Component is not null) { @@ -104,7 +104,7 @@ public override void EnumerateTags(ref TProcessor processor) processor.Process(new TagItem("cmd.truncated", Truncated, TruncatedBytes)); } - base.EnumerateTags(ref processor); + base.EnumerateTags(ref processor, openTelemetrySemanticsEnabled); } protected override void WriteAdditionalTags(System.Text.StringBuilder sb) diff --git a/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TagListGenerator/RabbitMQTags.g.cs b/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TagListGenerator/RabbitMQTags.g.cs index 1c7208f59de7..0abf2ed4f716 100644 --- a/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TagListGenerator/RabbitMQTags.g.cs +++ b/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TagListGenerator/RabbitMQTags.g.cs @@ -93,7 +93,7 @@ public override void SetTag(string key, string? value) } } - public override void EnumerateTags(ref TProcessor processor) + public override void EnumerateTags(ref TProcessor processor, bool openTelemetrySemanticsEnabled) { if (SpanKind is not null) { @@ -140,7 +140,7 @@ public override void EnumerateTags(ref TProcessor processor) processor.Process(new TagItem("out.host", OutHost, OutHostBytes)); } - base.EnumerateTags(ref processor); + base.EnumerateTags(ref processor, openTelemetrySemanticsEnabled); } protected override void WriteAdditionalTags(System.Text.StringBuilder sb) diff --git a/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TagListGenerator/RabbitMQV1Tags.g.cs b/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TagListGenerator/RabbitMQV1Tags.g.cs index 75851ba4d8d6..6cebdb522d7d 100644 --- a/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TagListGenerator/RabbitMQV1Tags.g.cs +++ b/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TagListGenerator/RabbitMQV1Tags.g.cs @@ -46,7 +46,7 @@ public override void SetTag(string key, string? value) } } - public override void EnumerateTags(ref TProcessor processor) + public override void EnumerateTags(ref TProcessor processor, bool openTelemetrySemanticsEnabled) { if (PeerService is not null) { @@ -58,7 +58,7 @@ public override void EnumerateTags(ref TProcessor processor) processor.Process(new TagItem("_dd.peer.service.source", PeerServiceSource, PeerServiceSourceBytes)); } - base.EnumerateTags(ref processor); + base.EnumerateTags(ref processor, openTelemetrySemanticsEnabled); } protected override void WriteAdditionalTags(System.Text.StringBuilder sb) diff --git a/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TagListGenerator/RedisTags.g.cs b/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TagListGenerator/RedisTags.g.cs index e812be841d36..db7ecc3c7fd6 100644 --- a/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TagListGenerator/RedisTags.g.cs +++ b/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TagListGenerator/RedisTags.g.cs @@ -70,7 +70,7 @@ public override void SetTag(string key, string? value) } } - public override void EnumerateTags(ref TProcessor processor) + public override void EnumerateTags(ref TProcessor processor, bool openTelemetrySemanticsEnabled) { if (SpanKind is not null) { @@ -97,7 +97,7 @@ public override void EnumerateTags(ref TProcessor processor) processor.Process(new TagItem("out.port", Port, PortBytes)); } - base.EnumerateTags(ref processor); + base.EnumerateTags(ref processor, openTelemetrySemanticsEnabled); } protected override void WriteAdditionalTags(System.Text.StringBuilder sb) diff --git a/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TagListGenerator/RedisV1Tags.g.cs b/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TagListGenerator/RedisV1Tags.g.cs index 11317f7a92c1..69f39339e993 100644 --- a/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TagListGenerator/RedisV1Tags.g.cs +++ b/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TagListGenerator/RedisV1Tags.g.cs @@ -46,7 +46,7 @@ public override void SetTag(string key, string? value) } } - public override void EnumerateTags(ref TProcessor processor) + public override void EnumerateTags(ref TProcessor processor, bool openTelemetrySemanticsEnabled) { if (PeerService is not null) { @@ -58,7 +58,7 @@ public override void EnumerateTags(ref TProcessor processor) processor.Process(new TagItem("_dd.peer.service.source", PeerServiceSource, PeerServiceSourceBytes)); } - base.EnumerateTags(ref processor); + base.EnumerateTags(ref processor, openTelemetrySemanticsEnabled); } protected override void WriteAdditionalTags(System.Text.StringBuilder sb) diff --git a/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TagListGenerator/RemotingClientV1Tags.g.cs b/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TagListGenerator/RemotingClientV1Tags.g.cs index 2d4946deb561..7bf5882637b2 100644 --- a/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TagListGenerator/RemotingClientV1Tags.g.cs +++ b/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TagListGenerator/RemotingClientV1Tags.g.cs @@ -46,7 +46,7 @@ public override void SetTag(string key, string? value) } } - public override void EnumerateTags(ref TProcessor processor) + public override void EnumerateTags(ref TProcessor processor, bool openTelemetrySemanticsEnabled) { if (PeerService is not null) { @@ -58,7 +58,7 @@ public override void EnumerateTags(ref TProcessor processor) processor.Process(new TagItem("_dd.peer.service.source", PeerServiceSource, PeerServiceSourceBytes)); } - base.EnumerateTags(ref processor); + base.EnumerateTags(ref processor, openTelemetrySemanticsEnabled); } protected override void WriteAdditionalTags(System.Text.StringBuilder sb) diff --git a/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TagListGenerator/RemotingTags.g.cs b/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TagListGenerator/RemotingTags.g.cs index 33446c86d899..0677a2937661 100644 --- a/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TagListGenerator/RemotingTags.g.cs +++ b/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TagListGenerator/RemotingTags.g.cs @@ -63,7 +63,7 @@ public override void SetTag(string key, string? value) } } - public override void EnumerateTags(ref TProcessor processor) + public override void EnumerateTags(ref TProcessor processor, bool openTelemetrySemanticsEnabled) { if (SpanKind is not null) { @@ -90,7 +90,7 @@ public override void EnumerateTags(ref TProcessor processor) processor.Process(new TagItem("rpc.system", RpcSystem, RpcSystemBytes)); } - base.EnumerateTags(ref processor); + base.EnumerateTags(ref processor, openTelemetrySemanticsEnabled); } protected override void WriteAdditionalTags(System.Text.StringBuilder sb) diff --git a/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TagListGenerator/ServiceRemotingClientV1Tags.g.cs b/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TagListGenerator/ServiceRemotingClientV1Tags.g.cs index 1959416b21c7..41253e26f8c1 100644 --- a/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TagListGenerator/ServiceRemotingClientV1Tags.g.cs +++ b/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TagListGenerator/ServiceRemotingClientV1Tags.g.cs @@ -46,7 +46,7 @@ public override void SetTag(string key, string? value) } } - public override void EnumerateTags(ref TProcessor processor) + public override void EnumerateTags(ref TProcessor processor, bool openTelemetrySemanticsEnabled) { if (PeerService is not null) { @@ -58,7 +58,7 @@ public override void EnumerateTags(ref TProcessor processor) processor.Process(new TagItem("_dd.peer.service.source", PeerServiceSource, PeerServiceSourceBytes)); } - base.EnumerateTags(ref processor); + base.EnumerateTags(ref processor, openTelemetrySemanticsEnabled); } protected override void WriteAdditionalTags(System.Text.StringBuilder sb) diff --git a/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TagListGenerator/ServiceRemotingTags.g.cs b/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TagListGenerator/ServiceRemotingTags.g.cs index 75b61e70e456..47a2eeff6e2a 100644 --- a/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TagListGenerator/ServiceRemotingTags.g.cs +++ b/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TagListGenerator/ServiceRemotingTags.g.cs @@ -123,7 +123,7 @@ public override void SetTag(string key, string? value) } } - public override void EnumerateTags(ref TProcessor processor) + public override void EnumerateTags(ref TProcessor processor, bool openTelemetrySemanticsEnabled) { if (SpanKind is not null) { @@ -190,7 +190,7 @@ public override void EnumerateTags(ref TProcessor processor) processor.Process(new TagItem("service-fabric.service-remoting.invocation-id", RemotingInvocationId, RemotingInvocationIdBytes)); } - base.EnumerateTags(ref processor); + base.EnumerateTags(ref processor, openTelemetrySemanticsEnabled); } protected override void WriteAdditionalTags(System.Text.StringBuilder sb) diff --git a/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TagListGenerator/SqlTags.g.cs b/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TagListGenerator/SqlTags.g.cs index 5fa99249f899..fe5ad1d586fb 100644 --- a/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TagListGenerator/SqlTags.g.cs +++ b/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TagListGenerator/SqlTags.g.cs @@ -88,7 +88,7 @@ public override void SetTag(string key, string? value) } } - public override void EnumerateTags(ref TProcessor processor) + public override void EnumerateTags(ref TProcessor processor, bool openTelemetrySemanticsEnabled) { if (SpanKind is not null) { @@ -130,7 +130,7 @@ public override void EnumerateTags(ref TProcessor processor) processor.Process(new TagItem("_dd.propagated_hash", BaseHash, BaseHashBytes)); } - base.EnumerateTags(ref processor); + base.EnumerateTags(ref processor, openTelemetrySemanticsEnabled); } protected override void WriteAdditionalTags(System.Text.StringBuilder sb) diff --git a/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TagListGenerator/SqlV1Tags.g.cs b/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TagListGenerator/SqlV1Tags.g.cs index 9751da7af7a3..87d74064a129 100644 --- a/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TagListGenerator/SqlV1Tags.g.cs +++ b/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TagListGenerator/SqlV1Tags.g.cs @@ -46,7 +46,7 @@ public override void SetTag(string key, string? value) } } - public override void EnumerateTags(ref TProcessor processor) + public override void EnumerateTags(ref TProcessor processor, bool openTelemetrySemanticsEnabled) { if (PeerService is not null) { @@ -58,7 +58,7 @@ public override void EnumerateTags(ref TProcessor processor) processor.Process(new TagItem("_dd.peer.service.source", PeerServiceSource, PeerServiceSourceBytes)); } - base.EnumerateTags(ref processor); + base.EnumerateTags(ref processor, openTelemetrySemanticsEnabled); } protected override void WriteAdditionalTags(System.Text.StringBuilder sb) diff --git a/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TagListGenerator/TagAttribute.g.cs b/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TagListGenerator/TagAttribute.g.cs index 0020d1490683..d678d06ab096 100644 --- a/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TagListGenerator/TagAttribute.g.cs +++ b/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TagListGenerator/TagAttribute.g.cs @@ -27,6 +27,11 @@ public TagAttribute(string tagName) => /// Gets the name of the datadog tag the property corresponds to /// public string TagName { get; } + + /// + /// Gets or sets the OpenTelemetry semantic convention name that aliases . + /// + public string? OtelName { get; set; } } /// diff --git a/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TagListGenerator/TestModuleSpanTags.g.cs b/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TagListGenerator/TestModuleSpanTags.g.cs index 61d1c47ac52f..7809da282493 100644 --- a/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TagListGenerator/TestModuleSpanTags.g.cs +++ b/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TagListGenerator/TestModuleSpanTags.g.cs @@ -112,7 +112,7 @@ public override void SetTag(string key, string? value) } } - public override void EnumerateTags(ref TProcessor processor) + public override void EnumerateTags(ref TProcessor processor, bool openTelemetrySemanticsEnabled) { if (Type is not null) { @@ -169,7 +169,7 @@ public override void EnumerateTags(ref TProcessor processor) processor.Process(new TagItem("os.version", OSVersion, OSVersionBytes)); } - base.EnumerateTags(ref processor); + base.EnumerateTags(ref processor, openTelemetrySemanticsEnabled); } protected override void WriteAdditionalTags(System.Text.StringBuilder sb) diff --git a/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TagListGenerator/TestSessionSpanTags.g.cs b/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TagListGenerator/TestSessionSpanTags.g.cs index 13a5d04d49da..37b566d3f8d4 100644 --- a/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TagListGenerator/TestSessionSpanTags.g.cs +++ b/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TagListGenerator/TestSessionSpanTags.g.cs @@ -350,7 +350,7 @@ public override void SetTag(string key, string? value) } } - public override void EnumerateTags(ref TProcessor processor) + public override void EnumerateTags(ref TProcessor processor, bool openTelemetrySemanticsEnabled) { if (Command is not null) { @@ -577,7 +577,7 @@ public override void EnumerateTags(ref TProcessor processor) processor.Process(new TagItem("git.commit.head.message", GitHeadCommitMessage, GitHeadCommitMessageBytes)); } - base.EnumerateTags(ref processor); + base.EnumerateTags(ref processor, openTelemetrySemanticsEnabled); } protected override void WriteAdditionalTags(System.Text.StringBuilder sb) diff --git a/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TagListGenerator/TestSpanTags.g.cs b/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TagListGenerator/TestSpanTags.g.cs index 97ef1c5c81a8..1e08fb410a81 100644 --- a/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TagListGenerator/TestSpanTags.g.cs +++ b/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TagListGenerator/TestSpanTags.g.cs @@ -234,7 +234,7 @@ public override void SetTag(string key, string? value) } } - public override void EnumerateTags(ref TProcessor processor) + public override void EnumerateTags(ref TProcessor processor, bool openTelemetrySemanticsEnabled) { if (Name is not null) { @@ -376,7 +376,7 @@ public override void EnumerateTags(ref TProcessor processor) processor.Process(new TagItem("_dd.library_capabilities.test_management.attempt_to_fix", CapabilitiesTestManagementAttemptToFix, CapabilitiesTestManagementAttemptToFixBytes)); } - base.EnumerateTags(ref processor); + base.EnumerateTags(ref processor, openTelemetrySemanticsEnabled); } protected override void WriteAdditionalTags(System.Text.StringBuilder sb) diff --git a/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TagListGenerator/TestSuiteSpanTags.g.cs b/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TagListGenerator/TestSuiteSpanTags.g.cs index b1d3aa6eaf67..14eccb5e013b 100644 --- a/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TagListGenerator/TestSuiteSpanTags.g.cs +++ b/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TagListGenerator/TestSuiteSpanTags.g.cs @@ -53,7 +53,7 @@ public override void SetTag(string key, string? value) } } - public override void EnumerateTags(ref TProcessor processor) + public override void EnumerateTags(ref TProcessor processor, bool openTelemetrySemanticsEnabled) { if (Suite is not null) { @@ -70,7 +70,7 @@ public override void EnumerateTags(ref TProcessor processor) processor.Process(new TagItem("test.codeowners", CodeOwners, CodeOwnersBytes)); } - base.EnumerateTags(ref processor); + base.EnumerateTags(ref processor, openTelemetrySemanticsEnabled); } protected override void WriteAdditionalTags(System.Text.StringBuilder sb) diff --git a/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TagListGenerator/TraceAnnotationTags.g.cs b/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TagListGenerator/TraceAnnotationTags.g.cs index 67f69361144c..984350404d53 100644 --- a/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TagListGenerator/TraceAnnotationTags.g.cs +++ b/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TagListGenerator/TraceAnnotationTags.g.cs @@ -39,14 +39,14 @@ public override void SetTag(string key, string? value) } } - public override void EnumerateTags(ref TProcessor processor) + public override void EnumerateTags(ref TProcessor processor, bool openTelemetrySemanticsEnabled) { if (InstrumentationName is not null) { processor.Process(new TagItem("component", InstrumentationName, InstrumentationNameBytes)); } - base.EnumerateTags(ref processor); + base.EnumerateTags(ref processor, openTelemetrySemanticsEnabled); } protected override void WriteAdditionalTags(System.Text.StringBuilder sb) diff --git a/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TagListGenerator/WcfTags.g.cs b/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TagListGenerator/WcfTags.g.cs index b8d5c42bb58a..f0125208b5bc 100644 --- a/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TagListGenerator/WcfTags.g.cs +++ b/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TagListGenerator/WcfTags.g.cs @@ -39,14 +39,14 @@ public override void SetTag(string key, string? value) } } - public override void EnumerateTags(ref TProcessor processor) + public override void EnumerateTags(ref TProcessor processor, bool openTelemetrySemanticsEnabled) { if (InstrumentationName is not null) { processor.Process(new TagItem("component", InstrumentationName, InstrumentationNameBytes)); } - base.EnumerateTags(ref processor); + base.EnumerateTags(ref processor, openTelemetrySemanticsEnabled); } protected override void WriteAdditionalTags(System.Text.StringBuilder sb) diff --git a/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TagListGenerator/WebTags.g.cs b/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TagListGenerator/WebTags.g.cs index 0d0922839d45..8e05ef465dde 100644 --- a/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TagListGenerator/WebTags.g.cs +++ b/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TagListGenerator/WebTags.g.cs @@ -32,6 +32,9 @@ partial class WebTags // HttpStatusCodeBytes = MessagePack.Serialize("http.status_code"); private static ReadOnlySpan HttpStatusCodeBytes => [176, 104, 116, 116, 112, 46, 115, 116, 97, 116, 117, 115, 95, 99, 111, 100, 101]; + // HttpStatusCodeOtelBytes = MessagePack.Serialize("http.response.status_code"); + private static ReadOnlySpan HttpStatusCodeOtelBytes => [185, 104, 116, 116, 112, 46, 114, 101, 115, 112, 111, 110, 115, 101, 46, 115, 116, 97, 116, 117, 115, 95, 99, 111, 100, 101]; + // NetworkClientIpBytes = MessagePack.Serialize("network.client.ip"); private static ReadOnlySpan NetworkClientIpBytes => [177, 110, 101, 116, 119, 111, 114, 107, 46, 99, 108, 105, 101, 110, 116, 46, 105, 112]; @@ -48,6 +51,7 @@ partial class WebTags "http.request.headers.host" => HttpRequestHeadersHost, "http.url" => HttpUrl, "http.status_code" => HttpStatusCode is null ? null : Datadog.Trace.Util.IntStringCache.ToInvariantString(HttpStatusCode.Value), + "http.response.status_code" => HttpStatusCode is null ? null : Datadog.Trace.Util.IntStringCache.ToInvariantString(HttpStatusCode.Value), "network.client.ip" => NetworkClientIp, "http.client_ip" => HttpClientIp, _ => base.GetTag(key), @@ -70,7 +74,8 @@ public override void SetTag(string key, string? value) case "http.url": HttpUrl = value; break; - case "http.status_code": + case "http.status_code": + case "http.response.status_code": if (int.TryParse(value, System.Globalization.NumberStyles.Integer, System.Globalization.CultureInfo.InvariantCulture, out var parsedHttpStatusCode)) { HttpStatusCode = parsedHttpStatusCode; @@ -96,7 +101,7 @@ public override void SetTag(string key, string? value) } } - public override void EnumerateTags(ref TProcessor processor) + public override void EnumerateTags(ref TProcessor processor, bool openTelemetrySemanticsEnabled) { if (SpanKind is not null) { @@ -125,7 +130,14 @@ public override void EnumerateTags(ref TProcessor processor) if (HttpStatusCode is not null) { - processor.Process(new TagItem("http.status_code", HttpStatusCode.Value, HttpStatusCodeBytes)); + if (openTelemetrySemanticsEnabled) + { + processor.Process(new TagItem("http.response.status_code", HttpStatusCode.Value, HttpStatusCodeOtelBytes)); + } + else + { + processor.Process(new TagItem("http.status_code", HttpStatusCode.Value, HttpStatusCodeBytes)); + } } if (NetworkClientIp is not null) @@ -138,7 +150,7 @@ public override void EnumerateTags(ref TProcessor processor) processor.Process(new TagItem("http.client_ip", HttpClientIp, HttpClientIpBytes)); } - base.EnumerateTags(ref processor); + base.EnumerateTags(ref processor, openTelemetrySemanticsEnabled); } protected override void WriteAdditionalTags(System.Text.StringBuilder sb) diff --git a/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TagListGenerator/AerospikeTags.g.cs b/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TagListGenerator/AerospikeTags.g.cs index ea4558a93691..e6b67ece8851 100644 --- a/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TagListGenerator/AerospikeTags.g.cs +++ b/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TagListGenerator/AerospikeTags.g.cs @@ -72,7 +72,7 @@ public override void SetTag(string key, string? value) } } - public override void EnumerateTags(ref TProcessor processor) + public override void EnumerateTags(ref TProcessor processor, bool openTelemetrySemanticsEnabled) { if (SpanKind is not null) { @@ -104,7 +104,7 @@ public override void EnumerateTags(ref TProcessor processor) processor.Process(new TagItem("aerospike.userkey", UserKey, UserKeyBytes)); } - base.EnumerateTags(ref processor); + base.EnumerateTags(ref processor, openTelemetrySemanticsEnabled); } protected override void WriteAdditionalTags(System.Text.StringBuilder sb) diff --git a/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TagListGenerator/AerospikeV1Tags.g.cs b/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TagListGenerator/AerospikeV1Tags.g.cs index 38446d61fa14..73a3e3cc8f3c 100644 --- a/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TagListGenerator/AerospikeV1Tags.g.cs +++ b/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TagListGenerator/AerospikeV1Tags.g.cs @@ -46,7 +46,7 @@ public override void SetTag(string key, string? value) } } - public override void EnumerateTags(ref TProcessor processor) + public override void EnumerateTags(ref TProcessor processor, bool openTelemetrySemanticsEnabled) { if (PeerService is not null) { @@ -58,7 +58,7 @@ public override void EnumerateTags(ref TProcessor processor) processor.Process(new TagItem("_dd.peer.service.source", PeerServiceSource, PeerServiceSourceBytes)); } - base.EnumerateTags(ref processor); + base.EnumerateTags(ref processor, openTelemetrySemanticsEnabled); } protected override void WriteAdditionalTags(System.Text.StringBuilder sb) diff --git a/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TagListGenerator/AspNetCoreEndpointTags.g.cs b/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TagListGenerator/AspNetCoreEndpointTags.g.cs index 57f2de401d7e..49c57fc27ca3 100644 --- a/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TagListGenerator/AspNetCoreEndpointTags.g.cs +++ b/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TagListGenerator/AspNetCoreEndpointTags.g.cs @@ -39,14 +39,14 @@ public override void SetTag(string key, string? value) } } - public override void EnumerateTags(ref TProcessor processor) + public override void EnumerateTags(ref TProcessor processor, bool openTelemetrySemanticsEnabled) { if (AspNetCoreEndpoint is not null) { processor.Process(new TagItem("aspnet_core.endpoint", AspNetCoreEndpoint, AspNetCoreEndpointBytes)); } - base.EnumerateTags(ref processor); + base.EnumerateTags(ref processor, openTelemetrySemanticsEnabled); } protected override void WriteAdditionalTags(System.Text.StringBuilder sb) diff --git a/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TagListGenerator/AspNetCoreMvcTags.g.cs b/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TagListGenerator/AspNetCoreMvcTags.g.cs index 0e7aa5558682..c9ef75bc22ee 100644 --- a/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TagListGenerator/AspNetCoreMvcTags.g.cs +++ b/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TagListGenerator/AspNetCoreMvcTags.g.cs @@ -79,7 +79,7 @@ public override void SetTag(string key, string? value) } } - public override void EnumerateTags(ref TProcessor processor) + public override void EnumerateTags(ref TProcessor processor, bool openTelemetrySemanticsEnabled) { if (SpanKind is not null) { @@ -116,7 +116,7 @@ public override void EnumerateTags(ref TProcessor processor) processor.Process(new TagItem("aspnet_core.route", AspNetCoreRoute, AspNetCoreRouteBytes)); } - base.EnumerateTags(ref processor); + base.EnumerateTags(ref processor, openTelemetrySemanticsEnabled); } protected override void WriteAdditionalTags(System.Text.StringBuilder sb) diff --git a/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TagListGenerator/AspNetCoreSingleSpanTags.g.cs b/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TagListGenerator/AspNetCoreSingleSpanTags.g.cs index 268236edb742..b54ba8c3fb36 100644 --- a/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TagListGenerator/AspNetCoreSingleSpanTags.g.cs +++ b/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TagListGenerator/AspNetCoreSingleSpanTags.g.cs @@ -107,7 +107,7 @@ public override void SetTag(string key, string? value) } } - public override void EnumerateTags(ref TProcessor processor) + public override void EnumerateTags(ref TProcessor processor, bool openTelemetrySemanticsEnabled) { if (InstrumentationName is not null) { @@ -164,7 +164,7 @@ public override void EnumerateTags(ref TProcessor processor) processor.Process(new TagItem("_dd.code_origin.frames.0.column", CodeOriginFrameColumn, CodeOriginFrameColumnBytes)); } - base.EnumerateTags(ref processor); + base.EnumerateTags(ref processor, openTelemetrySemanticsEnabled); } protected override void WriteAdditionalTags(System.Text.StringBuilder sb) diff --git a/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TagListGenerator/AspNetCoreTags.g.cs b/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TagListGenerator/AspNetCoreTags.g.cs index 2ab87d9d28d3..9674b3c620fc 100644 --- a/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TagListGenerator/AspNetCoreTags.g.cs +++ b/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TagListGenerator/AspNetCoreTags.g.cs @@ -102,7 +102,7 @@ public override void SetTag(string key, string? value) } } - public override void EnumerateTags(ref TProcessor processor) + public override void EnumerateTags(ref TProcessor processor, bool openTelemetrySemanticsEnabled) { if (InstrumentationName is not null) { @@ -154,7 +154,7 @@ public override void EnumerateTags(ref TProcessor processor) processor.Process(new TagItem("_dd.code_origin.frames.0.column", CodeOriginFrameColumn, CodeOriginFrameColumnBytes)); } - base.EnumerateTags(ref processor); + base.EnumerateTags(ref processor, openTelemetrySemanticsEnabled); } protected override void WriteAdditionalTags(System.Text.StringBuilder sb) diff --git a/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TagListGenerator/AspNetTags.g.cs b/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TagListGenerator/AspNetTags.g.cs index 1493deadadd2..f87275c9d138 100644 --- a/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TagListGenerator/AspNetTags.g.cs +++ b/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TagListGenerator/AspNetTags.g.cs @@ -74,7 +74,7 @@ public override void SetTag(string key, string? value) } } - public override void EnumerateTags(ref TProcessor processor) + public override void EnumerateTags(ref TProcessor processor, bool openTelemetrySemanticsEnabled) { if (AspNetRoute is not null) { @@ -106,7 +106,7 @@ public override void EnumerateTags(ref TProcessor processor) processor.Process(new TagItem("component", InstrumentationName, InstrumentationNameBytes)); } - base.EnumerateTags(ref processor); + base.EnumerateTags(ref processor, openTelemetrySemanticsEnabled); } protected override void WriteAdditionalTags(System.Text.StringBuilder sb) diff --git a/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TagListGenerator/AwsDynamoDbTags.g.cs b/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TagListGenerator/AwsDynamoDbTags.g.cs index 6b4094015296..fabde3fd5416 100644 --- a/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TagListGenerator/AwsDynamoDbTags.g.cs +++ b/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TagListGenerator/AwsDynamoDbTags.g.cs @@ -46,7 +46,7 @@ public override void SetTag(string key, string? value) } } - public override void EnumerateTags(ref TProcessor processor) + public override void EnumerateTags(ref TProcessor processor, bool openTelemetrySemanticsEnabled) { if (TableName is not null) { @@ -58,7 +58,7 @@ public override void EnumerateTags(ref TProcessor processor) processor.Process(new TagItem("span.kind", SpanKind, SpanKindBytes)); } - base.EnumerateTags(ref processor); + base.EnumerateTags(ref processor, openTelemetrySemanticsEnabled); } protected override void WriteAdditionalTags(System.Text.StringBuilder sb) diff --git a/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TagListGenerator/AwsEventBridgeTags.g.cs b/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TagListGenerator/AwsEventBridgeTags.g.cs index af149744d93d..c194f4868294 100644 --- a/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TagListGenerator/AwsEventBridgeTags.g.cs +++ b/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TagListGenerator/AwsEventBridgeTags.g.cs @@ -46,7 +46,7 @@ public override void SetTag(string key, string? value) } } - public override void EnumerateTags(ref TProcessor processor) + public override void EnumerateTags(ref TProcessor processor, bool openTelemetrySemanticsEnabled) { if (RuleName is not null) { @@ -58,7 +58,7 @@ public override void EnumerateTags(ref TProcessor processor) processor.Process(new TagItem("span.kind", SpanKind, SpanKindBytes)); } - base.EnumerateTags(ref processor); + base.EnumerateTags(ref processor, openTelemetrySemanticsEnabled); } protected override void WriteAdditionalTags(System.Text.StringBuilder sb) diff --git a/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TagListGenerator/AwsKinesisTags.g.cs b/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TagListGenerator/AwsKinesisTags.g.cs index cdb8a4e6793c..9a01c7b53b21 100644 --- a/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TagListGenerator/AwsKinesisTags.g.cs +++ b/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TagListGenerator/AwsKinesisTags.g.cs @@ -46,7 +46,7 @@ public override void SetTag(string key, string? value) } } - public override void EnumerateTags(ref TProcessor processor) + public override void EnumerateTags(ref TProcessor processor, bool openTelemetrySemanticsEnabled) { if (StreamName is not null) { @@ -58,7 +58,7 @@ public override void EnumerateTags(ref TProcessor processor) processor.Process(new TagItem("span.kind", SpanKind, SpanKindBytes)); } - base.EnumerateTags(ref processor); + base.EnumerateTags(ref processor, openTelemetrySemanticsEnabled); } protected override void WriteAdditionalTags(System.Text.StringBuilder sb) diff --git a/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TagListGenerator/AwsS3Tags.g.cs b/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TagListGenerator/AwsS3Tags.g.cs index 834732e88bb4..a6159664e1cd 100644 --- a/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TagListGenerator/AwsS3Tags.g.cs +++ b/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TagListGenerator/AwsS3Tags.g.cs @@ -53,7 +53,7 @@ public override void SetTag(string key, string? value) } } - public override void EnumerateTags(ref TProcessor processor) + public override void EnumerateTags(ref TProcessor processor, bool openTelemetrySemanticsEnabled) { if (BucketName is not null) { @@ -70,7 +70,7 @@ public override void EnumerateTags(ref TProcessor processor) processor.Process(new TagItem("span.kind", SpanKind, SpanKindBytes)); } - base.EnumerateTags(ref processor); + base.EnumerateTags(ref processor, openTelemetrySemanticsEnabled); } protected override void WriteAdditionalTags(System.Text.StringBuilder sb) diff --git a/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TagListGenerator/AwsSdkTags.g.cs b/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TagListGenerator/AwsSdkTags.g.cs index 6b5d2d3193a5..3bb3d26b6f5c 100644 --- a/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TagListGenerator/AwsSdkTags.g.cs +++ b/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TagListGenerator/AwsSdkTags.g.cs @@ -53,6 +53,9 @@ partial class AwsSdkTags // HttpStatusCodeBytes = MessagePack.Serialize("http.status_code"); private static ReadOnlySpan HttpStatusCodeBytes => [176, 104, 116, 116, 112, 46, 115, 116, 97, 116, 117, 115, 95, 99, 111, 100, 101]; + // HttpStatusCodeOtelBytes = MessagePack.Serialize("http.response.status_code"); + private static ReadOnlySpan HttpStatusCodeOtelBytes => [185, 104, 116, 116, 112, 46, 114, 101, 115, 112, 111, 110, 115, 101, 46, 115, 116, 97, 116, 117, 115, 95, 99, 111, 100, 101]; + public override string? GetTag(string key) { return key switch @@ -70,6 +73,7 @@ partial class AwsSdkTags "http.method" => HttpMethod, "http.url" => HttpUrl, "http.status_code" => HttpStatusCode is null ? null : Datadog.Trace.Util.IntStringCache.ToInvariantString(HttpStatusCode.Value), + "http.response.status_code" => HttpStatusCode is null ? null : Datadog.Trace.Util.IntStringCache.ToInvariantString(HttpStatusCode.Value), _ => base.GetTag(key), }; } @@ -102,7 +106,8 @@ public override void SetTag(string key, string? value) case "http.url": HttpUrl = value; break; - case "http.status_code": + case "http.status_code": + case "http.response.status_code": if (int.TryParse(value, System.Globalization.NumberStyles.Integer, System.Globalization.CultureInfo.InvariantCulture, out var parsedHttpStatusCode)) { HttpStatusCode = parsedHttpStatusCode; @@ -125,7 +130,7 @@ public override void SetTag(string key, string? value) } } - public override void EnumerateTags(ref TProcessor processor) + public override void EnumerateTags(ref TProcessor processor, bool openTelemetrySemanticsEnabled) { if (InstrumentationName is not null) { @@ -189,10 +194,17 @@ public override void EnumerateTags(ref TProcessor processor) if (HttpStatusCode is not null) { - processor.Process(new TagItem("http.status_code", HttpStatusCode.Value, HttpStatusCodeBytes)); + if (openTelemetrySemanticsEnabled) + { + processor.Process(new TagItem("http.response.status_code", HttpStatusCode.Value, HttpStatusCodeOtelBytes)); + } + else + { + processor.Process(new TagItem("http.status_code", HttpStatusCode.Value, HttpStatusCodeBytes)); + } } - base.EnumerateTags(ref processor); + base.EnumerateTags(ref processor, openTelemetrySemanticsEnabled); } protected override void WriteAdditionalTags(System.Text.StringBuilder sb) diff --git a/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TagListGenerator/AwsSnsTags.g.cs b/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TagListGenerator/AwsSnsTags.g.cs index 0f6ee97e8ff0..33e5bf5e2ece 100644 --- a/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TagListGenerator/AwsSnsTags.g.cs +++ b/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TagListGenerator/AwsSnsTags.g.cs @@ -58,7 +58,7 @@ public override void SetTag(string key, string? value) } } - public override void EnumerateTags(ref TProcessor processor) + public override void EnumerateTags(ref TProcessor processor, bool openTelemetrySemanticsEnabled) { if (AwsTopicName is not null) { @@ -80,7 +80,7 @@ public override void EnumerateTags(ref TProcessor processor) processor.Process(new TagItem("span.kind", SpanKind, SpanKindBytes)); } - base.EnumerateTags(ref processor); + base.EnumerateTags(ref processor, openTelemetrySemanticsEnabled); } protected override void WriteAdditionalTags(System.Text.StringBuilder sb) diff --git a/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TagListGenerator/AwsSqsTags.g.cs b/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TagListGenerator/AwsSqsTags.g.cs index ab84a58d85a3..f92531146146 100644 --- a/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TagListGenerator/AwsSqsTags.g.cs +++ b/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TagListGenerator/AwsSqsTags.g.cs @@ -58,7 +58,7 @@ public override void SetTag(string key, string? value) } } - public override void EnumerateTags(ref TProcessor processor) + public override void EnumerateTags(ref TProcessor processor, bool openTelemetrySemanticsEnabled) { if (AwsQueueName is not null) { @@ -80,7 +80,7 @@ public override void EnumerateTags(ref TProcessor processor) processor.Process(new TagItem("span.kind", SpanKind, SpanKindBytes)); } - base.EnumerateTags(ref processor); + base.EnumerateTags(ref processor, openTelemetrySemanticsEnabled); } protected override void WriteAdditionalTags(System.Text.StringBuilder sb) diff --git a/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TagListGenerator/AwsStepFunctionsTags.g.cs b/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TagListGenerator/AwsStepFunctionsTags.g.cs index d35e46e0688b..7f30da9df1c4 100644 --- a/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TagListGenerator/AwsStepFunctionsTags.g.cs +++ b/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TagListGenerator/AwsStepFunctionsTags.g.cs @@ -46,7 +46,7 @@ public override void SetTag(string key, string? value) } } - public override void EnumerateTags(ref TProcessor processor) + public override void EnumerateTags(ref TProcessor processor, bool openTelemetrySemanticsEnabled) { if (StateMachineName is not null) { @@ -58,7 +58,7 @@ public override void EnumerateTags(ref TProcessor processor) processor.Process(new TagItem("span.kind", SpanKind, SpanKindBytes)); } - base.EnumerateTags(ref processor); + base.EnumerateTags(ref processor, openTelemetrySemanticsEnabled); } protected override void WriteAdditionalTags(System.Text.StringBuilder sb) diff --git a/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TagListGenerator/AzureEventHubsTags.g.cs b/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TagListGenerator/AzureEventHubsTags.g.cs index 31b548dd2865..b4574999458c 100644 --- a/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TagListGenerator/AzureEventHubsTags.g.cs +++ b/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TagListGenerator/AzureEventHubsTags.g.cs @@ -115,7 +115,7 @@ public override void SetTag(string key, string? value) } } - public override void EnumerateTags(ref TProcessor processor) + public override void EnumerateTags(ref TProcessor processor, bool openTelemetrySemanticsEnabled) { if (SpanKind is not null) { @@ -177,7 +177,7 @@ public override void EnumerateTags(ref TProcessor processor) processor.Process(new TagItem("messaging.message_id", MessagingMessageId, MessagingMessageIdBytes)); } - base.EnumerateTags(ref processor); + base.EnumerateTags(ref processor, openTelemetrySemanticsEnabled); } protected override void WriteAdditionalTags(System.Text.StringBuilder sb) diff --git a/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TagListGenerator/AzureEventHubsV1Tags.g.cs b/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TagListGenerator/AzureEventHubsV1Tags.g.cs index b6580fed8efd..2631ff833fb6 100644 --- a/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TagListGenerator/AzureEventHubsV1Tags.g.cs +++ b/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TagListGenerator/AzureEventHubsV1Tags.g.cs @@ -46,7 +46,7 @@ public override void SetTag(string key, string? value) } } - public override void EnumerateTags(ref TProcessor processor) + public override void EnumerateTags(ref TProcessor processor, bool openTelemetrySemanticsEnabled) { if (PeerService is not null) { @@ -58,7 +58,7 @@ public override void EnumerateTags(ref TProcessor processor) processor.Process(new TagItem("_dd.peer.service.source", PeerServiceSource, PeerServiceSourceBytes)); } - base.EnumerateTags(ref processor); + base.EnumerateTags(ref processor, openTelemetrySemanticsEnabled); } protected override void WriteAdditionalTags(System.Text.StringBuilder sb) diff --git a/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TagListGenerator/AzureFunctionsTags.g.cs b/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TagListGenerator/AzureFunctionsTags.g.cs index 685fd8163817..805fa37f033b 100644 --- a/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TagListGenerator/AzureFunctionsTags.g.cs +++ b/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TagListGenerator/AzureFunctionsTags.g.cs @@ -72,7 +72,7 @@ public override void SetTag(string key, string? value) } } - public override void EnumerateTags(ref TProcessor processor) + public override void EnumerateTags(ref TProcessor processor, bool openTelemetrySemanticsEnabled) { if (SpanKind is not null) { @@ -104,7 +104,7 @@ public override void EnumerateTags(ref TProcessor processor) processor.Process(new TagItem("aas.function.trigger", TriggerType, TriggerTypeBytes)); } - base.EnumerateTags(ref processor); + base.EnumerateTags(ref processor, openTelemetrySemanticsEnabled); } protected override void WriteAdditionalTags(System.Text.StringBuilder sb) diff --git a/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TagListGenerator/AzureServiceBusTags.g.cs b/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TagListGenerator/AzureServiceBusTags.g.cs index b6cfb5de3e3c..647d086d0be8 100644 --- a/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TagListGenerator/AzureServiceBusTags.g.cs +++ b/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TagListGenerator/AzureServiceBusTags.g.cs @@ -101,7 +101,7 @@ public override void SetTag(string key, string? value) } } - public override void EnumerateTags(ref TProcessor processor) + public override void EnumerateTags(ref TProcessor processor, bool openTelemetrySemanticsEnabled) { if (InstrumentationName is not null) { @@ -148,7 +148,7 @@ public override void EnumerateTags(ref TProcessor processor) processor.Process(new TagItem("server.address", ServerAddress, ServerAddressBytes)); } - base.EnumerateTags(ref processor); + base.EnumerateTags(ref processor, openTelemetrySemanticsEnabled); } protected override void WriteAdditionalTags(System.Text.StringBuilder sb) diff --git a/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TagListGenerator/AzureServiceBusV1Tags.g.cs b/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TagListGenerator/AzureServiceBusV1Tags.g.cs index 602423d8a83f..63fcff43d898 100644 --- a/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TagListGenerator/AzureServiceBusV1Tags.g.cs +++ b/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TagListGenerator/AzureServiceBusV1Tags.g.cs @@ -46,7 +46,7 @@ public override void SetTag(string key, string? value) } } - public override void EnumerateTags(ref TProcessor processor) + public override void EnumerateTags(ref TProcessor processor, bool openTelemetrySemanticsEnabled) { if (PeerService is not null) { @@ -58,7 +58,7 @@ public override void EnumerateTags(ref TProcessor processor) processor.Process(new TagItem("_dd.peer.service.source", PeerServiceSource, PeerServiceSourceBytes)); } - base.EnumerateTags(ref processor); + base.EnumerateTags(ref processor, openTelemetrySemanticsEnabled); } protected override void WriteAdditionalTags(System.Text.StringBuilder sb) diff --git a/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TagListGenerator/CosmosDbTags.g.cs b/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TagListGenerator/CosmosDbTags.g.cs index a72ebf93e4e6..aa2d8e1efb33 100644 --- a/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TagListGenerator/CosmosDbTags.g.cs +++ b/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TagListGenerator/CosmosDbTags.g.cs @@ -98,7 +98,7 @@ public override void SetTag(string key, string? value) } } - public override void EnumerateTags(ref TProcessor processor) + public override void EnumerateTags(ref TProcessor processor, bool openTelemetrySemanticsEnabled) { if (SpanKind is not null) { @@ -150,7 +150,7 @@ public override void EnumerateTags(ref TProcessor processor) processor.Process(new TagItem("cosmosdb.connection.mode", ConnectionMode, ConnectionModeBytes)); } - base.EnumerateTags(ref processor); + base.EnumerateTags(ref processor, openTelemetrySemanticsEnabled); } protected override void WriteAdditionalTags(System.Text.StringBuilder sb) diff --git a/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TagListGenerator/CosmosDbV1Tags.g.cs b/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TagListGenerator/CosmosDbV1Tags.g.cs index 58b46d58b982..eea36b6406d8 100644 --- a/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TagListGenerator/CosmosDbV1Tags.g.cs +++ b/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TagListGenerator/CosmosDbV1Tags.g.cs @@ -53,7 +53,7 @@ public override void SetTag(string key, string? value) } } - public override void EnumerateTags(ref TProcessor processor) + public override void EnumerateTags(ref TProcessor processor, bool openTelemetrySemanticsEnabled) { if (Port is not null) { @@ -70,7 +70,7 @@ public override void EnumerateTags(ref TProcessor processor) processor.Process(new TagItem("_dd.peer.service.source", PeerServiceSource, PeerServiceSourceBytes)); } - base.EnumerateTags(ref processor); + base.EnumerateTags(ref processor, openTelemetrySemanticsEnabled); } protected override void WriteAdditionalTags(System.Text.StringBuilder sb) diff --git a/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TagListGenerator/CouchbaseTags.g.cs b/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TagListGenerator/CouchbaseTags.g.cs index 95f10b3803ca..d34b1182ea0a 100644 --- a/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TagListGenerator/CouchbaseTags.g.cs +++ b/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TagListGenerator/CouchbaseTags.g.cs @@ -86,7 +86,7 @@ public override void SetTag(string key, string? value) } } - public override void EnumerateTags(ref TProcessor processor) + public override void EnumerateTags(ref TProcessor processor, bool openTelemetrySemanticsEnabled) { if (SpanKind is not null) { @@ -128,7 +128,7 @@ public override void EnumerateTags(ref TProcessor processor) processor.Process(new TagItem("out.port", Port, PortBytes)); } - base.EnumerateTags(ref processor); + base.EnumerateTags(ref processor, openTelemetrySemanticsEnabled); } protected override void WriteAdditionalTags(System.Text.StringBuilder sb) diff --git a/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TagListGenerator/CouchbaseV1Tags.g.cs b/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TagListGenerator/CouchbaseV1Tags.g.cs index 6b6a2e602e23..44450d38b10e 100644 --- a/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TagListGenerator/CouchbaseV1Tags.g.cs +++ b/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TagListGenerator/CouchbaseV1Tags.g.cs @@ -46,7 +46,7 @@ public override void SetTag(string key, string? value) } } - public override void EnumerateTags(ref TProcessor processor) + public override void EnumerateTags(ref TProcessor processor, bool openTelemetrySemanticsEnabled) { if (PeerService is not null) { @@ -58,7 +58,7 @@ public override void EnumerateTags(ref TProcessor processor) processor.Process(new TagItem("_dd.peer.service.source", PeerServiceSource, PeerServiceSourceBytes)); } - base.EnumerateTags(ref processor); + base.EnumerateTags(ref processor, openTelemetrySemanticsEnabled); } protected override void WriteAdditionalTags(System.Text.StringBuilder sb) diff --git a/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TagListGenerator/ElasticsearchTags.g.cs b/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TagListGenerator/ElasticsearchTags.g.cs index d0a973383095..9a372195b4ab 100644 --- a/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TagListGenerator/ElasticsearchTags.g.cs +++ b/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TagListGenerator/ElasticsearchTags.g.cs @@ -72,7 +72,7 @@ public override void SetTag(string key, string? value) } } - public override void EnumerateTags(ref TProcessor processor) + public override void EnumerateTags(ref TProcessor processor, bool openTelemetrySemanticsEnabled) { if (SpanKind is not null) { @@ -104,7 +104,7 @@ public override void EnumerateTags(ref TProcessor processor) processor.Process(new TagItem("out.host", Host, HostBytes)); } - base.EnumerateTags(ref processor); + base.EnumerateTags(ref processor, openTelemetrySemanticsEnabled); } protected override void WriteAdditionalTags(System.Text.StringBuilder sb) diff --git a/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TagListGenerator/ElasticsearchV1Tags.g.cs b/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TagListGenerator/ElasticsearchV1Tags.g.cs index 154659ca0134..db538ee95417 100644 --- a/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TagListGenerator/ElasticsearchV1Tags.g.cs +++ b/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TagListGenerator/ElasticsearchV1Tags.g.cs @@ -46,7 +46,7 @@ public override void SetTag(string key, string? value) } } - public override void EnumerateTags(ref TProcessor processor) + public override void EnumerateTags(ref TProcessor processor, bool openTelemetrySemanticsEnabled) { if (PeerService is not null) { @@ -58,7 +58,7 @@ public override void EnumerateTags(ref TProcessor processor) processor.Process(new TagItem("_dd.peer.service.source", PeerServiceSource, PeerServiceSourceBytes)); } - base.EnumerateTags(ref processor); + base.EnumerateTags(ref processor, openTelemetrySemanticsEnabled); } protected override void WriteAdditionalTags(System.Text.StringBuilder sb) diff --git a/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TagListGenerator/GraphQLTags.g.cs b/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TagListGenerator/GraphQLTags.g.cs index fa648637efa9..b37ad74308c6 100644 --- a/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TagListGenerator/GraphQLTags.g.cs +++ b/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TagListGenerator/GraphQLTags.g.cs @@ -65,7 +65,7 @@ public override void SetTag(string key, string? value) } } - public override void EnumerateTags(ref TProcessor processor) + public override void EnumerateTags(ref TProcessor processor, bool openTelemetrySemanticsEnabled) { if (SpanKind is not null) { @@ -92,7 +92,7 @@ public override void EnumerateTags(ref TProcessor processor) processor.Process(new TagItem("graphql.operation.type", OperationType, OperationTypeBytes)); } - base.EnumerateTags(ref processor); + base.EnumerateTags(ref processor, openTelemetrySemanticsEnabled); } protected override void WriteAdditionalTags(System.Text.StringBuilder sb) diff --git a/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TagListGenerator/GrpcClientTags.g.cs b/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TagListGenerator/GrpcClientTags.g.cs index 2446a6bf023a..bd93cc0038f7 100644 --- a/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TagListGenerator/GrpcClientTags.g.cs +++ b/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TagListGenerator/GrpcClientTags.g.cs @@ -46,7 +46,7 @@ public override void SetTag(string key, string? value) } } - public override void EnumerateTags(ref TProcessor processor) + public override void EnumerateTags(ref TProcessor processor, bool openTelemetrySemanticsEnabled) { if (Host is not null) { @@ -58,7 +58,7 @@ public override void EnumerateTags(ref TProcessor processor) processor.Process(new TagItem("peer.hostname", PeerHostname, PeerHostnameBytes)); } - base.EnumerateTags(ref processor); + base.EnumerateTags(ref processor, openTelemetrySemanticsEnabled); } protected override void WriteAdditionalTags(System.Text.StringBuilder sb) diff --git a/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TagListGenerator/GrpcClientV1Tags.g.cs b/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TagListGenerator/GrpcClientV1Tags.g.cs index 4f9cc28c3cce..f39c5be4711f 100644 --- a/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TagListGenerator/GrpcClientV1Tags.g.cs +++ b/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TagListGenerator/GrpcClientV1Tags.g.cs @@ -46,7 +46,7 @@ public override void SetTag(string key, string? value) } } - public override void EnumerateTags(ref TProcessor processor) + public override void EnumerateTags(ref TProcessor processor, bool openTelemetrySemanticsEnabled) { if (PeerService is not null) { @@ -58,7 +58,7 @@ public override void EnumerateTags(ref TProcessor processor) processor.Process(new TagItem("_dd.peer.service.source", PeerServiceSource, PeerServiceSourceBytes)); } - base.EnumerateTags(ref processor); + base.EnumerateTags(ref processor, openTelemetrySemanticsEnabled); } protected override void WriteAdditionalTags(System.Text.StringBuilder sb) diff --git a/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TagListGenerator/GrpcTags.g.cs b/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TagListGenerator/GrpcTags.g.cs index 4c01218928a4..8ec123c6e7df 100644 --- a/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TagListGenerator/GrpcTags.g.cs +++ b/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TagListGenerator/GrpcTags.g.cs @@ -86,7 +86,7 @@ public override void SetTag(string key, string? value) } } - public override void EnumerateTags(ref TProcessor processor) + public override void EnumerateTags(ref TProcessor processor, bool openTelemetrySemanticsEnabled) { if (SpanKind is not null) { @@ -128,7 +128,7 @@ public override void EnumerateTags(ref TProcessor processor) processor.Process(new TagItem("grpc.status.code", StatusCode, StatusCodeBytes)); } - base.EnumerateTags(ref processor); + base.EnumerateTags(ref processor, openTelemetrySemanticsEnabled); } protected override void WriteAdditionalTags(System.Text.StringBuilder sb) diff --git a/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TagListGenerator/HangfireTags.g.cs b/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TagListGenerator/HangfireTags.g.cs index adcd5af61841..ea3e826dad35 100644 --- a/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TagListGenerator/HangfireTags.g.cs +++ b/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TagListGenerator/HangfireTags.g.cs @@ -58,7 +58,7 @@ public override void SetTag(string key, string? value) } } - public override void EnumerateTags(ref TProcessor processor) + public override void EnumerateTags(ref TProcessor processor, bool openTelemetrySemanticsEnabled) { if (InstrumentationName is not null) { @@ -80,7 +80,7 @@ public override void EnumerateTags(ref TProcessor processor) processor.Process(new TagItem("job.ID", JobId, JobIdBytes)); } - base.EnumerateTags(ref processor); + base.EnumerateTags(ref processor, openTelemetrySemanticsEnabled); } protected override void WriteAdditionalTags(System.Text.StringBuilder sb) diff --git a/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TagListGenerator/HttpTags.g.cs b/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TagListGenerator/HttpTags.g.cs index 1414cda04601..7406088379c3 100644 --- a/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TagListGenerator/HttpTags.g.cs +++ b/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TagListGenerator/HttpTags.g.cs @@ -32,6 +32,9 @@ partial class HttpTags // HttpStatusCodeBytes = MessagePack.Serialize("http.status_code"); private static ReadOnlySpan HttpStatusCodeBytes => [176, 104, 116, 116, 112, 46, 115, 116, 97, 116, 117, 115, 95, 99, 111, 100, 101]; + // HttpStatusCodeOtelBytes = MessagePack.Serialize("http.response.status_code"); + private static ReadOnlySpan HttpStatusCodeOtelBytes => [185, 104, 116, 116, 112, 46, 114, 101, 115, 112, 111, 110, 115, 101, 46, 115, 116, 97, 116, 117, 115, 95, 99, 111, 100, 101]; + // HostBytes = MessagePack.Serialize("out.host"); private static ReadOnlySpan HostBytes => [168, 111, 117, 116, 46, 104, 111, 115, 116]; @@ -45,6 +48,7 @@ partial class HttpTags "http.url" => HttpUrl, "http-client-handler-type" => HttpClientHandlerType, "http.status_code" => HttpStatusCode is null ? null : Datadog.Trace.Util.IntStringCache.ToInvariantString(HttpStatusCode.Value), + "http.response.status_code" => HttpStatusCode is null ? null : Datadog.Trace.Util.IntStringCache.ToInvariantString(HttpStatusCode.Value), "out.host" => Host, _ => base.GetTag(key), }; @@ -66,7 +70,8 @@ public override void SetTag(string key, string? value) case "http-client-handler-type": HttpClientHandlerType = value; break; - case "http.status_code": + case "http.status_code": + case "http.response.status_code": if (int.TryParse(value, System.Globalization.NumberStyles.Integer, System.Globalization.CultureInfo.InvariantCulture, out var parsedHttpStatusCode)) { HttpStatusCode = parsedHttpStatusCode; @@ -89,7 +94,7 @@ public override void SetTag(string key, string? value) } } - public override void EnumerateTags(ref TProcessor processor) + public override void EnumerateTags(ref TProcessor processor, bool openTelemetrySemanticsEnabled) { if (SpanKind is not null) { @@ -118,7 +123,14 @@ public override void EnumerateTags(ref TProcessor processor) if (HttpStatusCode is not null) { - processor.Process(new TagItem("http.status_code", HttpStatusCode.Value, HttpStatusCodeBytes)); + if (openTelemetrySemanticsEnabled) + { + processor.Process(new TagItem("http.response.status_code", HttpStatusCode.Value, HttpStatusCodeOtelBytes)); + } + else + { + processor.Process(new TagItem("http.status_code", HttpStatusCode.Value, HttpStatusCodeBytes)); + } } if (Host is not null) @@ -126,7 +138,7 @@ public override void EnumerateTags(ref TProcessor processor) processor.Process(new TagItem("out.host", Host, HostBytes)); } - base.EnumerateTags(ref processor); + base.EnumerateTags(ref processor, openTelemetrySemanticsEnabled); } protected override void WriteAdditionalTags(System.Text.StringBuilder sb) diff --git a/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TagListGenerator/HttpV1Tags.g.cs b/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TagListGenerator/HttpV1Tags.g.cs index 36e594313021..8fc26c308117 100644 --- a/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TagListGenerator/HttpV1Tags.g.cs +++ b/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TagListGenerator/HttpV1Tags.g.cs @@ -46,7 +46,7 @@ public override void SetTag(string key, string? value) } } - public override void EnumerateTags(ref TProcessor processor) + public override void EnumerateTags(ref TProcessor processor, bool openTelemetrySemanticsEnabled) { if (PeerService is not null) { @@ -58,7 +58,7 @@ public override void EnumerateTags(ref TProcessor processor) processor.Process(new TagItem("_dd.peer.service.source", PeerServiceSource, PeerServiceSourceBytes)); } - base.EnumerateTags(ref processor); + base.EnumerateTags(ref processor, openTelemetrySemanticsEnabled); } protected override void WriteAdditionalTags(System.Text.StringBuilder sb) diff --git a/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TagListGenerator/IastTags.g.cs b/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TagListGenerator/IastTags.g.cs index e8d2bf22fcb9..98882fc5a048 100644 --- a/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TagListGenerator/IastTags.g.cs +++ b/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TagListGenerator/IastTags.g.cs @@ -46,7 +46,7 @@ public override void SetTag(string key, string? value) } } - public override void EnumerateTags(ref TProcessor processor) + public override void EnumerateTags(ref TProcessor processor, bool openTelemetrySemanticsEnabled) { if (IastJson is not null) { @@ -58,7 +58,7 @@ public override void EnumerateTags(ref TProcessor processor) processor.Process(new TagItem("_dd.iast.enabled", IastEnabled, IastEnabledBytes)); } - base.EnumerateTags(ref processor); + base.EnumerateTags(ref processor, openTelemetrySemanticsEnabled); } protected override void WriteAdditionalTags(System.Text.StringBuilder sb) diff --git a/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TagListGenerator/IbmMqTags.g.cs b/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TagListGenerator/IbmMqTags.g.cs index 232f669c54c6..47e81e1d5383 100644 --- a/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TagListGenerator/IbmMqTags.g.cs +++ b/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TagListGenerator/IbmMqTags.g.cs @@ -51,7 +51,7 @@ public override void SetTag(string key, string? value) } } - public override void EnumerateTags(ref TProcessor processor) + public override void EnumerateTags(ref TProcessor processor, bool openTelemetrySemanticsEnabled) { if (SpanKind is not null) { @@ -68,7 +68,7 @@ public override void EnumerateTags(ref TProcessor processor) processor.Process(new TagItem("topicname", TopicName, TopicNameBytes)); } - base.EnumerateTags(ref processor); + base.EnumerateTags(ref processor, openTelemetrySemanticsEnabled); } protected override void WriteAdditionalTags(System.Text.StringBuilder sb) diff --git a/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TagListGenerator/InferredProxyTags.g.cs b/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TagListGenerator/InferredProxyTags.g.cs index a80c57e07420..dafae6dcf60d 100644 --- a/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TagListGenerator/InferredProxyTags.g.cs +++ b/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TagListGenerator/InferredProxyTags.g.cs @@ -35,6 +35,9 @@ partial class InferredProxyTags // HttpStatusCodeBytes = MessagePack.Serialize("http.status_code"); private static ReadOnlySpan HttpStatusCodeBytes => [176, 104, 116, 116, 112, 46, 115, 116, 97, 116, 117, 115, 95, 99, 111, 100, 101]; + // HttpStatusCodeOtelBytes = MessagePack.Serialize("http.response.status_code"); + private static ReadOnlySpan HttpStatusCodeOtelBytes => [185, 104, 116, 116, 112, 46, 114, 101, 115, 112, 111, 110, 115, 101, 46, 115, 116, 97, 116, 117, 115, 95, 99, 111, 100, 101]; + // StageBytes = MessagePack.Serialize("stage"); private static ReadOnlySpan StageBytes => [165, 115, 116, 97, 103, 101]; @@ -51,6 +54,7 @@ partial class InferredProxyTags "http.url" => HttpUrl, "http.route" => HttpRoute, "http.status_code" => HttpStatusCode is null ? null : Datadog.Trace.Util.IntStringCache.ToInvariantString(HttpStatusCode.Value), + "http.response.status_code" => HttpStatusCode is null ? null : Datadog.Trace.Util.IntStringCache.ToInvariantString(HttpStatusCode.Value), "stage" => Stage, "region" => Region, _ => base.GetTag(key), @@ -73,7 +77,8 @@ public override void SetTag(string key, string? value) case "http.route": HttpRoute = value; break; - case "http.status_code": + case "http.status_code": + case "http.response.status_code": if (int.TryParse(value, System.Globalization.NumberStyles.Integer, System.Globalization.CultureInfo.InvariantCulture, out var parsedHttpStatusCode)) { HttpStatusCode = parsedHttpStatusCode; @@ -99,7 +104,7 @@ public override void SetTag(string key, string? value) } } - public override void EnumerateTags(ref TProcessor processor) + public override void EnumerateTags(ref TProcessor processor, bool openTelemetrySemanticsEnabled) { if (SpanKind is not null) { @@ -128,7 +133,14 @@ public override void EnumerateTags(ref TProcessor processor) if (HttpStatusCode is not null) { - processor.Process(new TagItem("http.status_code", HttpStatusCode.Value, HttpStatusCodeBytes)); + if (openTelemetrySemanticsEnabled) + { + processor.Process(new TagItem("http.response.status_code", HttpStatusCode.Value, HttpStatusCodeOtelBytes)); + } + else + { + processor.Process(new TagItem("http.status_code", HttpStatusCode.Value, HttpStatusCodeBytes)); + } } if (Stage is not null) @@ -141,7 +153,7 @@ public override void EnumerateTags(ref TProcessor processor) processor.Process(new TagItem("region", Region, RegionBytes)); } - base.EnumerateTags(ref processor); + base.EnumerateTags(ref processor, openTelemetrySemanticsEnabled); } protected override void WriteAdditionalTags(System.Text.StringBuilder sb) diff --git a/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TagListGenerator/KafkaTags.g.cs b/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TagListGenerator/KafkaTags.g.cs index b2b1acea9ca2..899d9ef0948f 100644 --- a/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TagListGenerator/KafkaTags.g.cs +++ b/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TagListGenerator/KafkaTags.g.cs @@ -96,7 +96,7 @@ public override void SetTag(string key, string? value) } } - public override void EnumerateTags(ref TProcessor processor) + public override void EnumerateTags(ref TProcessor processor, bool openTelemetrySemanticsEnabled) { if (SpanKind is not null) { @@ -143,7 +143,7 @@ public override void EnumerateTags(ref TProcessor processor) processor.Process(new TagItem("kafka.group", ConsumerGroup, ConsumerGroupBytes)); } - base.EnumerateTags(ref processor); + base.EnumerateTags(ref processor, openTelemetrySemanticsEnabled); } protected override void WriteAdditionalTags(System.Text.StringBuilder sb) diff --git a/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TagListGenerator/KafkaV1Tags.g.cs b/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TagListGenerator/KafkaV1Tags.g.cs index 3fc177b7f28e..f35d93fb3deb 100644 --- a/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TagListGenerator/KafkaV1Tags.g.cs +++ b/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TagListGenerator/KafkaV1Tags.g.cs @@ -46,7 +46,7 @@ public override void SetTag(string key, string? value) } } - public override void EnumerateTags(ref TProcessor processor) + public override void EnumerateTags(ref TProcessor processor, bool openTelemetrySemanticsEnabled) { if (PeerService is not null) { @@ -58,7 +58,7 @@ public override void EnumerateTags(ref TProcessor processor) processor.Process(new TagItem("_dd.peer.service.source", PeerServiceSource, PeerServiceSourceBytes)); } - base.EnumerateTags(ref processor); + base.EnumerateTags(ref processor, openTelemetrySemanticsEnabled); } protected override void WriteAdditionalTags(System.Text.StringBuilder sb) diff --git a/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TagListGenerator/MongoDbTags.g.cs b/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TagListGenerator/MongoDbTags.g.cs index f49ad1d1c1b3..cd4e96d5e641 100644 --- a/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TagListGenerator/MongoDbTags.g.cs +++ b/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TagListGenerator/MongoDbTags.g.cs @@ -79,7 +79,7 @@ public override void SetTag(string key, string? value) } } - public override void EnumerateTags(ref TProcessor processor) + public override void EnumerateTags(ref TProcessor processor, bool openTelemetrySemanticsEnabled) { if (SpanKind is not null) { @@ -116,7 +116,7 @@ public override void EnumerateTags(ref TProcessor processor) processor.Process(new TagItem("out.port", Port, PortBytes)); } - base.EnumerateTags(ref processor); + base.EnumerateTags(ref processor, openTelemetrySemanticsEnabled); } protected override void WriteAdditionalTags(System.Text.StringBuilder sb) diff --git a/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TagListGenerator/MongoDbV1Tags.g.cs b/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TagListGenerator/MongoDbV1Tags.g.cs index c0a2519aaa8c..f16d424525f3 100644 --- a/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TagListGenerator/MongoDbV1Tags.g.cs +++ b/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TagListGenerator/MongoDbV1Tags.g.cs @@ -46,7 +46,7 @@ public override void SetTag(string key, string? value) } } - public override void EnumerateTags(ref TProcessor processor) + public override void EnumerateTags(ref TProcessor processor, bool openTelemetrySemanticsEnabled) { if (PeerService is not null) { @@ -58,7 +58,7 @@ public override void EnumerateTags(ref TProcessor processor) processor.Process(new TagItem("_dd.peer.service.source", PeerServiceSource, PeerServiceSourceBytes)); } - base.EnumerateTags(ref processor); + base.EnumerateTags(ref processor, openTelemetrySemanticsEnabled); } protected override void WriteAdditionalTags(System.Text.StringBuilder sb) diff --git a/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TagListGenerator/MsmqTags.g.cs b/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TagListGenerator/MsmqTags.g.cs index 8608949ad59c..efbad3b04760 100644 --- a/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TagListGenerator/MsmqTags.g.cs +++ b/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TagListGenerator/MsmqTags.g.cs @@ -79,7 +79,7 @@ public override void SetTag(string key, string? value) } } - public override void EnumerateTags(ref TProcessor processor) + public override void EnumerateTags(ref TProcessor processor, bool openTelemetrySemanticsEnabled) { if (Command is not null) { @@ -116,7 +116,7 @@ public override void EnumerateTags(ref TProcessor processor) processor.Process(new TagItem("msmq.queue.transactional", IsTransactionalQueue, IsTransactionalQueueBytes)); } - base.EnumerateTags(ref processor); + base.EnumerateTags(ref processor, openTelemetrySemanticsEnabled); } protected override void WriteAdditionalTags(System.Text.StringBuilder sb) diff --git a/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TagListGenerator/MsmqV1Tags.g.cs b/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TagListGenerator/MsmqV1Tags.g.cs index 78fee57665fc..29cee9a54f04 100644 --- a/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TagListGenerator/MsmqV1Tags.g.cs +++ b/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TagListGenerator/MsmqV1Tags.g.cs @@ -46,7 +46,7 @@ public override void SetTag(string key, string? value) } } - public override void EnumerateTags(ref TProcessor processor) + public override void EnumerateTags(ref TProcessor processor, bool openTelemetrySemanticsEnabled) { if (PeerService is not null) { @@ -58,7 +58,7 @@ public override void EnumerateTags(ref TProcessor processor) processor.Process(new TagItem("_dd.peer.service.source", PeerServiceSource, PeerServiceSourceBytes)); } - base.EnumerateTags(ref processor); + base.EnumerateTags(ref processor, openTelemetrySemanticsEnabled); } protected override void WriteAdditionalTags(System.Text.StringBuilder sb) diff --git a/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TagListGenerator/OpenTelemetryTags.g.cs b/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TagListGenerator/OpenTelemetryTags.g.cs index 5599a863b297..e064e2179266 100644 --- a/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TagListGenerator/OpenTelemetryTags.g.cs +++ b/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TagListGenerator/OpenTelemetryTags.g.cs @@ -67,7 +67,7 @@ public override void SetTag(string key, string? value) } } - public override void EnumerateTags(ref TProcessor processor) + public override void EnumerateTags(ref TProcessor processor, bool openTelemetrySemanticsEnabled) { if (SpanKind is not null) { @@ -94,7 +94,7 @@ public override void EnumerateTags(ref TProcessor processor) processor.Process(new TagItem("otel.status_code", OtelStatusCode, OtelStatusCodeBytes)); } - base.EnumerateTags(ref processor); + base.EnumerateTags(ref processor, openTelemetrySemanticsEnabled); } protected override void WriteAdditionalTags(System.Text.StringBuilder sb) diff --git a/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TagListGenerator/ProcessCommandStartTags.g.cs b/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TagListGenerator/ProcessCommandStartTags.g.cs index 92f0a0649b5d..53322d01c0f7 100644 --- a/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TagListGenerator/ProcessCommandStartTags.g.cs +++ b/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TagListGenerator/ProcessCommandStartTags.g.cs @@ -72,7 +72,7 @@ public override void SetTag(string key, string? value) } } - public override void EnumerateTags(ref TProcessor processor) + public override void EnumerateTags(ref TProcessor processor, bool openTelemetrySemanticsEnabled) { if (Component is not null) { @@ -104,7 +104,7 @@ public override void EnumerateTags(ref TProcessor processor) processor.Process(new TagItem("cmd.truncated", Truncated, TruncatedBytes)); } - base.EnumerateTags(ref processor); + base.EnumerateTags(ref processor, openTelemetrySemanticsEnabled); } protected override void WriteAdditionalTags(System.Text.StringBuilder sb) diff --git a/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TagListGenerator/RabbitMQTags.g.cs b/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TagListGenerator/RabbitMQTags.g.cs index 1c7208f59de7..0abf2ed4f716 100644 --- a/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TagListGenerator/RabbitMQTags.g.cs +++ b/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TagListGenerator/RabbitMQTags.g.cs @@ -93,7 +93,7 @@ public override void SetTag(string key, string? value) } } - public override void EnumerateTags(ref TProcessor processor) + public override void EnumerateTags(ref TProcessor processor, bool openTelemetrySemanticsEnabled) { if (SpanKind is not null) { @@ -140,7 +140,7 @@ public override void EnumerateTags(ref TProcessor processor) processor.Process(new TagItem("out.host", OutHost, OutHostBytes)); } - base.EnumerateTags(ref processor); + base.EnumerateTags(ref processor, openTelemetrySemanticsEnabled); } protected override void WriteAdditionalTags(System.Text.StringBuilder sb) diff --git a/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TagListGenerator/RabbitMQV1Tags.g.cs b/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TagListGenerator/RabbitMQV1Tags.g.cs index 75851ba4d8d6..6cebdb522d7d 100644 --- a/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TagListGenerator/RabbitMQV1Tags.g.cs +++ b/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TagListGenerator/RabbitMQV1Tags.g.cs @@ -46,7 +46,7 @@ public override void SetTag(string key, string? value) } } - public override void EnumerateTags(ref TProcessor processor) + public override void EnumerateTags(ref TProcessor processor, bool openTelemetrySemanticsEnabled) { if (PeerService is not null) { @@ -58,7 +58,7 @@ public override void EnumerateTags(ref TProcessor processor) processor.Process(new TagItem("_dd.peer.service.source", PeerServiceSource, PeerServiceSourceBytes)); } - base.EnumerateTags(ref processor); + base.EnumerateTags(ref processor, openTelemetrySemanticsEnabled); } protected override void WriteAdditionalTags(System.Text.StringBuilder sb) diff --git a/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TagListGenerator/RedisTags.g.cs b/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TagListGenerator/RedisTags.g.cs index e812be841d36..db7ecc3c7fd6 100644 --- a/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TagListGenerator/RedisTags.g.cs +++ b/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TagListGenerator/RedisTags.g.cs @@ -70,7 +70,7 @@ public override void SetTag(string key, string? value) } } - public override void EnumerateTags(ref TProcessor processor) + public override void EnumerateTags(ref TProcessor processor, bool openTelemetrySemanticsEnabled) { if (SpanKind is not null) { @@ -97,7 +97,7 @@ public override void EnumerateTags(ref TProcessor processor) processor.Process(new TagItem("out.port", Port, PortBytes)); } - base.EnumerateTags(ref processor); + base.EnumerateTags(ref processor, openTelemetrySemanticsEnabled); } protected override void WriteAdditionalTags(System.Text.StringBuilder sb) diff --git a/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TagListGenerator/RedisV1Tags.g.cs b/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TagListGenerator/RedisV1Tags.g.cs index 11317f7a92c1..69f39339e993 100644 --- a/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TagListGenerator/RedisV1Tags.g.cs +++ b/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TagListGenerator/RedisV1Tags.g.cs @@ -46,7 +46,7 @@ public override void SetTag(string key, string? value) } } - public override void EnumerateTags(ref TProcessor processor) + public override void EnumerateTags(ref TProcessor processor, bool openTelemetrySemanticsEnabled) { if (PeerService is not null) { @@ -58,7 +58,7 @@ public override void EnumerateTags(ref TProcessor processor) processor.Process(new TagItem("_dd.peer.service.source", PeerServiceSource, PeerServiceSourceBytes)); } - base.EnumerateTags(ref processor); + base.EnumerateTags(ref processor, openTelemetrySemanticsEnabled); } protected override void WriteAdditionalTags(System.Text.StringBuilder sb) diff --git a/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TagListGenerator/RemotingClientV1Tags.g.cs b/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TagListGenerator/RemotingClientV1Tags.g.cs index 2d4946deb561..7bf5882637b2 100644 --- a/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TagListGenerator/RemotingClientV1Tags.g.cs +++ b/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TagListGenerator/RemotingClientV1Tags.g.cs @@ -46,7 +46,7 @@ public override void SetTag(string key, string? value) } } - public override void EnumerateTags(ref TProcessor processor) + public override void EnumerateTags(ref TProcessor processor, bool openTelemetrySemanticsEnabled) { if (PeerService is not null) { @@ -58,7 +58,7 @@ public override void EnumerateTags(ref TProcessor processor) processor.Process(new TagItem("_dd.peer.service.source", PeerServiceSource, PeerServiceSourceBytes)); } - base.EnumerateTags(ref processor); + base.EnumerateTags(ref processor, openTelemetrySemanticsEnabled); } protected override void WriteAdditionalTags(System.Text.StringBuilder sb) diff --git a/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TagListGenerator/RemotingTags.g.cs b/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TagListGenerator/RemotingTags.g.cs index 33446c86d899..0677a2937661 100644 --- a/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TagListGenerator/RemotingTags.g.cs +++ b/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TagListGenerator/RemotingTags.g.cs @@ -63,7 +63,7 @@ public override void SetTag(string key, string? value) } } - public override void EnumerateTags(ref TProcessor processor) + public override void EnumerateTags(ref TProcessor processor, bool openTelemetrySemanticsEnabled) { if (SpanKind is not null) { @@ -90,7 +90,7 @@ public override void EnumerateTags(ref TProcessor processor) processor.Process(new TagItem("rpc.system", RpcSystem, RpcSystemBytes)); } - base.EnumerateTags(ref processor); + base.EnumerateTags(ref processor, openTelemetrySemanticsEnabled); } protected override void WriteAdditionalTags(System.Text.StringBuilder sb) diff --git a/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TagListGenerator/ServiceRemotingClientV1Tags.g.cs b/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TagListGenerator/ServiceRemotingClientV1Tags.g.cs index 1959416b21c7..41253e26f8c1 100644 --- a/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TagListGenerator/ServiceRemotingClientV1Tags.g.cs +++ b/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TagListGenerator/ServiceRemotingClientV1Tags.g.cs @@ -46,7 +46,7 @@ public override void SetTag(string key, string? value) } } - public override void EnumerateTags(ref TProcessor processor) + public override void EnumerateTags(ref TProcessor processor, bool openTelemetrySemanticsEnabled) { if (PeerService is not null) { @@ -58,7 +58,7 @@ public override void EnumerateTags(ref TProcessor processor) processor.Process(new TagItem("_dd.peer.service.source", PeerServiceSource, PeerServiceSourceBytes)); } - base.EnumerateTags(ref processor); + base.EnumerateTags(ref processor, openTelemetrySemanticsEnabled); } protected override void WriteAdditionalTags(System.Text.StringBuilder sb) diff --git a/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TagListGenerator/ServiceRemotingTags.g.cs b/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TagListGenerator/ServiceRemotingTags.g.cs index 75b61e70e456..47a2eeff6e2a 100644 --- a/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TagListGenerator/ServiceRemotingTags.g.cs +++ b/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TagListGenerator/ServiceRemotingTags.g.cs @@ -123,7 +123,7 @@ public override void SetTag(string key, string? value) } } - public override void EnumerateTags(ref TProcessor processor) + public override void EnumerateTags(ref TProcessor processor, bool openTelemetrySemanticsEnabled) { if (SpanKind is not null) { @@ -190,7 +190,7 @@ public override void EnumerateTags(ref TProcessor processor) processor.Process(new TagItem("service-fabric.service-remoting.invocation-id", RemotingInvocationId, RemotingInvocationIdBytes)); } - base.EnumerateTags(ref processor); + base.EnumerateTags(ref processor, openTelemetrySemanticsEnabled); } protected override void WriteAdditionalTags(System.Text.StringBuilder sb) diff --git a/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TagListGenerator/SqlTags.g.cs b/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TagListGenerator/SqlTags.g.cs index 5fa99249f899..fe5ad1d586fb 100644 --- a/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TagListGenerator/SqlTags.g.cs +++ b/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TagListGenerator/SqlTags.g.cs @@ -88,7 +88,7 @@ public override void SetTag(string key, string? value) } } - public override void EnumerateTags(ref TProcessor processor) + public override void EnumerateTags(ref TProcessor processor, bool openTelemetrySemanticsEnabled) { if (SpanKind is not null) { @@ -130,7 +130,7 @@ public override void EnumerateTags(ref TProcessor processor) processor.Process(new TagItem("_dd.propagated_hash", BaseHash, BaseHashBytes)); } - base.EnumerateTags(ref processor); + base.EnumerateTags(ref processor, openTelemetrySemanticsEnabled); } protected override void WriteAdditionalTags(System.Text.StringBuilder sb) diff --git a/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TagListGenerator/SqlV1Tags.g.cs b/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TagListGenerator/SqlV1Tags.g.cs index 9751da7af7a3..87d74064a129 100644 --- a/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TagListGenerator/SqlV1Tags.g.cs +++ b/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TagListGenerator/SqlV1Tags.g.cs @@ -46,7 +46,7 @@ public override void SetTag(string key, string? value) } } - public override void EnumerateTags(ref TProcessor processor) + public override void EnumerateTags(ref TProcessor processor, bool openTelemetrySemanticsEnabled) { if (PeerService is not null) { @@ -58,7 +58,7 @@ public override void EnumerateTags(ref TProcessor processor) processor.Process(new TagItem("_dd.peer.service.source", PeerServiceSource, PeerServiceSourceBytes)); } - base.EnumerateTags(ref processor); + base.EnumerateTags(ref processor, openTelemetrySemanticsEnabled); } protected override void WriteAdditionalTags(System.Text.StringBuilder sb) diff --git a/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TagListGenerator/TagAttribute.g.cs b/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TagListGenerator/TagAttribute.g.cs index 0020d1490683..d678d06ab096 100644 --- a/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TagListGenerator/TagAttribute.g.cs +++ b/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TagListGenerator/TagAttribute.g.cs @@ -27,6 +27,11 @@ public TagAttribute(string tagName) => /// Gets the name of the datadog tag the property corresponds to /// public string TagName { get; } + + /// + /// Gets or sets the OpenTelemetry semantic convention name that aliases . + /// + public string? OtelName { get; set; } } /// diff --git a/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TagListGenerator/TestModuleSpanTags.g.cs b/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TagListGenerator/TestModuleSpanTags.g.cs index 61d1c47ac52f..7809da282493 100644 --- a/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TagListGenerator/TestModuleSpanTags.g.cs +++ b/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TagListGenerator/TestModuleSpanTags.g.cs @@ -112,7 +112,7 @@ public override void SetTag(string key, string? value) } } - public override void EnumerateTags(ref TProcessor processor) + public override void EnumerateTags(ref TProcessor processor, bool openTelemetrySemanticsEnabled) { if (Type is not null) { @@ -169,7 +169,7 @@ public override void EnumerateTags(ref TProcessor processor) processor.Process(new TagItem("os.version", OSVersion, OSVersionBytes)); } - base.EnumerateTags(ref processor); + base.EnumerateTags(ref processor, openTelemetrySemanticsEnabled); } protected override void WriteAdditionalTags(System.Text.StringBuilder sb) diff --git a/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TagListGenerator/TestSessionSpanTags.g.cs b/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TagListGenerator/TestSessionSpanTags.g.cs index 13a5d04d49da..37b566d3f8d4 100644 --- a/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TagListGenerator/TestSessionSpanTags.g.cs +++ b/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TagListGenerator/TestSessionSpanTags.g.cs @@ -350,7 +350,7 @@ public override void SetTag(string key, string? value) } } - public override void EnumerateTags(ref TProcessor processor) + public override void EnumerateTags(ref TProcessor processor, bool openTelemetrySemanticsEnabled) { if (Command is not null) { @@ -577,7 +577,7 @@ public override void EnumerateTags(ref TProcessor processor) processor.Process(new TagItem("git.commit.head.message", GitHeadCommitMessage, GitHeadCommitMessageBytes)); } - base.EnumerateTags(ref processor); + base.EnumerateTags(ref processor, openTelemetrySemanticsEnabled); } protected override void WriteAdditionalTags(System.Text.StringBuilder sb) diff --git a/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TagListGenerator/TestSpanTags.g.cs b/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TagListGenerator/TestSpanTags.g.cs index 97ef1c5c81a8..1e08fb410a81 100644 --- a/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TagListGenerator/TestSpanTags.g.cs +++ b/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TagListGenerator/TestSpanTags.g.cs @@ -234,7 +234,7 @@ public override void SetTag(string key, string? value) } } - public override void EnumerateTags(ref TProcessor processor) + public override void EnumerateTags(ref TProcessor processor, bool openTelemetrySemanticsEnabled) { if (Name is not null) { @@ -376,7 +376,7 @@ public override void EnumerateTags(ref TProcessor processor) processor.Process(new TagItem("_dd.library_capabilities.test_management.attempt_to_fix", CapabilitiesTestManagementAttemptToFix, CapabilitiesTestManagementAttemptToFixBytes)); } - base.EnumerateTags(ref processor); + base.EnumerateTags(ref processor, openTelemetrySemanticsEnabled); } protected override void WriteAdditionalTags(System.Text.StringBuilder sb) diff --git a/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TagListGenerator/TestSuiteSpanTags.g.cs b/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TagListGenerator/TestSuiteSpanTags.g.cs index b1d3aa6eaf67..14eccb5e013b 100644 --- a/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TagListGenerator/TestSuiteSpanTags.g.cs +++ b/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TagListGenerator/TestSuiteSpanTags.g.cs @@ -53,7 +53,7 @@ public override void SetTag(string key, string? value) } } - public override void EnumerateTags(ref TProcessor processor) + public override void EnumerateTags(ref TProcessor processor, bool openTelemetrySemanticsEnabled) { if (Suite is not null) { @@ -70,7 +70,7 @@ public override void EnumerateTags(ref TProcessor processor) processor.Process(new TagItem("test.codeowners", CodeOwners, CodeOwnersBytes)); } - base.EnumerateTags(ref processor); + base.EnumerateTags(ref processor, openTelemetrySemanticsEnabled); } protected override void WriteAdditionalTags(System.Text.StringBuilder sb) diff --git a/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TagListGenerator/TraceAnnotationTags.g.cs b/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TagListGenerator/TraceAnnotationTags.g.cs index 67f69361144c..984350404d53 100644 --- a/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TagListGenerator/TraceAnnotationTags.g.cs +++ b/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TagListGenerator/TraceAnnotationTags.g.cs @@ -39,14 +39,14 @@ public override void SetTag(string key, string? value) } } - public override void EnumerateTags(ref TProcessor processor) + public override void EnumerateTags(ref TProcessor processor, bool openTelemetrySemanticsEnabled) { if (InstrumentationName is not null) { processor.Process(new TagItem("component", InstrumentationName, InstrumentationNameBytes)); } - base.EnumerateTags(ref processor); + base.EnumerateTags(ref processor, openTelemetrySemanticsEnabled); } protected override void WriteAdditionalTags(System.Text.StringBuilder sb) diff --git a/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TagListGenerator/WcfTags.g.cs b/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TagListGenerator/WcfTags.g.cs index b8d5c42bb58a..f0125208b5bc 100644 --- a/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TagListGenerator/WcfTags.g.cs +++ b/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TagListGenerator/WcfTags.g.cs @@ -39,14 +39,14 @@ public override void SetTag(string key, string? value) } } - public override void EnumerateTags(ref TProcessor processor) + public override void EnumerateTags(ref TProcessor processor, bool openTelemetrySemanticsEnabled) { if (InstrumentationName is not null) { processor.Process(new TagItem("component", InstrumentationName, InstrumentationNameBytes)); } - base.EnumerateTags(ref processor); + base.EnumerateTags(ref processor, openTelemetrySemanticsEnabled); } protected override void WriteAdditionalTags(System.Text.StringBuilder sb) diff --git a/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TagListGenerator/WebTags.g.cs b/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TagListGenerator/WebTags.g.cs index 0d0922839d45..8e05ef465dde 100644 --- a/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TagListGenerator/WebTags.g.cs +++ b/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TagListGenerator/WebTags.g.cs @@ -32,6 +32,9 @@ partial class WebTags // HttpStatusCodeBytes = MessagePack.Serialize("http.status_code"); private static ReadOnlySpan HttpStatusCodeBytes => [176, 104, 116, 116, 112, 46, 115, 116, 97, 116, 117, 115, 95, 99, 111, 100, 101]; + // HttpStatusCodeOtelBytes = MessagePack.Serialize("http.response.status_code"); + private static ReadOnlySpan HttpStatusCodeOtelBytes => [185, 104, 116, 116, 112, 46, 114, 101, 115, 112, 111, 110, 115, 101, 46, 115, 116, 97, 116, 117, 115, 95, 99, 111, 100, 101]; + // NetworkClientIpBytes = MessagePack.Serialize("network.client.ip"); private static ReadOnlySpan NetworkClientIpBytes => [177, 110, 101, 116, 119, 111, 114, 107, 46, 99, 108, 105, 101, 110, 116, 46, 105, 112]; @@ -48,6 +51,7 @@ partial class WebTags "http.request.headers.host" => HttpRequestHeadersHost, "http.url" => HttpUrl, "http.status_code" => HttpStatusCode is null ? null : Datadog.Trace.Util.IntStringCache.ToInvariantString(HttpStatusCode.Value), + "http.response.status_code" => HttpStatusCode is null ? null : Datadog.Trace.Util.IntStringCache.ToInvariantString(HttpStatusCode.Value), "network.client.ip" => NetworkClientIp, "http.client_ip" => HttpClientIp, _ => base.GetTag(key), @@ -70,7 +74,8 @@ public override void SetTag(string key, string? value) case "http.url": HttpUrl = value; break; - case "http.status_code": + case "http.status_code": + case "http.response.status_code": if (int.TryParse(value, System.Globalization.NumberStyles.Integer, System.Globalization.CultureInfo.InvariantCulture, out var parsedHttpStatusCode)) { HttpStatusCode = parsedHttpStatusCode; @@ -96,7 +101,7 @@ public override void SetTag(string key, string? value) } } - public override void EnumerateTags(ref TProcessor processor) + public override void EnumerateTags(ref TProcessor processor, bool openTelemetrySemanticsEnabled) { if (SpanKind is not null) { @@ -125,7 +130,14 @@ public override void EnumerateTags(ref TProcessor processor) if (HttpStatusCode is not null) { - processor.Process(new TagItem("http.status_code", HttpStatusCode.Value, HttpStatusCodeBytes)); + if (openTelemetrySemanticsEnabled) + { + processor.Process(new TagItem("http.response.status_code", HttpStatusCode.Value, HttpStatusCodeOtelBytes)); + } + else + { + processor.Process(new TagItem("http.status_code", HttpStatusCode.Value, HttpStatusCodeBytes)); + } } if (NetworkClientIp is not null) @@ -138,7 +150,7 @@ public override void EnumerateTags(ref TProcessor processor) processor.Process(new TagItem("http.client_ip", HttpClientIp, HttpClientIpBytes)); } - base.EnumerateTags(ref processor); + base.EnumerateTags(ref processor, openTelemetrySemanticsEnabled); } protected override void WriteAdditionalTags(System.Text.StringBuilder sb) diff --git a/tracer/src/Datadog.Trace/OpenTelemetry/OtlpMapper.cs b/tracer/src/Datadog.Trace/OpenTelemetry/OtlpMapper.cs index bca915285028..e5fea109a4bb 100644 --- a/tracer/src/Datadog.Trace/OpenTelemetry/OtlpMapper.cs +++ b/tracer/src/Datadog.Trace/OpenTelemetry/OtlpMapper.cs @@ -87,20 +87,20 @@ public static bool IsHandledResourceAttribute(string tagKey) tagKey.Equals("service.version", StringComparison.OrdinalIgnoreCase); } - public static int EmitAttributesFromSpan(Action writeKeyValue, in SpanModel spanModel, int limit, bool openTelemetrySemanticsEnabled) + public static int EmitAttributesFromSpan(Action writeKeyValue, in SpanModel spanModel, int limit) { return EmitAttributesFromSpan( in spanModel, limit, - openTelemetrySemanticsEnabled, ref writeKeyValue, static (ref Action action, KeyValue keyValue) => action(keyValue)); } - public static int EmitAttributesFromSpan(in SpanModel spanModel, int limit, bool openTelemetrySemanticsEnabled, ref TState state, KeyValueWriter writeKeyValue) + public static int EmitAttributesFromSpan(in SpanModel spanModel, int limit, ref TState state, KeyValueWriter writeKeyValue) { int count = 0; int droppedAttributesCount = 0; + bool openTelemetrySemanticsEnabled = spanModel.Span.OpenTelemetrySemanticsEnabled; if (!openTelemetrySemanticsEnabled) { @@ -251,7 +251,7 @@ public static int EmitAttributesFromSpan(in SpanModel spanModel, int lim } var tagWriter = new TagWriter(state, writeKeyValue, tagProcessors, count, limit, openTelemetrySemanticsEnabled); - spanModel.Span.Tags.EnumerateTags(ref tagWriter); + spanModel.Span.Tags.EnumerateTags(ref tagWriter, openTelemetrySemanticsEnabled); count = tagWriter.Count; droppedAttributesCount += tagWriter.DroppedCount; state = tagWriter.State; diff --git a/tracer/src/Datadog.Trace/OpenTelemetry/Traces/OtlpTracesJsonSerializer.cs b/tracer/src/Datadog.Trace/OpenTelemetry/Traces/OtlpTracesJsonSerializer.cs index b3194249338f..d16a163f0e23 100644 --- a/tracer/src/Datadog.Trace/OpenTelemetry/Traces/OtlpTracesJsonSerializer.cs +++ b/tracer/src/Datadog.Trace/OpenTelemetry/Traces/OtlpTracesJsonSerializer.cs @@ -33,13 +33,6 @@ internal sealed class OtlpTracesJsonSerializer : ISpanBufferSerializer internal const int AttributePerEventCountLimit = 128; internal const int AttributePerLinkCountLimit = 128; - private readonly bool _openTelemetrySemanticsEnabled; - - public OtlpTracesJsonSerializer(bool openTelemetrySemanticsEnabled) - { - _openTelemetrySemanticsEnabled = openTelemetrySemanticsEnabled; - } - // Cache several strings required for encoding OTLP JSON private static ReadOnlySpan ClosingTracesBytes => "]}]}]}"u8; @@ -525,7 +518,7 @@ static Action WriteKeyValue(JsonTextWriter writer) int droppedAttributesCount = 0; writer.WritePropertyName("attributes"); writer.WriteStartArray(); - droppedAttributesCount = OtlpMapper.EmitAttributesFromSpan(WriteKeyValue(writer), in spanModel, SpanAttributeCountLimit, _openTelemetrySemanticsEnabled); + droppedAttributesCount = OtlpMapper.EmitAttributesFromSpan(WriteKeyValue(writer), in spanModel, SpanAttributeCountLimit); writer.WriteEndArray(); // droppedAttributesCount (optional) diff --git a/tracer/src/Datadog.Trace/OpenTelemetry/Traces/OtlpTracesProtobufSerializer.cs b/tracer/src/Datadog.Trace/OpenTelemetry/Traces/OtlpTracesProtobufSerializer.cs index 52e69fbb96a7..ef53a777d110 100644 --- a/tracer/src/Datadog.Trace/OpenTelemetry/Traces/OtlpTracesProtobufSerializer.cs +++ b/tracer/src/Datadog.Trace/OpenTelemetry/Traces/OtlpTracesProtobufSerializer.cs @@ -46,8 +46,6 @@ internal sealed class OtlpTracesProtobufSerializer : ISpanBufferSerializer // by the 7th doubling to maintain efficient allocation without frequent resizing. private const int InitialBufferSize = 750000; - private readonly bool _openTelemetrySemanticsEnabled; - // Absolute positions of the length placeholders. INVARIANT: these are offsets // into the caller's eventual `_buffer` (the destination), NOT into the temporary // serialization buffer (`bytes` in SerializeSpans). This works because @@ -58,11 +56,6 @@ internal sealed class OtlpTracesProtobufSerializer : ISpanBufferSerializer private int _resourceSpansLengthPos = -1; private int _scopeSpansLengthPos = -1; - public OtlpTracesProtobufSerializer(bool openTelemetrySemanticsEnabled) - { - _openTelemetrySemanticsEnabled = openTelemetrySemanticsEnabled; - } - public int HeaderSize => 0; public void WriteHeader(ref byte[] bytes, int offset, int traceCount) @@ -481,7 +474,6 @@ private int WriteSpan(byte[] bytes, int writePosition, in SpanModel spanModel) int droppedAttributes = OtlpMapper.EmitAttributesFromSpan( in spanModel, SpanAttributeCountLimit, - _openTelemetrySemanticsEnabled, ref attributesState, static (ref WriteAttributesState s, KeyValue kv) => s.Position = WriteKeyValueAttribute(s.Bytes, s.Position, Span_Attributes, kv)); diff --git a/tracer/src/Datadog.Trace/PlatformHelpers/AspNetCoreHttpRequestHandler.cs b/tracer/src/Datadog.Trace/PlatformHelpers/AspNetCoreHttpRequestHandler.cs index 69cf22e1d90d..0d2e3a8a4969 100644 --- a/tracer/src/Datadog.Trace/PlatformHelpers/AspNetCoreHttpRequestHandler.cs +++ b/tracer/src/Datadog.Trace/PlatformHelpers/AspNetCoreHttpRequestHandler.cs @@ -396,6 +396,7 @@ static bool IsKnownWebTag(string tagName) => || tagName == Tags.HttpMethod || tagName == Tags.HttpUrl || tagName == Tags.HttpStatusCode + || tagName == Tags.HttpResponseStatusCode || tagName == Tags.NetworkClientIp || tagName == Tags.HttpClientIp; } diff --git a/tracer/src/Datadog.Trace/Processors/NormalizerTraceProcessor.cs b/tracer/src/Datadog.Trace/Processors/NormalizerTraceProcessor.cs index a3ad4915b9e6..507bdabedb5c 100644 --- a/tracer/src/Datadog.Trace/Processors/NormalizerTraceProcessor.cs +++ b/tracer/src/Datadog.Trace/Processors/NormalizerTraceProcessor.cs @@ -138,7 +138,7 @@ public Span Process(Span span) } else { - var rawHttpStatusCode = span.GetTag(Tags.HttpStatusCode); + var rawHttpStatusCode = span.GetHttpStatusCodeString(); if (!string.IsNullOrEmpty(rawHttpStatusCode) && !TraceUtil.IsValidStatusCode(span.GetHttpStatusCode())) { Log.Debug("Fixing malformed trace. HTTP status code is invalid (reason:invalid_http_status_code), dropping invalid http.status_code={InvalidStatusCode}: {Span}", rawHttpStatusCode, span); diff --git a/tracer/src/Datadog.Trace/Tagging/AwsSdkTags.cs b/tracer/src/Datadog.Trace/Tagging/AwsSdkTags.cs index f6504d87e2ad..587ebf43ecd4 100644 --- a/tracer/src/Datadog.Trace/Tagging/AwsSdkTags.cs +++ b/tracer/src/Datadog.Trace/Tagging/AwsSdkTags.cs @@ -51,7 +51,7 @@ internal abstract partial class AwsSdkTags : InstrumentationTags, IHasStatusCode [Tag(Trace.Tags.HttpUrl)] public string? HttpUrl { get; set; } - [Tag(Trace.Tags.HttpStatusCode)] + [Tag(Trace.Tags.HttpStatusCode, OtelName = Trace.Tags.HttpResponseStatusCode)] public int? HttpStatusCode { get; set; } } } diff --git a/tracer/src/Datadog.Trace/Tagging/HttpTags.cs b/tracer/src/Datadog.Trace/Tagging/HttpTags.cs index b1e6ed6e2e78..095304bee5ca 100644 --- a/tracer/src/Datadog.Trace/Tagging/HttpTags.cs +++ b/tracer/src/Datadog.Trace/Tagging/HttpTags.cs @@ -27,7 +27,7 @@ internal partial class HttpTags : InstrumentationTags, IHasStatusCode [Tag(HttpClientHandlerTypeKey)] public string HttpClientHandlerType { get; set; } - [Tag(Trace.Tags.HttpStatusCode)] + [Tag(Trace.Tags.HttpStatusCode, OtelName = Trace.Tags.HttpResponseStatusCode)] public int? HttpStatusCode { get; set; } [Tag(Trace.Tags.OutHost)] diff --git a/tracer/src/Datadog.Trace/Tagging/ITags.cs b/tracer/src/Datadog.Trace/Tagging/ITags.cs index 8d10346d2643..f2855175f2d1 100644 --- a/tracer/src/Datadog.Trace/Tagging/ITags.cs +++ b/tracer/src/Datadog.Trace/Tagging/ITags.cs @@ -11,7 +11,7 @@ internal interface ITags void SetTag(string key, string value); - void EnumerateTags(ref TProcessor processor) + void EnumerateTags(ref TProcessor processor, bool openTelemetrySemanticsEnabled) where TProcessor : struct, IItemProcessor, IItemProcessor; double? GetMetric(string key); diff --git a/tracer/src/Datadog.Trace/Tagging/InferredProxyTags.cs b/tracer/src/Datadog.Trace/Tagging/InferredProxyTags.cs index 3b9973e06b1d..e052b2eaee77 100644 --- a/tracer/src/Datadog.Trace/Tagging/InferredProxyTags.cs +++ b/tracer/src/Datadog.Trace/Tagging/InferredProxyTags.cs @@ -26,7 +26,7 @@ internal sealed partial class InferredProxyTags : InstrumentationTags, IHasStatu [Tag(Trace.Tags.HttpRoute)] public string? HttpRoute { get; set; } - [Tag(Trace.Tags.HttpStatusCode)] + [Tag(Trace.Tags.HttpStatusCode, OtelName = Trace.Tags.HttpResponseStatusCode)] public int? HttpStatusCode { get; set; } [Tag(Trace.Tags.ProxyStage)] diff --git a/tracer/src/Datadog.Trace/Tagging/TagsList.cs b/tracer/src/Datadog.Trace/Tagging/TagsList.cs index a26fe7209916..bb4ef551dff2 100644 --- a/tracer/src/Datadog.Trace/Tagging/TagsList.cs +++ b/tracer/src/Datadog.Trace/Tagging/TagsList.cs @@ -208,7 +208,7 @@ private static void SetTagNoLock(List> tags, KeyVal return null; } - public virtual void EnumerateTags(ref TProcessor processor) + public virtual void EnumerateTags(ref TProcessor processor, bool openTelemetrySemanticsEnabled) where TProcessor : struct, IItemProcessor, IItemProcessor { var tags = Volatile.Read(ref _tags); diff --git a/tracer/src/Datadog.Trace/Tagging/WebTags.cs b/tracer/src/Datadog.Trace/Tagging/WebTags.cs index 727e4f76e033..0a797a9747c0 100644 --- a/tracer/src/Datadog.Trace/Tagging/WebTags.cs +++ b/tracer/src/Datadog.Trace/Tagging/WebTags.cs @@ -24,7 +24,7 @@ internal partial class WebTags : InstrumentationTags, IHasStatusCode [Tag(Trace.Tags.HttpUrl)] public string HttpUrl { get; set; } - [Tag(Trace.Tags.HttpStatusCode)] + [Tag(Trace.Tags.HttpStatusCode, OtelName = Trace.Tags.HttpResponseStatusCode)] public int? HttpStatusCode { get; set; } [Tag(Trace.Tags.NetworkClientIp)] diff --git a/tracer/src/Datadog.Trace/Tags.cs b/tracer/src/Datadog.Trace/Tags.cs index 43afcf639cd3..36425e4372ca 100644 --- a/tracer/src/Datadog.Trace/Tags.cs +++ b/tracer/src/Datadog.Trace/Tags.cs @@ -71,6 +71,11 @@ public static partial class Tags /// public const string HttpStatusCode = "http.status_code"; + /// + /// The OpenTelemetry semantic convention status code of an HTTP response + /// + public const string HttpResponseStatusCode = "http.response.status_code"; + /// /// The error message of an exception /// diff --git a/tracer/test/Datadog.Trace.ClrProfiler.IntegrationTests/HttpMessageHandlerTests.cs b/tracer/test/Datadog.Trace.ClrProfiler.IntegrationTests/HttpMessageHandlerTests.cs index 9e97cf94ec38..9ecacca23d65 100644 --- a/tracer/test/Datadog.Trace.ClrProfiler.IntegrationTests/HttpMessageHandlerTests.cs +++ b/tracer/test/Datadog.Trace.ClrProfiler.IntegrationTests/HttpMessageHandlerTests.cs @@ -106,7 +106,7 @@ public async Task HttpClient_SubmitsTraces( foreach (var span in spans) { - if (span.GetHttpStatusCode() == "502") + if (span.GetHttpStatusCodeString() == "502") { span.Error.Should().Be(1); } diff --git a/tracer/test/Datadog.Trace.IntegrationTests/StatsTests.cs b/tracer/test/Datadog.Trace.IntegrationTests/StatsTests.cs index 7d411447b7f6..66a2e62905e4 100644 --- a/tracer/test/Datadog.Trace.IntegrationTests/StatsTests.cs +++ b/tracer/test/Datadog.Trace.IntegrationTests/StatsTests.cs @@ -156,7 +156,7 @@ public async Task SendsStatsWithProcessing_Normalizer() durationStartBuckets.Single().Hits.Should().Be(3); durationStartBuckets.Single().Duration.Should().Be(beforeY2KDuration.ToNanoseconds()); - var durationStartSpans = spans.Where(s => s.Name == "default_operation" && s.Resource == "default-resource" && s.Service == "default-service" && s.GetTag(Tags.Origin) != "synthetics" && s.Type == "default-type" && s.GetHttpStatusCode() == "200"); + var durationStartSpans = spans.Where(s => s.Name == "default_operation" && s.Resource == "default-resource" && s.Service == "default-service" && s.GetTag(Tags.Origin) != "synthetics" && s.Type == "default-type" && s.GetHttpStatusCodeString() == "200"); durationStartSpans.Should().HaveCount(3); durationStartSpans.Sum(s => s.Duration).Should().Be(beforeY2KDuration.ToNanoseconds()); @@ -171,8 +171,8 @@ public async Task SendsStatsWithProcessing_Normalizer() stats.Where(s => s.HttpStatusCode == 0).Sum(s => s.Hits).Should().Be(3, "http.status_code key is deleted if it's an invalid numeric value smaller than 100 or bigger than 600"); stats.Where(s => s.HttpStatusCode != 0).Should().OnlyContain(s => s.HttpStatusCode == 200); - spans.Where(s => s.GetTag(Tags.HttpStatusCode) is null).Should().HaveCount(3, "http.status_code key is deleted if it's an invalid numeric value smaller than 100 or bigger than 600"); - spans.Where(s => s.GetTag(Tags.HttpStatusCode) is not null).Should().OnlyContain(s => s.GetTag(Tags.HttpStatusCode) == "200"); + spans.Where(s => s.GetHttpStatusCodeString() is null).Should().HaveCount(3, "http.status_code key is deleted if it's an invalid numeric value smaller than 100 or bigger than 600"); + spans.Where(s => s.GetHttpStatusCodeString() is not null).Should().OnlyContain(s => s.GetHttpStatusCodeString() == "200"); Span CreateDefaultSpan(string serviceName = null, string operationName = null, string resourceName = null, string type = null, string httpStatusCode = null, bool finishOnClose = true) { diff --git a/tracer/test/Datadog.Trace.Security.Unit.Tests/IAST/ExecutedTelemetryHelperTests.cs b/tracer/test/Datadog.Trace.Security.Unit.Tests/IAST/ExecutedTelemetryHelperTests.cs index 6009050d78d1..dfb089646950 100644 --- a/tracer/test/Datadog.Trace.Security.Unit.Tests/IAST/ExecutedTelemetryHelperTests.cs +++ b/tracer/test/Datadog.Trace.Security.Unit.Tests/IAST/ExecutedTelemetryHelperTests.cs @@ -70,7 +70,7 @@ void ITags.EnumerateMetrics(ref TProcessor processor) throw new NotImplementedException(); } - void ITags.EnumerateTags(ref TProcessor processor) + void ITags.EnumerateTags(ref TProcessor processor, bool openTelemetrySemanticsEnabled) { throw new NotImplementedException(); } diff --git a/tracer/test/Datadog.Trace.SourceGenerators.Tests/TagsListGeneratorTests.cs b/tracer/test/Datadog.Trace.SourceGenerators.Tests/TagsListGeneratorTests.cs index d2a38b49564b..6c54acc80595 100644 --- a/tracer/test/Datadog.Trace.SourceGenerators.Tests/TagsListGeneratorTests.cs +++ b/tracer/test/Datadog.Trace.SourceGenerators.Tests/TagsListGeneratorTests.cs @@ -58,14 +58,14 @@ public override void SetTag(string key, string? value) } } - public override void EnumerateTags(ref TProcessor processor) + public override void EnumerateTags(ref TProcessor processor, bool openTelemetrySemanticsEnabled) { if (Id is not null) { processor.Process(new TagItem(""TestId"", Id, IdBytes)); } - base.EnumerateTags(ref processor); + base.EnumerateTags(ref processor, openTelemetrySemanticsEnabled); } protected override void WriteAdditionalTags(System.Text.StringBuilder sb) @@ -88,6 +88,196 @@ protected override void WriteAdditionalTags(System.Text.StringBuilder sb) Assert.Empty(diagnostics); } + [Fact] + public void CanGenerateTagsListWithOTelAlias() + { + const string input = @"using Datadog.Trace.SourceGenerators; +namespace MyTests.TestListNameSpace +{ + public class TestList + { + [Tag(""dd.k"", OtelName = ""otel.k"")] + public string Id { get; set; } + } +}"; + const string expected = Constants.FileHeader + @"using Datadog.Trace.Processors; +using Datadog.Trace.Tagging; +using System; + +namespace MyTests.TestListNameSpace +{ + partial class TestList + { + // IdBytes = MessagePack.Serialize(""dd.k""); + private static ReadOnlySpan IdBytes => [164, 100, 100, 46, 107]; + + // IdOtelBytes = MessagePack.Serialize(""otel.k""); + private static ReadOnlySpan IdOtelBytes => [166, 111, 116, 101, 108, 46, 107]; + + public override string? GetTag(string key) + { + return key switch + { + ""dd.k"" => Id, + ""otel.k"" => Id, + _ => base.GetTag(key), + }; + } + + public override void SetTag(string key, string? value) + { + switch(key) + { + case ""dd.k"": + case ""otel.k"": + Id = value; + break; + default: + base.SetTag(key, value); + break; + } + } + + public override void EnumerateTags(ref TProcessor processor, bool openTelemetrySemanticsEnabled) + { + if (Id is not null) + { + if (openTelemetrySemanticsEnabled) + { + processor.Process(new TagItem(""otel.k"", Id, IdOtelBytes)); + } + else + { + processor.Process(new TagItem(""dd.k"", Id, IdBytes)); + } + } + + base.EnumerateTags(ref processor, openTelemetrySemanticsEnabled); + } + + protected override void WriteAdditionalTags(System.Text.StringBuilder sb) + { + if (Id is not null) + { + sb.Append(""dd.k (tag):"") + .Append(Id) + .Append(','); + } + + base.WriteAdditionalTags(sb); + } + } +} +"; + + var (diagnostics, output) = TestHelpers.GetGeneratedOutput(input); + Assert.Equal(expected, output); + Assert.Empty(diagnostics); + } + + [Fact] + public void CanGenerateTagsListWithOTelAliasForNullableIntTag() + { + // language=csharp + const string input = + """ + using Datadog.Trace.SourceGenerators; + namespace MyTests.TestListNameSpace + { + public class TestList + { + [Tag("dd.status", OtelName = "otel.status")] + public int? StatusCode { get; set; } + } + } + """; + // language=csharp + const string expected = Constants.FileHeader + + """ + using Datadog.Trace.Processors; + using Datadog.Trace.Tagging; + using System; + + namespace MyTests.TestListNameSpace + { + partial class TestList + { + // StatusCodeBytes = MessagePack.Serialize("dd.status"); + private static ReadOnlySpan StatusCodeBytes => [169, 100, 100, 46, 115, 116, 97, 116, 117, 115]; + + // StatusCodeOtelBytes = MessagePack.Serialize("otel.status"); + private static ReadOnlySpan StatusCodeOtelBytes => [171, 111, 116, 101, 108, 46, 115, 116, 97, 116, 117, 115]; + + public override string? GetTag(string key) + { + return key switch + { + "dd.status" => StatusCode is null ? null : Datadog.Trace.Util.IntStringCache.ToInvariantString(StatusCode.Value), + "otel.status" => StatusCode is null ? null : Datadog.Trace.Util.IntStringCache.ToInvariantString(StatusCode.Value), + _ => base.GetTag(key), + }; + } + + public override void SetTag(string key, string? value) + { + switch(key) + { + case "dd.status": + case "otel.status": + if (int.TryParse(value, System.Globalization.NumberStyles.Integer, System.Globalization.CultureInfo.InvariantCulture, out var parsedStatusCode)) + { + StatusCode = parsedStatusCode; + } + else + { + StatusCode = null; + } + + break; + default: + base.SetTag(key, value); + break; + } + } + + public override void EnumerateTags(ref TProcessor processor, bool openTelemetrySemanticsEnabled) + { + if (StatusCode is not null) + { + if (openTelemetrySemanticsEnabled) + { + processor.Process(new TagItem("otel.status", StatusCode.Value, StatusCodeOtelBytes)); + } + else + { + processor.Process(new TagItem("dd.status", StatusCode.Value, StatusCodeBytes)); + } + } + + base.EnumerateTags(ref processor, openTelemetrySemanticsEnabled); + } + + protected override void WriteAdditionalTags(System.Text.StringBuilder sb) + { + if (StatusCode is not null) + { + sb.Append("dd.status (tag):") + .Append(StatusCode.Value.ToString(System.Globalization.CultureInfo.InvariantCulture)) + .Append(','); + } + + base.WriteAdditionalTags(sb); + } + } + } + + """; + + var (diagnostics, output) = TestHelpers.GetGeneratedOutput(input); + Assert.Equal(expected, output); + Assert.Empty(diagnostics); + } + [Fact] public void CanGenerateTagsListWithNullableIntTag() { @@ -148,14 +338,14 @@ public override void SetTag(string key, string? value) } } - public override void EnumerateTags(ref TProcessor processor) + public override void EnumerateTags(ref TProcessor processor, bool openTelemetrySemanticsEnabled) { if (Id is not null) { processor.Process(new TagItem("TestPort", Id.Value, IdBytes)); } - base.EnumerateTags(ref processor); + base.EnumerateTags(ref processor, openTelemetrySemanticsEnabled); } protected override void WriteAdditionalTags(System.Text.StringBuilder sb) @@ -242,7 +432,7 @@ public override void SetTag(string key, string? value) } } - public override void EnumerateTags(ref TProcessor processor) + public override void EnumerateTags(ref TProcessor processor, bool openTelemetrySemanticsEnabled) { if (Name is not null) { @@ -254,7 +444,7 @@ public override void EnumerateTags(ref TProcessor processor) processor.Process(new TagItem(""PortTag"", Port.Value, PortBytes)); } - base.EnumerateTags(ref processor); + base.EnumerateTags(ref processor, openTelemetrySemanticsEnabled); } protected override void WriteAdditionalTags(System.Text.StringBuilder sb) @@ -414,7 +604,7 @@ public override void SetTag(string key, string? value) } } - public override void EnumerateTags(ref TProcessor processor) + public override void EnumerateTags(ref TProcessor processor, bool openTelemetrySemanticsEnabled) { if (Id is not null) { @@ -426,7 +616,7 @@ public override void EnumerateTags(ref TProcessor processor) processor.Process(new TagItem(""NameTag"", Name, NameBytes)); } - base.EnumerateTags(ref processor); + base.EnumerateTags(ref processor, openTelemetrySemanticsEnabled); } protected override void WriteAdditionalTags(System.Text.StringBuilder sb) @@ -614,7 +804,7 @@ public override void SetTag(string key, string? value) } } - public override void EnumerateTags(ref TProcessor processor) + public override void EnumerateTags(ref TProcessor processor, bool openTelemetrySemanticsEnabled) { if (Id is not null) { @@ -631,7 +821,7 @@ public override void EnumerateTags(ref TProcessor processor) processor.Process(new TagItem(""NameTag"", Name, NameBytes)); } - base.EnumerateTags(ref processor); + base.EnumerateTags(ref processor, openTelemetrySemanticsEnabled); } protected override void WriteAdditionalTags(System.Text.StringBuilder sb) diff --git a/tracer/test/Datadog.Trace.TestHelpers/MockSpanExtensions.cs b/tracer/test/Datadog.Trace.TestHelpers/MockSpanExtensions.cs index 283f1a10ae22..5162af7b8cc2 100644 --- a/tracer/test/Datadog.Trace.TestHelpers/MockSpanExtensions.cs +++ b/tracer/test/Datadog.Trace.TestHelpers/MockSpanExtensions.cs @@ -19,7 +19,7 @@ public static class MockSpanExtensions /// /// The span to read the status code from. /// The HTTP status code, or null if the span doesn't have one. - public static string GetHttpStatusCode(this MockSpan span) - => span.GetTag(Tags.HttpStatusCode); + public static string GetHttpStatusCodeString(this MockSpan span) + => span.GetTag(Tags.HttpStatusCode) ?? span.GetTag(Tags.HttpResponseStatusCode); } } diff --git a/tracer/test/Datadog.Trace.Tests/Agent/AgentWriterTests.cs b/tracer/test/Datadog.Trace.Tests/Agent/AgentWriterTests.cs index e27fe629f707..2c9816c29395 100644 --- a/tracer/test/Datadog.Trace.Tests/Agent/AgentWriterTests.cs +++ b/tracer/test/Datadog.Trace.Tests/Agent/AgentWriterTests.cs @@ -514,7 +514,7 @@ public async Task AddsTraceKeepRateMetricToRootSpan() // Make the buffer size big enough for a single trace var api = new MockApi(); - var agent = new AgentWriter(api, statsAggregator: null, statsd: TestStatsdManager.NoOp, calculator, automaticFlush: false, (sizeOfTrace * 2) + SpanBufferMessagePackSerializer.HeaderSizeConst - 1, batchInterval: 100, apmTracingEnabled: true, initialTracerMetricsEnabled: false, openTelemetrySemanticsEnabled: false); + var agent = new AgentWriter(api, statsAggregator: null, statsd: TestStatsdManager.NoOp, calculator, automaticFlush: false, (sizeOfTrace * 2) + SpanBufferMessagePackSerializer.HeaderSizeConst - 1, batchInterval: 100, apmTracingEnabled: true, initialTracerMetricsEnabled: false); // Fill both buffers agent.WriteTrace(spans); diff --git a/tracer/test/Datadog.Trace.Tests/Agent/MessagePack/SpanMessagePackFormatterTests.cs b/tracer/test/Datadog.Trace.Tests/Agent/MessagePack/SpanMessagePackFormatterTests.cs index 8da189d3f930..4e9b2b59db06 100644 --- a/tracer/test/Datadog.Trace.Tests/Agent/MessagePack/SpanMessagePackFormatterTests.cs +++ b/tracer/test/Datadog.Trace.Tests/Agent/MessagePack/SpanMessagePackFormatterTests.cs @@ -90,7 +90,7 @@ public void SerializeSpans() actual.ParentId.Should().Be(expected.Context.ParentId); var tagsProcessor = new TagsProcessor(actual.Tags); - expected.Tags.EnumerateTags(ref tagsProcessor); + expected.Tags.EnumerateTags(ref tagsProcessor, expected.OpenTelemetrySemanticsEnabled); // runtime-id and language are added during serialization if (actual.ParentId == null) diff --git a/tracer/test/Datadog.Trace.Tests/OpenTelemetry/OtlpMapperTests.cs b/tracer/test/Datadog.Trace.Tests/OpenTelemetry/OtlpMapperTests.cs index a5dc3f0c2c3b..2e17773e663a 100644 --- a/tracer/test/Datadog.Trace.Tests/OpenTelemetry/OtlpMapperTests.cs +++ b/tracer/test/Datadog.Trace.Tests/OpenTelemetry/OtlpMapperTests.cs @@ -162,7 +162,7 @@ public void EmitAttributesFromSpan_EmitsDatadogAttributes() var span = CreateSpan(); var attributes = new List(); - OtlpMapper.EmitAttributesFromSpan(kv => attributes.Add(kv), CreateSpanModel(span), limit: 128, openTelemetrySemanticsEnabled: false); + OtlpMapper.EmitAttributesFromSpan(kv => attributes.Add(kv), CreateSpanModel(span), limit: 128); attributes.Should().Contain(kv => kv.Key == "service.name" && (string)kv.Value! == span.ServiceName); attributes.Should().Contain(kv => kv.Key == "resource.name" && (string)kv.Value! == span.ResourceName); @@ -173,10 +173,10 @@ public void EmitAttributesFromSpan_EmitsDatadogAttributes() [Fact] public void EmitAttributesFromSpan_DoesNotEmitDatadogAttributes_WhenOpenTelemetrySemanticsEnabled() { - var span = CreateSpan(); + var span = CreateSpan(openTelemetrySemanticsEnabled: true); var attributes = new List(); - OtlpMapper.EmitAttributesFromSpan(kv => attributes.Add(kv), CreateSpanModel(span), limit: 128, openTelemetrySemanticsEnabled: true); + OtlpMapper.EmitAttributesFromSpan(kv => attributes.Add(kv), CreateSpanModel(span), limit: 128); attributes.Should().NotContain(kv => kv.Key == "service.name"); attributes.Should().NotContain(kv => kv.Key == "resource.name"); @@ -192,7 +192,7 @@ public void EmitAttributesFromSpan_EmitsStringTags() span.SetTag("http.url", "https://example.com"); var attributes = new List(); - OtlpMapper.EmitAttributesFromSpan(kv => attributes.Add(kv), CreateSpanModel(span), limit: 128, openTelemetrySemanticsEnabled: false); + OtlpMapper.EmitAttributesFromSpan(kv => attributes.Add(kv), CreateSpanModel(span), limit: 128); attributes.Should().Contain(kv => kv.Key == "http.method" && (string)kv.Value! == "GET"); attributes.Should().Contain(kv => kv.Key == "http.url" && (string)kv.Value! == "https://example.com"); @@ -205,7 +205,7 @@ public void EmitAttributesFromSpan_EmitsDoubleMetrics() span.SetMetric("my.metric", 42.5); var attributes = new List(); - OtlpMapper.EmitAttributesFromSpan(kv => attributes.Add(kv), CreateSpanModel(span), limit: 128, openTelemetrySemanticsEnabled: false); + OtlpMapper.EmitAttributesFromSpan(kv => attributes.Add(kv), CreateSpanModel(span), limit: 128); attributes.Should().Contain(kv => kv.Key == "my.metric" && (double)kv.Value! == 42.5); } @@ -217,7 +217,7 @@ public void EmitAttributesFromSpan_EmitsLastParentId_WhenSet() span.Context.LastParentId = "0000000000000042"; var attributes = new List(); - OtlpMapper.EmitAttributesFromSpan(kv => attributes.Add(kv), CreateSpanModel(span), limit: 128, openTelemetrySemanticsEnabled: false); + OtlpMapper.EmitAttributesFromSpan(kv => attributes.Add(kv), CreateSpanModel(span), limit: 128); attributes.Should().Contain(kv => kv.Key == Tags.LastParentId && (string)kv.Value! == "0000000000000042"); } @@ -228,7 +228,7 @@ public void EmitAttributesFromSpan_OmitsLastParentId_WhenEmpty() var span = CreateSpan(); var attributes = new List(); - OtlpMapper.EmitAttributesFromSpan(kv => attributes.Add(kv), CreateSpanModel(span), limit: 128, openTelemetrySemanticsEnabled: false); + OtlpMapper.EmitAttributesFromSpan(kv => attributes.Add(kv), CreateSpanModel(span), limit: 128); attributes.Should().NotContain(kv => kv.Key == Tags.LastParentId); } @@ -239,7 +239,7 @@ public void EmitAttributesFromSpan_EmitsRuntimeId_ForTopLevelSpan() var span = CreateSpan(); var attributes = new List(); - OtlpMapper.EmitAttributesFromSpan(kv => attributes.Add(kv), CreateSpanModel(span), limit: 128, openTelemetrySemanticsEnabled: false); + OtlpMapper.EmitAttributesFromSpan(kv => attributes.Add(kv), CreateSpanModel(span), limit: 128); attributes.Should().Contain(kv => kv.Key == Tags.RuntimeId && (string)kv.Value! == Tracer.RuntimeId); } @@ -254,7 +254,7 @@ public void EmitAttributesFromSpan_EmitsOrigin_WhenPresent() var spanModel = traceChunk.GetSpanModel(0); var attributes = new List(); - OtlpMapper.EmitAttributesFromSpan(kv => attributes.Add(kv), spanModel, limit: 128, openTelemetrySemanticsEnabled: false); + OtlpMapper.EmitAttributesFromSpan(kv => attributes.Add(kv), spanModel, limit: 128); attributes.Should().Contain(kv => kv.Key == Tags.Origin && (string)kv.Value! == "synthetics"); } @@ -265,7 +265,7 @@ public void EmitAttributesFromSpan_OmitsOrigin_WhenNull() var span = CreateSpan(); var attributes = new List(); - OtlpMapper.EmitAttributesFromSpan(kv => attributes.Add(kv), CreateSpanModel(span), limit: 128, openTelemetrySemanticsEnabled: false); + OtlpMapper.EmitAttributesFromSpan(kv => attributes.Add(kv), CreateSpanModel(span), limit: 128); attributes.Should().NotContain(kv => kv.Key == Tags.Origin); } @@ -277,7 +277,7 @@ public void EmitAttributesFromSpan_ReturnsZeroDropped_WhenUnderLimit() span.SetTag("single.tag", "value"); var attributes = new List(); - int droppedCount = OtlpMapper.EmitAttributesFromSpan(kv => attributes.Add(kv), CreateSpanModel(span), limit: 128, openTelemetrySemanticsEnabled: false); + int droppedCount = OtlpMapper.EmitAttributesFromSpan(kv => attributes.Add(kv), CreateSpanModel(span), limit: 128); droppedCount.Should().Be(0); } @@ -292,7 +292,7 @@ public void EmitAttributesFromSpan_ReturnsDroppedCount_WhenLimitExceeded() } var attributes = new List(); - int droppedCount = OtlpMapper.EmitAttributesFromSpan(kv => attributes.Add(kv), CreateSpanModel(span), limit: 3, openTelemetrySemanticsEnabled: false); + int droppedCount = OtlpMapper.EmitAttributesFromSpan(kv => attributes.Add(kv), CreateSpanModel(span), limit: 3); attributes.Should().HaveCount(3); droppedCount.Should().BeGreaterThanOrEqualTo(7); @@ -308,7 +308,7 @@ public void EmitAttributesFromSpan_DropsTelemetrySdkAttributes() span.SetTag("other.tag", "should-be-kept"); var attributes = new List(); - OtlpMapper.EmitAttributesFromSpan(kv => attributes.Add(kv), CreateSpanModel(span), limit: 128, openTelemetrySemanticsEnabled: false); + OtlpMapper.EmitAttributesFromSpan(kv => attributes.Add(kv), CreateSpanModel(span), limit: 128); // Ensures that telemetry SDK attributes (added by OpenTelemetry) are dropped attributes.Should().NotContain(kv => kv.Key == "telemetry.sdk.name"); @@ -330,11 +330,11 @@ public void EmitAttributesFromSpan_DropsTelemetrySdkAttributes() [InlineData("http-client-handler-type")] public void EmitAttributesFromSpan_DoesNotEmitOtelSemanticsRestrictedTag_WhenOpenTelemetrySemanticsEnabled(string tagKey) { - var span = CreateSpan(); + var span = CreateSpan(openTelemetrySemanticsEnabled: true); span.SetTag(tagKey, "some-value"); var attributes = new List(); - OtlpMapper.EmitAttributesFromSpan(kv => attributes.Add(kv), CreateSpanModel(span), limit: 128, openTelemetrySemanticsEnabled: true); + OtlpMapper.EmitAttributesFromSpan(kv => attributes.Add(kv), CreateSpanModel(span), limit: 128); attributes.Should().NotContain(kv => kv.Key == tagKey, because: $"'{tagKey}' must not be emitted as a span attribute when OTel trace compatibility is enabled"); } @@ -359,7 +359,7 @@ public void EmitAttributesFromSpan_EmitsOtelSemanticsRestrictedTag_WhenOpenTelem span.SetTag(tagKey, "some-value"); var attributes = new List(); - OtlpMapper.EmitAttributesFromSpan(kv => attributes.Add(kv), CreateSpanModel(span), limit: 128, openTelemetrySemanticsEnabled: false); + OtlpMapper.EmitAttributesFromSpan(kv => attributes.Add(kv), CreateSpanModel(span), limit: 128); attributes.Should().Contain(kv => kv.Key == tagKey, because: $"'{tagKey}' should be emitted as a span attribute when OTel trace compatibility is disabled"); } @@ -387,7 +387,7 @@ public async Task EmitAttributesFromSpan_EmitsFeatureFlagEnrichment_OnLocalRoot( spanModel.IsLocalRoot.Should().BeTrue(); var attributes = new List(); - OtlpMapper.EmitAttributesFromSpan(kv => attributes.Add(kv), spanModel, limit: 128, openTelemetrySemanticsEnabled: false); + OtlpMapper.EmitAttributesFromSpan(kv => attributes.Add(kv), spanModel, limit: 128); attributes.Should().Contain(kv => kv.Key == SpanEnrichmentState.TagFlagsEnc && (string)kv.Value! == "ZA=="); attributes.Should().Contain(kv => kv.Key == SpanEnrichmentState.TagSubjectsEnc); @@ -402,7 +402,11 @@ public async Task EmitAttributesFromSpan_ReservesEnrichmentSlots_WhenSpanTagsExc // path has no such limit, so dropping it here would diverge). Emitting ffe_* before the span // tags reserves their slots. OTEL-semantics mode skips the service/operation/etc. block, so // with no origin/last_parent set the three ffe_* attributes are emitted first, deterministically. - var settings = TracerSettings.Create(new() { { ConfigurationKeys.FeatureFlags.SpanEnrichmentEnabled, "true" } }); + var settings = TracerSettings.Create(new() + { + { ConfigurationKeys.FeatureFlags.SpanEnrichmentEnabled, "true" }, + { ConfigurationKeys.OpenTelemetry.OtelSemanticsEnabled, "true" }, + }); await using var tracer = TracerHelper.Create(settings, new Mock().Object, new Mock().Object); var scope = (Scope)tracer.StartActive("root-op"); @@ -422,7 +426,7 @@ public async Task EmitAttributesFromSpan_ReservesEnrichmentSlots_WhenSpanTagsExc var attributes = new List(); // limit 3 = exactly the three ffe_* slots; every customer tag must then spill. - var dropped = OtlpMapper.EmitAttributesFromSpan(kv => attributes.Add(kv), spanModel, limit: 3, openTelemetrySemanticsEnabled: true); + var dropped = OtlpMapper.EmitAttributesFromSpan(kv => attributes.Add(kv), spanModel, limit: 3); attributes.Should().Contain(kv => kv.Key == SpanEnrichmentState.TagFlagsEnc); attributes.Should().Contain(kv => kv.Key == SpanEnrichmentState.TagSubjectsEnc); @@ -431,12 +435,12 @@ public async Task EmitAttributesFromSpan_ReservesEnrichmentSlots_WhenSpanTagsExc dropped.Should().BeGreaterOrEqualTo(5, "the five customer tags all spill once the three enrichment slots are taken"); } - private static Span CreateSpan(string? origin = null) + private static Span CreateSpan(string? origin = null, bool openTelemetrySemanticsEnabled = false) { var traceContext = new TraceContext(new StubDatadogTracer()); traceContext.Origin = origin; var spanContext = new SpanContext(parent: null, traceContext, serviceName: null); - return new Span(spanContext, DateTimeOffset.UtcNow); + return new Span(spanContext, DateTimeOffset.UtcNow, tags: null, openTelemetrySemanticsEnabled: openTelemetrySemanticsEnabled); } private static SpanModel CreateSpanModel(Span span) diff --git a/tracer/test/Datadog.Trace.Tests/OpenTelemetry/Traces/OtlpTracesProtobufSerializerTests.cs b/tracer/test/Datadog.Trace.Tests/OpenTelemetry/Traces/OtlpTracesProtobufSerializerTests.cs index 95f3ffd27f1a..7a6cadd5c9c2 100644 --- a/tracer/test/Datadog.Trace.Tests/OpenTelemetry/Traces/OtlpTracesProtobufSerializerTests.cs +++ b/tracer/test/Datadog.Trace.Tests/OpenTelemetry/Traces/OtlpTracesProtobufSerializerTests.cs @@ -26,7 +26,7 @@ public class OtlpTracesProtobufSerializerTests [Fact] public void FinishBody_ReturnsZero_WhenNothingSerialized() { - var serializer = new OtlpTracesProtobufSerializer(openTelemetrySemanticsEnabled: false); + var serializer = new OtlpTracesProtobufSerializer(); var buffer = new byte[1024]; serializer.FinishBody(ref buffer, offset: 0, maxSize: buffer.Length).Should().Be(0); @@ -35,7 +35,7 @@ public void FinishBody_ReturnsZero_WhenNothingSerialized() [Fact] public void SerializeSpans_ReturnsZero_WhenSpansExceedMaxSize() { - var serializer = new OtlpTracesProtobufSerializer(openTelemetrySemanticsEnabled: false); + var serializer = new OtlpTracesProtobufSerializer(); var buffer = new byte[8 * 1024]; // Pick a maxSize tiny enough that any real span overflows. @@ -48,7 +48,7 @@ public void SerializeSpans_ReturnsZero_WhenSpansExceedMaxSize() [Fact] public void SerializeSpans_ReturnsZero_WhenWritesExceedBufferCapacity() { - var serializer = new OtlpTracesProtobufSerializer(openTelemetrySemanticsEnabled: false); + var serializer = new OtlpTracesProtobufSerializer(); // Buffer is smaller than a single span's serialized form, so per-field writes // will throw IndexOutOfRangeException mid-serialization. The catch must roll @@ -71,7 +71,7 @@ public void SerializeSpans_TwoChunks_ProducesSingleResourceSpansWithBothSpans() var chunk1 = CreateChunk(CreateSpan(resourceName: "resource_name1")); var chunk2 = CreateChunk(CreateSpan(resourceName: "resource_name2")); - var serializer = new OtlpTracesProtobufSerializer(openTelemetrySemanticsEnabled: false); + var serializer = new OtlpTracesProtobufSerializer(); var buffer = new byte[16 * 1024]; var firstLength = serializer.SerializeSpans(ref buffer, 0, chunk1, spanBufferOffset: 0, maxSize: buffer.Length); @@ -538,7 +538,7 @@ private static AnyValue SerializeEventAttribute(string key, object? value) private static OtlpSpan SerializeAndParse(TraceChunkModel chunk) { - var serializer = new OtlpTracesProtobufSerializer(openTelemetrySemanticsEnabled: false); + var serializer = new OtlpTracesProtobufSerializer(); var buffer = new byte[64 * 1024]; var written = serializer.SerializeSpans(ref buffer, 0, chunk, spanBufferOffset: 0, maxSize: buffer.Length); serializer.FinishBody(ref buffer, written, maxSize: buffer.Length); diff --git a/tracer/test/Datadog.Trace.Tests/Tagging/TagsListTests.cs b/tracer/test/Datadog.Trace.Tests/Tagging/TagsListTests.cs index 5c96c1489479..4357163523f3 100644 --- a/tracer/test/Datadog.Trace.Tests/Tagging/TagsListTests.cs +++ b/tracer/test/Datadog.Trace.Tests/Tagging/TagsListTests.cs @@ -144,6 +144,52 @@ public void SetTag_WithUnparseableValue_RemovesIntBackedTag(Type tagsType) GetTagsSnapshot(tags).Select(x => x.Key).Should().NotContain(Tags.HttpStatusCode); } + [Fact] + public void StronglyTypedStatusCodeAliasesCanBeReadAndWrittenByEitherName() + { + var tags = new WebTags(); + + tags.SetTag(Tags.HttpStatusCode, "200"); + tags.GetTag(Tags.HttpResponseStatusCode).Should().Be("200"); + + tags.SetTag(Tags.HttpResponseStatusCode, "201"); + tags.GetTag(Tags.HttpStatusCode).Should().Be("201"); + } + + [Theory] + [InlineData(false, Tags.HttpStatusCode)] + [InlineData(true, Tags.HttpResponseStatusCode)] + public void StronglyTypedStatusCodeAliasEnumeratesSelectedName(bool openTelemetrySemanticsEnabled, string expectedKey) + { + var tags = new WebTags { HttpStatusCode = 202 }; + + var snapshot = GetTagsSnapshot(tags, openTelemetrySemanticsEnabled); + + snapshot + .Where(x => x.Key == Tags.HttpStatusCode || x.Key == Tags.HttpResponseStatusCode) + .Should() + .ContainSingle() + .Which + .Should() + .Be(new KeyValuePair(expectedKey, "202")); + } + + [Fact] + public void StronglyTypedStatusCodeAliasCanBeClearedByEitherName() + { + var tags = new WebTags(); + + tags.SetTag(Tags.HttpStatusCode, "203"); + tags.SetTag(Tags.HttpResponseStatusCode, null); + tags.GetTag(Tags.HttpStatusCode).Should().BeNull(); + tags.GetTag(Tags.HttpResponseStatusCode).Should().BeNull(); + + tags.SetTag(Tags.HttpResponseStatusCode, "204"); + tags.SetTag(Tags.HttpStatusCode, null); + tags.GetTag(Tags.HttpStatusCode).Should().BeNull(); + tags.GetTag(Tags.HttpResponseStatusCode).Should().BeNull(); + } + [Fact] public void GetTag_GetMetric_ReturnUpdatedValues() { @@ -465,11 +511,11 @@ private static void ValidateProperties(Type type, Action se } } - private static List> GetTagsSnapshot(TagsList tags) + private static List> GetTagsSnapshot(TagsList tags, bool openTelemetrySemanticsEnabled = false) { var result = new List>(); var processor = new TagCollectorProcessor(result); - tags.EnumerateTags(ref processor); + tags.EnumerateTags(ref processor, openTelemetrySemanticsEnabled); return result; }