Skip to content

Commit 5879846

Browse files
Service bus integration disabled by default
1 parent f9fcaf5 commit 5879846

File tree

3 files changed

+7
-2
lines changed

3 files changed

+7
-2
lines changed

tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/Azure/Functions/AzureFunctionsCommon.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -237,7 +237,7 @@ _ when type.StartsWith("eventGrid", StringComparison.OrdinalIgnoreCase) => "Even
237237
{
238238
extractedContext = ExtractPropagatedContextFromHttp(context, entry.Key as string).MergeBaggageInto(Baggage.Current);
239239
}
240-
else if (triggerType == "ServiceBus")
240+
else if (triggerType == "ServiceBus" && tracer.Settings.IsIntegrationEnabled(IntegrationId.AzureServiceBus, false))
241241
{
242242
extractedContext = ExtractPropagatedContextFromServiceBus(context).MergeBaggageInto(Baggage.Current);
243243
}

tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/Azure/ServiceBus/ServiceBusReceiverReceiveMessagesAsyncIntegration.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ internal static CallTargetState OnMethodBegin<TTarget>(TTarget instance, int max
4949
where TTarget : IServiceBusReceiver, IDuckType
5050
{
5151
var tracer = Tracer.Instance;
52-
if (!tracer.Settings.IsIntegrationEnabled(IntegrationId.AzureServiceBus))
52+
if (!tracer.Settings.IsIntegrationEnabled(IntegrationId.AzureServiceBus, false))
5353
{
5454
return returnValue;
5555
}

tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/Azure/ServiceBus/ServiceBusSenderSendMessagesAsyncIntegration.cs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,11 @@ internal static CallTargetState OnMethodBegin<TTarget>(TTarget instance, ref IEn
4242
where TTarget : IServiceBusSender, IDuckType
4343
{
4444
var tracer = Tracer.Instance;
45+
if (!tracer.Settings.IsIntegrationEnabled(IntegrationId.AzureServiceBus, false))
46+
{
47+
return new CallTargetState(null);
48+
}
49+
4550
var tags = tracer.CurrentTraceSettings.Schema.Messaging.CreateAzureServiceBusTags(SpanKinds.Producer);
4651

4752
var entityPath = instance.EntityPath ?? "unknown";

0 commit comments

Comments
 (0)