From 23859041cec4562f4ae5ccc9a88ffbcf0309278c Mon Sep 17 00:00:00 2001
From: Alan West <3676547+alanwest@users.noreply.github.com>
Date: Wed, 13 Jan 2021 21:03:31 -0800
Subject: [PATCH 1/2] Add OTLP exporter integration test (#1671)

* Add OTLP exporter integration test

* Fix typo

* Move DelegatingTestExporter to shared location

* Fix build

* Fix build part 2

* Fix build part 3 - third time's the charm right?

* Fix build part 4 - third time's not the charm.

* Fix TargetFrameworks for OTLP exporter project and add explanation

* Set switch allowing for insecure GrpcChannel for netcoreapp3.1

* Learning to spell is a life-long process

Co-authored-by: Cijo Thomas <cithomas@microsoft.com>
---
 .github/workflows/integration.yml             | 11 +++
 ...etry.Exporter.OpenTelemetryProtocol.csproj | 22 +++++-
 .../Dockerfile                                | 17 +++++
 .../IntegrationTests.cs                       | 70 +++++++++++++++++++
 ...xporter.OpenTelemetryProtocol.Tests.csproj |  7 +-
 .../config.yaml                               | 20 ++++++
 .../docker-compose.yml                        | 24 +++++++
 .../Shared/DelegatingTestExporter.cs          | 40 +++++++++++
 .../SkipUnlessEnvVarFoundFactAttribute.cs     | 44 ++++++++++++
 9 files changed, 252 insertions(+), 3 deletions(-)
 create mode 100644 test/OpenTelemetry.Exporter.OpenTelemetryProtocol.Tests/Dockerfile
 create mode 100644 test/OpenTelemetry.Exporter.OpenTelemetryProtocol.Tests/IntegrationTests.cs
 create mode 100644 test/OpenTelemetry.Exporter.OpenTelemetryProtocol.Tests/config.yaml
 create mode 100644 test/OpenTelemetry.Exporter.OpenTelemetryProtocol.Tests/docker-compose.yml
 create mode 100644 test/OpenTelemetry.Tests/Shared/DelegatingTestExporter.cs
 create mode 100644 test/OpenTelemetry.Tests/Shared/SkipUnlessEnvVarFoundFactAttribute.cs

diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml
index 3c001cc5c0a..3da3a26d2d7 100644
--- a/.github/workflows/integration.yml
+++ b/.github/workflows/integration.yml
@@ -43,3 +43,14 @@ jobs:
       - uses: actions/checkout@v2
       - name: Run W3C Trace Context docker-compose.integration
         run: docker-compose --file=test/OpenTelemetry.Instrumentation.W3cTraceContext.Tests/docker-compose.yml --file=build/docker-compose.${{ matrix.version }}.yml --project-directory=. up --exit-code-from=tests --build
+
+  otlp-exporter-test:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        version: [netcoreapp2.1,netcoreapp3.1]
+    steps:
+      - uses: actions/checkout@v2
+      - name: Run OTLP Exporter docker-compose.integration
+        run: docker-compose --file=test/OpenTelemetry.Exporter.OpenTelemetryProtocol.Tests/docker-compose.yml --file=build/docker-compose.${{ matrix.version }}.yml --project-directory=. up --exit-code-from=tests --build
diff --git a/src/OpenTelemetry.Exporter.OpenTelemetryProtocol/OpenTelemetry.Exporter.OpenTelemetryProtocol.csproj b/src/OpenTelemetry.Exporter.OpenTelemetryProtocol/OpenTelemetry.Exporter.OpenTelemetryProtocol.csproj
index 34067c518fa..e29b6855e7a 100644
--- a/src/OpenTelemetry.Exporter.OpenTelemetryProtocol/OpenTelemetry.Exporter.OpenTelemetryProtocol.csproj
+++ b/src/OpenTelemetry.Exporter.OpenTelemetryProtocol/OpenTelemetry.Exporter.OpenTelemetryProtocol.csproj
@@ -1,6 +1,26 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net452;net46;netstandard2.0;netstandard2.1</TargetFrameworks>
+    <TargetFrameworks>net452;net46;netstandard2.0</TargetFrameworks>
+
+    <!--
+        There is an integration test for the OTLP exporter that runs a test targeting netcoreapp2.1, netcoreapp3.1 and net5.0.
+        The .NET Core 2.1 SDK cannot handle the presence of a netstandard2.1 target, so this project fails to build for the
+        netcoreapp2.1 test with the following error:
+
+            /usr/share/dotnet/sdk/2.1.811/Sdks/Microsoft.NET.Sdk/targets/Microsoft.NET.TargetFrameworkInference.targets(150,5):
+            error NETSDK1045: The current .NET SDK does not support targeting .NET Standard 2.1.
+            Either target .NET Standard 2.0 or lower, or use a version of the .NET SDK that supports .NET Standard 2.1.
+            [/repo/src/OpenTelemetry.Exporter.OpenTelemetryProtocol/OpenTelemetry.Exporter.OpenTelemetryProtocol.csproj]
+
+        When the CI runs the integration test, the TARGET_FRAMEWORK variable is set. The presence of this variable is used
+        to determine whether to include the netstandard2.1 target.
+
+        Ideally, this would check the version of the SDK used to build the project rather than a check that is dependent on
+        how the integration test works. I have yet to find an available MSBuild property for checking SDK version.
+    -->
+    <TargetFrameworks Condition="$(TARGET_FRAMEWORK) == ''">$(TargetFrameworks);netstandard2.1</TargetFrameworks>
+    <TargetFrameworks Condition="$(TARGET_FRAMEWORK) != '' AND $(TARGET_FRAMEWORK) != 'netcoreapp2.1'">netstandard2.1</TargetFrameworks>
+
     <Description>OpenTelemetry protocol exporter for OpenTelemetry .NET</Description>
     <PackageTags>$(PackageTags);OTLP</PackageTags>
   </PropertyGroup>
diff --git a/test/OpenTelemetry.Exporter.OpenTelemetryProtocol.Tests/Dockerfile b/test/OpenTelemetry.Exporter.OpenTelemetryProtocol.Tests/Dockerfile
new file mode 100644
index 00000000000..154130b97c1
--- /dev/null
+++ b/test/OpenTelemetry.Exporter.OpenTelemetryProtocol.Tests/Dockerfile
@@ -0,0 +1,17 @@
+# Create a container for running the OpenTelemetry Collector integration tests.
+# This should be run from the root of the repo:
+# docker build --file test/OpenTelemetry.Exporter.OpenTelemetryProtocol.Tests/Dockerfile
+
+ARG SDK_VERSION=3.1
+FROM mcr.microsoft.com/dotnet/core/sdk:${SDK_VERSION} AS build
+ARG PUBLISH_CONFIGURATION=Release
+ARG PUBLISH_FRAMEWORK=netcoreapp3.1
+WORKDIR /repo
+COPY . ./
+WORKDIR "/repo/test/OpenTelemetry.Exporter.OpenTelemetryProtocol.Tests"
+RUN dotnet publish "OpenTelemetry.Exporter.OpenTelemetryProtocol.Tests.csproj" -c "${PUBLISH_CONFIGURATION}" -f "${PUBLISH_FRAMEWORK}" -o /drop -p:IntegrationBuild=true -p:TARGET_FRAMEWORK=${PUBLISH_FRAMEWORK}
+
+FROM mcr.microsoft.com/dotnet/core/sdk:${SDK_VERSION} AS final
+WORKDIR /test
+COPY --from=build /drop .
+ENTRYPOINT ["dotnet", "vstest", "OpenTelemetry.Exporter.OpenTelemetryProtocol.Tests.dll"]
diff --git a/test/OpenTelemetry.Exporter.OpenTelemetryProtocol.Tests/IntegrationTests.cs b/test/OpenTelemetry.Exporter.OpenTelemetryProtocol.Tests/IntegrationTests.cs
new file mode 100644
index 00000000000..1d001eeefe7
--- /dev/null
+++ b/test/OpenTelemetry.Exporter.OpenTelemetryProtocol.Tests/IntegrationTests.cs
@@ -0,0 +1,70 @@
+// <copyright file="IntegrationTests.cs" company="OpenTelemetry Authors">
+// Copyright The OpenTelemetry Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+// </copyright>
+
+using System;
+using System.Diagnostics;
+using OpenTelemetry.Tests;
+using OpenTelemetry.Trace;
+using Xunit;
+
+namespace OpenTelemetry.Exporter.OpenTelemetryProtocol.Tests
+{
+    public class IntegrationTests
+    {
+        private const string CollectorEndpointEnvVarName = "OTEL_EXPORTER_OTLP_ENDPOINT";
+        private static readonly string CollectorEndpoint = SkipUnlessEnvVarFoundFactAttribute.GetEnvironmentVariable(CollectorEndpointEnvVarName);
+
+        [Trait("CategoryName", "CollectorIntegrationTests")]
+        [SkipUnlessEnvVarFoundFact(CollectorEndpointEnvVarName)]
+        public void ExportResultIsSuccess()
+        {
+#if NETCOREAPP3_1
+            // Adding the OtlpExporter creates a GrpcChannel.
+            // This switch must be set before creating a GrpcChannel/HttpClient when calling an insecure gRPC service.
+            // See: https://docs.microsoft.com/aspnet/core/grpc/troubleshoot#call-insecure-grpc-services-with-net-core-client
+            AppContext.SetSwitch("System.Net.Http.SocketsHttpHandler.Http2UnencryptedSupport", true);
+#endif
+
+            var exporterOptions = new OtlpExporterOptions
+            {
+#if NETCOREAPP3_1 || NET5_0
+                Endpoint = new System.Uri($"http://{CollectorEndpoint}"),
+#else
+                Endpoint = CollectorEndpoint,
+#endif
+            };
+
+            var otlpExporter = new OtlpExporter(exporterOptions);
+            var delegatingExporter = new DelegatingTestExporter<Activity>(otlpExporter);
+            var exportActivityProcessor = new SimpleActivityExportProcessor(delegatingExporter);
+
+            var activitySourceName = "otlp.collector.test";
+
+            var builder = Sdk.CreateTracerProviderBuilder()
+                .AddSource(activitySourceName)
+                .AddProcessor(exportActivityProcessor);
+
+            using var tracerProvider = builder.Build();
+
+            var source = new ActivitySource(activitySourceName);
+            var activity = source.StartActivity("Test Activity");
+            activity?.Stop();
+
+            Assert.Single(delegatingExporter.ExportResults);
+            Assert.Equal(ExportResult.Success, delegatingExporter.ExportResults[0]);
+        }
+    }
+}
diff --git a/test/OpenTelemetry.Exporter.OpenTelemetryProtocol.Tests/OpenTelemetry.Exporter.OpenTelemetryProtocol.Tests.csproj b/test/OpenTelemetry.Exporter.OpenTelemetryProtocol.Tests/OpenTelemetry.Exporter.OpenTelemetryProtocol.Tests.csproj
index b8219cfd7a5..699181ad13a 100644
--- a/test/OpenTelemetry.Exporter.OpenTelemetryProtocol.Tests/OpenTelemetry.Exporter.OpenTelemetryProtocol.Tests.csproj
+++ b/test/OpenTelemetry.Exporter.OpenTelemetryProtocol.Tests/OpenTelemetry.Exporter.OpenTelemetryProtocol.Tests.csproj
@@ -1,8 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp2.1;netcoreapp3.1;net5.0</TargetFrameworks>
-    <TargetFrameworks Condition="$(OS) == 'Windows_NT'">$(TargetFrameworks);net452;net46</TargetFrameworks>
+    <TargetFrameworks Condition="$(TARGET_FRAMEWORK) == ''">netcoreapp2.1;netcoreapp3.1;net5.0</TargetFrameworks>
+    <TargetFrameworks Condition="$(TARGET_FRAMEWORK) == '' AND $(OS) == 'Windows_NT'">$(TargetFrameworks);net452;net46</TargetFrameworks>
+    <TargetFrameworks Condition="$(TARGET_FRAMEWORK) != ''">$(TARGET_FRAMEWORK)</TargetFrameworks>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
@@ -22,7 +23,9 @@
 
   <ItemGroup>
     <Compile Include="$(RepoRoot)\src\OpenTelemetry\Internal\DateTimeOffsetExtensions.net452.cs" Link="Includes\DateTimeOffsetExtensions.net452.cs" />
+    <Compile Include="$(RepoRoot)\test\OpenTelemetry.Tests\Shared\DelegatingTestExporter.cs" Link="Includes\DelegatingTestExporter.cs" />
     <Compile Include="$(RepoRoot)\test\OpenTelemetry.Tests\Shared\EventSourceTestHelper.cs" Link="Includes\EventSourceTestHelper.cs" />
+    <Compile Include="$(RepoRoot)\test\OpenTelemetry.Tests\Shared\SkipUnlessEnvVarFoundFactAttribute.cs" Link="Includes\SkipUnlessEnvVarFoundFactAttribute.cs" />
     <Compile Include="$(RepoRoot)\test\OpenTelemetry.Tests\Shared\TestActivityProcessor.cs" Link="Includes\TestActivityProcessor.cs" />
     <Compile Include="$(RepoRoot)\test\OpenTelemetry.Tests\Shared\TestEventListener.cs" Link="Includes\TestEventListener.cs" />
     <Compile Include="$(RepoRoot)\test\OpenTelemetry.Tests\Shared\TestExporter.cs" Link="Includes\TestExporter.cs" />
diff --git a/test/OpenTelemetry.Exporter.OpenTelemetryProtocol.Tests/config.yaml b/test/OpenTelemetry.Exporter.OpenTelemetryProtocol.Tests/config.yaml
new file mode 100644
index 00000000000..544292318ff
--- /dev/null
+++ b/test/OpenTelemetry.Exporter.OpenTelemetryProtocol.Tests/config.yaml
@@ -0,0 +1,20 @@
+# This is a configuration file for the OpenTelemetry Collector intended to be
+# used in conjunction with the OTLP Exporter integration tests.
+#
+# For more information about the OpenTelemetry Collector see:
+#   https://github.com/open-telemetry/opentelemetry-collector
+#
+receivers:
+  otlp:
+    protocols:
+      grpc:
+
+exporters:
+  logging:
+    loglevel: debug
+
+service:
+  pipelines:
+    traces:
+      receivers: [otlp]
+      exporters: [logging]
diff --git a/test/OpenTelemetry.Exporter.OpenTelemetryProtocol.Tests/docker-compose.yml b/test/OpenTelemetry.Exporter.OpenTelemetryProtocol.Tests/docker-compose.yml
new file mode 100644
index 00000000000..5e7aee9b690
--- /dev/null
+++ b/test/OpenTelemetry.Exporter.OpenTelemetryProtocol.Tests/docker-compose.yml
@@ -0,0 +1,24 @@
+# Starts an OpenTelemetry Collector and then runs the OTLP exporter integration tests.
+# This should be run from the root of the repo:
+#    docker-compose --file=test/OpenTelemetry.Exporter.OpenTelemetryProtocol.Tests/docker-compose.yml --project-directory=. up --exit-code-from=tests --build
+
+version: '3.7'
+
+services:
+  otel-collector:
+    image: otel/opentelemetry-collector
+    volumes:
+      - ./test/OpenTelemetry.Exporter.OpenTelemetryProtocol.Tests:/cfg
+    command: --config=/cfg/config.yaml
+    ports:
+      - "55680:55680"
+
+  tests:
+    build:
+      context: .
+      dockerfile: ./test/OpenTelemetry.Exporter.OpenTelemetryProtocol.Tests/Dockerfile
+    command: --TestCaseFilter:CategoryName=CollectorIntegrationTests
+    environment:
+      - OTEL_EXPORTER_OTLP_ENDPOINT=otel-collector:55680
+    depends_on:
+      - otel-collector
diff --git a/test/OpenTelemetry.Tests/Shared/DelegatingTestExporter.cs b/test/OpenTelemetry.Tests/Shared/DelegatingTestExporter.cs
new file mode 100644
index 00000000000..a589668369a
--- /dev/null
+++ b/test/OpenTelemetry.Tests/Shared/DelegatingTestExporter.cs
@@ -0,0 +1,40 @@
+// <copyright file="DelegatingTestExporter.cs" company="OpenTelemetry Authors">
+// Copyright The OpenTelemetry Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+// </copyright>
+
+using System.Collections.Generic;
+
+namespace OpenTelemetry.Tests
+{
+    public class DelegatingTestExporter<T> : BaseExporter<T>
+        where T : class
+    {
+        public List<ExportResult> ExportResults = new List<ExportResult>();
+
+        private readonly BaseExporter<T> exporter;
+
+        public DelegatingTestExporter(BaseExporter<T> exporter)
+        {
+            this.exporter = exporter;
+        }
+
+        public override ExportResult Export(in Batch<T> batch)
+        {
+            var result = this.exporter.Export(batch);
+            this.ExportResults.Add(result);
+            return result;
+        }
+    }
+}
diff --git a/test/OpenTelemetry.Tests/Shared/SkipUnlessEnvVarFoundFactAttribute.cs b/test/OpenTelemetry.Tests/Shared/SkipUnlessEnvVarFoundFactAttribute.cs
new file mode 100644
index 00000000000..512bd6188c3
--- /dev/null
+++ b/test/OpenTelemetry.Tests/Shared/SkipUnlessEnvVarFoundFactAttribute.cs
@@ -0,0 +1,44 @@
+// <copyright file="SkipUnlessEnvVarFoundFactAttribute.cs" company="OpenTelemetry Authors">
+// Copyright The OpenTelemetry Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+// </copyright>
+
+using System;
+using Xunit;
+
+namespace OpenTelemetry.Tests
+{
+    internal class SkipUnlessEnvVarFoundFactAttribute : FactAttribute
+    {
+        public SkipUnlessEnvVarFoundFactAttribute(string environmentVariable)
+        {
+            if (string.IsNullOrEmpty(GetEnvironmentVariable(environmentVariable)))
+            {
+                this.Skip = $"Skipped because {environmentVariable} environment variable was not configured.";
+            }
+        }
+
+        public static string GetEnvironmentVariable(string environmentVariableName)
+        {
+            string environmentVariableValue = Environment.GetEnvironmentVariable(environmentVariableName, EnvironmentVariableTarget.Process);
+
+            if (string.IsNullOrEmpty(environmentVariableValue))
+            {
+                environmentVariableValue = Environment.GetEnvironmentVariable(environmentVariableName, EnvironmentVariableTarget.Machine);
+            }
+
+            return environmentVariableValue;
+        }
+    }
+}

From 9b60e1fe8f2d18f89c47381b1dd442917cfbab5d Mon Sep 17 00:00:00 2001
From: xiang17 <xili9@microsoft.com>
Date: Thu, 14 Jan 2021 09:31:15 -0800
Subject: [PATCH 2/2] Enable integration tests for .NET 5.0 (#1694)

* Enable integration tests for .NET 5.0

* Change configuration for other packages (StackExchangeRedis and SqlClient)

Co-authored-by: Cijo Thomas <cithomas@microsoft.com>
---
 .github/workflows/integration.yml                         | 6 +++---
 build/docker-compose.net5.0.yml                           | 8 ++++++++
 .../dockerfile                                            | 8 ++++----
 .../dockerfile                                            | 8 ++++----
 .../Dockerfile                                            | 8 ++++----
 5 files changed, 23 insertions(+), 15 deletions(-)
 create mode 100644 build/docker-compose.net5.0.yml

diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml
index 3da3a26d2d7..2e700f36ccd 100644
--- a/.github/workflows/integration.yml
+++ b/.github/workflows/integration.yml
@@ -16,7 +16,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        version: [netcoreapp2.1,netcoreapp3.1]
+        version: [netcoreapp2.1,netcoreapp3.1,net5.0]
     steps:
       - uses: actions/checkout@v2
       - name: Run redis docker-compose.integration
@@ -27,7 +27,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        version: [netcoreapp2.1,netcoreapp3.1]
+        version: [netcoreapp2.1,netcoreapp3.1,net5.0]
     steps:
       - uses: actions/checkout@v2
       - name: Run sql docker-compose.integration
@@ -38,7 +38,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        version: [netcoreapp2.1,netcoreapp3.1]
+        version: [netcoreapp2.1,netcoreapp3.1,net5.0]
     steps:
       - uses: actions/checkout@v2
       - name: Run W3C Trace Context docker-compose.integration
diff --git a/build/docker-compose.net5.0.yml b/build/docker-compose.net5.0.yml
new file mode 100644
index 00000000000..fe9fe982dd4
--- /dev/null
+++ b/build/docker-compose.net5.0.yml
@@ -0,0 +1,8 @@
+version: '3.7'
+
+services:
+  tests:
+    build:
+      args:
+        PUBLISH_FRAMEWORK: net5.0
+        SDK_VERSION: 5.0
diff --git a/test/OpenTelemetry.Instrumentation.SqlClient.Tests/dockerfile b/test/OpenTelemetry.Instrumentation.SqlClient.Tests/dockerfile
index c4038ff5d9a..d9ea3cdbb7f 100644
--- a/test/OpenTelemetry.Instrumentation.SqlClient.Tests/dockerfile
+++ b/test/OpenTelemetry.Instrumentation.SqlClient.Tests/dockerfile
@@ -2,17 +2,17 @@
 # This should be run from the root of the repo:
 # docker build --file test/OpenTelemetry.Instrumentation.SqlClient.Tests/dockerfile .
 
-ARG SDK_VERSION=3.1
-FROM mcr.microsoft.com/dotnet/core/sdk:${SDK_VERSION} AS build
+ARG SDK_VERSION=5.0
+FROM mcr.microsoft.com/dotnet/sdk:${SDK_VERSION} AS build
 ARG PUBLISH_CONFIGURATION=Release
-ARG PUBLISH_FRAMEWORK=netcoreapp3.1
+ARG PUBLISH_FRAMEWORK=net5.0
 WORKDIR /repo
 COPY . ./
 RUN ls -la /repo
 WORKDIR "/repo/test/OpenTelemetry.Instrumentation.SqlClient.Tests"
 RUN dotnet publish "OpenTelemetry.Instrumentation.SqlClient.Tests.csproj" -c "${PUBLISH_CONFIGURATION}" -f "${PUBLISH_FRAMEWORK}" -o /drop -p:IntegrationBuild=true -p:TARGET_FRAMEWORK=${PUBLISH_FRAMEWORK}
 
-FROM mcr.microsoft.com/dotnet/core/sdk:${SDK_VERSION} AS final
+FROM mcr.microsoft.com/dotnet/sdk:${SDK_VERSION} AS final
 ADD https://github.com/ufoscout/docker-compose-wait/releases/download/2.7.3/wait /wait
 RUN chmod +x /wait
 WORKDIR /test
diff --git a/test/OpenTelemetry.Instrumentation.StackExchangeRedis.Tests/dockerfile b/test/OpenTelemetry.Instrumentation.StackExchangeRedis.Tests/dockerfile
index 493bed807e4..90907e708b0 100644
--- a/test/OpenTelemetry.Instrumentation.StackExchangeRedis.Tests/dockerfile
+++ b/test/OpenTelemetry.Instrumentation.StackExchangeRedis.Tests/dockerfile
@@ -2,16 +2,16 @@
 # This should be run from the root of the repo:
 # docker build --file test/OpenTelemetry.Instrumentation.StackExchangeRedis.Tests/dockerfile .
 
-ARG SDK_VERSION=3.1
-FROM mcr.microsoft.com/dotnet/core/sdk:${SDK_VERSION} AS build
+ARG SDK_VERSION=5.0
+FROM mcr.microsoft.com/dotnet/sdk:${SDK_VERSION} AS build
 ARG PUBLISH_CONFIGURATION=Release
-ARG PUBLISH_FRAMEWORK=netcoreapp3.1
+ARG PUBLISH_FRAMEWORK=net5.0
 WORKDIR /repo
 COPY . ./
 WORKDIR "/repo/test/OpenTelemetry.Instrumentation.StackExchangeRedis.Tests"
 RUN dotnet publish "OpenTelemetry.Instrumentation.StackExchangeRedis.Tests.csproj" -c "${PUBLISH_CONFIGURATION}" -f "${PUBLISH_FRAMEWORK}" -o /drop -p:IntegrationBuild=true -p:TARGET_FRAMEWORK=${PUBLISH_FRAMEWORK}
 
-FROM mcr.microsoft.com/dotnet/core/sdk:${SDK_VERSION} AS final
+FROM mcr.microsoft.com/dotnet/sdk:${SDK_VERSION} AS final
 WORKDIR /test
 COPY --from=build /drop .
 ENTRYPOINT ["dotnet", "vstest", "OpenTelemetry.Instrumentation.StackExchangeRedis.Tests.dll"]
diff --git a/test/OpenTelemetry.Instrumentation.W3cTraceContext.Tests/Dockerfile b/test/OpenTelemetry.Instrumentation.W3cTraceContext.Tests/Dockerfile
index bce6ebb0d44..163c0f26a7b 100644
--- a/test/OpenTelemetry.Instrumentation.W3cTraceContext.Tests/Dockerfile
+++ b/test/OpenTelemetry.Instrumentation.W3cTraceContext.Tests/Dockerfile
@@ -2,22 +2,22 @@
 # This should be run from the root of the repo:
 # docker build --file test/OpenTelemetry.Instrumentation.W3cTraceContext.Tests/Dockerfile .
 
-ARG SDK_VERSION=3.1
+ARG SDK_VERSION=5.0
 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
 
-FROM mcr.microsoft.com/dotnet/core/sdk:3.1 AS build
+FROM mcr.microsoft.com/dotnet/sdk:5.0 AS build
 ARG PUBLISH_CONFIGURATION=Release
-ARG PUBLISH_FRAMEWORK=netcoreapp3.1
+ARG PUBLISH_FRAMEWORK=net5.0
 WORKDIR /repo
 COPY . ./
 WORKDIR "/repo/test/OpenTelemetry.Instrumentation.W3cTraceContext.Tests"
 RUN dotnet publish "OpenTelemetry.Instrumentation.W3cTraceContext.Tests.csproj" -c "${PUBLISH_CONFIGURATION}" -f "${PUBLISH_FRAMEWORK}" -o /drop -p:IntegrationBuild=true -p:TARGET_FRAMEWORK=${PUBLISH_FRAMEWORK}
 
-FROM mcr.microsoft.com/dotnet/core/sdk:${SDK_VERSION} AS final
+FROM mcr.microsoft.com/dotnet/sdk:${SDK_VERSION} AS final
 WORKDIR /test
 COPY --from=build /drop .
 COPY --from=w3c /w3c .