From ff9912f87a90242dd573a5fc384445754497175d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20Kie=C5=82kowicz?= Date: Wed, 1 Nov 2023 09:11:13 +0100 Subject: [PATCH] W3C Trace propagator tests - switch to level 1 (#4937) --- .../Dockerfile | 2 +- .../W3CTraceContextTests.cs | 4 ++-- .../docker-compose.yml | 1 - 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/test/OpenTelemetry.Instrumentation.W3cTraceContext.Tests/Dockerfile b/test/OpenTelemetry.Instrumentation.W3cTraceContext.Tests/Dockerfile index b0c7a87696..0508036d3e 100644 --- a/test/OpenTelemetry.Instrumentation.W3cTraceContext.Tests/Dockerfile +++ b/test/OpenTelemetry.Instrumentation.W3cTraceContext.Tests/Dockerfile @@ -9,7 +9,7 @@ FROM ubuntu AS w3c #Install git WORKDIR /w3c RUN apt-get update && apt-get install -y git -RUN git clone https://github.com/w3c/trace-context.git +RUN git clone --branch level-1 https://github.com/w3c/trace-context.git FROM mcr.microsoft.com/dotnet/sdk:${BUILD_SDK_VERSION} AS build ARG PUBLISH_CONFIGURATION=Release diff --git a/test/OpenTelemetry.Instrumentation.W3cTraceContext.Tests/W3CTraceContextTests.cs b/test/OpenTelemetry.Instrumentation.W3cTraceContext.Tests/W3CTraceContextTests.cs index 58ec321d60..aacc918f67 100644 --- a/test/OpenTelemetry.Instrumentation.W3cTraceContext.Tests/W3CTraceContextTests.cs +++ b/test/OpenTelemetry.Instrumentation.W3cTraceContext.Tests/W3CTraceContextTests.cs @@ -103,11 +103,11 @@ public void W3CTraceContextTestSuiteAsync(string value) if (AspNetCoreHostingVersion.Major <= 6) { - Assert.StartsWith("FAILED (failures=5)", lastLine); + Assert.StartsWith("FAILED (failures=3)", lastLine); } else { - Assert.StartsWith("FAILED (failures=2)", lastLine); + Assert.StartsWith("OK", lastLine); } } diff --git a/test/OpenTelemetry.Instrumentation.W3cTraceContext.Tests/docker-compose.yml b/test/OpenTelemetry.Instrumentation.W3cTraceContext.Tests/docker-compose.yml index ae3253078c..7c421786f5 100644 --- a/test/OpenTelemetry.Instrumentation.W3cTraceContext.Tests/docker-compose.yml +++ b/test/OpenTelemetry.Instrumentation.W3cTraceContext.Tests/docker-compose.yml @@ -11,4 +11,3 @@ services: command: --TestCaseFilter:CategoryName=W3CTraceContextTests environment: - OTEL_W3CTRACECONTEXT=enabled - - SPEC_LEVEL=2