upgraded the build/CI to use net8.0 (#4876)

open-telemetry · Oct 2, 2023 · 8ea6bb9 · 8ea6bb9
1 parent bb57319
commit 8ea6bb9
Show file tree

Hide file tree

Showing 16 changed files with 49 additions and 41 deletions.
diff --git a/.github/workflows/ci-instrumentation-libraries-md.yml b/.github/workflows/ci-instrumentation-libraries-md.yml
@@ -18,7 +18,7 @@ jobs:
     strategy:
       matrix:
         os: [ windows-latest, ubuntu-latest ]
-        version: [ net462, net6.0, net7.0 ]
+        version: [ net462, net6.0, net7.0, net8.0 ]
         exclude:
         - os: ubuntu-latest
           version: net462

diff --git a/.github/workflows/ci-instrumentation-libraries.yml b/.github/workflows/ci-instrumentation-libraries.yml
@@ -16,7 +16,7 @@ jobs:
       fail-fast: false  # ensures the entire test matrix is run, even if one permutation fails
       matrix:
         os: [ windows-latest, ubuntu-latest ]
-        version: [ net462, net6.0, net7.0 ]
+        version: [ net462, net6.0, net7.0, net8.0 ]
         exclude:
         - os: ubuntu-latest
           version: net462

diff --git a/.github/workflows/ci-md.yml b/.github/workflows/ci-md.yml
@@ -18,7 +18,7 @@ jobs:
     strategy:
       matrix:
         os: [ windows-latest, ubuntu-latest ]
-        version: [ net462, net6.0, net7.0 ]
+        version: [ net462, net6.0, net7.0, net8.0 ]
         exclude:
         - os: ubuntu-latest
           version: net462
@@ -31,7 +31,7 @@ jobs:
     strategy:
       matrix:
         os: [ windows-latest, ubuntu-latest ]
-        version: [ net462, net6.0, net7.0 ]
+        version: [ net462, net6.0, net7.0, net8.0 ]
         exclude:
         - os: ubuntu-latest
           version: net462

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -16,7 +16,7 @@ jobs:
       fail-fast: false  # ensures the entire test matrix is run, even if one permutation fails
       matrix:
         os: [ windows-latest, ubuntu-latest ]
-        version: [ net462, net6.0, net7.0 ]
+        version: [ net462, net6.0, net7.0, net8.0 ]
         exclude:
         - os: ubuntu-latest
           version: net462
@@ -44,7 +44,7 @@ jobs:
       fail-fast: false  # ensures the entire test matrix is run, even if one permutation fails
       matrix:
         os: [ windows-latest, ubuntu-latest ]
-        version: [ net462, net6.0, net7.0 ]
+        version: [ net462, net6.0, net7.0, net8.0 ]
         exclude:
         - os: ubuntu-latest
           version: net462

diff --git a/.github/workflows/integration-md.yml b/.github/workflows/integration-md.yml
@@ -18,22 +18,22 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        version: [net6.0,net7.0]
+        version: [ net6.0, net7.0, net8.0 ]
     steps:
       - run: 'echo "No build required"'
 
   w3c-trace-context-test:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        version: [net6.0,net7.0]
+        version: [ net6.0, net7.0, net8.0 ]
     steps:
       - run: 'echo "No build required"'
 
   otlp-exporter-test:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        version: [net6.0,net7.0]
+        version: [ net6.0, net7.0 , net8.0 ]
     steps:
       - run: 'echo "No build required"'
diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml
@@ -16,7 +16,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        version: [net6.0,net7.0]
+        version: [ net6.0, net7.0 ]
     steps:
       - uses: actions/checkout@v4
 
@@ -28,7 +28,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        version: [net6.0,net7.0]
+        version: [ net6.0, net7.0, net8.0 ]
     steps:
       - uses: actions/checkout@v4
 

diff --git a/build/Common.props b/build/Common.props
@@ -23,13 +23,13 @@
     <TargetFrameworksForPrometheusAspNetCore>net6.0</TargetFrameworksForPrometheusAspNetCore>
 
     <!-- non-production TFMs -->
-    <TargetFrameworksForAspNetCoreTests>net7.0;net6.0</TargetFrameworksForAspNetCoreTests>
+    <TargetFrameworksForAspNetCoreTests>net8.0;net7.0;net6.0</TargetFrameworksForAspNetCoreTests>
     <TargetFrameworksForAotCompatibilityTests>net8.0</TargetFrameworksForAotCompatibilityTests>
     <TargetFrameworksForDocs>net7.0;net6.0</TargetFrameworksForDocs>
     <TargetFrameworksForDocs Condition="$(OS) == 'Windows_NT' And '$(UsingMicrosoftNETSdkWeb)' == 'False'">
       $(TargetFrameworksForDocs);net481;net48;net472;net471;net47;net462
     </TargetFrameworksForDocs>
-    <TargetFrameworksForTests>net7.0;net6.0</TargetFrameworksForTests>
+    <TargetFrameworksForTests>net8.0;net7.0;net6.0</TargetFrameworksForTests>
     <TargetFrameworksForTests Condition="$(OS) == 'Windows_NT'">
       $(TargetFrameworksForTests);net462
     </TargetFrameworksForTests>

diff --git a/build/docker-compose.net8.0.yml b/build/docker-compose.net8.0.yml
@@ -0,0 +1,9 @@
+version: '3.7'
+
+services:
+  tests:
+    build:
+      args:
+        PUBLISH_FRAMEWORK: net8.0
+        TEST_SDK_VERSION: "8.0"
+        BUILD_SDK_VERSION: "8.0"
diff --git a/test/OpenTelemetry.Api.Tests/Trace/TracerTest.cs b/test/OpenTelemetry.Api.Tests/Trace/TracerTest.cs
@@ -62,13 +62,13 @@ public void Tracer_StartRootSpan_BadArgs_NullSpanName()
             .Build();
 
         var span1 = this.tracer.StartRootSpan(null);
-        Assert.Null(span1.Activity.DisplayName);
+        Assert.True(string.IsNullOrEmpty(span1.Activity.DisplayName));
 
         var span2 = this.tracer.StartRootSpan(null, SpanKind.Client);
-        Assert.Null(span2.Activity.DisplayName);
+        Assert.True(string.IsNullOrEmpty(span2.Activity.DisplayName));
 
         var span3 = this.tracer.StartRootSpan(null, SpanKind.Client, default);
-        Assert.Null(span3.Activity.DisplayName);
+        Assert.True(string.IsNullOrEmpty(span3.Activity.DisplayName));
     }
 
     [Fact]
