Skip to content

Commit bfd562a

Browse files
NachoEchevarriaNachoEchevarria
authored
Merge branch 'master' into nacho/FixCleanObjFiles
2 parents 24c13a0 + 1f8906c commit bfd562a

31 files changed

+168
-134
lines changed

‎tracer/src/Datadog.Trace/Ci/CiEnvironment/GitInfo.cs‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -192,6 +192,11 @@ public static IGitInfo GetCurrent()
192192
Log.Warning(ex, "Get directories failed with DirectoryNotFoundException");
193193
return null;
194194
}
195+
catch (IOException ex)
196+
{
197+
Log.Warning(ex, "Get directories failed with IOException");
198+
return null;
199+
}
195200
catch (UnauthorizedAccessException ex)
196201
{
197202
Log.Warning(ex, "Get directories failed with UnauthorizedAccessException");

‎tracer/src/Datadog.Trace/Ci/TestOptimizationTracerManager.cs‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ public TestOptimizationTracerManager(
3838
ITelemetryController telemetry,
3939
IDiscoveryService discoveryService,
4040
DataStreamsManager dataStreamsManager,
41-
string defaultServiceName,
4241
IGitMetadataTagsProvider gitMetadataTagsProvider,
4342
ITraceSampler traceSampler,
4443
ISpanSampler spanSampler,
@@ -56,7 +55,6 @@ public TestOptimizationTracerManager(
5655
telemetry,
5756
discoveryService,
5857
dataStreamsManager,
59-
defaultServiceName,
6058
gitMetadataTagsProvider,
6159
traceSampler,
6260
spanSampler,
@@ -156,7 +154,6 @@ public LockedManager(
156154
ITelemetryController telemetry,
157155
IDiscoveryService discoveryService,
158156
DataStreamsManager dataStreamsManager,
159-
string defaultServiceName,
160157
IGitMetadataTagsProvider gitMetadataTagsProvider,
161158
ITraceSampler traceSampler,
162159
ISpanSampler spanSampler,
@@ -174,7 +171,6 @@ public LockedManager(
174171
telemetry,
175172
discoveryService,
176173
dataStreamsManager,
177-
defaultServiceName,
178174
gitMetadataTagsProvider,
179175
traceSampler,
180176
spanSampler,

‎tracer/src/Datadog.Trace/Ci/TestOptimizationTracerManagerFactory.cs‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@ protected override TracerManager CreateTracerManagerFrom(
4747
ITelemetryController telemetry,
4848
IDiscoveryService discoveryService,
4949
DataStreamsManager dataStreamsManager,
50-
string defaultServiceName,
5150
IGitMetadataTagsProvider gitMetadataTagsProvider,
5251
ITraceSampler traceSampler,
5352
ISpanSampler spanSampler,
@@ -59,10 +58,10 @@ protected override TracerManager CreateTracerManagerFrom(
5958
telemetry.RecordTestOptimizationSettings(_settings);
6059
if (_testOptimizationTracerManagement.UseLockedTracerManager)
6160
{
62-
return new TestOptimizationTracerManager.LockedManager(settings, agentWriter, scopeManager, statsd, runtimeMetrics, logSubmissionManager, telemetry, discoveryService, dataStreamsManager, defaultServiceName, gitMetadataTagsProvider, traceSampler, spanSampler, remoteConfigurationManager, dynamicConfigurationManager, tracerFlareManager, spanEventsManager);
61+
return new TestOptimizationTracerManager.LockedManager(settings, agentWriter, scopeManager, statsd, runtimeMetrics, logSubmissionManager, telemetry, discoveryService, dataStreamsManager, gitMetadataTagsProvider, traceSampler, spanSampler, remoteConfigurationManager, dynamicConfigurationManager, tracerFlareManager, spanEventsManager);
6362
}
6463

65-
return new TestOptimizationTracerManager(settings, agentWriter, scopeManager, statsd, runtimeMetrics, logSubmissionManager, telemetry, discoveryService, dataStreamsManager, defaultServiceName, gitMetadataTagsProvider, traceSampler, spanSampler, remoteConfigurationManager, dynamicConfigurationManager, tracerFlareManager, spanEventsManager);
64+
return new TestOptimizationTracerManager(settings, agentWriter, scopeManager, statsd, runtimeMetrics, logSubmissionManager, telemetry, discoveryService, dataStreamsManager, gitMetadataTagsProvider, traceSampler, spanSampler, remoteConfigurationManager, dynamicConfigurationManager, tracerFlareManager, spanEventsManager);
6665
}
6766

6867
protected override ITelemetryController CreateTelemetryController(TracerSettings settings, IDiscoveryService discoveryService)

‎tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/AWS/DynamoDb/AwsDynamoDbCommon.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ public static Scope CreateScope(Tracer tracer, string operation, out AwsDynamoDb
3636
try
3737
{
3838
tags = tracer.CurrentTraceSettings.Schema.Database.CreateAwsDynamoDbTags();
39-
var serviceName = tracer.CurrentTraceSettings.GetServiceName(tracer, DatadogAwsDynamoDbServiceName);
39+
var serviceName = tracer.CurrentTraceSettings.GetServiceName(DatadogAwsDynamoDbServiceName);
4040
scope = tracer.StartActiveInternal(DynamoDbOperationName, parent: parentContext, tags: tags, serviceName: serviceName);
4141
var span = scope.Span;
4242

‎tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/AWS/EventBridge/AwsEventBridgeCommon.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ internal static class AwsEventBridgeCommon
4040
try
4141
{
4242
tags = tracer.CurrentTraceSettings.Schema.Messaging.CreateAwsEventBridgeTags(spanKind);
43-
var serviceName = tracer.CurrentTraceSettings.GetServiceName(tracer, DatadogAwsEventBridgeServiceName);
43+
var serviceName = tracer.CurrentTraceSettings.GetServiceName(DatadogAwsEventBridgeServiceName);
4444
var operationName = GetOperationName(tracer);
4545
scope = tracer.StartActiveInternal(operationName, parent: parentContext, tags: tags, serviceName: serviceName);
4646
var span = scope.Span;

‎tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/AWS/Kinesis/AwsKinesisCommon.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ internal static class AwsKinesisCommon
5959
try
6060
{
6161
tags = tracer.CurrentTraceSettings.Schema.Messaging.CreateAwsKinesisTags(spanKind);
62-
string serviceName = tracer.CurrentTraceSettings.GetServiceName(tracer, DatadogAwsKinesisServiceName);
62+
string serviceName = tracer.CurrentTraceSettings.GetServiceName(DatadogAwsKinesisServiceName);
6363
string operationName = tracer.CurrentTraceSettings.Schema.Messaging.GetOutboundOperationName(KinesisOperationName);
6464
scope = tracer.StartActiveInternal(operationName, parent: parentContext, tags: tags, serviceName: serviceName);
6565
var span = scope.Span;

‎tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/AWS/S3/AwsS3Common.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ internal static class AwsS3Common
3737
try
3838
{
3939
tags = tracer.CurrentTraceSettings.Schema.Messaging.CreateAwsS3Tags(spanKind);
40-
var serviceName = tracer.CurrentTraceSettings.GetServiceName(tracer, DatadogAwsS3ServiceName);
40+
var serviceName = tracer.CurrentTraceSettings.GetServiceName(DatadogAwsS3ServiceName);
4141
var operationName = GetOperationName(tracer);
4242
scope = tracer.StartActiveInternal(operationName, parent: parentContext, tags: tags, serviceName: serviceName);
4343
var span = scope.Span;

‎tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/AWS/SNS/AwsSnsCommon.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ internal static class AwsSnsCommon
3939
try
4040
{
4141
tags = tracer.CurrentTraceSettings.Schema.Messaging.CreateAwsSnsTags(spanKind);
42-
var serviceName = tracer.CurrentTraceSettings.GetServiceName(tracer, DatadogAwsSnsServiceName);
42+
var serviceName = tracer.CurrentTraceSettings.GetServiceName(DatadogAwsSnsServiceName);
4343
var operationName = GetOperationName(tracer, spanKind);
4444
scope = tracer.StartActiveInternal(operationName, parent: parentContext, tags: tags, serviceName: serviceName);
4545
var span = scope.Span;

‎tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/AWS/SQS/AwsSqsCommon.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ internal static class AwsSqsCommon
3939
try
4040
{
4141
tags = tracer.CurrentTraceSettings.Schema.Messaging.CreateAwsSqsTags(spanKind);
42-
string serviceName = tracer.CurrentTraceSettings.GetServiceName(tracer, DatadogAwsSqsServiceName);
42+
string serviceName = tracer.CurrentTraceSettings.GetServiceName(DatadogAwsSqsServiceName);
4343
string operationName = GetOperationName(tracer, spanKind);
4444
scope = tracer.StartActiveInternal(operationName, parent: parentContext, tags: tags, serviceName: serviceName);
4545
var span = scope.Span;

‎tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/AWS/StepFunctions/AwsStepFunctionsCommon.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ internal static class AwsStepFunctionsCommon
3838
try
3939
{
4040
tags = tracer.CurrentTraceSettings.Schema.Messaging.CreateAwsStepFunctionsTags(spanKind);
41-
var serviceName = tracer.CurrentTraceSettings.GetServiceName(tracer, DatadogAwsStepFunctionsServiceName);
41+
var serviceName = tracer.CurrentTraceSettings.GetServiceName(DatadogAwsStepFunctionsServiceName);
4242
var operationName = GetOperationName(tracer, spanKind);
4343
scope = tracer.StartActiveInternal(operationName, parent: parentContext, tags: tags, serviceName: serviceName);
4444
var span = scope.Span;

0 commit comments

Comments
 (0)