Cleanup of PerTraceSettings.GetServiceName()

andrewlock · andrewlock · commit ea05552aa303 · 2025-10-15T10:55:44.000+01:00
diff --git a/tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/AWS/DynamoDb/AwsDynamoDbCommon.cs b/tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/AWS/DynamoDb/AwsDynamoDbCommon.cs
@@ -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;
 
diff --git a/tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/AWS/EventBridge/AwsEventBridgeCommon.cs b/tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/AWS/EventBridge/AwsEventBridgeCommon.cs
@@ -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;
diff --git a/tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/AWS/Kinesis/AwsKinesisCommon.cs b/tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/AWS/Kinesis/AwsKinesisCommon.cs
@@ -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;
diff --git a/tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/AWS/S3/AwsS3Common.cs b/tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/AWS/S3/AwsS3Common.cs
@@ -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;
diff --git a/tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/AWS/SNS/AwsSnsCommon.cs b/tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/AWS/SNS/AwsSnsCommon.cs
@@ -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;
diff --git a/tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/AWS/SQS/AwsSqsCommon.cs b/tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/AWS/SQS/AwsSqsCommon.cs
@@ -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;
diff --git a/tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/AWS/StepFunctions/AwsStepFunctionsCommon.cs b/tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/AWS/StepFunctions/AwsStepFunctionsCommon.cs
@@ -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;
diff --git a/tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/AdoNet/DbScopeFactory.cs b/tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/AdoNet/DbScopeFactory.cs
@@ -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;
@@ -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);
                 }
 
diff --git a/tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/GraphQL/GraphQLCommonBase.cs b/tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/GraphQL/GraphQLCommonBase.cs
@@ -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"}";
diff --git a/tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/GraphQL/Net/GraphQLCommon.cs b/tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/GraphQL/Net/GraphQLCommon.cs
@@ -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;
diff --git a/tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/Process/ProcessStartCommon.cs b/tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/Process/ProcessStartCommon.cs
@@ -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;
diff --git a/tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/Remoting/RemotingIntegration.cs b/tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/Remoting/RemotingIntegration.cs
@@ -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;
 
diff --git a/tracer/src/Datadog.Trace/Configuration/PerTraceSettings.cs b/tracer/src/Datadog.Trace/Configuration/PerTraceSettings.cs
@@ -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))
             {
@@ -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);
             }
 
diff --git a/tracer/test/Datadog.Trace.Tests/Configuration/DynamicConfigurationTests.cs b/tracer/test/Datadog.Trace.Tests/Configuration/DynamicConfigurationTests.cs
@@ -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");
         }
 
diff --git a/tracer/test/Datadog.Trace.Tests/Configuration/PerTraceSettingsTests.cs b/tracer/test/Datadog.Trace.Tests/Configuration/PerTraceSettingsTests.cs
@@ -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");
         }
     }
diff --git a/tracer/test/Datadog.Trace.Tests/Configuration/ServiceNameTests.cs b/tracer/test/Datadog.Trace.Tests/Configuration/ServiceNameTests.cs
@@ -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);
             }
         }
 
@@ -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);
             }
         }
 
