Skip to content

Commit

Permalink
WIP changes to run on Linux VM
Browse files Browse the repository at this point in the history
  • Loading branch information
stevejgordon committed Nov 22, 2024
1 parent 9020565 commit 3fe9786
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 5 deletions.
3 changes: 2 additions & 1 deletion examples/Example.AutoInstrumentation/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG OTEL_VERSION=1.9.0
ARG OTEL_VERSION=1.9.0
FROM mcr.microsoft.com/dotnet/runtime:8.0 AS base
ARG TARGETPLATFORM
ARG TARGETARCH
Expand Down Expand Up @@ -66,6 +66,7 @@ ENV OTEL_DOTNET_AUTO_LOG_DIRECTORY=/app/logs
ENV ELASTIC_OTEL_LOG_TARGETS=stdout

ENV OTEL_DOTNET_AUTO_HOME="/app/otel"
ENV OTEL_DOTNET_AUTO_LOGGER="console"
ENV DOTNET_ADDITIONAL_DEPS="/app/otel/AdditionalDeps"
ENV DOTNET_SHARED_STORE="/app/otel/store"
ENV DOTNET_STARTUP_HOOKS="/app/otel/net/OpenTelemetry.AutoInstrumentation.StartupHook.dll"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,6 @@ public ExampleApplicationContainer()
.WithLogger(ConsoleLogger.Instance)
.WithOutputConsumer(_output)
.Build();

}

public async Task InitializeAsync()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ namespace Elastic.OpenTelemetry.AutoInstrumentation.IntegrationTests;

public class PluginLoaderTests(ExampleApplicationContainer exampleApplicationContainer) : IPartitionFixture<ExampleApplicationContainer>
{

[NotWindowsCiFact]
public async Task ObserveDistributionPluginLoad()
{
Expand All @@ -22,9 +21,7 @@ public async Task ObserveDistributionPluginLoad()
.And.Contain("Elastic Distribution of OpenTelemetry .NET:")
.And.Contain("ElasticOpenTelemetryBuilder initialized")
.And.Contain("Added 'Elastic.OpenTelemetry.Processors.ElasticCompatibilityProcessor'");

}

}

public class NotWindowsCiFact : FactAttribute
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ public async Task InitializeAsync()
await page.GetByRole(AriaRole.Textbox, new() { Name = "password" }).FillAsync(password);
await page.GetByRole(AriaRole.Button, new() { Name = "Log in" }).ClickAsync();


await WaitForServiceOnOverview(page);

StorageState = await page.Context.StorageStateAsync();
Expand Down

0 comments on commit 3fe9786

Please sign in to comment.