Skip to content

Disable tiered compilation in integration tests #3479

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
andrewlock merged 2 commits into from
Nov 17, 2022
Merged

Disable tiered compilation in integration tests #3479

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
52cd15b
Disable tiered compilation everywhere
andrewlock Nov 16, 2022
59fc775
Add COMPlus_TieredCompilation=0 to smoke tests
andrewlock Nov 17, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions tracer/build/_build/docker/smoke.dotnet-tool.dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,9 @@ ENV DD_TRACE_DEBUG=1
ENV ASPNETCORE_URLS=http://localhost:5000
ENV DD_PROFILING_LOG_DIR=/var/log/datadog/dotnet

# see https://github.com/dotnet/runtime/issues/77973
ENV COMPlus_TieredCompilation=0

# Copy the app across
COPY --from=builder /src/publish /app/.

Expand Down
3 changes: 3 additions & 0 deletions tracer/build/_build/docker/smoke.dotnet-tool.nuget.dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,9 @@ ENV DD_TRACE_DEBUG=1
ENV ASPNETCORE_URLS=http://localhost:5000
ENV DD_PROFILING_LOG_DIR=/var/log/datadog/dotnet

# see https://github.com/dotnet/runtime/issues/77973
ENV COMPlus_TieredCompilation=0

# Copy the app across
COPY --from=builder /src/publish /app/.

Expand Down
3 changes: 3 additions & 0 deletions tracer/build/_build/docker/smoke.windows.dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,9 @@ ENV DD_PROFILING_ENABLED=1 \
DD_PROFILING_LOG_DIR="C:\logs" \
ASPNETCORE_URLS=http://localhost:5000

# see https://github.com/dotnet/runtime/issues/77973
ENV COMPlus_TieredCompilation=0

# Copy the app across
COPY --from=builder /src/publish /app/.

Expand Down
3 changes: 3 additions & 0 deletions tracer/build/_build/docker/smoke.windows.dotnet-tool.dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,9 @@ ENV DD_PROFILING_ENABLED=1 \
DD_PROFILING_LOG_DIR="C:\logs" \
ASPNETCORE_URLS=http://localhost:5000

# see https://github.com/dotnet/runtime/issues/77973
ENV COMPlus_TieredCompilation=0

# Copy the app across
COPY --from=builder /src/publish /app/.

Expand Down
3 changes: 3 additions & 0 deletions tracer/build/_build/docker/smoke.windows.nuget.dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,9 @@ ENV CORECLR_ENABLE_PROFILING=1 \
DD_PROFILING_ENABLED=1 \
ASPNETCORE_URLS=http://localhost:5000

# see https://github.com/dotnet/runtime/issues/77973
ENV COMPlus_TieredCompilation=0

# Copy the app across
COPY --from=builder /src/publish /app/.

Expand Down
3 changes: 3 additions & 0 deletions tracer/build/_build/docker/smoke.windows.tracer-home.dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,9 @@ ENV DD_PROFILING_ENABLED=1 \
DD_PROFILING_LOG_DIR="C:\logs" \
ASPNETCORE_URLS=http://localhost:5000

# see https://github.com/dotnet/runtime/issues/77973
ENV COMPlus_TieredCompilation=0

# Copy the app across
COPY --from=builder /src/publish /app/.

Expand Down
1 change: 1 addition & 0 deletions tracer/test/Datadog.Trace.TestHelpers/EnvironmentHelper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,6 +189,7 @@ public void SetEnvironmentVariables(
{
string profilerEnabled = AutomaticInstrumentationEnabled ? "1" : "0";
environmentVariables["DD_DOTNET_TRACER_HOME"] = MonitoringHome;
environmentVariables["COMPlus_TieredCompilation"] = "0";

// Everything should be using the native loader now
var nativeLoaderPath = GetNativeLoaderPath();
Expand Down