Skip to content

Commit 88d1f7f

Browse files
Kevin Gosseandrewlock
authored andcommitted
Fix the path of the log file (#5700)
1 parent 16bb889 commit 88d1f7f

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

tracer/test/Datadog.Trace.ClrProfiler.IntegrationTests/InstrumentationTests.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ public InstrumentationTests(ITestOutputHelper output, TelemetryReporterFixture f
3232
SetServiceVersion("1.0.0");
3333
}
3434

35-
// There's nothing .NET 8 specific here, it's just that it's an identical test for all runtimes
36-
// so there's not really any point in testing it repeatedly
35+
// There's nothing .NET 8 specific here, it's just that it's an identical test for all runtimes
36+
// so there's not really any point in testing it repeatedly
3737
#if NET8_0
3838
[SkippableFact]
3939
[Trait("RunOnWindows", "True")]
@@ -226,9 +226,9 @@ public async Task OnEolFrameworkInSsi_WhenForwarderPathExists_CallsForwarderWith
226226
// indicate we're running in auto-instrumentation, this just needs to be non-null
227227
SetEnvironmentVariable("DD_INJECTION_ENABLED", "tracer");
228228
SetEnvironmentVariable("DD_TELEMETRY_FORWARDER_PATH", echoApp);
229-
SetEnvironmentVariable(WatchFileEnvironmentVariable, echoApp);
230229

231230
var logDir = SetLogDirectory();
231+
SetEnvironmentVariable(WatchFileEnvironmentVariable, Path.Combine(logDir, TelemetryReporterFixture.LogFileName));
232232

233233
using var agent = EnvironmentHelper.GetMockAgent(useTelemetry: true);
234234
using var processResult = await RunSampleAndWaitForExit(agent, arguments: "traces 1");
@@ -256,9 +256,9 @@ public async Task OnEolFrameworkInSsi_WhenOverriden_CallsForwarderWithExpectedTe
256256
SetEnvironmentVariable("DD_INJECTION_ENABLED", "tracer");
257257
SetEnvironmentVariable("DD_TELEMETRY_FORWARDER_PATH", echoApp);
258258
SetEnvironmentVariable("DD_INJECT_FORCE", "true");
259-
SetEnvironmentVariable(WatchFileEnvironmentVariable, echoApp);
260259

261260
var logDir = SetLogDirectory();
261+
SetEnvironmentVariable(WatchFileEnvironmentVariable, Path.Combine(logDir, TelemetryReporterFixture.LogFileName));
262262

263263
using var agent = EnvironmentHelper.GetMockAgent(useTelemetry: true);
264264
using var processResult = await RunSampleAndWaitForExit(agent, arguments: "traces 1");
@@ -290,9 +290,9 @@ public async Task OnSupportedFrameworkInSsi_CallsForwarderWithExpectedTelemetry(
290290
SetEnvironmentVariable("DD_TELEMETRY_FORWARDER_PATH", echoApp);
291291
// this value doesn't matter, should have same result, and _shouldn't_ change the metrics
292292
SetEnvironmentVariable("DD_INJECT_FORCE", isOverriden);
293-
SetEnvironmentVariable(WatchFileEnvironmentVariable, echoApp);
294293

295294
var logDir = SetLogDirectory($"_{isOverriden}");
295+
SetEnvironmentVariable(WatchFileEnvironmentVariable, Path.Combine(logDir, TelemetryReporterFixture.LogFileName));
296296

297297
using var agent = EnvironmentHelper.GetMockAgent(useTelemetry: true);
298298
using var processResult = await RunSampleAndWaitForExit(agent, arguments: "traces 1");

0 commit comments

Comments
 (0)