@@ -118,13 +118,13 @@ public void Tracer_StartSpan_BadArgs_NullSpanName()
             .Build();
 
         var span1 = this.tracer.StartSpan(null);
-        Assert.Null(span1.Activity.DisplayName);
+        Assert.True(string.IsNullOrEmpty(span1.Activity.DisplayName));
 
         var span2 = this.tracer.StartSpan(null, SpanKind.Client);
-        Assert.Null(span2.Activity.DisplayName);
+        Assert.True(string.IsNullOrEmpty(span2.Activity.DisplayName));
 
         var span3 = this.tracer.StartSpan(null, SpanKind.Client, null);
-        Assert.Null(span3.Activity.DisplayName);
+        Assert.True(string.IsNullOrEmpty(span3.Activity.DisplayName));
     }
 
     [Fact]
@@ -135,13 +135,13 @@ public void Tracer_StartActiveSpan_BadArgs_NullSpanName()
             .Build();
 
         var span1 = this.tracer.StartActiveSpan(null);
-        Assert.Null(span1.Activity.DisplayName);
+        Assert.True(string.IsNullOrEmpty(span1.Activity.DisplayName));
 
         var span2 = this.tracer.StartActiveSpan(null, SpanKind.Client);
-        Assert.Null(span2.Activity.DisplayName);
+        Assert.True(string.IsNullOrEmpty(span2.Activity.DisplayName));
 
         var span3 = this.tracer.StartActiveSpan(null, SpanKind.Client, null);
-        Assert.Null(span3.Activity.DisplayName);
+        Assert.True(string.IsNullOrEmpty(span3.Activity.DisplayName));
     }
 
     [Fact]
@@ -152,10 +152,10 @@ public void Tracer_StartSpan_FromParent_BadArgs_NullSpanName()
             .Build();
 
         var span1 = this.tracer.StartSpan(null, SpanKind.Client, TelemetrySpan.NoopInstance);
