component and service tags

pablomartinezbernardo · pablomartinezbernardo · commit 729efe51e19a · 2025-09-01T17:24:03.000+02:00
diff --git a/tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/Azure/ServiceBus/ServiceBusReceiverReceiveMessagesAsyncIntegration.cs b/tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/Azure/ServiceBus/ServiceBusReceiverReceiveMessagesAsyncIntegration.cs
@@ -152,8 +152,15 @@ private static ContextExtractionResult ExtractContextsFromMessages(Tracer tracer
         tags.MessagingDestinationName = entityPath;
         tags.MessagingOperation = "receive";
         tags.MessagingSystem = "servicebus";
-
-        var scope = tracer.StartActiveInternal(OperationName, parent: parentContext, links: spanLinks, tags: tags);
+        tags.InstrumentationName = "AzureServiceBus";
+
+        string serviceName = tracer.CurrentTraceSettings.Schema.Messaging.GetServiceName("azureservicebus");
+        var scope = tracer.StartActiveInternal(
+            OperationName,
+            parent: parentContext,
+            links: spanLinks,
+            tags: tags,
+            serviceName: serviceName);
         var span = scope.Span;
 
         span.Type = SpanTypes.Queue;
diff --git a/tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/Azure/ServiceBus/ServiceBusSenderSendMessagesAsyncIntegration.cs b/tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/Azure/ServiceBus/ServiceBusSenderSendMessagesAsyncIntegration.cs
@@ -48,8 +48,13 @@ internal static CallTargetState OnMethodBegin<TTarget>(TTarget instance, ref IEn
         tags.MessagingDestinationName = entityPath;
         tags.MessagingOperation = "send";
         tags.MessagingSystem = "servicebus";
+        tags.InstrumentationName = "AzureServiceBus";
 
-        var scope = tracer.StartActiveInternal(OperationName, tags: tags);
+        string serviceName = tracer.CurrentTraceSettings.Schema.Messaging.GetServiceName("azureservicebus");
+        var scope = tracer.StartActiveInternal(
+            OperationName,
+            tags: tags,
+            serviceName: serviceName);
         var span = scope.Span;
 
         span.Type = SpanTypes.Queue;
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
@@ -18,6 +18,8 @@ partial class AzureServiceBusTags
         private static ReadOnlySpan<byte> AnalyticsSampleRateBytes => new byte[] { 173, 95, 100, 100, 49, 46, 115, 114, 46, 101, 97, 117, 115, 114 };
         // MessageQueueTimeMsBytes = MessagePack.Serialize("message.queue_time_ms");
         private static ReadOnlySpan<byte> MessageQueueTimeMsBytes => new byte[] { 181, 109, 101, 115, 115, 97, 103, 101, 46, 113, 117, 101, 117, 101, 95, 116, 105, 109, 101, 95, 109, 115 };
+        // InstrumentationNameBytes = MessagePack.Serialize("component");
+        private static ReadOnlySpan<byte> InstrumentationNameBytes => new byte[] { 169, 99, 111, 109, 112, 111, 110, 101, 110, 116 };
         // MessagingSourceNameBytes = MessagePack.Serialize("messaging.source.name");
         private static ReadOnlySpan<byte> MessagingSourceNameBytes => new byte[] { 181, 109, 101, 115, 115, 97, 103, 105, 110, 103, 46, 115, 111, 117, 114, 99, 101, 46, 110, 97, 109, 101 };
         // MessagingDestinationNameBytes = MessagePack.Serialize("messaging.destination.name");
@@ -33,6 +35,7 @@ partial class AzureServiceBusTags
         {
             return key switch
             {
+                "component" => InstrumentationName,
                 "messaging.source.name" => MessagingSourceName,
                 "messaging.destination.name" => MessagingDestinationName,
                 "message_bus.destination" => LegacyMessageBusDestination,
@@ -46,6 +49,9 @@ public override void SetTag(string key, string value)
         {
             switch(key)
             {
+                case "component": 
+                    InstrumentationName = value;
+                    break;
                 case "messaging.source.name": 
                     MessagingSourceName = value;
                     break;
@@ -69,6 +75,11 @@ public override void SetTag(string key, string value)
 
         public override void EnumerateTags<TProcessor>(ref TProcessor processor)
         {
+            if (InstrumentationName is not null)
+            {
+                processor.Process(new TagItem<string>("component", InstrumentationName, InstrumentationNameBytes));
+            }
+
             if (MessagingSourceName is not null)
             {
                 processor.Process(new TagItem<string>("messaging.source.name", MessagingSourceName, MessagingSourceNameBytes));
@@ -99,6 +110,13 @@ public override void EnumerateTags<TProcessor>(ref TProcessor processor)
 
         protected override void WriteAdditionalTags(System.Text.StringBuilder sb)
         {
+            if (InstrumentationName is not null)
+            {
+                sb.Append("component (tag):")
+                  .Append(InstrumentationName)
+                  .Append(',');
+            }
+
             if (MessagingSourceName is not null)
             {
                 sb.Append("messaging.source.name (tag):")
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
@@ -18,6 +18,8 @@ partial class AzureServiceBusTags
         private static ReadOnlySpan<byte> AnalyticsSampleRateBytes => new byte[] { 173, 95, 100, 100, 49, 46, 115, 114, 46, 101, 97, 117, 115, 114 };
         // MessageQueueTimeMsBytes = MessagePack.Serialize("message.queue_time_ms");
         private static ReadOnlySpan<byte> MessageQueueTimeMsBytes => new byte[] { 181, 109, 101, 115, 115, 97, 103, 101, 46, 113, 117, 101, 117, 101, 95, 116, 105, 109, 101, 95, 109, 115 };
+        // InstrumentationNameBytes = MessagePack.Serialize("component");
+        private static ReadOnlySpan<byte> InstrumentationNameBytes => new byte[] { 169, 99, 111, 109, 112, 111, 110, 101, 110, 116 };
         // MessagingSourceNameBytes = MessagePack.Serialize("messaging.source.name");
         private static ReadOnlySpan<byte> MessagingSourceNameBytes => new byte[] { 181, 109, 101, 115, 115, 97, 103, 105, 110, 103, 46, 115, 111, 117, 114, 99, 101, 46, 110, 97, 109, 101 };
         // MessagingDestinationNameBytes = MessagePack.Serialize("messaging.destination.name");
@@ -33,6 +35,7 @@ partial class AzureServiceBusTags
         {
             return key switch
             {
+                "component" => InstrumentationName,
                 "messaging.source.name" => MessagingSourceName,
                 "messaging.destination.name" => MessagingDestinationName,
                 "message_bus.destination" => LegacyMessageBusDestination,
@@ -46,6 +49,9 @@ public override void SetTag(string key, string value)
         {
             switch(key)
             {
+                case "component": 
+                    InstrumentationName = value;
+                    break;
                 case "messaging.source.name": 
                     MessagingSourceName = value;
                     break;
@@ -69,6 +75,11 @@ public override void SetTag(string key, string value)
 
         public override void EnumerateTags<TProcessor>(ref TProcessor processor)
         {
+            if (InstrumentationName is not null)
+            {
+                processor.Process(new TagItem<string>("component", InstrumentationName, InstrumentationNameBytes));
+            }
+
             if (MessagingSourceName is not null)
             {
                 processor.Process(new TagItem<string>("messaging.source.name", MessagingSourceName, MessagingSourceNameBytes));
@@ -99,6 +110,13 @@ public override void EnumerateTags<TProcessor>(ref TProcessor processor)
 
         protected override void WriteAdditionalTags(System.Text.StringBuilder sb)
         {
+            if (InstrumentationName is not null)
+            {
+                sb.Append("component (tag):")
+                  .Append(InstrumentationName)
+                  .Append(',');
+            }
+
             if (MessagingSourceName is not null)
             {
                 sb.Append("messaging.source.name (tag):")
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
@@ -18,6 +18,8 @@ partial class AzureServiceBusTags
         private static ReadOnlySpan<byte> AnalyticsSampleRateBytes => new byte[] { 173, 95, 100, 100, 49, 46, 115, 114, 46, 101, 97, 117, 115, 114 };
         // MessageQueueTimeMsBytes = MessagePack.Serialize("message.queue_time_ms");
         private static ReadOnlySpan<byte> MessageQueueTimeMsBytes => new byte[] { 181, 109, 101, 115, 115, 97, 103, 101, 46, 113, 117, 101, 117, 101, 95, 116, 105, 109, 101, 95, 109, 115 };
+        // InstrumentationNameBytes = MessagePack.Serialize("component");
+        private static ReadOnlySpan<byte> InstrumentationNameBytes => new byte[] { 169, 99, 111, 109, 112, 111, 110, 101, 110, 116 };
         // MessagingSourceNameBytes = MessagePack.Serialize("messaging.source.name");
         private static ReadOnlySpan<byte> MessagingSourceNameBytes => new byte[] { 181, 109, 101, 115, 115, 97, 103, 105, 110, 103, 46, 115, 111, 117, 114, 99, 101, 46, 110, 97, 109, 101 };
         // MessagingDestinationNameBytes = MessagePack.Serialize("messaging.destination.name");
@@ -33,6 +35,7 @@ partial class AzureServiceBusTags
         {
             return key switch
             {
+                "component" => InstrumentationName,
                 "messaging.source.name" => MessagingSourceName,
                 "messaging.destination.name" => MessagingDestinationName,
                 "message_bus.destination" => LegacyMessageBusDestination,
@@ -46,6 +49,9 @@ public override void SetTag(string key, string value)
         {
             switch(key)
             {
+                case "component": 
+                    InstrumentationName = value;
+                    break;
                 case "messaging.source.name": 
                     MessagingSourceName = value;
                     break;
@@ -69,6 +75,11 @@ public override void SetTag(string key, string value)
 
         public override void EnumerateTags<TProcessor>(ref TProcessor processor)
         {
+            if (InstrumentationName is not null)
+            {
+                processor.Process(new TagItem<string>("component", InstrumentationName, InstrumentationNameBytes));
+            }
+
             if (MessagingSourceName is not null)
             {
                 processor.Process(new TagItem<string>("messaging.source.name", MessagingSourceName, MessagingSourceNameBytes));
@@ -99,6 +110,13 @@ public override void EnumerateTags<TProcessor>(ref TProcessor processor)
 
         protected override void WriteAdditionalTags(System.Text.StringBuilder sb)
         {
+            if (InstrumentationName is not null)
+            {
+                sb.Append("component (tag):")
+                  .Append(InstrumentationName)
+                  .Append(',');
+            }
+
             if (MessagingSourceName is not null)
             {
                 sb.Append("messaging.source.name (tag):")
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
@@ -18,6 +18,8 @@ partial class AzureServiceBusTags
         private static ReadOnlySpan<byte> AnalyticsSampleRateBytes => new byte[] { 173, 95, 100, 100, 49, 46, 115, 114, 46, 101, 97, 117, 115, 114 };
         // MessageQueueTimeMsBytes = MessagePack.Serialize("message.queue_time_ms");
         private static ReadOnlySpan<byte> MessageQueueTimeMsBytes => new byte[] { 181, 109, 101, 115, 115, 97, 103, 101, 46, 113, 117, 101, 117, 101, 95, 116, 105, 109, 101, 95, 109, 115 };
+        // InstrumentationNameBytes = MessagePack.Serialize("component");
+        private static ReadOnlySpan<byte> InstrumentationNameBytes => new byte[] { 169, 99, 111, 109, 112, 111, 110, 101, 110, 116 };
         // MessagingSourceNameBytes = MessagePack.Serialize("messaging.source.name");
         private static ReadOnlySpan<byte> MessagingSourceNameBytes => new byte[] { 181, 109, 101, 115, 115, 97, 103, 105, 110, 103, 46, 115, 111, 117, 114, 99, 101, 46, 110, 97, 109, 101 };
         // MessagingDestinationNameBytes = MessagePack.Serialize("messaging.destination.name");
@@ -33,6 +35,7 @@ partial class AzureServiceBusTags
         {
             return key switch
             {
+                "component" => InstrumentationName,
                 "messaging.source.name" => MessagingSourceName,
                 "messaging.destination.name" => MessagingDestinationName,
                 "message_bus.destination" => LegacyMessageBusDestination,
@@ -46,6 +49,9 @@ public override void SetTag(string key, string value)
         {
             switch(key)
             {
+                case "component": 
+                    InstrumentationName = value;
+                    break;
                 case "messaging.source.name": 
                     MessagingSourceName = value;
                     break;
@@ -69,6 +75,11 @@ public override void SetTag(string key, string value)
 
         public override void EnumerateTags<TProcessor>(ref TProcessor processor)
         {
+            if (InstrumentationName is not null)
+            {
+                processor.Process(new TagItem<string>("component", InstrumentationName, InstrumentationNameBytes));
+            }
+
             if (MessagingSourceName is not null)
             {
                 processor.Process(new TagItem<string>("messaging.source.name", MessagingSourceName, MessagingSourceNameBytes));
@@ -99,6 +110,13 @@ public override void EnumerateTags<TProcessor>(ref TProcessor processor)
 
         protected override void WriteAdditionalTags(System.Text.StringBuilder sb)
         {
+            if (InstrumentationName is not null)
+            {
+                sb.Append("component (tag):")
+                  .Append(InstrumentationName)
+                  .Append(',');
+            }
+
             if (MessagingSourceName is not null)
             {
                 sb.Append("messaging.source.name (tag):")
diff --git a/tracer/src/Datadog.Trace/Tagging/AzureServiceBusTags.cs b/tracer/src/Datadog.Trace/Tagging/AzureServiceBusTags.cs
@@ -17,6 +17,9 @@ internal partial class AzureServiceBusTags : OpenTelemetryTags
     {
         private string _spanKind;
 
+        [Tag(Trace.Tags.InstrumentationName)]
+        public string InstrumentationName { get; set; }
+
         [Metric(Trace.Tags.Analytics)]
         public double? AnalyticsSampleRate { get; set; }
 
diff --git a/tracer/test/Datadog.Trace.ClrProfiler.IntegrationTests/Azure/AzureServiceBusAPMTests.cs b/tracer/test/Datadog.Trace.ClrProfiler.IntegrationTests/Azure/AzureServiceBusAPMTests.cs
@@ -49,7 +49,6 @@ public async Task TestSendMessagesAsyncIntegration(string packageVersion, string
         {
             SetEnvironmentVariable("DD_TRACE_SPAN_ATTRIBUTE_SCHEMA", metadataSchemaVersion);
 
-            using (var telemetry = this.ConfigureTelemetry())
             using (var agent = EnvironmentHelper.GetMockAgent())
             using (await RunSampleAndWaitForExit(agent, packageVersion: packageVersion))
             {
@@ -86,7 +85,6 @@ public async Task TestReceiveMessagesAsyncIntegration(string packageVersion, str
         {
             SetEnvironmentVariable("DD_TRACE_SPAN_ATTRIBUTE_SCHEMA", metadataSchemaVersion);
 
-            using (var telemetry = this.ConfigureTelemetry())
             using (var agent = EnvironmentHelper.GetMockAgent())
             using (await RunSampleAndWaitForExit(agent, packageVersion: packageVersion))
             {
diff --git a/tracer/test/Datadog.Trace.TestHelpers/SpanMetadataV0Rules.cs b/tracer/test/Datadog.Trace.TestHelpers/SpanMetadataV0Rules.cs
@@ -316,7 +316,7 @@ public static Result IsAzureServiceBusInboundAPMV0(this MockSpan span, ISet<stri
                 .IsOptional("net.peer.name")
                 .IsOptional("peer.address")
                 .IsOptional("server.address")
-                .IfPresentMatches("component", "servicebus")
+                .Matches("component", "AzureServiceBus")
                 .IfPresentMatches("kind", "consumer")
                 .IsOptional("_dd.base_service")
                 .Matches("span.kind", "consumer"));
@@ -356,7 +356,7 @@ public static Result IsAzureServiceBusOutboundAPMV0(this MockSpan span, ISet<str
                 .IsOptional("net.peer.name")
                 .IsOptional("peer.address")
                 .IsOptional("server.address")
-                .IfPresentMatches("component", "servicebus")
+                .Matches("component", "AzureServiceBus")
                 .IfPresentMatches("kind", "producer")
                 .IsOptional("_dd.base_service")
                 .Matches("span.kind", "producer"));
diff --git a/tracer/test/Datadog.Trace.TestHelpers/SpanMetadataV1Rules.cs b/tracer/test/Datadog.Trace.TestHelpers/SpanMetadataV1Rules.cs
@@ -517,7 +517,7 @@ public static Result IsAzureServiceBusInboundAPMV1(this MockSpan span, ISet<stri
                 .IsOptional("net.peer.name")
                 .IsOptional("peer.address")
                 .IsOptional("server.address")
-                .IfPresentMatches("component", "servicebus")
+                .Matches("component", "AzureServiceBus")
                 .IfPresentMatches("kind", "consumer")
                 .IsOptional("_dd.base_service")
                 .Matches("span.kind", "consumer"));
@@ -563,7 +563,7 @@ public static Result IsAzureServiceBusOutboundAPMV1(this MockSpan span, ISet<str
                 .IsPresent("peer.service")
                 .IsOptional("peer.service.remapped_from")
                 .MatchesOneOf("_dd.peer.service.source", "messaging.destination.name", "message_bus.destination", "peer.service")
-                .IfPresentMatches("component", "servicebus")
+                .Matches("component", "AzureServiceBus")
                 .IfPresentMatches("kind", "producer")
                 .IsOptional("_dd.base_service")
                 .Matches("span.kind", "producer"));

Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,9 @@ internal partial class AzureServiceBusTags : OpenTelemetryTags`
`17`	`17`	`{`
`18`	`18`	`private string _spanKind;`
`19`	`19`
	`20`	`+ [Tag(Trace.Tags.InstrumentationName)]`
	`21`	`+ public string InstrumentationName { get; set; }`
	`22`	`+`
`20`	`23`	`[Metric(Trace.Tags.Analytics)]`
`21`	`24`	`public double? AnalyticsSampleRate { get; set; }`
`22`	`25`
Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,6 @@ public async Task TestSendMessagesAsyncIntegration(string packageVersion, string`
`49`	`49`	`{`
`50`	`50`	`SetEnvironmentVariable("DD_TRACE_SPAN_ATTRIBUTE_SCHEMA", metadataSchemaVersion);`
`51`	`51`
`52`		`- using (var telemetry = this.ConfigureTelemetry())`
`53`	`52`	`using (var agent = EnvironmentHelper.GetMockAgent())`
`54`	`53`	`using (await RunSampleAndWaitForExit(agent, packageVersion: packageVersion))`
`55`	`54`	`{`
`@@ -86,7 +85,6 @@ public async Task TestReceiveMessagesAsyncIntegration(string packageVersion, str`
`86`	`85`	`{`
`87`	`86`	`SetEnvironmentVariable("DD_TRACE_SPAN_ATTRIBUTE_SCHEMA", metadataSchemaVersion);`
`88`	`87`
`89`		`- using (var telemetry = this.ConfigureTelemetry())`
`90`	`88`	`using (var agent = EnvironmentHelper.GetMockAgent())`
`91`	`89`	`using (await RunSampleAndWaitForExit(agent, packageVersion: packageVersion))`
`92`	`90`	`{`