[Azure Event Grid] Enable integration and add support metadata

pablomartinezbernardo · pablomartinezbernardo · commit 8bb93d9a70cf · 2026-07-24T12:11:06.000+02:00
diff --git a/docs/span_attribute_schema/v0.md b/docs/span_attribute_schema/v0.md
@@ -642,6 +642,44 @@ peer.address | No
 server.address | Yes
 span.kind | `consumer`
 
+## AzureEventGridOutbound
+### Span properties
+Name | Required |
+---------|----------------|
+Name | `azure_eventgrid.send`
+Type | `queue`
+### Tags
+Name | Required |
+---------|----------------|
+_dd.base_service | No
+component | `AzureEventGrid`
+messaging.batch.message_count | No
+messaging.message_id | No
+messaging.operation | `send`
+messaging.system | Optional: `eventgrid`
+net.peer.name | No
+network.destination.name | Yes
+network.destination.port | No
+peer.address | No
+span.kind | `producer`
+
+## AzureEventGridInbound
+### Span properties
+Name | Required |
+---------|----------------|
+Name | `azure_eventgrid.receive`
+Type | `queue`
+### Tags
+Name | Required |
+---------|----------------|
+_dd.base_service | No
+component | `AzureEventGrid`
+messaging.batch.message_count | No
+messaging.message_id | No
+messaging.operation | `receive`
+messaging.system | Optional: `eventgrid`
+span.kind | `consumer`
+
 ## CosmosDb
 ### Span properties
 Name | Required |
diff --git a/docs/span_attribute_schema/v1.md b/docs/span_attribute_schema/v1.md
@@ -401,6 +401,47 @@ peer.address | No
 server.address | Yes
 span.kind | `consumer`
 
+## AzureEventGridOutbound
+### Span properties
+Name | Required |
+---------|----------------|
+Name | `azure_eventgrid.send`
+Type | `queue`
+### Tags
+Name | Required |
+---------|----------------|
+_dd.base_service | No
+_dd.peer.service.source | No
+component | `AzureEventGrid`
+messaging.batch.message_count | No
+messaging.message_id | No
+messaging.operation | `send`
+messaging.system | Optional: `eventgrid`
+net.peer.name | No
+network.destination.name | Yes
+network.destination.port | No
+peer.address | No
+peer.service | No
+peer.service.remapped_from | No
+span.kind | `producer`
+
+## AzureEventGridInbound
+### Span properties
+Name | Required |
+---------|----------------|
+Name | `azure_eventgrid.receive`
+Type | `queue`
+### Tags
+Name | Required |
+---------|----------------|
+_dd.base_service | No
+component | `AzureEventGrid`
+messaging.batch.message_count | No
+messaging.message_id | No
+messaging.operation | `receive`
+messaging.system | Optional: `eventgrid`
+span.kind | `consumer`
+
 ## CosmosDb
 ### Span properties
 Name | Required |
diff --git a/tracer/build/supported_versions.json b/tracer/build/supported_versions.json
@@ -401,6 +401,40 @@
       }
     ]
   },
