Skip to content

Commit c94374c

Browse files
committed
nit: simplify PerTraceSettings to remove unecessary field
1 parent a2951da commit c94374c

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/Logging/ILogger/LogsInjection/LoggerIntegrationCommon.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ internal static class LoggerIntegrationCommon
1313
public const string IntegrationName = nameof(Configuration.IntegrationId.ILogger);
1414
private const IntegrationId IntegrationId = Configuration.IntegrationId.ILogger;
1515

16+
// TODO: Subscribe to changes in settings
1617
private static readonly DatadogLoggingScope DatadogScope = new();
1718

1819
public static void AddScope<TAction, TState>(Tracer tracer, TAction callback, TState state)

tracer/src/Datadog.Trace/Configuration/PerTraceSettings.cs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,10 @@ internal class PerTraceSettings
1616
{
1717
private readonly ConcurrentDictionary<string, string> _serviceNameCache = new();
1818

19-
public PerTraceSettings(ITraceSampler? traceSampler, ISpanSampler? spanSampler, IReadOnlyDictionary<string, string> serviceNames, NamingSchema schema, MutableSettings mutableSettings)
19+
public PerTraceSettings(ITraceSampler? traceSampler, ISpanSampler? spanSampler, NamingSchema schema, MutableSettings mutableSettings)
2020
{
2121
TraceSampler = traceSampler;
2222
SpanSampler = spanSampler;
23-
ServiceNames = serviceNames;
2423
Schema = schema;
2524
HasResourceBasedSamplingRule = (traceSampler?.HasResourceBasedSamplingRule ?? false) || (spanSampler?.HasResourceBasedSamplingRule ?? false);
2625
Settings = mutableSettings;
@@ -30,7 +29,7 @@ public PerTraceSettings(ITraceSampler? traceSampler, ISpanSampler? spanSampler,
3029

3130
public ISpanSampler? SpanSampler { get; }
3231

33-
public IReadOnlyDictionary<string, string> ServiceNames { get; }
32+
public IReadOnlyDictionary<string, string> ServiceNames => Settings.ServiceNameMappings;
3433

3534
public NamingSchema Schema { get; }
3635

tracer/src/Datadog.Trace/TracerManager.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ public TracerManager(
101101
SpanEventsManager = new SpanEventsManager(discoveryService);
102102

103103
var schema = new NamingSchema(settings.MetadataSchemaVersion, settings.PeerServiceTagsEnabled, settings.RemoveClientServiceNamesEnabled, settings.MutableSettings.DefaultServiceName, settings.ServiceNameMappings, settings.PeerServiceNameMappings);
104-
PerTraceSettings = new(traceSampler, spanSampler, settings.ServiceNameMappings, schema, settings.MutableSettings);
104+
PerTraceSettings = new(traceSampler, spanSampler, schema, settings.MutableSettings);
105105

106106
SpanContextPropagator = SpanContextPropagatorFactory.GetSpanContextPropagator(settings.PropagationStyleInject, settings.PropagationStyleExtract, settings.PropagationExtractFirstOnly, settings.PropagationBehaviorExtract);
107107
}

0 commit comments

Comments
 (0)