@@ -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);
             }
         }
 

Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ public static Scope CreateScope(Tracer tracer, string operation, out AwsDynamoDb`
`36`	`36`	`try`
`37`	`37`	`{`
`38`	`38`	`tags = tracer.CurrentTraceSettings.Schema.Database.CreateAwsDynamoDbTags();`
`39`		`- var serviceName = tracer.CurrentTraceSettings.GetServiceName(tracer, DatadogAwsDynamoDbServiceName);`
	`39`	`+ var serviceName = tracer.CurrentTraceSettings.GetServiceName(DatadogAwsDynamoDbServiceName);`
`40`	`40`	`scope = tracer.StartActiveInternal(DynamoDbOperationName, parent: parentContext, tags: tags, serviceName: serviceName);`
`41`	`41`	`var span = scope.Span;`
`42`	`42`
Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ internal static class AwsEventBridgeCommon`
`40`	`40`	`try`
`41`	`41`	`{`
`42`	`42`	`tags = tracer.CurrentTraceSettings.Schema.Messaging.CreateAwsEventBridgeTags(spanKind);`
`43`		`- var serviceName = tracer.CurrentTraceSettings.GetServiceName(tracer, DatadogAwsEventBridgeServiceName);`
	`43`	`+ var serviceName = tracer.CurrentTraceSettings.GetServiceName(DatadogAwsEventBridgeServiceName);`
`44`	`44`	`var operationName = GetOperationName(tracer);`
`45`	`45`	`scope = tracer.StartActiveInternal(operationName, parent: parentContext, tags: tags, serviceName: serviceName);`
`46`	`46`	`var span = scope.Span;`
Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@ internal static class AwsKinesisCommon`
`59`	`59`	`try`
`60`	`60`	`{`
`61`	`61`	`tags = tracer.CurrentTraceSettings.Schema.Messaging.CreateAwsKinesisTags(spanKind);`
`62`		`- string serviceName = tracer.CurrentTraceSettings.GetServiceName(tracer, DatadogAwsKinesisServiceName);`
	`62`	`+ string serviceName = tracer.CurrentTraceSettings.GetServiceName(DatadogAwsKinesisServiceName);`
`63`	`63`	`string operationName = tracer.CurrentTraceSettings.Schema.Messaging.GetOutboundOperationName(KinesisOperationName);`
`64`	`64`	`scope = tracer.StartActiveInternal(operationName, parent: parentContext, tags: tags, serviceName: serviceName);`
`65`	`65`	`var span = scope.Span;`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ internal static class AwsS3Common`
`37`	`37`	`try`
`38`	`38`	`{`
`39`	`39`	`tags = tracer.CurrentTraceSettings.Schema.Messaging.CreateAwsS3Tags(spanKind);`
`40`		`- var serviceName = tracer.CurrentTraceSettings.GetServiceName(tracer, DatadogAwsS3ServiceName);`
	`40`	`+ var serviceName = tracer.CurrentTraceSettings.GetServiceName(DatadogAwsS3ServiceName);`
`41`	`41`	`var operationName = GetOperationName(tracer);`
`42`	`42`	`scope = tracer.StartActiveInternal(operationName, parent: parentContext, tags: tags, serviceName: serviceName);`
`43`	`43`	`var span = scope.Span;`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ internal static class AwsSnsCommon`
`39`	`39`	`try`
`40`	`40`	`{`
`41`	`41`	`tags = tracer.CurrentTraceSettings.Schema.Messaging.CreateAwsSnsTags(spanKind);`
`42`		`- var serviceName = tracer.CurrentTraceSettings.GetServiceName(tracer, DatadogAwsSnsServiceName);`
	`42`	`+ var serviceName = tracer.CurrentTraceSettings.GetServiceName(DatadogAwsSnsServiceName);`
`43`	`43`	`var operationName = GetOperationName(tracer, spanKind);`
`44`	`44`	`scope = tracer.StartActiveInternal(operationName, parent: parentContext, tags: tags, serviceName: serviceName);`
`45`	`45`	`var span = scope.Span;`
Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ internal static class AwsStepFunctionsCommon`
`38`	`38`	`try`
`39`	`39`	`{`
`40`	`40`	`tags = tracer.CurrentTraceSettings.Schema.Messaging.CreateAwsStepFunctionsTags(spanKind);`
`41`		`- var serviceName = tracer.CurrentTraceSettings.GetServiceName(tracer, DatadogAwsStepFunctionsServiceName);`
	`41`	`+ var serviceName = tracer.CurrentTraceSettings.GetServiceName(DatadogAwsStepFunctionsServiceName);`
`42`	`42`	`var operationName = GetOperationName(tracer, spanKind);`
`43`	`43`	`scope = tracer.StartActiveInternal(operationName, parent: parentContext, tags: tags, serviceName: serviceName);`
`44`	`44`	`var span = scope.Span;`
Original file line number	Diff line number	Diff line change
`@@ -298,7 +298,7 @@ private static string GetServiceName(Tracer tracer, string dbTypeName)`
`298`	`298`	`if (DbTypeName != dbTypeName)`
`299`	`299`	`{`
`300`	`300`	`// We cannot cache in the base class`
`301`		`- return tracer.CurrentTraceSettings.GetServiceName(tracer, dbTypeName);`
	`301`	`+ return tracer.CurrentTraceSettings.GetServiceName(dbTypeName);`
`302`	`302`	`}`
`303`	`303`
`304`	`304`	`var serviceNameCache = _serviceNameCache;`
`@@ -314,7 +314,7 @@ private static string GetServiceName(Tracer tracer, string dbTypeName)`
`314`	`314`	`// We create or replace the cache with the new service name`
`315`	`315`	`// Slowpath`
`316`	`316`	`var defaultServiceName = tracer.DefaultServiceName;`
`317`		`- serviceName = tracer.CurrentTraceSettings.GetServiceName(tracer, dbTypeName);`
	`317`	`+ serviceName = tracer.CurrentTraceSettings.GetServiceName(dbTypeName);`
`318`	`318`	`_serviceNameCache = new KeyValuePair<string, string>(defaultServiceName, serviceName);`
`319`	`319`	`}`
`320`	`320`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ internal abstract class GraphQLCommonBase`
`27`	`27`
`28`	`28`	`protected static Scope CreateScopeFromExecuteAsync(Tracer tracer, IntegrationId integrationId, GraphQLTags tags, string serviceName, string queryOperationName, string source, string queryOperationType)`
`29`	`29`	`{`
`30`		`- var scope = tracer.StartActiveInternal(ExecuteOperationName, serviceName: tracer.CurrentTraceSettings.GetServiceName(tracer, serviceName), tags: tags);`
	`30`	`+ var scope = tracer.StartActiveInternal(ExecuteOperationName, serviceName: tracer.CurrentTraceSettings.GetServiceName(serviceName), tags: tags);`
`31`	`31`	`var span = scope.Span;`
`32`	`32`	`span.Type = SpanTypes.GraphQL;`
`33`	`33`	`span.ResourceName = $"{queryOperationType} {queryOperationName ?? "operation"}";`
Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ internal static Scope CreateScopeFromValidate(Tracer tracer, string documentSour`
`55`	`55`	`try`
`56`	`56`	`{`
`57`	`57`	`var tags = new GraphQLTags(GraphQLCommon.IntegrationName);`
`58`		`- string serviceName = tracer.CurrentTraceSettings.GetServiceName(tracer, ServiceName);`
	`58`	`+ string serviceName = tracer.CurrentTraceSettings.GetServiceName(ServiceName);`
`59`	`59`	`scope = tracer.StartActiveInternal(ValidateOperationName, serviceName: serviceName, tags: tags);`
`60`	`60`
`61`	`61`	`var span = scope.Span;`