Skip to content

[Tracer] (Event Grid 5/5) Enable integration and add support metadata #8915

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
pablomartinezbernardo wants to merge 1 commit into
base: pmartinez/event-grid-functions
Choose a base branch
from
Open

[Tracer] (Event Grid 5/5) Enable integration and add support metadata #8915

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 38 additions & 0 deletions docs/span_attribute_schema/v0.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 |
Expand Down
41 changes: 41 additions & 0 deletions docs/span_attribute_schema/v1.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 |
Expand Down
34 changes: 34 additions & 0 deletions tracer/build/supported_versions.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -408,6 +408,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",
Expand Down
6 changes: 3 additions & 3 deletions tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/Azure/EventGrid/EventGridCommon.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Comment thread
pablomartinezbernardo marked this conversation as resolved.
{
return CallTargetState.GetDefault();
}
Expand All @@ -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();
}
Expand All @@ -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();
}
Expand Down
2 changes: 1 addition & 1 deletion ...src/Datadog.Trace/ClrProfiler/AutoInstrumentation/Azure/Functions/AzureFunctionsCommon.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
1 change: 0 additions & 1 deletion ...er/test/Datadog.Trace.ClrProfiler.IntegrationTests/Azure/AzureEventGridNamespacesTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
1 change: 0 additions & 1 deletion tracer/test/Datadog.Trace.ClrProfiler.IntegrationTests/Azure/AzureEventGridTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,6 @@ public class AzureEventGridTests : TracingIntegrationTest
public AzureEventGridTests(ITestOutputHelper output)
: base("AzureEventGrid", output)
{
SetEnvironmentVariable("DD_TRACE_AZUREEVENTGRID_ENABLED", "true");
}

public static IEnumerable<object[]> GetEnabledConfig()
Expand Down
1 change: 0 additions & 1 deletion ...er/test/Datadog.Trace.ClrProfiler.IntegrationTests/AzureFunctionsMessagingTriggerTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
Loading