open-telemetry
/
opentelemetry-dotnet
mirror of https://github.com/open-telemetry/opentelemetry-dotnet.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

added NET8 RC1 target (#4868)

This commit is contained in:
Yun-Ting Lin 2023-09-21 10:42:30 -07:00 committed by GitHub
parent f3da99f4ea
commit 15a54bb7a1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
11 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/ci-aot.yml vendored
View File

@ -16,7 +16,7 @@ jobs:
fail-fast: false # ensures the entire test matrix is run, even if one permutation fails
matrix:
os: [ ubuntu-latest ]
version: [ net7.0 ]
version: [ net8.0 ]
runs-on: ${{ matrix.os }}
steps:

2
CONTRIBUTING.md
View File

@ -44,7 +44,7 @@ You can contribute to this project from a Windows, macOS or Linux machine.
On all platforms, the minimum requirements are:
* Git client and command line tools.
* .NET 7.0+
* .NET 8.0
### Linux or MacOS

2
build/docker-compose.net6.0.yml
View File

@ -6,4 +6,4 @@ services:
args:
PUBLISH_FRAMEWORK: net6.0
TEST_SDK_VERSION: "6.0"
BUILD_SDK_VERSION: "7.0"
BUILD_SDK_VERSION: "8.0"

2
build/docker-compose.net7.0.yml
View File

@ -6,4 +6,4 @@ services:
args:
PUBLISH_FRAMEWORK: net7.0
TEST_SDK_VERSION: "7.0"
BUILD_SDK_VERSION: "7.0"
BUILD_SDK_VERSION: "8.0"

4
build/test-aot-compatibility.ps1
View File

@ -15,7 +15,7 @@ foreach ($line in $($publishOutput -split "`r`n"))
}
}
pushd $rootDirectory/test/OpenTelemetry.AotCompatibility.TestApp/bin/Debug/$targetNetFramework/linux-x64
pushd $rootDirectory/test/OpenTelemetry.AotCompatibility.TestApp/bin/Release/$targetNetFramework/linux-x64
Write-Host "Executing test App..."
./OpenTelemetry.AotCompatibility.TestApp
@ -29,7 +29,7 @@ if ($LastExitCode -ne 0)
popd
Write-Host "Actual warning count is:", $actualWarningCount
$expectedWarningCount = 16
$expectedWarningCount = 0
$testPassed = 0
if ($actualWarningCount -ne $expectedWarningCount)

3
docs/trace/getting-started-jaeger/Program.cs
View File

@ -15,6 +15,9 @@
// </copyright>
using System.Diagnostics;
#if !NET6_0_OR_GREATER
using System.Net.Http;
#endif
using OpenTelemetry;
using OpenTelemetry.Resources;
using OpenTelemetry.Trace;

2
global.json
View File

@ -1,6 +1,6 @@
{
"sdk": {
"rollForward": "latestFeature",
"version": "7.0.400"
"version": "8.0.100-rc.1.23463.5"
}
}

4
src/OpenTelemetry.Api.ProviderBuilderExtensions/Logs/LoggerProviderServiceCollectionBuilder.cs
View File

@ -57,7 +57,7 @@ internal sealed class LoggerProviderServiceCollectionBuilder : LoggerProviderBui
LoggerProviderBuilder IDeferredLoggerProviderBuilder.Configure(Action<IServiceProvider, LoggerProviderBuilder> configure)
=> this.ConfigureBuilderInternal(configure);
private LoggerProviderBuilder ConfigureBuilderInternal(Action<IServiceProvider, LoggerProviderBuilder> configure)
private LoggerProviderServiceCollectionBuilder ConfigureBuilderInternal(Action<IServiceProvider, LoggerProviderBuilder> configure)
{
var services = this.Services
?? throw new NotSupportedException("Builder cannot be configured during LoggerProvider construction.");
@ -67,7 +67,7 @@ internal sealed class LoggerProviderServiceCollectionBuilder : LoggerProviderBui
return this;
}
private LoggerProviderBuilder ConfigureServicesInternal(Action<IServiceCollection> configure)
private LoggerProviderServiceCollectionBuilder ConfigureServicesInternal(Action<IServiceCollection> configure)
{
Guard.ThrowIfNull(configure);

4
src/OpenTelemetry.Api.ProviderBuilderExtensions/Metrics/MeterProviderServiceCollectionBuilder.cs
View File

@ -70,7 +70,7 @@ internal sealed class MeterProviderServiceCollectionBuilder : MeterProviderBuild
MeterProviderBuilder IDeferredMeterProviderBuilder.Configure(Action<IServiceProvider, MeterProviderBuilder> configure)
=> this.ConfigureBuilderInternal(configure);
private MeterProviderBuilder ConfigureBuilderInternal(Action<IServiceProvider, MeterProviderBuilder> configure)
private MeterProviderServiceCollectionBuilder ConfigureBuilderInternal(Action<IServiceProvider, MeterProviderBuilder> configure)
{
var services = this.Services
?? throw new NotSupportedException("Builder cannot be configured during MeterProvider construction.");
@ -80,7 +80,7 @@ internal sealed class MeterProviderServiceCollectionBuilder : MeterProviderBuild
return this;
}
private MeterProviderBuilder ConfigureServicesInternal(Action<IServiceCollection> configure)
private MeterProviderServiceCollectionBuilder ConfigureServicesInternal(Action<IServiceCollection> configure)
{
Guard.ThrowIfNull(configure);

4
src/OpenTelemetry.Api.ProviderBuilderExtensions/Trace/TracerProviderServiceCollectionBuilder.cs
View File

@ -83,7 +83,7 @@ internal sealed class TracerProviderServiceCollectionBuilder : TracerProviderBui
TracerProviderBuilder IDeferredTracerProviderBuilder.Configure(Action<IServiceProvider, TracerProviderBuilder> configure)
=> this.ConfigureBuilderInternal(configure);
private TracerProviderBuilder ConfigureBuilderInternal(Action<IServiceProvider, TracerProviderBuilder> configure)
private TracerProviderServiceCollectionBuilder ConfigureBuilderInternal(Action<IServiceProvider, TracerProviderBuilder> configure)
{
var services = this.Services
?? throw new NotSupportedException("Builder cannot be configured during TracerProvider construction.");
@ -93,7 +93,7 @@ internal sealed class TracerProviderServiceCollectionBuilder : TracerProviderBui
return this;
}
private TracerProviderBuilder ConfigureServicesInternal(Action<IServiceCollection> configure)
private TracerProviderServiceCollectionBuilder ConfigureServicesInternal(Action<IServiceCollection> configure)
{
Guard.ThrowIfNull(configure);

4
test/OpenTelemetry.AotCompatibility.TestApp/OpenTelemetry.AotCompatibility.TestApp.csproj
View File

@ -2,8 +2,8 @@
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net7.0</TargetFramework>
<PublishAot Condition="!$([MSBuild]::IsOSPlatform('OSX'))">true</PublishAot>
<TargetFramework>net8.0</TargetFramework>
<PublishAot>true</PublishAot>
<TrimmerSingleWarn>false</TrimmerSingleWarn>
<SelfContained>true</SelfContained>
</PropertyGroup>