+  {
+    "integrationName": "AzureEventGrid",
+    "assemblyName": "Azure.Messaging.EventGrid",
+    "minAssemblyVersionInclusive": "4.0.0",
+    "maxAssemblyVersionInclusive": "5.65535.65535",
+    "packages": [
+      {
+        "name": "Azure.Messaging.EventGrid",
+        "minVersionAvailableInclusive": "4.0.0",
+        "minVersionSupportedInclusive": "4.0.0",
+        "minVersionTestedInclusive": "4.0.0",
+        "maxVersionSupportedInclusive": "5.0.0",
+        "maxVersionAvailableInclusive": "5.0.0",
+        "maxVersionTestedInclusive": "5.0.0"
+      }
+    ]
+  },
+  {
+    "integrationName": "AzureEventGrid",
+    "assemblyName": "Azure.Messaging.EventGrid.Namespaces",
+    "minAssemblyVersionInclusive": "1.0.0",
+    "maxAssemblyVersionInclusive": "1.65535.65535",
+    "packages": [
+      {
+        "name": "Azure.Messaging.EventGrid.Namespaces",
+        "minVersionAvailableInclusive": "1.0.0",
+        "minVersionSupportedInclusive": "1.0.0",
+        "minVersionTestedInclusive": "1.0.0",
+        "maxVersionSupportedInclusive": "1.1.0",
+        "maxVersionAvailableInclusive": "1.1.0",
+        "maxVersionTestedInclusive": "1.1.0"
+      }
+    ]
+  },
   {
     "integrationName": "AzureEventHubs",
     "assemblyName": "Azure.Messaging.EventHubs",
diff --git a/tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/Azure/EventGrid/EventGridCommon.cs b/tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/Azure/EventGrid/EventGridCommon.cs
@@ -26,7 +26,7 @@ internal static class EventGridCommon
     internal static CallTargetState CreateProducerSpan<TTarget, TEvents>(TTarget instance, ref TEvents events, bool injectContext)
     {
         var tracer = Tracer.Instance;
-        if (!tracer.CurrentTraceSettings.Settings.IsIntegrationEnabled(IntegrationId.AzureEventGrid, defaultValue: false))
+        if (!tracer.CurrentTraceSettings.Settings.IsIntegrationEnabled(IntegrationId.AzureEventGrid))
         {
             return CallTargetState.GetDefault();
         }
@@ -50,7 +50,7 @@ internal static CallTargetState CreateNamespaceProducerSpanForEvent<TTarget>(TTa
         where TTarget : IEventGridSenderClient
     {
         var tracer = Tracer.Instance;
-        if (!tracer.CurrentTraceSettings.Settings.IsIntegrationEnabled(IntegrationId.AzureEventGrid, defaultValue: false))
+        if (!tracer.CurrentTraceSettings.Settings.IsIntegrationEnabled(IntegrationId.AzureEventGrid))
         {
             return CallTargetState.GetDefault();
         }
@@ -63,7 +63,7 @@ internal static CallTargetState CreateNamespaceProducerSpanForEvents<TTarget, TE
         where TTarget : IEventGridSenderClient
     {
         var tracer = Tracer.Instance;
-        if (!tracer.CurrentTraceSettings.Settings.IsIntegrationEnabled(IntegrationId.AzureEventGrid, defaultValue: false))
+        if (!tracer.CurrentTraceSettings.Settings.IsIntegrationEnabled(IntegrationId.AzureEventGrid))
         {
             return CallTargetState.GetDefault();
         }
diff --git a/tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/Azure/Functions/AzureFunctionsCommon.cs b/tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/Azure/Functions/AzureFunctionsCommon.cs
@@ -311,7 +311,7 @@ _ when type.StartsWith("eventGrid", StringComparison.OrdinalIgnoreCase) => "Even
                             extractedContext = ExtractPropagatedContextFromMessaging(functionContext, "Properties", "PropertiesArray").MergeBaggageInto(Baggage.Current);
                             break;
 
-                        case "EventGrid" when tracer.CurrentTraceSettings.Settings.IsIntegrationEnabled(IntegrationId.AzureEventGrid, defaultValue: false):
+                        case "EventGrid" when tracer.CurrentTraceSettings.Settings.IsIntegrationEnabled(IntegrationId.AzureEventGrid):
                         {
                             extractedContext = EventGridFunctionsCommon.CreateReceiveSpanContext(tracer, functionContext, entry.Key as string, Baggage.Current);
                             break;
diff --git a/tracer/test/Datadog.Trace.ClrProfiler.IntegrationTests/Azure/AzureEventGridNamespacesTests.cs b/tracer/test/Datadog.Trace.ClrProfiler.IntegrationTests/Azure/AzureEventGridNamespacesTests.cs
@@ -23,7 +23,6 @@ public class AzureEventGridNamespacesTests : TracingIntegrationTest
         public AzureEventGridNamespacesTests(ITestOutputHelper output)
             : base("AzureEventGridNamespaces", output)
         {
-            SetEnvironmentVariable("DD_TRACE_AZUREEVENTGRID_ENABLED", "true");
         }
 
         public static IEnumerable<object[]> GetEnabledConfig()
diff --git a/tracer/test/Datadog.Trace.ClrProfiler.IntegrationTests/Azure/AzureEventGridTests.cs b/tracer/test/Datadog.Trace.ClrProfiler.IntegrationTests/Azure/AzureEventGridTests.cs
@@ -49,7 +49,6 @@ public class AzureEventGridTests : TracingIntegrationTest
         public AzureEventGridTests(ITestOutputHelper output)
             : base("AzureEventGrid", output)
         {
-            SetEnvironmentVariable("DD_TRACE_AZUREEVENTGRID_ENABLED", "true");
         }
 
         public static IEnumerable<object[]> GetEnabledConfig()
diff --git a/tracer/test/Datadog.Trace.ClrProfiler.IntegrationTests/AzureFunctionsMessagingTriggerTests.cs b/tracer/test/Datadog.Trace.ClrProfiler.IntegrationTests/AzureFunctionsMessagingTriggerTests.cs
@@ -55,7 +55,6 @@ public AzureFunctionsMessagingTriggerTests(ITestOutputHelper output)
         SetEnvironmentVariable("EVENTHUBS_CONNECTION_STRING", GetEventHubsConnectionString());
         SetEnvironmentVariable("EVENTGRID_TOPIC_ENDPOINT", GetEventGridTopicEndpoint());
         SetEnvironmentVariable("EVENTGRID_TOPIC_KEY", "test-key");
-        SetEnvironmentVariable("DD_TRACE_AZUREEVENTGRID_ENABLED", "true");
         SetEnvironmentVariable("AzureWebJobsStorage", GetAzuriteConnectionString());
         // Exclude the Event Grid emulator endpoint from HTTP client tracing to avoid an extra http.request span.
         SetEnvironmentVariable(
diff --git a/tracer/test/snapshots/AzureFunctionsMessagingTriggerTests.EventGridOutputBinding_SubmitsTrace.verified.txt b/tracer/test/snapshots/AzureFunctionsMessagingTriggerTests.EventGridOutputBinding_SubmitsTrace.verified.txt
@@ -184,4 +184,4 @@
       _dd.top_level: 1.0
     }
   }
-]
+]
diff --git a/tracer/test/snapshots/AzureFunctionsMessagingTriggerTests.EventGridTrigger_SubmitsTrace.verified.txt b/tracer/test/snapshots/AzureFunctionsMessagingTriggerTests.EventGridTrigger_SubmitsTrace.verified.txt
@@ -184,4 +184,4 @@
       _dd.top_level: 1.0
     }
   }
-]
+]

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ internal static class EventGridCommon`
`26`	`26`	`internal static CallTargetState CreateProducerSpan<TTarget, TEvents>(TTarget instance, ref TEvents events, bool injectContext)`
`27`	`27`	`{`
`28`	`28`	`var tracer = Tracer.Instance;`
`29`		`- if (!tracer.CurrentTraceSettings.Settings.IsIntegrationEnabled(IntegrationId.AzureEventGrid, defaultValue: false))`
	`29`	`+ if (!tracer.CurrentTraceSettings.Settings.IsIntegrationEnabled(IntegrationId.AzureEventGrid))`
`30`	`30`	`{`
`31`	`31`	`return CallTargetState.GetDefault();`
`32`	`32`	`}`
`@@ -50,7 +50,7 @@ internal static CallTargetState CreateNamespaceProducerSpanForEvent<TTarget>(TTa`
`50`	`50`	`where TTarget : IEventGridSenderClient`
`51`	`51`	`{`
`52`	`52`	`var tracer = Tracer.Instance;`
`53`		`- if (!tracer.CurrentTraceSettings.Settings.IsIntegrationEnabled(IntegrationId.AzureEventGrid, defaultValue: false))`
	`53`	`+ if (!tracer.CurrentTraceSettings.Settings.IsIntegrationEnabled(IntegrationId.AzureEventGrid))`
`54`	`54`	`{`
`55`	`55`	`return CallTargetState.GetDefault();`
`56`	`56`	`}`
`@@ -63,7 +63,7 @@ internal static CallTargetState CreateNamespaceProducerSpanForEvents<TTarget, TE`
`63`	`63`	`where TTarget : IEventGridSenderClient`
`64`	`64`	`{`
`65`	`65`	`var tracer = Tracer.Instance;`
`66`		`- if (!tracer.CurrentTraceSettings.Settings.IsIntegrationEnabled(IntegrationId.AzureEventGrid, defaultValue: false))`
	`66`	`+ if (!tracer.CurrentTraceSettings.Settings.IsIntegrationEnabled(IntegrationId.AzureEventGrid))`
`67`	`67`	`{`
`68`	`68`	`return CallTargetState.GetDefault();`
`69`	`69`	`}`
Original file line number	Diff line number	Diff line change
`@@ -311,7 +311,7 @@ _ when type.StartsWith("eventGrid", StringComparison.OrdinalIgnoreCase) => "Even`
`311`	`311`	`extractedContext = ExtractPropagatedContextFromMessaging(functionContext, "Properties", "PropertiesArray").MergeBaggageInto(Baggage.Current);`
`312`	`312`	`break;`
`313`	`313`
`314`		`- case "EventGrid" when tracer.CurrentTraceSettings.Settings.IsIntegrationEnabled(IntegrationId.AzureEventGrid, defaultValue: false):`
	`314`	`+ case "EventGrid" when tracer.CurrentTraceSettings.Settings.IsIntegrationEnabled(IntegrationId.AzureEventGrid):`
`315`	`315`	`{`
`316`	`316`	`extractedContext = EventGridFunctionsCommon.CreateReceiveSpanContext(tracer, functionContext, entry.Key as string, Baggage.Current);`
`317`	`317`	`break;`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,6 @@ public class AzureEventGridNamespacesTests : TracingIntegrationTest`
`23`	`23`	`public AzureEventGridNamespacesTests(ITestOutputHelper output)`
`24`	`24`	`: base("AzureEventGridNamespaces", output)`
`25`	`25`	`{`
`26`		`- SetEnvironmentVariable("DD_TRACE_AZUREEVENTGRID_ENABLED", "true");`
`27`	`26`	`}`
`28`	`27`
`29`	`28`	`public static IEnumerable<object[]> GetEnabledConfig()`
Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,6 @@ public class AzureEventGridTests : TracingIntegrationTest`
`49`	`49`	`public AzureEventGridTests(ITestOutputHelper output)`
`50`	`50`	`: base("AzureEventGrid", output)`
`51`	`51`	`{`
`52`		`- SetEnvironmentVariable("DD_TRACE_AZUREEVENTGRID_ENABLED", "true");`
`53`	`52`	`}`
`54`	`53`
`55`	`54`	`public static IEnumerable<object[]> GetEnabledConfig()`
Original file line number	Diff line number	Diff line change
`@@ -184,4 +184,4 @@`
`184`	`184`	`_dd.top_level: 1.0`
`185`	`185`	`}`
`186`	`186`	`}`
`187`		`-]`
	`187`	`+]`