Skip to content

Simplify PerTraceSettings.GetServiceName() #7532

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

Merged
merged 1 commit into from
Oct 16, 2025
Merged

Simplify PerTraceSettings.GetServiceName() #7532

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
2 changes: 1 addition & 1 deletion tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/AWS/DynamoDb/AwsDynamoDbCommon.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ public static Scope CreateScope(Tracer tracer, string operation, out AwsDynamoDb
try
{
tags = tracer.CurrentTraceSettings.Schema.Database.CreateAwsDynamoDbTags();
var serviceName = tracer.CurrentTraceSettings.GetServiceName(tracer, DatadogAwsDynamoDbServiceName);
var serviceName = tracer.CurrentTraceSettings.GetServiceName(DatadogAwsDynamoDbServiceName);
scope = tracer.StartActiveInternal(DynamoDbOperationName, parent: parentContext, tags: tags, serviceName: serviceName);
var span = scope.Span;

Expand Down
2 changes: 1 addition & 1 deletion ...src/Datadog.Trace/ClrProfiler/AutoInstrumentation/AWS/EventBridge/AwsEventBridgeCommon.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ internal static class AwsEventBridgeCommon
try
{
tags = tracer.CurrentTraceSettings.Schema.Messaging.CreateAwsEventBridgeTags(spanKind);
var serviceName = tracer.CurrentTraceSettings.GetServiceName(tracer, DatadogAwsEventBridgeServiceName);
var serviceName = tracer.CurrentTraceSettings.GetServiceName(DatadogAwsEventBridgeServiceName);
var operationName = GetOperationName(tracer);
scope = tracer.StartActiveInternal(operationName, parent: parentContext, tags: tags, serviceName: serviceName);
var span = scope.Span;
Expand Down
2 changes: 1 addition & 1 deletion tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/AWS/Kinesis/AwsKinesisCommon.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ internal static class AwsKinesisCommon
try
{
tags = tracer.CurrentTraceSettings.Schema.Messaging.CreateAwsKinesisTags(spanKind);
string serviceName = tracer.CurrentTraceSettings.GetServiceName(tracer, DatadogAwsKinesisServiceName);
string serviceName = tracer.CurrentTraceSettings.GetServiceName(DatadogAwsKinesisServiceName);
string operationName = tracer.CurrentTraceSettings.Schema.Messaging.GetOutboundOperationName(KinesisOperationName);
scope = tracer.StartActiveInternal(operationName, parent: parentContext, tags: tags, serviceName: serviceName);
var span = scope.Span;
Expand Down
2 changes: 1 addition & 1 deletion tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/AWS/S3/AwsS3Common.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ internal static class AwsS3Common
try
{
tags = tracer.CurrentTraceSettings.Schema.Messaging.CreateAwsS3Tags(spanKind);
var serviceName = tracer.CurrentTraceSettings.GetServiceName(tracer, DatadogAwsS3ServiceName);
var serviceName = tracer.CurrentTraceSettings.GetServiceName(DatadogAwsS3ServiceName);
var operationName = GetOperationName(tracer);
scope = tracer.StartActiveInternal(operationName, parent: parentContext, tags: tags, serviceName: serviceName);
var span = scope.Span;
Expand Down
2 changes: 1 addition & 1 deletion tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/AWS/SNS/AwsSnsCommon.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ internal static class AwsSnsCommon
try
{
tags = tracer.CurrentTraceSettings.Schema.Messaging.CreateAwsSnsTags(spanKind);
var serviceName = tracer.CurrentTraceSettings.GetServiceName(tracer, DatadogAwsSnsServiceName);
var serviceName = tracer.CurrentTraceSettings.GetServiceName(DatadogAwsSnsServiceName);
var operationName = GetOperationName(tracer, spanKind);
scope = tracer.StartActiveInternal(operationName, parent: parentContext, tags: tags, serviceName: serviceName);
var span = scope.Span;
Expand Down
2 changes: 1 addition & 1 deletion tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/AWS/SQS/AwsSqsCommon.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ internal static class AwsSqsCommon
try
{
tags = tracer.CurrentTraceSettings.Schema.Messaging.CreateAwsSqsTags(spanKind);
string serviceName = tracer.CurrentTraceSettings.GetServiceName(tracer, DatadogAwsSqsServiceName);
string serviceName = tracer.CurrentTraceSettings.GetServiceName(DatadogAwsSqsServiceName);
string operationName = GetOperationName(tracer, spanKind);
scope = tracer.StartActiveInternal(operationName, parent: parentContext, tags: tags, serviceName: serviceName);
var span = scope.Span;
Expand Down
2 changes: 1 addition & 1 deletion ...Datadog.Trace/ClrProfiler/AutoInstrumentation/AWS/StepFunctions/AwsStepFunctionsCommon.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ internal static class AwsStepFunctionsCommon
try
{
tags = tracer.CurrentTraceSettings.Schema.Messaging.CreateAwsStepFunctionsTags(spanKind);
var serviceName = tracer.CurrentTraceSettings.GetServiceName(tracer, DatadogAwsStepFunctionsServiceName);
var serviceName = tracer.CurrentTraceSettings.GetServiceName(DatadogAwsStepFunctionsServiceName);
var operationName = GetOperationName(tracer, spanKind);
scope = tracer.StartActiveInternal(operationName, parent: parentContext, tags: tags, serviceName: serviceName);
var span = scope.Span;
Expand Down
4 changes: 2 additions & 2 deletions tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/AdoNet/DbScopeFactory.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -298,7 +298,7 @@ private static string GetServiceName(Tracer tracer, string dbTypeName)
if (DbTypeName != dbTypeName)
{
// We cannot cache in the base class
return tracer.CurrentTraceSettings.GetServiceName(tracer, dbTypeName);
return tracer.CurrentTraceSettings.GetServiceName(dbTypeName);
}

var serviceNameCache = _serviceNameCache;
Expand All @@ -314,7 +314,7 @@ private static string GetServiceName(Tracer tracer, string dbTypeName)
// We create or replace the cache with the new service name
// Slowpath
var defaultServiceName = tracer.DefaultServiceName;
serviceName = tracer.CurrentTraceSettings.GetServiceName(tracer, dbTypeName);
serviceName = tracer.CurrentTraceSettings.GetServiceName(dbTypeName);
_serviceNameCache = new KeyValuePair<string, string>(defaultServiceName, serviceName);
}

Expand Down
2 changes: 1 addition & 1 deletion tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/GraphQL/GraphQLCommonBase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ internal abstract class GraphQLCommonBase

protected static Scope CreateScopeFromExecuteAsync(Tracer tracer, IntegrationId integrationId, GraphQLTags tags, string serviceName, string queryOperationName, string source, string queryOperationType)
{
var scope = tracer.StartActiveInternal(ExecuteOperationName, serviceName: tracer.CurrentTraceSettings.GetServiceName(tracer, serviceName), tags: tags);
var scope = tracer.StartActiveInternal(ExecuteOperationName, serviceName: tracer.CurrentTraceSettings.GetServiceName(serviceName), tags: tags);
var span = scope.Span;
span.Type = SpanTypes.GraphQL;
span.ResourceName = $"{queryOperationType} {queryOperationName ?? "operation"}";
Expand Down
2 changes: 1 addition & 1 deletion tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/GraphQL/Net/GraphQLCommon.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ internal static Scope CreateScopeFromValidate(Tracer tracer, string documentSour
try
{
var tags = new GraphQLTags(GraphQLCommon.IntegrationName);
string serviceName = tracer.CurrentTraceSettings.GetServiceName(tracer, ServiceName);
string serviceName = tracer.CurrentTraceSettings.GetServiceName(ServiceName);
scope = tracer.StartActiveInternal(ValidateOperationName, serviceName: serviceName, tags: tags);

var span = scope.Span;
Expand Down
2 changes: 1 addition & 1 deletion tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/Process/ProcessStartCommon.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ internal static class ProcessStartCommon
{
var tags = PopulateTags(filename, environmentVariables, useShellExecute, arguments, argumentList);

var serviceName = tracer.CurrentTraceSettings.GetServiceName(tracer, ServiceName);
var serviceName = tracer.CurrentTraceSettings.GetServiceName(ServiceName);
tags.SetAnalyticsSampleRate(IntegrationId, tracer.Settings, enabledWithGlobalSetting: false);
scope = tracer.StartActiveInternal(OperationName, serviceName: serviceName, tags: tags);
scope.Span.ResourceName = filename;
Expand Down
2 changes: 1 addition & 1 deletion tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/Remoting/RemotingIntegration.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ internal static class RemotingIntegration
return null;
}

var serviceName = tracer.CurrentTraceSettings.GetServiceName(tracer, ServiceName);
var serviceName = tracer.CurrentTraceSettings.GetServiceName(ServiceName);

Scope? scope = null;

Expand Down
6 changes: 3 additions & 3 deletions tracer/src/Datadog.Trace/Configuration/PerTraceSettings.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ public PerTraceSettings(ITraceSampler? traceSampler, ISpanSampler? spanSampler,

public MutableSettings Settings { get; }

internal string GetServiceName(Tracer tracer, string serviceName)
internal string GetServiceName(string serviceName)
{
if (ServiceNames.TryGetValue(serviceName, out var name))
{
Expand All @@ -47,12 +47,12 @@ internal string GetServiceName(Tracer tracer, string serviceName)

if (Schema.Version != SchemaVersion.V0 || Schema.RemoveClientServiceNamesEnabled)
{
return tracer.DefaultServiceName;
return Settings.DefaultServiceName;
}

if (!_serviceNameCache.TryGetValue(serviceName, out var finalServiceName))
{
finalServiceName = $"{tracer.DefaultServiceName}-{serviceName}";
finalServiceName = $"{Settings.DefaultServiceName}-{serviceName}";
_serviceNameCache.TryAdd(serviceName, finalServiceName);
}

Expand Down
6 changes: 3 additions & 3 deletions tracer/test/Datadog.Trace.Tests/Configuration/DynamicConfigurationTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,17 +26,17 @@ public void ApplyServiceMappingToNewTraces()
{
var scope = Tracer.Instance.StartActive("Trace1");

Tracer.Instance.CurrentTraceSettings.GetServiceName(Tracer.Instance, "test")
Tracer.Instance.CurrentTraceSettings.GetServiceName("test")
.Should().Be($"{Tracer.Instance.DefaultServiceName}-test");

DynamicConfigurationManager.OnlyForTests_ApplyConfiguration(CreateConfig(("tracing_service_mapping", "test:ok")));

Tracer.Instance.CurrentTraceSettings.GetServiceName(Tracer.Instance, "test")
Tracer.Instance.CurrentTraceSettings.GetServiceName("test")
.Should().Be($"{Tracer.Instance.DefaultServiceName}-test", "the old configuration should be used inside of the active trace");

scope.Close();

Tracer.Instance.CurrentTraceSettings.GetServiceName(Tracer.Instance, "test")
Tracer.Instance.CurrentTraceSettings.GetServiceName("test")
.Should().Be("ok", "the new configuration should be used outside of the active trace");
}

Expand Down
6 changes: 3 additions & 3 deletions tracer/test/Datadog.Trace.Tests/Configuration/PerTraceSettingsTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,20 +25,20 @@ public void ApplyServiceMappingToNewTraces()

var scope = Tracer.Instance.StartActive("Trace1");

Tracer.Instance.CurrentTraceSettings.GetServiceName(Tracer.Instance, "test")
Tracer.Instance.CurrentTraceSettings.GetServiceName("test")
.Should().Be("before");

Tracer.Configure(TracerSettings.Create(new()
{
[ConfigurationKeys.ServiceNameMappings] = "test:after"
}));

Tracer.Instance.CurrentTraceSettings.GetServiceName(Tracer.Instance, "test")
Tracer.Instance.CurrentTraceSettings.GetServiceName("test")
.Should().Be("before", "the old configuration should be used inside of the active trace");

scope.Close();

Tracer.Instance.CurrentTraceSettings.GetServiceName(Tracer.Instance, "test")
Tracer.Instance.CurrentTraceSettings.GetServiceName("test")
.Should().Be("after", "the new configuration should be used outside of the active trace");
}
}
Expand Down
6 changes: 3 additions & 3 deletions tracer/test/Datadog.Trace.Tests/Configuration/ServiceNameTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ public void RetrievesMappedServiceNames(object schemaVersionObject, bool peerSer

foreach (var kvp in Mappings)
{
tracer.CurrentTraceSettings.GetServiceName(tracer, kvp.Key).Should().Be(kvp.Value);
tracer.CurrentTraceSettings.GetServiceName(kvp.Key).Should().Be(kvp.Value);
}
}

Expand Down Expand Up @@ -76,7 +76,7 @@ public void RetrievesUnmappedServiceNames(object schemaVersionObject, bool peerS
_ => tracer.DefaultServiceName,
};

tracer.CurrentTraceSettings.GetServiceName(tracer, key).Should().Be(expectedServiceName);
tracer.CurrentTraceSettings.GetServiceName(key).Should().Be(expectedServiceName);
}
}

Expand All @@ -103,7 +103,7 @@ public void DoesNotRequireAnyMappings(object schemaVersionObject, bool peerServi
_ => tracer.DefaultServiceName,
};

tracer.CurrentTraceSettings.GetServiceName(tracer, key).Should().Be(expectedServiceName);
tracer.CurrentTraceSettings.GetServiceName(key).Should().Be(expectedServiceName);
}
}

Expand Down
Loading