-        Assert.Null(span1.Activity.DisplayName);
+        Assert.True(string.IsNullOrEmpty(span1.Activity.DisplayName));
 
         var span2 = this.tracer.StartSpan(null, SpanKind.Client, TelemetrySpan.NoopInstance, default);
-        Assert.Null(span2.Activity.DisplayName);
+        Assert.True(string.IsNullOrEmpty(span2.Activity.DisplayName));
     }
 
     [Fact]
@@ -168,10 +168,10 @@ public void Tracer_StartSpan_FromParentContext_BadArgs_NullSpanName()
         var blankContext = default(SpanContext);
 
         var span1 = this.tracer.StartSpan(null, SpanKind.Client, blankContext);
-        Assert.Null(span1.Activity.DisplayName);
+        Assert.True(string.IsNullOrEmpty(span1.Activity.DisplayName));
 
         var span2 = this.tracer.StartSpan(null, SpanKind.Client, blankContext, default);
-        Assert.Null(span2.Activity.DisplayName);
+        Assert.True(string.IsNullOrEmpty(span2.Activity.DisplayName));
     }
 
     [Fact]
@@ -182,10 +182,10 @@ public void Tracer_StartActiveSpan_FromParent_BadArgs_NullSpanName()
             .Build();
 
         var span1 = this.tracer.StartActiveSpan(null, SpanKind.Client, TelemetrySpan.NoopInstance);
-        Assert.Null(span1.Activity.DisplayName);
+        Assert.True(string.IsNullOrEmpty(span1.Activity.DisplayName));
 
         var span2 = this.tracer.StartActiveSpan(null, SpanKind.Client, TelemetrySpan.NoopInstance, default);
-        Assert.Null(span2.Activity.DisplayName);
+        Assert.True(string.IsNullOrEmpty(span2.Activity.DisplayName));
     }
 
     [Fact]
@@ -198,10 +198,10 @@ public void Tracer_StartActiveSpan_FromParentContext_BadArgs_NullSpanName()
         var blankContext = default(SpanContext);
 
         var span1 = this.tracer.StartActiveSpan(null, SpanKind.Client, blankContext);
-        Assert.Null(span1.Activity.DisplayName);
+        Assert.True(string.IsNullOrEmpty(span1.Activity.DisplayName));
 
         var span2 = this.tracer.StartActiveSpan(null, SpanKind.Client, blankContext, default);
-        Assert.Null(span2.Activity.DisplayName);
+        Assert.True(string.IsNullOrEmpty(span2.Activity.DisplayName));
     }
 
     [Fact]

diff --git a/test/OpenTelemetry.Exporter.OpenTelemetryProtocol.Tests/IntegrationTest/Dockerfile b/test/OpenTelemetry.Exporter.OpenTelemetryProtocol.Tests/IntegrationTest/Dockerfile
@@ -2,12 +2,12 @@
 # This should be run from the root of the repo:
 # docker build --file test/OpenTelemetry.Exporter.OpenTelemetryProtocol.Tests/IntegrationTest/Dockerfile
 
-ARG BUILD_SDK_VERSION=7.0
-ARG TEST_SDK_VERSION=7.0
+ARG BUILD_SDK_VERSION=8.0
+ARG TEST_SDK_VERSION=8.0
 
 FROM mcr.microsoft.com/dotnet/sdk:${BUILD_SDK_VERSION} AS build
 ARG PUBLISH_CONFIGURATION=Release
-ARG PUBLISH_FRAMEWORK=net7.0
+ARG PUBLISH_FRAMEWORK=net8.0
 WORKDIR /repo
 COPY . ./
 WORKDIR "/repo/test/OpenTelemetry.Exporter.OpenTelemetryProtocol.Tests"

diff --git a/...ter.OpenTelemetryProtocol.Tests/OpenTelemetry.Exporter.OpenTelemetryProtocol.Tests.csproj b/...ter.OpenTelemetryProtocol.Tests/OpenTelemetry.Exporter.OpenTelemetryProtocol.Tests.csproj
@@ -17,7 +17,7 @@
     <PackageReference Include="Microsoft.Extensions.Http" />
   </ItemGroup>
 
-  <ItemGroup Condition="'$(TargetFramework)' == 'net7.0'">
+  <ItemGroup Condition="'$(TargetFramework)' == 'net7.0' or '$(TargetFramework)' == 'net8.0'">
     <PackageReference Include="Microsoft.AspNetCore.TestHost" />
     <PackageReference Include="Grpc.AspNetCore.Server" />
   </ItemGroup>

