diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6050960d..c9b956e4 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -53,6 +53,11 @@ jobs: filter: 'tree:0' show-progress: false + - name: Setup .NET 8 SDK + uses: actions/setup-dotnet@67a3573c9a986a3f9c594539f4ab511d57bb3ce9 # v4.3.1 + with: + dotnet-version: '8.0.x' + - name: Setup .NET SDK uses: actions/setup-dotnet@d4c94342e560b34958eacfc5d055d21461ed1c5d # v5.0.0 id: setup-dotnet diff --git a/GrafanaOpenTelemetry.sln b/GrafanaOpenTelemetry.sln deleted file mode 100644 index 23a03c05..00000000 --- a/GrafanaOpenTelemetry.sln +++ /dev/null @@ -1,64 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.0.31903.59 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{F0687CB8-95E1-4372-9444-70676DE3A34A}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Grafana.OpenTelemetry", "src\Grafana.OpenTelemetry\Grafana.OpenTelemetry.csproj", "{B4761520-2B6F-4605-BC3B-66710F7439EA}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Grafana.OpenTelemetry.Base", "src\Grafana.OpenTelemetry.Base\Grafana.OpenTelemetry.Base.csproj", "{8CA452C6-61DA-49A9-8AA7-909D48E7ACF0}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{FB0399BE-6925-42B7-8431-C5A6E21DC8EC}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Grafana.OpenTelemetry.Tests", "tests\Grafana.OpenTelemetry.Tests\Grafana.OpenTelemetry.Tests.csproj", "{30810D69-3237-4260-93C2-DC601C5AC80F}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "examples", "examples", "{2DC924CF-282A-446D-B94B-D2931E5C6130}" -EndProject -Project("{E53339B2-1760-4266-BCC7-CA923CBCF16C}") = "docker-compose-aspnetcore", "docker\docker-compose-aspnetcore\docker-compose-aspnetcore.dcproj", "{A4C41298-ED4F-4A4C-9B18-014986186C71}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "docker", "docker", "{E63943FA-D9F6-4DC4-91EE-D0BD0BF8E324}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "net8.0", "net8.0", "{74BA358B-6EDB-463F-8AB2-313FAA4DE564}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "aspnetcore", "examples\net8.0\aspnetcore\aspnetcore.csproj", "{BD1FB154-C711-4E37-947D-063F5DC4BF9E}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {B4761520-2B6F-4605-BC3B-66710F7439EA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B4761520-2B6F-4605-BC3B-66710F7439EA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B4761520-2B6F-4605-BC3B-66710F7439EA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B4761520-2B6F-4605-BC3B-66710F7439EA}.Release|Any CPU.Build.0 = Release|Any CPU - {8CA452C6-61DA-49A9-8AA7-909D48E7ACF0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8CA452C6-61DA-49A9-8AA7-909D48E7ACF0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8CA452C6-61DA-49A9-8AA7-909D48E7ACF0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8CA452C6-61DA-49A9-8AA7-909D48E7ACF0}.Release|Any CPU.Build.0 = Release|Any CPU - {30810D69-3237-4260-93C2-DC601C5AC80F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {30810D69-3237-4260-93C2-DC601C5AC80F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {30810D69-3237-4260-93C2-DC601C5AC80F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {30810D69-3237-4260-93C2-DC601C5AC80F}.Release|Any CPU.Build.0 = Release|Any CPU - {A4C41298-ED4F-4A4C-9B18-014986186C71}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A4C41298-ED4F-4A4C-9B18-014986186C71}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A4C41298-ED4F-4A4C-9B18-014986186C71}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A4C41298-ED4F-4A4C-9B18-014986186C71}.Release|Any CPU.Build.0 = Release|Any CPU - {BD1FB154-C711-4E37-947D-063F5DC4BF9E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BD1FB154-C711-4E37-947D-063F5DC4BF9E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BD1FB154-C711-4E37-947D-063F5DC4BF9E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BD1FB154-C711-4E37-947D-063F5DC4BF9E}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(NestedProjects) = preSolution - {B4761520-2B6F-4605-BC3B-66710F7439EA} = {F0687CB8-95E1-4372-9444-70676DE3A34A} - {8CA452C6-61DA-49A9-8AA7-909D48E7ACF0} = {F0687CB8-95E1-4372-9444-70676DE3A34A} - {30810D69-3237-4260-93C2-DC601C5AC80F} = {FB0399BE-6925-42B7-8431-C5A6E21DC8EC} - {A4C41298-ED4F-4A4C-9B18-014986186C71} = {E63943FA-D9F6-4DC4-91EE-D0BD0BF8E324} - {74BA358B-6EDB-463F-8AB2-313FAA4DE564} = {2DC924CF-282A-446D-B94B-D2931E5C6130} - {BD1FB154-C711-4E37-947D-063F5DC4BF9E} = {74BA358B-6EDB-463F-8AB2-313FAA4DE564} - EndGlobalSection -EndGlobal diff --git a/GrafanaOpenTelemetry.slnx b/GrafanaOpenTelemetry.slnx new file mode 100644 index 00000000..a84c720b --- /dev/null +++ b/GrafanaOpenTelemetry.slnx @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + + + diff --git a/docker/docker-compose-aspnetcore/docker-compose.oats.yml b/docker/docker-compose-aspnetcore/docker-compose.oats.yml index 1c6f341b..357e9ed0 100644 --- a/docker/docker-compose-aspnetcore/docker-compose.oats.yml +++ b/docker/docker-compose-aspnetcore/docker-compose.oats.yml @@ -3,7 +3,7 @@ services: image: ${DOCKER_REGISTRY-}aspnetcore build: context: ../.. - dockerfile: examples/net8.0/aspnetcore/Dockerfile + dockerfile: examples/net10.0/aspnetcore/Dockerfile args: DOTNET_PUBLISH_ARGS: "/p:BuildDistroFromSource=${BUILD_DISTRO_FROM_SOURCE:-true}" environment: diff --git a/docker/docker-compose-aspnetcore/docker-compose.self-contained.oats.yml b/docker/docker-compose-aspnetcore/docker-compose.self-contained.oats.yml index bde26735..0eb1287b 100644 --- a/docker/docker-compose-aspnetcore/docker-compose.self-contained.oats.yml +++ b/docker/docker-compose-aspnetcore/docker-compose.self-contained.oats.yml @@ -3,7 +3,7 @@ services: image: ${DOCKER_REGISTRY-}aspnetcore build: context: ../.. - dockerfile: examples/net8.0/aspnetcore/Dockerfile + dockerfile: examples/net10.0/aspnetcore/Dockerfile args: DOTNET_PUBLISH_ARGS: "--self-contained true /p:PublishSingleFile=true /p:BuildDistroFromSource=${BUILD_DISTRO_FROM_SOURCE:-true}" entrypoint: ./aspnetcore diff --git a/docker/docker-compose-aspnetcore/docker-compose.yml b/docker/docker-compose-aspnetcore/docker-compose.yml index 9c99ab56..231eba5e 100644 --- a/docker/docker-compose-aspnetcore/docker-compose.yml +++ b/docker/docker-compose-aspnetcore/docker-compose.yml @@ -3,7 +3,7 @@ services: image: ${DOCKER_REGISTRY-}aspnetcore build: context: ../.. - dockerfile: examples/net8.0/aspnetcore/Dockerfile + dockerfile: examples/net10.0/aspnetcore/Dockerfile args: DOTNET_PUBLISH_ARGS: "/p:BuildDistroFromSource=${BUILD_DISTRO_FROM_SOURCE:-true}" depends_on: diff --git a/examples/net8.0/aspnetcore/Controllers/AwsController.cs b/examples/net10.0/aspnetcore/Controllers/AwsController.cs similarity index 100% rename from examples/net8.0/aspnetcore/Controllers/AwsController.cs rename to examples/net10.0/aspnetcore/Controllers/AwsController.cs diff --git a/examples/net8.0/aspnetcore/Controllers/HttpClientController.cs b/examples/net10.0/aspnetcore/Controllers/HttpClientController.cs similarity index 100% rename from examples/net8.0/aspnetcore/Controllers/HttpClientController.cs rename to examples/net10.0/aspnetcore/Controllers/HttpClientController.cs diff --git a/examples/net8.0/aspnetcore/Controllers/MsSqlController.cs b/examples/net10.0/aspnetcore/Controllers/MsSqlController.cs similarity index 100% rename from examples/net8.0/aspnetcore/Controllers/MsSqlController.cs rename to examples/net10.0/aspnetcore/Controllers/MsSqlController.cs diff --git a/examples/net8.0/aspnetcore/Controllers/RedisController.cs b/examples/net10.0/aspnetcore/Controllers/RedisController.cs similarity index 100% rename from examples/net8.0/aspnetcore/Controllers/RedisController.cs rename to examples/net10.0/aspnetcore/Controllers/RedisController.cs diff --git a/examples/net8.0/aspnetcore/Controllers/WeatherForecastController.cs b/examples/net10.0/aspnetcore/Controllers/WeatherForecastController.cs similarity index 100% rename from examples/net8.0/aspnetcore/Controllers/WeatherForecastController.cs rename to examples/net10.0/aspnetcore/Controllers/WeatherForecastController.cs diff --git a/examples/net10.0/aspnetcore/Dockerfile b/examples/net10.0/aspnetcore/Dockerfile new file mode 100644 index 00000000..241c9dfc --- /dev/null +++ b/examples/net10.0/aspnetcore/Dockerfile @@ -0,0 +1,19 @@ +FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:10.0.100-rc.1@sha256:d599d654aa6fd7baabe54b4272dc475768307ef4d8a07d6e9f9b50b7b1758059 AS build +ARG TARGETARCH +ARG CONFIGURATION="Release" +ARG DOTNET_PUBLISH_ARGS="" + +COPY . /source +WORKDIR /source + +SHELL ["/bin/bash", "-o", "pipefail", "-c"] + +RUN --mount=type=cache,id=nuget,target=/root/.nuget/packages \ + dotnet publish "examples/net10.0/aspnetcore/aspnetcore.csproj" --arch "${TARGETARCH}" --configuration "${CONFIGURATION}" --output /app ${DOTNET_PUBLISH_ARGS} + +FROM mcr.microsoft.com/dotnet/aspnet:10.0.0-rc.1-noble-chiseled-extra@sha256:83795c4b066ec5f0610d8c3fdd977b65e7536c9bbade4f594e80e5fa24fb533a AS final +WORKDIR /app +EXPOSE 8080 + +COPY --from=build /app . +ENTRYPOINT ["dotnet", "aspnetcore.dll"] diff --git a/examples/net8.0/aspnetcore/Program.cs b/examples/net10.0/aspnetcore/Program.cs similarity index 100% rename from examples/net8.0/aspnetcore/Program.cs rename to examples/net10.0/aspnetcore/Program.cs diff --git a/examples/net8.0/aspnetcore/Properties/launchSettings.json b/examples/net10.0/aspnetcore/Properties/launchSettings.json similarity index 100% rename from examples/net8.0/aspnetcore/Properties/launchSettings.json rename to examples/net10.0/aspnetcore/Properties/launchSettings.json diff --git a/examples/net8.0/aspnetcore/TodoAppEndpoints.cs b/examples/net10.0/aspnetcore/TodoAppEndpoints.cs similarity index 100% rename from examples/net8.0/aspnetcore/TodoAppEndpoints.cs rename to examples/net10.0/aspnetcore/TodoAppEndpoints.cs diff --git a/examples/net8.0/aspnetcore/appsettings.json b/examples/net10.0/aspnetcore/appsettings.json similarity index 100% rename from examples/net8.0/aspnetcore/appsettings.json rename to examples/net10.0/aspnetcore/appsettings.json diff --git a/examples/net8.0/aspnetcore/aspnetcore.csproj b/examples/net10.0/aspnetcore/aspnetcore.csproj similarity index 93% rename from examples/net8.0/aspnetcore/aspnetcore.csproj rename to examples/net10.0/aspnetcore/aspnetcore.csproj index a26eadf8..c70078ce 100644 --- a/examples/net8.0/aspnetcore/aspnetcore.csproj +++ b/examples/net10.0/aspnetcore/aspnetcore.csproj @@ -1,7 +1,7 @@ - net8.0 + net10.0 enable enable Linux @@ -12,7 +12,7 @@ - + diff --git a/examples/net8.0/aspnetcore/Dockerfile b/examples/net8.0/aspnetcore/Dockerfile deleted file mode 100644 index 14d3d02a..00000000 --- a/examples/net8.0/aspnetcore/Dockerfile +++ /dev/null @@ -1,19 +0,0 @@ -FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:8.0.414@sha256:ff8311847c54c04d1a14c488362807997d59b61372da5095a95f89cbcda7f9b7 AS build -ARG TARGETARCH -ARG CONFIGURATION="Release" -ARG DOTNET_PUBLISH_ARGS="" - -COPY . /source -WORKDIR /source - -SHELL ["/bin/bash", "-o", "pipefail", "-c"] - -RUN --mount=type=cache,id=nuget,target=/root/.nuget/packages \ - dotnet publish "examples/net8.0/aspnetcore/aspnetcore.csproj" --arch "${TARGETARCH}" --configuration "${CONFIGURATION}" --output /app ${DOTNET_PUBLISH_ARGS} - -FROM mcr.microsoft.com/dotnet/aspnet:8.0.20-noble-chiseled-extra@sha256:e396ddb631cb148b3db17b8a464e2a306f4e802381c14e779362fb44aeb3cf5c AS final -WORKDIR /app -EXPOSE 8080 - -COPY --from=build /app . -ENTRYPOINT ["dotnet", "aspnetcore.dll"] diff --git a/global.json b/global.json index 0d7fdbce..4c76a4ef 100644 --- a/global.json +++ b/global.json @@ -1,7 +1,7 @@ { "sdk": { "rollForward": "latestFeature", - "version": "8.0.414", + "version": "10.0.100-rc.1.25451.1", "allowPrerelease": false } } diff --git a/src/Grafana.OpenTelemetry.Base/Grafana.OpenTelemetry.Base.csproj b/src/Grafana.OpenTelemetry.Base/Grafana.OpenTelemetry.Base.csproj index 2d2e633e..2bda216d 100644 --- a/src/Grafana.OpenTelemetry.Base/Grafana.OpenTelemetry.Base.csproj +++ b/src/Grafana.OpenTelemetry.Base/Grafana.OpenTelemetry.Base.csproj @@ -3,12 +3,19 @@ Minimal Grafana distribution of OpenTelemetry .NET true - net8.0;netstandard2.0;net462 + net10.0;net8.0;netstandard2.0;net462 + + + + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/src/Grafana.OpenTelemetry/Grafana.OpenTelemetry.csproj b/src/Grafana.OpenTelemetry/Grafana.OpenTelemetry.csproj index 3b52046f..9ae811d9 100644 --- a/src/Grafana.OpenTelemetry/Grafana.OpenTelemetry.csproj +++ b/src/Grafana.OpenTelemetry/Grafana.OpenTelemetry.csproj @@ -3,7 +3,7 @@ Full Grafana distribution of OpenTelemetry .NET true - net8.0;netstandard2.0;net462 + net10.0;net8.0;netstandard2.0;net462