Skip to content

Commit

Permalink
Fix the path of the log file (#5700)
Browse files Browse the repository at this point in the history
  • Loading branch information
kevingosse authored and andrewlock committed Jun 17, 2024
1 parent 16bb889 commit 88d1f7f
Showing 1 changed file with 5 additions and 5 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ public InstrumentationTests(ITestOutputHelper output, TelemetryReporterFixture f
SetServiceVersion("1.0.0");
}

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

var logDir = SetLogDirectory();
SetEnvironmentVariable(WatchFileEnvironmentVariable, Path.Combine(logDir, TelemetryReporterFixture.LogFileName));

using var agent = EnvironmentHelper.GetMockAgent(useTelemetry: true);
using var processResult = await RunSampleAndWaitForExit(agent, arguments: "traces 1");
Expand Down Expand Up @@ -256,9 +256,9 @@ public async Task OnEolFrameworkInSsi_WhenOverriden_CallsForwarderWithExpectedTe
SetEnvironmentVariable("DD_INJECTION_ENABLED", "tracer");
SetEnvironmentVariable("DD_TELEMETRY_FORWARDER_PATH", echoApp);
SetEnvironmentVariable("DD_INJECT_FORCE", "true");
SetEnvironmentVariable(WatchFileEnvironmentVariable, echoApp);

var logDir = SetLogDirectory();
SetEnvironmentVariable(WatchFileEnvironmentVariable, Path.Combine(logDir, TelemetryReporterFixture.LogFileName));

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

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

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

0 comments on commit 88d1f7f

Please sign in to comment.