diff --git a/...ter.Prometheus.AspNetCore.Tests/OpenTelemetry.Exporter.Prometheus.AspNetCore.Tests.csproj b/...ter.Prometheus.AspNetCore.Tests/OpenTelemetry.Exporter.Prometheus.AspNetCore.Tests.csproj
@@ -23,7 +23,7 @@
     <ProjectReference Include="$(RepoRoot)\src\OpenTelemetry.Exporter.Prometheus.AspNetCore\OpenTelemetry.Exporter.Prometheus.AspNetCore.csproj" />
   </ItemGroup>
 
-  <ItemGroup Condition="'$(TargetFramework)' == 'net7.0'">
+  <ItemGroup Condition="'$(TargetFramework)' == 'net7.0' or '$(TargetFramework)' == 'net8.0'">
     <PackageReference Include="Microsoft.AspNetCore.TestHost" />
   </ItemGroup>
 

diff --git a/test/OpenTelemetry.Exporter.Prometheus.AspNetCore.Tests/PrometheusExporterMiddlewareTests.cs b/test/OpenTelemetry.Exporter.Prometheus.AspNetCore.Tests/PrometheusExporterMiddlewareTests.cs
@@ -20,6 +20,7 @@
 using System.Text.RegularExpressions;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
+using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.TestHost;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
@@ -112,7 +113,7 @@ public Task PrometheusExporterMiddlewareIntegration_MixedPredicateAndPath()
                 path: "/metrics_path",
                 configureBranchedPipeline: branch => branch.Use((context, next) =>
                 {
-                    context.Response.Headers.Add("X-MiddlewareExecuted", "true");
+                    context.Response.Headers.Append("X-MiddlewareExecuted", "true");
                     return next();
                 }),
                 optionsName: null),
@@ -139,7 +140,7 @@ public Task PrometheusExporterMiddlewareIntegration_MixedPath()
                 path: "/metrics_path",
                 configureBranchedPipeline: branch => branch.Use((context, next) =>
                 {
-                    context.Response.Headers.Add("X-MiddlewareExecuted", "true");
+                    context.Response.Headers.Append("X-MiddlewareExecuted", "true");
                     return next();
                 }),
                 optionsName: null),

diff --git a/test/OpenTelemetry.Extensions.Hosting.Tests/OpenTelemetry.Extensions.Hosting.Tests.csproj b/test/OpenTelemetry.Extensions.Hosting.Tests/OpenTelemetry.Extensions.Hosting.Tests.csproj
@@ -27,7 +27,7 @@
     </PackageReference>
   </ItemGroup>
 
-  <ItemGroup Condition="'$(TargetFramework)' == 'net7.0'">
+  <ItemGroup Condition="'$(TargetFramework)' == 'net7.0' or '$(TargetFramework)' == 'net8.0'">
     <PackageReference Include="Microsoft.AspNetCore.TestHost" />
   </ItemGroup>
 

diff --git a/test/OpenTelemetry.Instrumentation.AspNetCore.Tests/InProcServerTests.cs b/test/OpenTelemetry.Instrumentation.AspNetCore.Tests/InProcServerTests.cs
@@ -14,7 +14,6 @@
 // limitations under the License.
 // </copyright>
 
-#if NET6_0_OR_GREATER
 using System.Diagnostics;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.Extensions.Logging;
@@ -85,4 +84,3 @@ public async void Dispose()
         await this.app.DisposeAsync().ConfigureAwait(false);
     }
 }
-#endif
diff --git a/...ry.Instrumentation.AspNetCore.Tests/OpenTelemetry.Instrumentation.AspNetCore.Tests.csproj b/...ry.Instrumentation.AspNetCore.Tests/OpenTelemetry.Instrumentation.AspNetCore.Tests.csproj
@@ -27,7 +27,7 @@
     <Compile Include="$(RepoRoot)\test\OpenTelemetry.Tests\Shared\TestEventListener.cs" Link="Includes\TestEventListener.cs" />
   </ItemGroup>
 
-  <ItemGroup Condition="'$(TargetFramework)' == 'net7.0'">
+  <ItemGroup Condition="'$(TargetFramework)' == 'net7.0' or '$(TargetFramework)' == 'net8.0'">
     <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" />
   </ItemGroup>