From db60adc2d4f6b28adb5bf63a1674e43263af73eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20Kie=C5=82kowicz?= Date: Fri, 29 Nov 2024 05:55:27 +0100 Subject: [PATCH] Bump OpenTelemetry main packages to 1.10.0 (#3816) * Bump OpenTelemetry main packages to 1.10.0 * Fix ActivityHelperTests tests + CHANGELOG * Fix DefinedTransientDeps_Are_MatchingGeneratedDeps * Update BuildTests verified files * Bump Microsoft.AspNetCore.SignalR.Client to 9.0.0 Older version references to old ILogger * [Tests] Bump Microsoft.Extensions.Hosting to 9.0.0 Older version brings old dependency on ILogger * Execute windows containers tests only against .net fx 4.6.2 There is no tests for other frameworks. It leads to build failures * CentOS Stream 9 - install dotnet by dotnet-install.sh centos repositories contains only prereleased versions of .NET9 * docs/changelog --- .github/workflows/ci.yml | 2 +- CHANGELOG.md | 29 ++++++ Directory.Packages.props | 8 +- build/Extensions/DepsJsonExtensions.cs | 2 +- docker/centos-stream9.dockerfile | 13 ++- docs/README.md | 4 +- docs/config.md | 4 +- docs/manual-instrumentation.md | 4 +- docs/plugins.md | 20 ++-- ...getting-started-dotnet-monitor-logs.csproj | 2 +- src/Directory.Packages.props | 41 +++++---- .../Directory.Packages.props | 6 +- .../netfx_assembly_redirection.h | 33 +++---- .../InstrumentationDefinitions.g.cs | 2 +- .../Logger/LoggingBuilderIntegration.cs | 2 +- .../OpenTelemetry.AutoInstrumentation.csproj | 1 + .../Util/ActivityHelper.cs | 5 +- test/Directory.Packages.props | 14 +-- ...nStructure_alpine-linux-arm64.verified.txt | 46 +++++----- ...ionStructure_alpine-linux-x64.verified.txt | 46 +++++----- ...ributionStructure_linux-arm64.verified.txt | 46 +++++----- ...stributionStructure_linux-x64.verified.txt | 46 +++++----- ...sts.DistributionStructure_osx.verified.txt | 46 +++++----- ...DistributionStructure_windows.verified.txt | 92 ++++++++++--------- .../TransientDependenciesTests.cs | 3 + .../Util/ActivityHelperTests.cs | 4 +- ...on.EntityFrameworkCore.Pomelo.MySql.csproj | 6 +- .../TestApplication.GrpcNetClient.csproj | 4 +- .../TestApplication.MongoDB.csproj | 4 +- .../TestApplication.MySqlConnector.csproj | 4 +- .../TestApplication.StackExchangeRedis.csproj | 4 +- 31 files changed, 300 insertions(+), 243 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d494d9158..e1afea744 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -189,7 +189,7 @@ jobs: run: ./build.cmd --skip RunManagedTests --target ManagedTests --containers ${{ matrix.containers }} - name: Run the integration tests - run: ./build.cmd --target RunManagedIntegrationTests --containers ${{ matrix.containers }} + run: ./build.cmd --target RunManagedIntegrationTests --containers ${{ matrix.containers }} --test-target-framework net462 - name: Upload test logs if: always() diff --git a/CHANGELOG.md b/CHANGELOG.md index e839453aa..2e768c285 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,8 +15,37 @@ This component adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.h ### Changed +- Kafka and RabbitMQ 6 tags `otel.status_code` and `otel.status_description` are + replaced by native fields `Status` and `StatusDescription`. +- Changed minimal supported version of `Microsoft.Extensions.Logging` + for `ILOGGER` instrumentation from `8.0.0` to `9.0.0`. +- Glibc native libraries are compiled on Ubuntu v16.04. + #### Dependency updates +- Updated [Core components](https://github.com/open-telemetry/opentelemetry-dotnet/blob/main/VERSIONING.md#core-components): + [`1.10.0`](https://github.com/open-telemetry/opentelemetry-dotnet/releases/tag/core-1.10.0). +- Following packages updated + - `OpenTelemetry.Exporter.Prometheus.HttpListener` from `1.9.0-beta.2` to `1.10.0-beta.1`, + - `Microsoft.Extensions.Configuration.Binder` from `8.0.2` to `9.0.0`, + - `MMicrosoft.Extensions.Logging.Configuration` from `8.0.0` to `9.0.0`. +- .NET only, following packages updated + - `System.Diagnostics.DiagnosticSource` from `8.0.0` to `9.0.0`. +- .NET Framework only, following packages updated + - `Microsoft.Bcl.AsyncInterfaces` from `8.0.0` to `9.0.0`, + - `Microsoft.Extensions.Configuration` from `9.0.0` to `9.0.0`, + - `Microsoft.Extensions.Configuration.Abstractions` from `8.0.0` to `9.0.0`, + - `Microsoft.Extensions.DependencyInjection` from `8.0.1` to `9.0.0`, + - `Microsoft.Extensions.DependencyInjection.Abstractions` from `8.0.2` to `9.0.0`, + - `Microsoft.Extensions.Logging` from `8.0.0` to `9.0.0`, + - `Microsoft.Extensions.Logging.Abstractions` from `8.0.1` to `9.0.0`, + - `Microsoft.Extensions.Options` from `8.0.2` to `9.0.0`, + - `Microsoft.Extensions.Options.ConfigurationExtensions` from `8.0.0` to `9.0.0`, + - `Microsoft.Extensions.Primitives` from `8.0.0` to `9.0.0`, + - `System.Diagnostics.DiagnosticSource` from `8.0.1` to `9.0.0`, + - `System.Text.Encodings.Web` from `8.0.0` to `9.0.0`, + - `System.Text.Json` from `8.0.5` to `9.0.0`. + ### Deprecated ### Removed diff --git a/Directory.Packages.props b/Directory.Packages.props index c70d9bd69..df8a5179b 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -6,10 +6,10 @@ - - - - + + + + diff --git a/build/Extensions/DepsJsonExtensions.cs b/build/Extensions/DepsJsonExtensions.cs index b610d3c17..6454843db 100644 --- a/build/Extensions/DepsJsonExtensions.cs +++ b/build/Extensions/DepsJsonExtensions.cs @@ -122,7 +122,7 @@ internal static class DepsJsonExtensions public static void RemoveDuplicatedLibraries(this JsonObject depsJson, ReadOnlyCollection architectureStores) { - var duplicatedLibraries = new List<(string Name, string Version)> { (Name: "Microsoft.Extensions.Configuration.Binder", Version: "8.0.0") }; + var duplicatedLibraries = new List<(string Name, string Version)>(0); foreach (var duplicatedLibrary in duplicatedLibraries) { diff --git a/docker/centos-stream9.dockerfile b/docker/centos-stream9.dockerfile index d4a15ae7f..10ada7015 100644 --- a/docker/centos-stream9.dockerfile +++ b/docker/centos-stream9.dockerfile @@ -2,8 +2,17 @@ FROM quay.io/centos/centos:stream9@sha256:fc94f4a0545cac9d6ea76e087b1482ea12b716 # Install dotnet sdk RUN dnf install -y \ - dotnet-sdk-9.0 \ - dotnet-sdk-8.0 + libicu-devel + +RUN curl -sSL https://dot.net/v1/dotnet-install.sh --output dotnet-install.sh \ + && echo "SHA256: $(sha256sum dotnet-install.sh)" \ + && echo "c169af55281cd1e58cdbe3ec95c2480cfb210ee460b3ff1421745c8f3236b263 dotnet-install.sh" | sha256sum -c \ + && chmod +x ./dotnet-install.sh \ + && ./dotnet-install.sh -v 9.0.100 --install-dir /usr/share/dotnet --no-path \ + && ./dotnet-install.sh -v 8.0.404 --install-dir /usr/share/dotnet --no-path \ + && rm dotnet-install.sh + +ENV PATH="$PATH:/usr/share/dotnet" # https://github.com/dotnet/runtime/issues/65874 RUN update-crypto-policies --set LEGACY diff --git a/docs/README.md b/docs/README.md index 9b54debe6..185f118f2 100644 --- a/docs/README.md +++ b/docs/README.md @@ -50,8 +50,8 @@ OpenTelemetry .NET Automatic Instrumentation is built on top of [OpenTelemetry .NET](https://github.com/open-telemetry/opentelemetry-dotnet): - [Core components](https://github.com/open-telemetry/opentelemetry-dotnet/blob/main/VERSIONING.md#core-components): -[`1.9.0`](https://github.com/open-telemetry/opentelemetry-dotnet/releases/tag/core-1.9.0) -- `System.Diagnostics.DiagnosticSource`: [`8.0.0`](https://www.nuget.org/packages/System.Diagnostics.DiagnosticSource/8.0.0) +[`1.9.0`](https://github.com/open-telemetry/opentelemetry-dotnet/releases/tag/core-1.10.0) +- `System.Diagnostics.DiagnosticSource`: [`9.0.0`](https://www.nuget.org/packages/System.Diagnostics.DiagnosticSource/9.0.0) referencing `System.Runtime.CompilerServices.Unsafe`: [`6.0.0`](https://www.nuget.org/packages/System.Runtime.CompilerServices.Unsafe/6.0.0) You can find all references in diff --git a/docs/config.md b/docs/config.md index 69aa2c245..cb7807b38 100644 --- a/docs/config.md +++ b/docs/config.md @@ -304,7 +304,7 @@ To enable the OTLP exporter, set the `OTEL_TRACES_EXPORTER`/`OTEL_METRICS_EXPORT environment variable to `otlp`. To customize the OTLP exporter using environment variables, see the -[OTLP exporter documentation](https://github.com/open-telemetry/opentelemetry-dotnet/tree/core-1.9.0/src/OpenTelemetry.Exporter.OpenTelemetryProtocol#environment-variables). +[OTLP exporter documentation](https://github.com/open-telemetry/opentelemetry-dotnet/tree/core-1.10.0/src/OpenTelemetry.Exporter.OpenTelemetryProtocol#environment-variables). Important environment variables include: | Environment variable | Description | Default value | Status | @@ -389,7 +389,7 @@ To enable the Zipkin exporter, set the `OTEL_TRACES_EXPORTER` environment variable to `zipkin`. To customize the Zipkin exporter using environment variables, -see the [Zipkin exporter documentation](https://github.com/open-telemetry/opentelemetry-dotnet/tree/core-1.9.0/src/OpenTelemetry.Exporter.Zipkin#configuration-using-environment-variables). +see the [Zipkin exporter documentation](https://github.com/open-telemetry/opentelemetry-dotnet/tree/core-1.10.0/src/OpenTelemetry.Exporter.Zipkin#configuration-using-environment-variables). Important environment variables include: | Environment variable | Description | Default value | Status | diff --git a/docs/manual-instrumentation.md b/docs/manual-instrumentation.md index 0596d2440..7222b50e5 100644 --- a/docs/manual-instrumentation.md +++ b/docs/manual-instrumentation.md @@ -12,7 +12,7 @@ To create your custom traces manually, follow these steps: 1. Add the `System.Diagnostics.DiagnosticSource` dependency to your project: ```xml - + ``` 2. Create an `ActivitySource` instance: @@ -48,7 +48,7 @@ To create your custom metrics manually, follow these steps: 1. Add the `System.Diagnostics.DiagnosticSource` dependency to your project: ```xml - + ``` 2. Create a `Meter` instance: diff --git a/docs/plugins.md b/docs/plugins.md index bfda3f1c3..c58dc4a5b 100644 --- a/docs/plugins.md +++ b/docs/plugins.md @@ -114,9 +114,9 @@ public class MyPlugin | Options type | NuGet package | NuGet version | |-------------------------------------------------------------------------------------------|---------------------------------------------------|---------------| -| OpenTelemetry.Exporter.ConsoleExporterOptions | OpenTelemetry.Exporter.Console | 1.9.0 | -| OpenTelemetry.Exporter.ZipkinExporterOptions | OpenTelemetry.Exporter.Zipkin | 1.9.0 | -| OpenTelemetry.Exporter.OtlpExporterOptions | OpenTelemetry.Exporter.OpenTelemetryProtocol | 1.9.0 | +| OpenTelemetry.Exporter.ConsoleExporterOptions | OpenTelemetry.Exporter.Console | 1.10.0 | +| OpenTelemetry.Exporter.ZipkinExporterOptions | OpenTelemetry.Exporter.Zipkin | 1.10.0 | +| OpenTelemetry.Exporter.OtlpExporterOptions | OpenTelemetry.Exporter.OpenTelemetryProtocol | 1.10.0 | | OpenTelemetry.Instrumentation.AspNet.AspNetTraceInstrumentationOptions | OpenTelemetry.Instrumentation.AspNet | 1.9.0-beta.1 | | OpenTelemetry.Instrumentation.AspNetCore.AspNetCoreTraceInstrumentationOptions | OpenTelemetry.Instrumentation.AspNetCore | 1.9.0 | | OpenTelemetry.Instrumentation.EntityFrameworkCore.EntityFrameworkInstrumentationOptions | OpenTelemetry.Instrumentation.EntityFrameworkCore | 1.0.0-beta.11 | @@ -131,10 +131,10 @@ public class MyPlugin | Options type | NuGet package | NuGet version | |--------------------------------------------------------------------------|------------------------------------------------|---------------| -| OpenTelemetry.Metrics.MetricReaderOptions | OpenTelemetry | 1.9.0 | -| OpenTelemetry.Exporter.ConsoleExporterOptions | OpenTelemetry.Exporter.Console | 1.9.0 | -| OpenTelemetry.Exporter.PrometheusExporterOptions | OpenTelemetry.Exporter.Prometheus.HttpListener | 1.9.0-beta.2 | -| OpenTelemetry.Exporter.OtlpExporterOptions | OpenTelemetry.Exporter.OpenTelemetryProtocol | 1.9.0 | +| OpenTelemetry.Metrics.MetricReaderOptions | OpenTelemetry | 1.10.0 | +| OpenTelemetry.Exporter.ConsoleExporterOptions | OpenTelemetry.Exporter.Console | 1.10.0 | +| OpenTelemetry.Exporter.PrometheusExporterOptions | OpenTelemetry.Exporter.Prometheus.HttpListener | 1.10.0-beta.1 | +| OpenTelemetry.Exporter.OtlpExporterOptions | OpenTelemetry.Exporter.OpenTelemetryProtocol | 1.10.0 | | OpenTelemetry.Instrumentation.AspNet.AspNetMetricsInstrumentationOptions | OpenTelemetry.Instrumentation.AspNet | 1.9.0-beta.1 | | OpenTelemetry.Instrumentation.Runtime.RuntimeInstrumentationOptions | OpenTelemetry.Instrumentation.Runtime | 1.9.0 | @@ -142,9 +142,9 @@ public class MyPlugin | Options type | NuGet package | NuGet version | |-----------------------------------------------|----------------------------------------------|---------------| -| OpenTelemetry.Logs.OpenTelemetryLoggerOptions | OpenTelemetry | 1.9.0 | -| OpenTelemetry.Exporter.ConsoleExporterOptions | OpenTelemetry.Exporter.Console | 1.9.0 | -| OpenTelemetry.Exporter.OtlpExporterOptions | OpenTelemetry.Exporter.OpenTelemetryProtocol | 1.9.0 | +| OpenTelemetry.Logs.OpenTelemetryLoggerOptions | OpenTelemetry | 1.10.0 | +| OpenTelemetry.Exporter.ConsoleExporterOptions | OpenTelemetry.Exporter.Console | 1.10.0 | +| OpenTelemetry.Exporter.OtlpExporterOptions | OpenTelemetry.Exporter.OpenTelemetryProtocol | 1.10.0 | ## Requirements diff --git a/next-gen/docs/getting-started-dotnet-monitor-logs/getting-started-dotnet-monitor-logs.csproj b/next-gen/docs/getting-started-dotnet-monitor-logs/getting-started-dotnet-monitor-logs.csproj index 849714fe9..519111f3d 100644 --- a/next-gen/docs/getting-started-dotnet-monitor-logs/getting-started-dotnet-monitor-logs.csproj +++ b/next-gen/docs/getting-started-dotnet-monitor-logs/getting-started-dotnet-monitor-logs.csproj @@ -10,7 +10,7 @@ - + diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props index 82319e1c1..82e47ea60 100644 --- a/src/Directory.Packages.props +++ b/src/Directory.Packages.props @@ -13,9 +13,9 @@ - - - + + + @@ -25,7 +25,7 @@ - + @@ -67,26 +67,27 @@ - - - - - - - - - - - - - + + + + + + + + + + + + + - + + - - + + diff --git a/src/OpenTelemetry.AutoInstrumentation.AdditionalDeps/Directory.Packages.props b/src/OpenTelemetry.AutoInstrumentation.AdditionalDeps/Directory.Packages.props index 52abb91da..01b1d041b 100644 --- a/src/OpenTelemetry.AutoInstrumentation.AdditionalDeps/Directory.Packages.props +++ b/src/OpenTelemetry.AutoInstrumentation.AdditionalDeps/Directory.Packages.props @@ -3,8 +3,8 @@ true - - - + + + diff --git a/src/OpenTelemetry.AutoInstrumentation.Native/netfx_assembly_redirection.h b/src/OpenTelemetry.AutoInstrumentation.Native/netfx_assembly_redirection.h index 57ef5a5d3..f11f352e4 100644 --- a/src/OpenTelemetry.AutoInstrumentation.Native/netfx_assembly_redirection.h +++ b/src/OpenTelemetry.AutoInstrumentation.Native/netfx_assembly_redirection.h @@ -21,19 +21,19 @@ void CorProfiler::InitNetFxAssemblyRedirectsMap() { L"Google.Protobuf", {3, 28, 3, 0} }, { L"Grpc.Core", {2, 0, 0, 0} }, { L"Grpc.Core.Api", {2, 0, 0, 0} }, - { L"Microsoft.Bcl.AsyncInterfaces", {8, 0, 0, 0} }, - { L"Microsoft.Extensions.Configuration", {8, 0, 0, 0} }, - { L"Microsoft.Extensions.Configuration.Abstractions", {8, 0, 0, 0} }, - { L"Microsoft.Extensions.Configuration.Binder", {8, 0, 0, 2} }, - { L"Microsoft.Extensions.DependencyInjection", {8, 0, 0, 1} }, - { L"Microsoft.Extensions.DependencyInjection.Abstractions", {8, 0, 0, 2} }, - { L"Microsoft.Extensions.Diagnostics.Abstractions", {8, 0, 0, 0} }, - { L"Microsoft.Extensions.Logging", {8, 0, 0, 0} }, - { L"Microsoft.Extensions.Logging.Abstractions", {8, 0, 0, 1} }, - { L"Microsoft.Extensions.Logging.Configuration", {8, 0, 0, 0} }, - { L"Microsoft.Extensions.Options", {8, 0, 0, 2} }, - { L"Microsoft.Extensions.Options.ConfigurationExtensions", {8, 0, 0, 0} }, - { L"Microsoft.Extensions.Primitives", {8, 0, 0, 0} }, + { L"Microsoft.Bcl.AsyncInterfaces", {9, 0, 0, 0} }, + { L"Microsoft.Extensions.Configuration", {9, 0, 0, 0} }, + { L"Microsoft.Extensions.Configuration.Abstractions", {9, 0, 0, 0} }, + { L"Microsoft.Extensions.Configuration.Binder", {9, 0, 0, 0} }, + { L"Microsoft.Extensions.DependencyInjection", {9, 0, 0, 0} }, + { L"Microsoft.Extensions.DependencyInjection.Abstractions", {9, 0, 0, 0} }, + { L"Microsoft.Extensions.Diagnostics.Abstractions", {9, 0, 0, 0} }, + { L"Microsoft.Extensions.Logging", {9, 0, 0, 0} }, + { L"Microsoft.Extensions.Logging.Abstractions", {9, 0, 0, 0} }, + { L"Microsoft.Extensions.Logging.Configuration", {9, 0, 0, 0} }, + { L"Microsoft.Extensions.Options", {9, 0, 0, 0} }, + { L"Microsoft.Extensions.Options.ConfigurationExtensions", {9, 0, 0, 0} }, + { L"Microsoft.Extensions.Primitives", {9, 0, 0, 0} }, { L"Microsoft.Win32.Primitives", {4, 0, 3, 0} }, { L"MongoDB.Driver.Core.Extensions.DiagnosticSources", {1, 0, 0, 0} }, { L"OpenTelemetry", {1, 0, 0, 0} }, @@ -75,7 +75,7 @@ void CorProfiler::InitNetFxAssemblyRedirectsMap() { L"System.Data.Common", {4, 2, 0, 0} }, { L"System.Diagnostics.Contracts", {4, 0, 1, 0} }, { L"System.Diagnostics.Debug", {4, 0, 11, 0} }, - { L"System.Diagnostics.DiagnosticSource", {8, 0, 0, 1} }, + { L"System.Diagnostics.DiagnosticSource", {9, 0, 0, 0} }, { L"System.Diagnostics.FileVersionInfo", {4, 0, 2, 0} }, { L"System.Diagnostics.Process", {4, 1, 2, 0} }, { L"System.Diagnostics.StackTrace", {4, 1, 0, 0} }, @@ -97,6 +97,7 @@ void CorProfiler::InitNetFxAssemblyRedirectsMap() { L"System.IO.FileSystem.Watcher", {4, 0, 2, 0} }, { L"System.IO.IsolatedStorage", {4, 0, 2, 0} }, { L"System.IO.MemoryMappedFiles", {4, 0, 2, 0} }, + { L"System.IO.Pipelines", {9, 0, 0, 0} }, { L"System.IO.Pipes", {4, 0, 2, 0} }, { L"System.IO.UnmanagedMemoryStream", {4, 0, 3, 0} }, { L"System.Linq", {4, 1, 2, 0} }, @@ -145,8 +146,8 @@ void CorProfiler::InitNetFxAssemblyRedirectsMap() { L"System.Security.SecureString", {4, 1, 0, 0} }, { L"System.Text.Encoding", {4, 0, 11, 0} }, { L"System.Text.Encoding.Extensions", {4, 0, 11, 0} }, - { L"System.Text.Encodings.Web", {8, 0, 0, 0} }, - { L"System.Text.Json", {8, 0, 0, 5} }, + { L"System.Text.Encodings.Web", {9, 0, 0, 0} }, + { L"System.Text.Json", {9, 0, 0, 0} }, { L"System.Text.RegularExpressions", {4, 1, 1, 0} }, { L"System.Threading", {4, 0, 11, 0} }, { L"System.Threading.Overlapped", {4, 1, 0, 0} }, diff --git a/src/OpenTelemetry.AutoInstrumentation/Generated/net8.0/SourceGenerators/SourceGenerators.InstrumentationDefinitionsGenerator/InstrumentationDefinitions.g.cs b/src/OpenTelemetry.AutoInstrumentation/Generated/net8.0/SourceGenerators/SourceGenerators.InstrumentationDefinitionsGenerator/InstrumentationDefinitions.g.cs index a412b4283..ec8e1dd44 100644 --- a/src/OpenTelemetry.AutoInstrumentation/Generated/net8.0/SourceGenerators/SourceGenerators.InstrumentationDefinitionsGenerator/InstrumentationDefinitions.g.cs +++ b/src/OpenTelemetry.AutoInstrumentation/Generated/net8.0/SourceGenerators/SourceGenerators.InstrumentationDefinitionsGenerator/InstrumentationDefinitions.g.cs @@ -79,7 +79,7 @@ internal static partial class InstrumentationDefinitions // ILogger if (logSettings.EnabledInstrumentations.Contains(LogInstrumentation.ILogger)) { - nativeCallTargetDefinitions.Add(new("Microsoft.Extensions.Logging", "Microsoft.Extensions.Logging.LoggingBuilder", ".ctor", new[] {"System.Void", "Microsoft.Extensions.DependencyInjection.IServiceCollection"}, 8, 0, 0, 9, 65535, 65535, AssemblyFullName, "OpenTelemetry.AutoInstrumentation.Instrumentations.Logger.LoggingBuilderIntegration")); + nativeCallTargetDefinitions.Add(new("Microsoft.Extensions.Logging", "Microsoft.Extensions.Logging.LoggingBuilder", ".ctor", new[] {"System.Void", "Microsoft.Extensions.DependencyInjection.IServiceCollection"}, 9, 0, 0, 9, 65535, 65535, AssemblyFullName, "OpenTelemetry.AutoInstrumentation.Instrumentations.Logger.LoggingBuilderIntegration")); } } diff --git a/src/OpenTelemetry.AutoInstrumentation/Instrumentations/Logger/LoggingBuilderIntegration.cs b/src/OpenTelemetry.AutoInstrumentation/Instrumentations/Logger/LoggingBuilderIntegration.cs index add3027b5..cc34e0fde 100644 --- a/src/OpenTelemetry.AutoInstrumentation/Instrumentations/Logger/LoggingBuilderIntegration.cs +++ b/src/OpenTelemetry.AutoInstrumentation/Instrumentations/Logger/LoggingBuilderIntegration.cs @@ -15,7 +15,7 @@ namespace OpenTelemetry.AutoInstrumentation.Instrumentations.Logger; methodName: ".ctor", returnTypeName: ClrNames.Void, parameterTypeNames: new[] { "Microsoft.Extensions.DependencyInjection.IServiceCollection" }, - minimumVersion: "8.0.0", + minimumVersion: "9.0.0", maximumVersion: "9.*.*", integrationName: "ILogger", type: InstrumentationType.Log)] diff --git a/src/OpenTelemetry.AutoInstrumentation/OpenTelemetry.AutoInstrumentation.csproj b/src/OpenTelemetry.AutoInstrumentation/OpenTelemetry.AutoInstrumentation.csproj index 7605529b5..035c5364d 100644 --- a/src/OpenTelemetry.AutoInstrumentation/OpenTelemetry.AutoInstrumentation.csproj +++ b/src/OpenTelemetry.AutoInstrumentation/OpenTelemetry.AutoInstrumentation.csproj @@ -80,6 +80,7 @@ + diff --git a/src/OpenTelemetry.AutoInstrumentation/Util/ActivityHelper.cs b/src/OpenTelemetry.AutoInstrumentation/Util/ActivityHelper.cs index 2baacdd61..57f4745a5 100644 --- a/src/OpenTelemetry.AutoInstrumentation/Util/ActivityHelper.cs +++ b/src/OpenTelemetry.AutoInstrumentation/Util/ActivityHelper.cs @@ -4,7 +4,6 @@ using System.Diagnostics; using OpenTelemetry.AutoInstrumentation.Logging; using OpenTelemetry.AutoInstrumentation.Tagging; -using OpenTelemetry.Trace; namespace OpenTelemetry.AutoInstrumentation.Util; @@ -30,8 +29,8 @@ internal static class ActivityHelper return; } - activity.SetStatus(Status.Error.WithDescription(exception.Message)); - activity.RecordException(exception); + activity.SetStatus(ActivityStatusCode.Error, exception.Message); + activity.AddException(exception); } public static Activity? StartActivityWithTags(this ActivitySource? activitySource, string operationName, ActivityKind kind, ITags tags) diff --git a/test/Directory.Packages.props b/test/Directory.Packages.props index 352b46f66..5069eb1ad 100644 --- a/test/Directory.Packages.props +++ b/test/Directory.Packages.props @@ -15,17 +15,17 @@ - + - - - - - + + + + + @@ -47,7 +47,7 @@ - + diff --git a/test/IntegrationTests/BuildTests.DistributionStructure_alpine-linux-arm64.verified.txt b/test/IntegrationTests/BuildTests.DistributionStructure_alpine-linux-arm64.verified.txt index 6d99b311f..43a726c2d 100644 --- a/test/IntegrationTests/BuildTests.DistributionStructure_alpine-linux-arm64.verified.txt +++ b/test/IntegrationTests/BuildTests.DistributionStructure_alpine-linux-arm64.verified.txt @@ -8,6 +8,7 @@ /net/Grpc.Core.Api.dll, /net/Grpc.Net.Client.dll, /net/Grpc.Net.Common.dll, + /net/Microsoft.Extensions.Diagnostics.Abstractions.dll, /net/MongoDB.Driver.Core.Extensions.DiagnosticSources.dll, /net/OpenTelemetry.Api.ProviderBuilderExtensions.dll, /net/OpenTelemetry.Api.dll, @@ -48,26 +49,27 @@ /net/System.ServiceModel.Primitives.dll, /net/System.ServiceModel.dll, /net/ruleEngine.json, - /store/arm64/net8.0/microsoft.extensions.configuration.abstractions/8.0.0/lib/net9.0/Microsoft.Extensions.Configuration.Abstractions.dll, - /store/arm64/net8.0/microsoft.extensions.configuration.binder/8.0.1/lib/net9.0/Microsoft.Extensions.Configuration.Binder.dll, - /store/arm64/net8.0/microsoft.extensions.configuration/8.0.0/lib/net9.0/Microsoft.Extensions.Configuration.dll, - /store/arm64/net8.0/microsoft.extensions.dependencyinjection.abstractions/8.0.0/lib/net9.0/Microsoft.Extensions.DependencyInjection.Abstractions.dll, - /store/arm64/net8.0/microsoft.extensions.dependencyinjection/8.0.0/lib/net9.0/Microsoft.Extensions.DependencyInjection.dll, - /store/arm64/net8.0/microsoft.extensions.logging.abstractions/8.0.0/lib/net9.0/Microsoft.Extensions.Logging.Abstractions.dll, - /store/arm64/net8.0/microsoft.extensions.logging.configuration/8.0.0/lib/net9.0/Microsoft.Extensions.Logging.Configuration.dll, - /store/arm64/net8.0/microsoft.extensions.logging/8.0.0/lib/net9.0/Microsoft.Extensions.Logging.dll, - /store/arm64/net8.0/microsoft.extensions.options.configurationextensions/8.0.0/lib/net9.0/Microsoft.Extensions.Options.ConfigurationExtensions.dll, - /store/arm64/net8.0/microsoft.extensions.options/8.0.0/lib/net9.0/Microsoft.Extensions.Options.dll, - /store/arm64/net8.0/microsoft.extensions.primitives/8.0.0/lib/net9.0/Microsoft.Extensions.Primitives.dll, - /store/arm64/net9.0/microsoft.extensions.configuration.abstractions/8.0.0/lib/net9.0/Microsoft.Extensions.Configuration.Abstractions.dll, - /store/arm64/net9.0/microsoft.extensions.configuration.binder/8.0.1/lib/net9.0/Microsoft.Extensions.Configuration.Binder.dll, - /store/arm64/net9.0/microsoft.extensions.configuration/8.0.0/lib/net9.0/Microsoft.Extensions.Configuration.dll, - /store/arm64/net9.0/microsoft.extensions.dependencyinjection.abstractions/8.0.0/lib/net9.0/Microsoft.Extensions.DependencyInjection.Abstractions.dll, - /store/arm64/net9.0/microsoft.extensions.dependencyinjection/8.0.0/lib/net9.0/Microsoft.Extensions.DependencyInjection.dll, - /store/arm64/net9.0/microsoft.extensions.logging.abstractions/8.0.0/lib/net9.0/Microsoft.Extensions.Logging.Abstractions.dll, - /store/arm64/net9.0/microsoft.extensions.logging.configuration/8.0.0/lib/net9.0/Microsoft.Extensions.Logging.Configuration.dll, - /store/arm64/net9.0/microsoft.extensions.logging/8.0.0/lib/net9.0/Microsoft.Extensions.Logging.dll, - /store/arm64/net9.0/microsoft.extensions.options.configurationextensions/8.0.0/lib/net9.0/Microsoft.Extensions.Options.ConfigurationExtensions.dll, - /store/arm64/net9.0/microsoft.extensions.options/8.0.0/lib/net9.0/Microsoft.Extensions.Options.dll, - /store/arm64/net9.0/microsoft.extensions.primitives/8.0.0/lib/net9.0/Microsoft.Extensions.Primitives.dll + /store/arm64/net8.0/microsoft.extensions.configuration.abstractions/9.0.0/lib/net9.0/Microsoft.Extensions.Configuration.Abstractions.dll, + /store/arm64/net8.0/microsoft.extensions.configuration.binder/9.0.0/lib/net9.0/Microsoft.Extensions.Configuration.Binder.dll, + /store/arm64/net8.0/microsoft.extensions.configuration/9.0.0/lib/net9.0/Microsoft.Extensions.Configuration.dll, + /store/arm64/net8.0/microsoft.extensions.dependencyinjection.abstractions/9.0.0/lib/net9.0/Microsoft.Extensions.DependencyInjection.Abstractions.dll, + /store/arm64/net8.0/microsoft.extensions.dependencyinjection/9.0.0/lib/net9.0/Microsoft.Extensions.DependencyInjection.dll, + /store/arm64/net8.0/microsoft.extensions.logging.abstractions/9.0.0/lib/net9.0/Microsoft.Extensions.Logging.Abstractions.dll, + /store/arm64/net8.0/microsoft.extensions.logging.configuration/9.0.0/lib/net9.0/Microsoft.Extensions.Logging.Configuration.dll, + /store/arm64/net8.0/microsoft.extensions.logging/9.0.0/lib/net9.0/Microsoft.Extensions.Logging.dll, + /store/arm64/net8.0/microsoft.extensions.options.configurationextensions/9.0.0/lib/net9.0/Microsoft.Extensions.Options.ConfigurationExtensions.dll, + /store/arm64/net8.0/microsoft.extensions.options/9.0.0/lib/net9.0/Microsoft.Extensions.Options.dll, + /store/arm64/net8.0/microsoft.extensions.primitives/9.0.0/lib/net9.0/Microsoft.Extensions.Primitives.dll, + /store/arm64/net8.0/system.diagnostics.diagnosticsource/9.0.0/lib/net9.0/System.Diagnostics.DiagnosticSource.dll, + /store/arm64/net9.0/microsoft.extensions.configuration.abstractions/9.0.0/lib/net9.0/Microsoft.Extensions.Configuration.Abstractions.dll, + /store/arm64/net9.0/microsoft.extensions.configuration.binder/9.0.0/lib/net9.0/Microsoft.Extensions.Configuration.Binder.dll, + /store/arm64/net9.0/microsoft.extensions.configuration/9.0.0/lib/net9.0/Microsoft.Extensions.Configuration.dll, + /store/arm64/net9.0/microsoft.extensions.dependencyinjection.abstractions/9.0.0/lib/net9.0/Microsoft.Extensions.DependencyInjection.Abstractions.dll, + /store/arm64/net9.0/microsoft.extensions.dependencyinjection/9.0.0/lib/net9.0/Microsoft.Extensions.DependencyInjection.dll, + /store/arm64/net9.0/microsoft.extensions.logging.abstractions/9.0.0/lib/net9.0/Microsoft.Extensions.Logging.Abstractions.dll, + /store/arm64/net9.0/microsoft.extensions.logging.configuration/9.0.0/lib/net9.0/Microsoft.Extensions.Logging.Configuration.dll, + /store/arm64/net9.0/microsoft.extensions.logging/9.0.0/lib/net9.0/Microsoft.Extensions.Logging.dll, + /store/arm64/net9.0/microsoft.extensions.options.configurationextensions/9.0.0/lib/net9.0/Microsoft.Extensions.Options.ConfigurationExtensions.dll, + /store/arm64/net9.0/microsoft.extensions.options/9.0.0/lib/net9.0/Microsoft.Extensions.Options.dll, + /store/arm64/net9.0/microsoft.extensions.primitives/9.0.0/lib/net9.0/Microsoft.Extensions.Primitives.dll ] \ No newline at end of file diff --git a/test/IntegrationTests/BuildTests.DistributionStructure_alpine-linux-x64.verified.txt b/test/IntegrationTests/BuildTests.DistributionStructure_alpine-linux-x64.verified.txt index aa8c6520a..6f929a91e 100644 --- a/test/IntegrationTests/BuildTests.DistributionStructure_alpine-linux-x64.verified.txt +++ b/test/IntegrationTests/BuildTests.DistributionStructure_alpine-linux-x64.verified.txt @@ -8,6 +8,7 @@ /net/Grpc.Core.Api.dll, /net/Grpc.Net.Client.dll, /net/Grpc.Net.Common.dll, + /net/Microsoft.Extensions.Diagnostics.Abstractions.dll, /net/MongoDB.Driver.Core.Extensions.DiagnosticSources.dll, /net/OpenTelemetry.Api.ProviderBuilderExtensions.dll, /net/OpenTelemetry.Api.dll, @@ -48,26 +49,27 @@ /net/System.ServiceModel.Primitives.dll, /net/System.ServiceModel.dll, /net/ruleEngine.json, - /store/x64/net8.0/microsoft.extensions.configuration.abstractions/8.0.0/lib/net9.0/Microsoft.Extensions.Configuration.Abstractions.dll, - /store/x64/net8.0/microsoft.extensions.configuration.binder/8.0.1/lib/net9.0/Microsoft.Extensions.Configuration.Binder.dll, - /store/x64/net8.0/microsoft.extensions.configuration/8.0.0/lib/net9.0/Microsoft.Extensions.Configuration.dll, - /store/x64/net8.0/microsoft.extensions.dependencyinjection.abstractions/8.0.0/lib/net9.0/Microsoft.Extensions.DependencyInjection.Abstractions.dll, - /store/x64/net8.0/microsoft.extensions.dependencyinjection/8.0.0/lib/net9.0/Microsoft.Extensions.DependencyInjection.dll, - /store/x64/net8.0/microsoft.extensions.logging.abstractions/8.0.0/lib/net9.0/Microsoft.Extensions.Logging.Abstractions.dll, - /store/x64/net8.0/microsoft.extensions.logging.configuration/8.0.0/lib/net9.0/Microsoft.Extensions.Logging.Configuration.dll, - /store/x64/net8.0/microsoft.extensions.logging/8.0.0/lib/net9.0/Microsoft.Extensions.Logging.dll, - /store/x64/net8.0/microsoft.extensions.options.configurationextensions/8.0.0/lib/net9.0/Microsoft.Extensions.Options.ConfigurationExtensions.dll, - /store/x64/net8.0/microsoft.extensions.options/8.0.0/lib/net9.0/Microsoft.Extensions.Options.dll, - /store/x64/net8.0/microsoft.extensions.primitives/8.0.0/lib/net9.0/Microsoft.Extensions.Primitives.dll, - /store/x64/net9.0/microsoft.extensions.configuration.abstractions/8.0.0/lib/net9.0/Microsoft.Extensions.Configuration.Abstractions.dll, - /store/x64/net9.0/microsoft.extensions.configuration.binder/8.0.1/lib/net9.0/Microsoft.Extensions.Configuration.Binder.dll, - /store/x64/net9.0/microsoft.extensions.configuration/8.0.0/lib/net9.0/Microsoft.Extensions.Configuration.dll, - /store/x64/net9.0/microsoft.extensions.dependencyinjection.abstractions/8.0.0/lib/net9.0/Microsoft.Extensions.DependencyInjection.Abstractions.dll, - /store/x64/net9.0/microsoft.extensions.dependencyinjection/8.0.0/lib/net9.0/Microsoft.Extensions.DependencyInjection.dll, - /store/x64/net9.0/microsoft.extensions.logging.abstractions/8.0.0/lib/net9.0/Microsoft.Extensions.Logging.Abstractions.dll, - /store/x64/net9.0/microsoft.extensions.logging.configuration/8.0.0/lib/net9.0/Microsoft.Extensions.Logging.Configuration.dll, - /store/x64/net9.0/microsoft.extensions.logging/8.0.0/lib/net9.0/Microsoft.Extensions.Logging.dll, - /store/x64/net9.0/microsoft.extensions.options.configurationextensions/8.0.0/lib/net9.0/Microsoft.Extensions.Options.ConfigurationExtensions.dll, - /store/x64/net9.0/microsoft.extensions.options/8.0.0/lib/net9.0/Microsoft.Extensions.Options.dll, - /store/x64/net9.0/microsoft.extensions.primitives/8.0.0/lib/net9.0/Microsoft.Extensions.Primitives.dll + /store/x64/net8.0/microsoft.extensions.configuration.abstractions/9.0.0/lib/net9.0/Microsoft.Extensions.Configuration.Abstractions.dll, + /store/x64/net8.0/microsoft.extensions.configuration.binder/9.0.0/lib/net9.0/Microsoft.Extensions.Configuration.Binder.dll, + /store/x64/net8.0/microsoft.extensions.configuration/9.0.0/lib/net9.0/Microsoft.Extensions.Configuration.dll, + /store/x64/net8.0/microsoft.extensions.dependencyinjection.abstractions/9.0.0/lib/net9.0/Microsoft.Extensions.DependencyInjection.Abstractions.dll, + /store/x64/net8.0/microsoft.extensions.dependencyinjection/9.0.0/lib/net9.0/Microsoft.Extensions.DependencyInjection.dll, + /store/x64/net8.0/microsoft.extensions.logging.abstractions/9.0.0/lib/net9.0/Microsoft.Extensions.Logging.Abstractions.dll, + /store/x64/net8.0/microsoft.extensions.logging.configuration/9.0.0/lib/net9.0/Microsoft.Extensions.Logging.Configuration.dll, + /store/x64/net8.0/microsoft.extensions.logging/9.0.0/lib/net9.0/Microsoft.Extensions.Logging.dll, + /store/x64/net8.0/microsoft.extensions.options.configurationextensions/9.0.0/lib/net9.0/Microsoft.Extensions.Options.ConfigurationExtensions.dll, + /store/x64/net8.0/microsoft.extensions.options/9.0.0/lib/net9.0/Microsoft.Extensions.Options.dll, + /store/x64/net8.0/microsoft.extensions.primitives/9.0.0/lib/net9.0/Microsoft.Extensions.Primitives.dll, + /store/x64/net8.0/system.diagnostics.diagnosticsource/9.0.0/lib/net9.0/System.Diagnostics.DiagnosticSource.dll, + /store/x64/net9.0/microsoft.extensions.configuration.abstractions/9.0.0/lib/net9.0/Microsoft.Extensions.Configuration.Abstractions.dll, + /store/x64/net9.0/microsoft.extensions.configuration.binder/9.0.0/lib/net9.0/Microsoft.Extensions.Configuration.Binder.dll, + /store/x64/net9.0/microsoft.extensions.configuration/9.0.0/lib/net9.0/Microsoft.Extensions.Configuration.dll, + /store/x64/net9.0/microsoft.extensions.dependencyinjection.abstractions/9.0.0/lib/net9.0/Microsoft.Extensions.DependencyInjection.Abstractions.dll, + /store/x64/net9.0/microsoft.extensions.dependencyinjection/9.0.0/lib/net9.0/Microsoft.Extensions.DependencyInjection.dll, + /store/x64/net9.0/microsoft.extensions.logging.abstractions/9.0.0/lib/net9.0/Microsoft.Extensions.Logging.Abstractions.dll, + /store/x64/net9.0/microsoft.extensions.logging.configuration/9.0.0/lib/net9.0/Microsoft.Extensions.Logging.Configuration.dll, + /store/x64/net9.0/microsoft.extensions.logging/9.0.0/lib/net9.0/Microsoft.Extensions.Logging.dll, + /store/x64/net9.0/microsoft.extensions.options.configurationextensions/9.0.0/lib/net9.0/Microsoft.Extensions.Options.ConfigurationExtensions.dll, + /store/x64/net9.0/microsoft.extensions.options/9.0.0/lib/net9.0/Microsoft.Extensions.Options.dll, + /store/x64/net9.0/microsoft.extensions.primitives/9.0.0/lib/net9.0/Microsoft.Extensions.Primitives.dll ] \ No newline at end of file diff --git a/test/IntegrationTests/BuildTests.DistributionStructure_linux-arm64.verified.txt b/test/IntegrationTests/BuildTests.DistributionStructure_linux-arm64.verified.txt index 75246d03a..7bcf5b63c 100644 --- a/test/IntegrationTests/BuildTests.DistributionStructure_linux-arm64.verified.txt +++ b/test/IntegrationTests/BuildTests.DistributionStructure_linux-arm64.verified.txt @@ -8,6 +8,7 @@ /net/Grpc.Core.Api.dll, /net/Grpc.Net.Client.dll, /net/Grpc.Net.Common.dll, + /net/Microsoft.Extensions.Diagnostics.Abstractions.dll, /net/MongoDB.Driver.Core.Extensions.DiagnosticSources.dll, /net/OpenTelemetry.Api.ProviderBuilderExtensions.dll, /net/OpenTelemetry.Api.dll, @@ -48,26 +49,27 @@ /net/System.ServiceModel.Primitives.dll, /net/System.ServiceModel.dll, /net/ruleEngine.json, - /store/arm64/net8.0/microsoft.extensions.configuration.abstractions/8.0.0/lib/net9.0/Microsoft.Extensions.Configuration.Abstractions.dll, - /store/arm64/net8.0/microsoft.extensions.configuration.binder/8.0.1/lib/net9.0/Microsoft.Extensions.Configuration.Binder.dll, - /store/arm64/net8.0/microsoft.extensions.configuration/8.0.0/lib/net9.0/Microsoft.Extensions.Configuration.dll, - /store/arm64/net8.0/microsoft.extensions.dependencyinjection.abstractions/8.0.0/lib/net9.0/Microsoft.Extensions.DependencyInjection.Abstractions.dll, - /store/arm64/net8.0/microsoft.extensions.dependencyinjection/8.0.0/lib/net9.0/Microsoft.Extensions.DependencyInjection.dll, - /store/arm64/net8.0/microsoft.extensions.logging.abstractions/8.0.0/lib/net9.0/Microsoft.Extensions.Logging.Abstractions.dll, - /store/arm64/net8.0/microsoft.extensions.logging.configuration/8.0.0/lib/net9.0/Microsoft.Extensions.Logging.Configuration.dll, - /store/arm64/net8.0/microsoft.extensions.logging/8.0.0/lib/net9.0/Microsoft.Extensions.Logging.dll, - /store/arm64/net8.0/microsoft.extensions.options.configurationextensions/8.0.0/lib/net9.0/Microsoft.Extensions.Options.ConfigurationExtensions.dll, - /store/arm64/net8.0/microsoft.extensions.options/8.0.0/lib/net9.0/Microsoft.Extensions.Options.dll, - /store/arm64/net8.0/microsoft.extensions.primitives/8.0.0/lib/net9.0/Microsoft.Extensions.Primitives.dll, - /store/arm64/net9.0/microsoft.extensions.configuration.abstractions/8.0.0/lib/net9.0/Microsoft.Extensions.Configuration.Abstractions.dll, - /store/arm64/net9.0/microsoft.extensions.configuration.binder/8.0.1/lib/net9.0/Microsoft.Extensions.Configuration.Binder.dll, - /store/arm64/net9.0/microsoft.extensions.configuration/8.0.0/lib/net9.0/Microsoft.Extensions.Configuration.dll, - /store/arm64/net9.0/microsoft.extensions.dependencyinjection.abstractions/8.0.0/lib/net9.0/Microsoft.Extensions.DependencyInjection.Abstractions.dll, - /store/arm64/net9.0/microsoft.extensions.dependencyinjection/8.0.0/lib/net9.0/Microsoft.Extensions.DependencyInjection.dll, - /store/arm64/net9.0/microsoft.extensions.logging.abstractions/8.0.0/lib/net9.0/Microsoft.Extensions.Logging.Abstractions.dll, - /store/arm64/net9.0/microsoft.extensions.logging.configuration/8.0.0/lib/net9.0/Microsoft.Extensions.Logging.Configuration.dll, - /store/arm64/net9.0/microsoft.extensions.logging/8.0.0/lib/net9.0/Microsoft.Extensions.Logging.dll, - /store/arm64/net9.0/microsoft.extensions.options.configurationextensions/8.0.0/lib/net9.0/Microsoft.Extensions.Options.ConfigurationExtensions.dll, - /store/arm64/net9.0/microsoft.extensions.options/8.0.0/lib/net9.0/Microsoft.Extensions.Options.dll, - /store/arm64/net9.0/microsoft.extensions.primitives/8.0.0/lib/net9.0/Microsoft.Extensions.Primitives.dll + /store/arm64/net8.0/microsoft.extensions.configuration.abstractions/9.0.0/lib/net9.0/Microsoft.Extensions.Configuration.Abstractions.dll, + /store/arm64/net8.0/microsoft.extensions.configuration.binder/9.0.0/lib/net9.0/Microsoft.Extensions.Configuration.Binder.dll, + /store/arm64/net8.0/microsoft.extensions.configuration/9.0.0/lib/net9.0/Microsoft.Extensions.Configuration.dll, + /store/arm64/net8.0/microsoft.extensions.dependencyinjection.abstractions/9.0.0/lib/net9.0/Microsoft.Extensions.DependencyInjection.Abstractions.dll, + /store/arm64/net8.0/microsoft.extensions.dependencyinjection/9.0.0/lib/net9.0/Microsoft.Extensions.DependencyInjection.dll, + /store/arm64/net8.0/microsoft.extensions.logging.abstractions/9.0.0/lib/net9.0/Microsoft.Extensions.Logging.Abstractions.dll, + /store/arm64/net8.0/microsoft.extensions.logging.configuration/9.0.0/lib/net9.0/Microsoft.Extensions.Logging.Configuration.dll, + /store/arm64/net8.0/microsoft.extensions.logging/9.0.0/lib/net9.0/Microsoft.Extensions.Logging.dll, + /store/arm64/net8.0/microsoft.extensions.options.configurationextensions/9.0.0/lib/net9.0/Microsoft.Extensions.Options.ConfigurationExtensions.dll, + /store/arm64/net8.0/microsoft.extensions.options/9.0.0/lib/net9.0/Microsoft.Extensions.Options.dll, + /store/arm64/net8.0/microsoft.extensions.primitives/9.0.0/lib/net9.0/Microsoft.Extensions.Primitives.dll, + /store/arm64/net8.0/system.diagnostics.diagnosticsource/9.0.0/lib/net9.0/System.Diagnostics.DiagnosticSource.dll, + /store/arm64/net9.0/microsoft.extensions.configuration.abstractions/9.0.0/lib/net9.0/Microsoft.Extensions.Configuration.Abstractions.dll, + /store/arm64/net9.0/microsoft.extensions.configuration.binder/9.0.0/lib/net9.0/Microsoft.Extensions.Configuration.Binder.dll, + /store/arm64/net9.0/microsoft.extensions.configuration/9.0.0/lib/net9.0/Microsoft.Extensions.Configuration.dll, + /store/arm64/net9.0/microsoft.extensions.dependencyinjection.abstractions/9.0.0/lib/net9.0/Microsoft.Extensions.DependencyInjection.Abstractions.dll, + /store/arm64/net9.0/microsoft.extensions.dependencyinjection/9.0.0/lib/net9.0/Microsoft.Extensions.DependencyInjection.dll, + /store/arm64/net9.0/microsoft.extensions.logging.abstractions/9.0.0/lib/net9.0/Microsoft.Extensions.Logging.Abstractions.dll, + /store/arm64/net9.0/microsoft.extensions.logging.configuration/9.0.0/lib/net9.0/Microsoft.Extensions.Logging.Configuration.dll, + /store/arm64/net9.0/microsoft.extensions.logging/9.0.0/lib/net9.0/Microsoft.Extensions.Logging.dll, + /store/arm64/net9.0/microsoft.extensions.options.configurationextensions/9.0.0/lib/net9.0/Microsoft.Extensions.Options.ConfigurationExtensions.dll, + /store/arm64/net9.0/microsoft.extensions.options/9.0.0/lib/net9.0/Microsoft.Extensions.Options.dll, + /store/arm64/net9.0/microsoft.extensions.primitives/9.0.0/lib/net9.0/Microsoft.Extensions.Primitives.dll ] \ No newline at end of file diff --git a/test/IntegrationTests/BuildTests.DistributionStructure_linux-x64.verified.txt b/test/IntegrationTests/BuildTests.DistributionStructure_linux-x64.verified.txt index 88e3e9a2c..2eaac0020 100644 --- a/test/IntegrationTests/BuildTests.DistributionStructure_linux-x64.verified.txt +++ b/test/IntegrationTests/BuildTests.DistributionStructure_linux-x64.verified.txt @@ -8,6 +8,7 @@ /net/Grpc.Core.Api.dll, /net/Grpc.Net.Client.dll, /net/Grpc.Net.Common.dll, + /net/Microsoft.Extensions.Diagnostics.Abstractions.dll, /net/MongoDB.Driver.Core.Extensions.DiagnosticSources.dll, /net/OpenTelemetry.Api.ProviderBuilderExtensions.dll, /net/OpenTelemetry.Api.dll, @@ -48,26 +49,27 @@ /net/System.ServiceModel.Primitives.dll, /net/System.ServiceModel.dll, /net/ruleEngine.json, - /store/x64/net8.0/microsoft.extensions.configuration.abstractions/8.0.0/lib/net9.0/Microsoft.Extensions.Configuration.Abstractions.dll, - /store/x64/net8.0/microsoft.extensions.configuration.binder/8.0.1/lib/net9.0/Microsoft.Extensions.Configuration.Binder.dll, - /store/x64/net8.0/microsoft.extensions.configuration/8.0.0/lib/net9.0/Microsoft.Extensions.Configuration.dll, - /store/x64/net8.0/microsoft.extensions.dependencyinjection.abstractions/8.0.0/lib/net9.0/Microsoft.Extensions.DependencyInjection.Abstractions.dll, - /store/x64/net8.0/microsoft.extensions.dependencyinjection/8.0.0/lib/net9.0/Microsoft.Extensions.DependencyInjection.dll, - /store/x64/net8.0/microsoft.extensions.logging.abstractions/8.0.0/lib/net9.0/Microsoft.Extensions.Logging.Abstractions.dll, - /store/x64/net8.0/microsoft.extensions.logging.configuration/8.0.0/lib/net9.0/Microsoft.Extensions.Logging.Configuration.dll, - /store/x64/net8.0/microsoft.extensions.logging/8.0.0/lib/net9.0/Microsoft.Extensions.Logging.dll, - /store/x64/net8.0/microsoft.extensions.options.configurationextensions/8.0.0/lib/net9.0/Microsoft.Extensions.Options.ConfigurationExtensions.dll, - /store/x64/net8.0/microsoft.extensions.options/8.0.0/lib/net9.0/Microsoft.Extensions.Options.dll, - /store/x64/net8.0/microsoft.extensions.primitives/8.0.0/lib/net9.0/Microsoft.Extensions.Primitives.dll, - /store/x64/net9.0/microsoft.extensions.configuration.abstractions/8.0.0/lib/net9.0/Microsoft.Extensions.Configuration.Abstractions.dll, - /store/x64/net9.0/microsoft.extensions.configuration.binder/8.0.1/lib/net9.0/Microsoft.Extensions.Configuration.Binder.dll, - /store/x64/net9.0/microsoft.extensions.configuration/8.0.0/lib/net9.0/Microsoft.Extensions.Configuration.dll, - /store/x64/net9.0/microsoft.extensions.dependencyinjection.abstractions/8.0.0/lib/net9.0/Microsoft.Extensions.DependencyInjection.Abstractions.dll, - /store/x64/net9.0/microsoft.extensions.dependencyinjection/8.0.0/lib/net9.0/Microsoft.Extensions.DependencyInjection.dll, - /store/x64/net9.0/microsoft.extensions.logging.abstractions/8.0.0/lib/net9.0/Microsoft.Extensions.Logging.Abstractions.dll, - /store/x64/net9.0/microsoft.extensions.logging.configuration/8.0.0/lib/net9.0/Microsoft.Extensions.Logging.Configuration.dll, - /store/x64/net9.0/microsoft.extensions.logging/8.0.0/lib/net9.0/Microsoft.Extensions.Logging.dll, - /store/x64/net9.0/microsoft.extensions.options.configurationextensions/8.0.0/lib/net9.0/Microsoft.Extensions.Options.ConfigurationExtensions.dll, - /store/x64/net9.0/microsoft.extensions.options/8.0.0/lib/net9.0/Microsoft.Extensions.Options.dll, - /store/x64/net9.0/microsoft.extensions.primitives/8.0.0/lib/net9.0/Microsoft.Extensions.Primitives.dll + /store/x64/net8.0/microsoft.extensions.configuration.abstractions/9.0.0/lib/net9.0/Microsoft.Extensions.Configuration.Abstractions.dll, + /store/x64/net8.0/microsoft.extensions.configuration.binder/9.0.0/lib/net9.0/Microsoft.Extensions.Configuration.Binder.dll, + /store/x64/net8.0/microsoft.extensions.configuration/9.0.0/lib/net9.0/Microsoft.Extensions.Configuration.dll, + /store/x64/net8.0/microsoft.extensions.dependencyinjection.abstractions/9.0.0/lib/net9.0/Microsoft.Extensions.DependencyInjection.Abstractions.dll, + /store/x64/net8.0/microsoft.extensions.dependencyinjection/9.0.0/lib/net9.0/Microsoft.Extensions.DependencyInjection.dll, + /store/x64/net8.0/microsoft.extensions.logging.abstractions/9.0.0/lib/net9.0/Microsoft.Extensions.Logging.Abstractions.dll, + /store/x64/net8.0/microsoft.extensions.logging.configuration/9.0.0/lib/net9.0/Microsoft.Extensions.Logging.Configuration.dll, + /store/x64/net8.0/microsoft.extensions.logging/9.0.0/lib/net9.0/Microsoft.Extensions.Logging.dll, + /store/x64/net8.0/microsoft.extensions.options.configurationextensions/9.0.0/lib/net9.0/Microsoft.Extensions.Options.ConfigurationExtensions.dll, + /store/x64/net8.0/microsoft.extensions.options/9.0.0/lib/net9.0/Microsoft.Extensions.Options.dll, + /store/x64/net8.0/microsoft.extensions.primitives/9.0.0/lib/net9.0/Microsoft.Extensions.Primitives.dll, + /store/x64/net8.0/system.diagnostics.diagnosticsource/9.0.0/lib/net9.0/System.Diagnostics.DiagnosticSource.dll, + /store/x64/net9.0/microsoft.extensions.configuration.abstractions/9.0.0/lib/net9.0/Microsoft.Extensions.Configuration.Abstractions.dll, + /store/x64/net9.0/microsoft.extensions.configuration.binder/9.0.0/lib/net9.0/Microsoft.Extensions.Configuration.Binder.dll, + /store/x64/net9.0/microsoft.extensions.configuration/9.0.0/lib/net9.0/Microsoft.Extensions.Configuration.dll, + /store/x64/net9.0/microsoft.extensions.dependencyinjection.abstractions/9.0.0/lib/net9.0/Microsoft.Extensions.DependencyInjection.Abstractions.dll, + /store/x64/net9.0/microsoft.extensions.dependencyinjection/9.0.0/lib/net9.0/Microsoft.Extensions.DependencyInjection.dll, + /store/x64/net9.0/microsoft.extensions.logging.abstractions/9.0.0/lib/net9.0/Microsoft.Extensions.Logging.Abstractions.dll, + /store/x64/net9.0/microsoft.extensions.logging.configuration/9.0.0/lib/net9.0/Microsoft.Extensions.Logging.Configuration.dll, + /store/x64/net9.0/microsoft.extensions.logging/9.0.0/lib/net9.0/Microsoft.Extensions.Logging.dll, + /store/x64/net9.0/microsoft.extensions.options.configurationextensions/9.0.0/lib/net9.0/Microsoft.Extensions.Options.ConfigurationExtensions.dll, + /store/x64/net9.0/microsoft.extensions.options/9.0.0/lib/net9.0/Microsoft.Extensions.Options.dll, + /store/x64/net9.0/microsoft.extensions.primitives/9.0.0/lib/net9.0/Microsoft.Extensions.Primitives.dll ] \ No newline at end of file diff --git a/test/IntegrationTests/BuildTests.DistributionStructure_osx.verified.txt b/test/IntegrationTests/BuildTests.DistributionStructure_osx.verified.txt index 1d894accc..17a969122 100644 --- a/test/IntegrationTests/BuildTests.DistributionStructure_osx.verified.txt +++ b/test/IntegrationTests/BuildTests.DistributionStructure_osx.verified.txt @@ -7,6 +7,7 @@ /net/Grpc.Core.Api.dll, /net/Grpc.Net.Client.dll, /net/Grpc.Net.Common.dll, + /net/Microsoft.Extensions.Diagnostics.Abstractions.dll, /net/MongoDB.Driver.Core.Extensions.DiagnosticSources.dll, /net/OpenTelemetry.Api.ProviderBuilderExtensions.dll, /net/OpenTelemetry.Api.dll, @@ -48,26 +49,27 @@ /net/System.ServiceModel.dll, /net/ruleEngine.json, /osx-x64/OpenTelemetry.AutoInstrumentation.Native.dylib, - /store/x64/net8.0/microsoft.extensions.configuration.abstractions/8.0.0/lib/net9.0/Microsoft.Extensions.Configuration.Abstractions.dll, - /store/x64/net8.0/microsoft.extensions.configuration.binder/8.0.1/lib/net9.0/Microsoft.Extensions.Configuration.Binder.dll, - /store/x64/net8.0/microsoft.extensions.configuration/8.0.0/lib/net9.0/Microsoft.Extensions.Configuration.dll, - /store/x64/net8.0/microsoft.extensions.dependencyinjection.abstractions/8.0.0/lib/net9.0/Microsoft.Extensions.DependencyInjection.Abstractions.dll, - /store/x64/net8.0/microsoft.extensions.dependencyinjection/8.0.0/lib/net9.0/Microsoft.Extensions.DependencyInjection.dll, - /store/x64/net8.0/microsoft.extensions.logging.abstractions/8.0.0/lib/net9.0/Microsoft.Extensions.Logging.Abstractions.dll, - /store/x64/net8.0/microsoft.extensions.logging.configuration/8.0.0/lib/net9.0/Microsoft.Extensions.Logging.Configuration.dll, - /store/x64/net8.0/microsoft.extensions.logging/8.0.0/lib/net9.0/Microsoft.Extensions.Logging.dll, - /store/x64/net8.0/microsoft.extensions.options.configurationextensions/8.0.0/lib/net9.0/Microsoft.Extensions.Options.ConfigurationExtensions.dll, - /store/x64/net8.0/microsoft.extensions.options/8.0.0/lib/net9.0/Microsoft.Extensions.Options.dll, - /store/x64/net8.0/microsoft.extensions.primitives/8.0.0/lib/net9.0/Microsoft.Extensions.Primitives.dll, - /store/x64/net9.0/microsoft.extensions.configuration.abstractions/8.0.0/lib/net9.0/Microsoft.Extensions.Configuration.Abstractions.dll, - /store/x64/net9.0/microsoft.extensions.configuration.binder/8.0.1/lib/net9.0/Microsoft.Extensions.Configuration.Binder.dll, - /store/x64/net9.0/microsoft.extensions.configuration/8.0.0/lib/net9.0/Microsoft.Extensions.Configuration.dll, - /store/x64/net9.0/microsoft.extensions.dependencyinjection.abstractions/8.0.0/lib/net9.0/Microsoft.Extensions.DependencyInjection.Abstractions.dll, - /store/x64/net9.0/microsoft.extensions.dependencyinjection/8.0.0/lib/net9.0/Microsoft.Extensions.DependencyInjection.dll, - /store/x64/net9.0/microsoft.extensions.logging.abstractions/8.0.0/lib/net9.0/Microsoft.Extensions.Logging.Abstractions.dll, - /store/x64/net9.0/microsoft.extensions.logging.configuration/8.0.0/lib/net9.0/Microsoft.Extensions.Logging.Configuration.dll, - /store/x64/net9.0/microsoft.extensions.logging/8.0.0/lib/net9.0/Microsoft.Extensions.Logging.dll, - /store/x64/net9.0/microsoft.extensions.options.configurationextensions/8.0.0/lib/net9.0/Microsoft.Extensions.Options.ConfigurationExtensions.dll, - /store/x64/net9.0/microsoft.extensions.options/8.0.0/lib/net9.0/Microsoft.Extensions.Options.dll, - /store/x64/net9.0/microsoft.extensions.primitives/8.0.0/lib/net9.0/Microsoft.Extensions.Primitives.dll + /store/x64/net8.0/microsoft.extensions.configuration.abstractions/9.0.0/lib/net9.0/Microsoft.Extensions.Configuration.Abstractions.dll, + /store/x64/net8.0/microsoft.extensions.configuration.binder/9.0.0/lib/net9.0/Microsoft.Extensions.Configuration.Binder.dll, + /store/x64/net8.0/microsoft.extensions.configuration/9.0.0/lib/net9.0/Microsoft.Extensions.Configuration.dll, + /store/x64/net8.0/microsoft.extensions.dependencyinjection.abstractions/9.0.0/lib/net9.0/Microsoft.Extensions.DependencyInjection.Abstractions.dll, + /store/x64/net8.0/microsoft.extensions.dependencyinjection/9.0.0/lib/net9.0/Microsoft.Extensions.DependencyInjection.dll, + /store/x64/net8.0/microsoft.extensions.logging.abstractions/9.0.0/lib/net9.0/Microsoft.Extensions.Logging.Abstractions.dll, + /store/x64/net8.0/microsoft.extensions.logging.configuration/9.0.0/lib/net9.0/Microsoft.Extensions.Logging.Configuration.dll, + /store/x64/net8.0/microsoft.extensions.logging/9.0.0/lib/net9.0/Microsoft.Extensions.Logging.dll, + /store/x64/net8.0/microsoft.extensions.options.configurationextensions/9.0.0/lib/net9.0/Microsoft.Extensions.Options.ConfigurationExtensions.dll, + /store/x64/net8.0/microsoft.extensions.options/9.0.0/lib/net9.0/Microsoft.Extensions.Options.dll, + /store/x64/net8.0/microsoft.extensions.primitives/9.0.0/lib/net9.0/Microsoft.Extensions.Primitives.dll, + /store/x64/net8.0/system.diagnostics.diagnosticsource/9.0.0/lib/net9.0/System.Diagnostics.DiagnosticSource.dll, + /store/x64/net9.0/microsoft.extensions.configuration.abstractions/9.0.0/lib/net9.0/Microsoft.Extensions.Configuration.Abstractions.dll, + /store/x64/net9.0/microsoft.extensions.configuration.binder/9.0.0/lib/net9.0/Microsoft.Extensions.Configuration.Binder.dll, + /store/x64/net9.0/microsoft.extensions.configuration/9.0.0/lib/net9.0/Microsoft.Extensions.Configuration.dll, + /store/x64/net9.0/microsoft.extensions.dependencyinjection.abstractions/9.0.0/lib/net9.0/Microsoft.Extensions.DependencyInjection.Abstractions.dll, + /store/x64/net9.0/microsoft.extensions.dependencyinjection/9.0.0/lib/net9.0/Microsoft.Extensions.DependencyInjection.dll, + /store/x64/net9.0/microsoft.extensions.logging.abstractions/9.0.0/lib/net9.0/Microsoft.Extensions.Logging.Abstractions.dll, + /store/x64/net9.0/microsoft.extensions.logging.configuration/9.0.0/lib/net9.0/Microsoft.Extensions.Logging.Configuration.dll, + /store/x64/net9.0/microsoft.extensions.logging/9.0.0/lib/net9.0/Microsoft.Extensions.Logging.dll, + /store/x64/net9.0/microsoft.extensions.options.configurationextensions/9.0.0/lib/net9.0/Microsoft.Extensions.Options.ConfigurationExtensions.dll, + /store/x64/net9.0/microsoft.extensions.options/9.0.0/lib/net9.0/Microsoft.Extensions.Options.dll, + /store/x64/net9.0/microsoft.extensions.primitives/9.0.0/lib/net9.0/Microsoft.Extensions.Primitives.dll ] \ No newline at end of file diff --git a/test/IntegrationTests/BuildTests.DistributionStructure_windows.verified.txt b/test/IntegrationTests/BuildTests.DistributionStructure_windows.verified.txt index 71d015ab4..7cd2f5eca 100644 --- a/test/IntegrationTests/BuildTests.DistributionStructure_windows.verified.txt +++ b/test/IntegrationTests/BuildTests.DistributionStructure_windows.verified.txt @@ -7,6 +7,7 @@ \net\Grpc.Core.Api.dll, \net\Grpc.Net.Client.dll, \net\Grpc.Net.Common.dll, + \net\Microsoft.Extensions.Diagnostics.Abstractions.dll, \net\MongoDB.Driver.Core.Extensions.DiagnosticSources.dll, \net\OpenTelemetry.Api.ProviderBuilderExtensions.dll, \net\OpenTelemetry.Api.dll, @@ -126,6 +127,7 @@ \netfx\System.IO.FileSystem.dll, \netfx\System.IO.IsolatedStorage.dll, \netfx\System.IO.MemoryMappedFiles.dll, + \netfx\System.IO.Pipelines.dll, \netfx\System.IO.Pipes.dll, \netfx\System.IO.UnmanagedMemoryStream.dll, \netfx\System.IO.dll, @@ -198,50 +200,52 @@ \netfx\libgrpc_csharp_ext.x64.dylib, \netfx\libgrpc_csharp_ext.x64.so, \netfx\netstandard.dll, - \store\x64\net8.0\microsoft.extensions.configuration.abstractions\8.0.0\lib\net9.0\Microsoft.Extensions.Configuration.Abstractions.dll, - \store\x64\net8.0\microsoft.extensions.configuration.binder\8.0.1\lib\net9.0\Microsoft.Extensions.Configuration.Binder.dll, - \store\x64\net8.0\microsoft.extensions.configuration\8.0.0\lib\net9.0\Microsoft.Extensions.Configuration.dll, - \store\x64\net8.0\microsoft.extensions.dependencyinjection.abstractions\8.0.0\lib\net9.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll, - \store\x64\net8.0\microsoft.extensions.dependencyinjection\8.0.0\lib\net9.0\Microsoft.Extensions.DependencyInjection.dll, - \store\x64\net8.0\microsoft.extensions.logging.abstractions\8.0.0\lib\net9.0\Microsoft.Extensions.Logging.Abstractions.dll, - \store\x64\net8.0\microsoft.extensions.logging.configuration\8.0.0\lib\net9.0\Microsoft.Extensions.Logging.Configuration.dll, - \store\x64\net8.0\microsoft.extensions.logging\8.0.0\lib\net9.0\Microsoft.Extensions.Logging.dll, - \store\x64\net8.0\microsoft.extensions.options.configurationextensions\8.0.0\lib\net9.0\Microsoft.Extensions.Options.ConfigurationExtensions.dll, - \store\x64\net8.0\microsoft.extensions.options\8.0.0\lib\net9.0\Microsoft.Extensions.Options.dll, - \store\x64\net8.0\microsoft.extensions.primitives\8.0.0\lib\net9.0\Microsoft.Extensions.Primitives.dll, - \store\x64\net9.0\microsoft.extensions.configuration.abstractions\8.0.0\lib\net9.0\Microsoft.Extensions.Configuration.Abstractions.dll, - \store\x64\net9.0\microsoft.extensions.configuration.binder\8.0.1\lib\net9.0\Microsoft.Extensions.Configuration.Binder.dll, - \store\x64\net9.0\microsoft.extensions.configuration\8.0.0\lib\net9.0\Microsoft.Extensions.Configuration.dll, - \store\x64\net9.0\microsoft.extensions.dependencyinjection.abstractions\8.0.0\lib\net9.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll, - \store\x64\net9.0\microsoft.extensions.dependencyinjection\8.0.0\lib\net9.0\Microsoft.Extensions.DependencyInjection.dll, - \store\x64\net9.0\microsoft.extensions.logging.abstractions\8.0.0\lib\net9.0\Microsoft.Extensions.Logging.Abstractions.dll, - \store\x64\net9.0\microsoft.extensions.logging.configuration\8.0.0\lib\net9.0\Microsoft.Extensions.Logging.Configuration.dll, - \store\x64\net9.0\microsoft.extensions.logging\8.0.0\lib\net9.0\Microsoft.Extensions.Logging.dll, - \store\x64\net9.0\microsoft.extensions.options.configurationextensions\8.0.0\lib\net9.0\Microsoft.Extensions.Options.ConfigurationExtensions.dll, - \store\x64\net9.0\microsoft.extensions.options\8.0.0\lib\net9.0\Microsoft.Extensions.Options.dll, - \store\x64\net9.0\microsoft.extensions.primitives\8.0.0\lib\net9.0\Microsoft.Extensions.Primitives.dll, - \store\x86\net8.0\microsoft.extensions.configuration.abstractions\8.0.0\lib\net9.0\Microsoft.Extensions.Configuration.Abstractions.dll, - \store\x86\net8.0\microsoft.extensions.configuration.binder\8.0.1\lib\net9.0\Microsoft.Extensions.Configuration.Binder.dll, - \store\x86\net8.0\microsoft.extensions.configuration\8.0.0\lib\net9.0\Microsoft.Extensions.Configuration.dll, - \store\x86\net8.0\microsoft.extensions.dependencyinjection.abstractions\8.0.0\lib\net9.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll, - \store\x86\net8.0\microsoft.extensions.dependencyinjection\8.0.0\lib\net9.0\Microsoft.Extensions.DependencyInjection.dll, - \store\x86\net8.0\microsoft.extensions.logging.abstractions\8.0.0\lib\net9.0\Microsoft.Extensions.Logging.Abstractions.dll, - \store\x86\net8.0\microsoft.extensions.logging.configuration\8.0.0\lib\net9.0\Microsoft.Extensions.Logging.Configuration.dll, - \store\x86\net8.0\microsoft.extensions.logging\8.0.0\lib\net9.0\Microsoft.Extensions.Logging.dll, - \store\x86\net8.0\microsoft.extensions.options.configurationextensions\8.0.0\lib\net9.0\Microsoft.Extensions.Options.ConfigurationExtensions.dll, - \store\x86\net8.0\microsoft.extensions.options\8.0.0\lib\net9.0\Microsoft.Extensions.Options.dll, - \store\x86\net8.0\microsoft.extensions.primitives\8.0.0\lib\net9.0\Microsoft.Extensions.Primitives.dll, - \store\x86\net9.0\microsoft.extensions.configuration.abstractions\8.0.0\lib\net9.0\Microsoft.Extensions.Configuration.Abstractions.dll, - \store\x86\net9.0\microsoft.extensions.configuration.binder\8.0.1\lib\net9.0\Microsoft.Extensions.Configuration.Binder.dll, - \store\x86\net9.0\microsoft.extensions.configuration\8.0.0\lib\net9.0\Microsoft.Extensions.Configuration.dll, - \store\x86\net9.0\microsoft.extensions.dependencyinjection.abstractions\8.0.0\lib\net9.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll, - \store\x86\net9.0\microsoft.extensions.dependencyinjection\8.0.0\lib\net9.0\Microsoft.Extensions.DependencyInjection.dll, - \store\x86\net9.0\microsoft.extensions.logging.abstractions\8.0.0\lib\net9.0\Microsoft.Extensions.Logging.Abstractions.dll, - \store\x86\net9.0\microsoft.extensions.logging.configuration\8.0.0\lib\net9.0\Microsoft.Extensions.Logging.Configuration.dll, - \store\x86\net9.0\microsoft.extensions.logging\8.0.0\lib\net9.0\Microsoft.Extensions.Logging.dll, - \store\x86\net9.0\microsoft.extensions.options.configurationextensions\8.0.0\lib\net9.0\Microsoft.Extensions.Options.ConfigurationExtensions.dll, - \store\x86\net9.0\microsoft.extensions.options\8.0.0\lib\net9.0\Microsoft.Extensions.Options.dll, - \store\x86\net9.0\microsoft.extensions.primitives\8.0.0\lib\net9.0\Microsoft.Extensions.Primitives.dll, + \store\x64\net8.0\microsoft.extensions.configuration.abstractions\9.0.0\lib\net9.0\Microsoft.Extensions.Configuration.Abstractions.dll, + \store\x64\net8.0\microsoft.extensions.configuration.binder\9.0.0\lib\net9.0\Microsoft.Extensions.Configuration.Binder.dll, + \store\x64\net8.0\microsoft.extensions.configuration\9.0.0\lib\net9.0\Microsoft.Extensions.Configuration.dll, + \store\x64\net8.0\microsoft.extensions.dependencyinjection.abstractions\9.0.0\lib\net9.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll, + \store\x64\net8.0\microsoft.extensions.dependencyinjection\9.0.0\lib\net9.0\Microsoft.Extensions.DependencyInjection.dll, + \store\x64\net8.0\microsoft.extensions.logging.abstractions\9.0.0\lib\net9.0\Microsoft.Extensions.Logging.Abstractions.dll, + \store\x64\net8.0\microsoft.extensions.logging.configuration\9.0.0\lib\net9.0\Microsoft.Extensions.Logging.Configuration.dll, + \store\x64\net8.0\microsoft.extensions.logging\9.0.0\lib\net9.0\Microsoft.Extensions.Logging.dll, + \store\x64\net8.0\microsoft.extensions.options.configurationextensions\9.0.0\lib\net9.0\Microsoft.Extensions.Options.ConfigurationExtensions.dll, + \store\x64\net8.0\microsoft.extensions.options\9.0.0\lib\net9.0\Microsoft.Extensions.Options.dll, + \store\x64\net8.0\microsoft.extensions.primitives\9.0.0\lib\net9.0\Microsoft.Extensions.Primitives.dll, + \store\x64\net8.0\system.diagnostics.diagnosticsource\9.0.0\lib\net9.0\System.Diagnostics.DiagnosticSource.dll, + \store\x64\net9.0\microsoft.extensions.configuration.abstractions\9.0.0\lib\net9.0\Microsoft.Extensions.Configuration.Abstractions.dll, + \store\x64\net9.0\microsoft.extensions.configuration.binder\9.0.0\lib\net9.0\Microsoft.Extensions.Configuration.Binder.dll, + \store\x64\net9.0\microsoft.extensions.configuration\9.0.0\lib\net9.0\Microsoft.Extensions.Configuration.dll, + \store\x64\net9.0\microsoft.extensions.dependencyinjection.abstractions\9.0.0\lib\net9.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll, + \store\x64\net9.0\microsoft.extensions.dependencyinjection\9.0.0\lib\net9.0\Microsoft.Extensions.DependencyInjection.dll, + \store\x64\net9.0\microsoft.extensions.logging.abstractions\9.0.0\lib\net9.0\Microsoft.Extensions.Logging.Abstractions.dll, + \store\x64\net9.0\microsoft.extensions.logging.configuration\9.0.0\lib\net9.0\Microsoft.Extensions.Logging.Configuration.dll, + \store\x64\net9.0\microsoft.extensions.logging\9.0.0\lib\net9.0\Microsoft.Extensions.Logging.dll, + \store\x64\net9.0\microsoft.extensions.options.configurationextensions\9.0.0\lib\net9.0\Microsoft.Extensions.Options.ConfigurationExtensions.dll, + \store\x64\net9.0\microsoft.extensions.options\9.0.0\lib\net9.0\Microsoft.Extensions.Options.dll, + \store\x64\net9.0\microsoft.extensions.primitives\9.0.0\lib\net9.0\Microsoft.Extensions.Primitives.dll, + \store\x86\net8.0\microsoft.extensions.configuration.abstractions\9.0.0\lib\net9.0\Microsoft.Extensions.Configuration.Abstractions.dll, + \store\x86\net8.0\microsoft.extensions.configuration.binder\9.0.0\lib\net9.0\Microsoft.Extensions.Configuration.Binder.dll, + \store\x86\net8.0\microsoft.extensions.configuration\9.0.0\lib\net9.0\Microsoft.Extensions.Configuration.dll, + \store\x86\net8.0\microsoft.extensions.dependencyinjection.abstractions\9.0.0\lib\net9.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll, + \store\x86\net8.0\microsoft.extensions.dependencyinjection\9.0.0\lib\net9.0\Microsoft.Extensions.DependencyInjection.dll, + \store\x86\net8.0\microsoft.extensions.logging.abstractions\9.0.0\lib\net9.0\Microsoft.Extensions.Logging.Abstractions.dll, + \store\x86\net8.0\microsoft.extensions.logging.configuration\9.0.0\lib\net9.0\Microsoft.Extensions.Logging.Configuration.dll, + \store\x86\net8.0\microsoft.extensions.logging\9.0.0\lib\net9.0\Microsoft.Extensions.Logging.dll, + \store\x86\net8.0\microsoft.extensions.options.configurationextensions\9.0.0\lib\net9.0\Microsoft.Extensions.Options.ConfigurationExtensions.dll, + \store\x86\net8.0\microsoft.extensions.options\9.0.0\lib\net9.0\Microsoft.Extensions.Options.dll, + \store\x86\net8.0\microsoft.extensions.primitives\9.0.0\lib\net9.0\Microsoft.Extensions.Primitives.dll, + \store\x86\net8.0\system.diagnostics.diagnosticsource\9.0.0\lib\net9.0\System.Diagnostics.DiagnosticSource.dll, + \store\x86\net9.0\microsoft.extensions.configuration.abstractions\9.0.0\lib\net9.0\Microsoft.Extensions.Configuration.Abstractions.dll, + \store\x86\net9.0\microsoft.extensions.configuration.binder\9.0.0\lib\net9.0\Microsoft.Extensions.Configuration.Binder.dll, + \store\x86\net9.0\microsoft.extensions.configuration\9.0.0\lib\net9.0\Microsoft.Extensions.Configuration.dll, + \store\x86\net9.0\microsoft.extensions.dependencyinjection.abstractions\9.0.0\lib\net9.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll, + \store\x86\net9.0\microsoft.extensions.dependencyinjection\9.0.0\lib\net9.0\Microsoft.Extensions.DependencyInjection.dll, + \store\x86\net9.0\microsoft.extensions.logging.abstractions\9.0.0\lib\net9.0\Microsoft.Extensions.Logging.Abstractions.dll, + \store\x86\net9.0\microsoft.extensions.logging.configuration\9.0.0\lib\net9.0\Microsoft.Extensions.Logging.Configuration.dll, + \store\x86\net9.0\microsoft.extensions.logging\9.0.0\lib\net9.0\Microsoft.Extensions.Logging.dll, + \store\x86\net9.0\microsoft.extensions.options.configurationextensions\9.0.0\lib\net9.0\Microsoft.Extensions.Options.ConfigurationExtensions.dll, + \store\x86\net9.0\microsoft.extensions.options\9.0.0\lib\net9.0\Microsoft.Extensions.Options.dll, + \store\x86\net9.0\microsoft.extensions.primitives\9.0.0\lib\net9.0\Microsoft.Extensions.Primitives.dll, \win-x64\OpenTelemetry.AutoInstrumentation.Native.dll, \win-x86\OpenTelemetry.AutoInstrumentation.Native.dll ] \ No newline at end of file diff --git a/test/OpenTelemetry.AutoInstrumentation.Tests/TransientDependenciesTests.cs b/test/OpenTelemetry.AutoInstrumentation.Tests/TransientDependenciesTests.cs index 4ac1c7b65..ce0f8ec44 100644 --- a/test/OpenTelemetry.AutoInstrumentation.Tests/TransientDependenciesTests.cs +++ b/test/OpenTelemetry.AutoInstrumentation.Tests/TransientDependenciesTests.cs @@ -43,6 +43,9 @@ public class TransientDependenciesTests .Select(x => x.Name) .ToList(); + // TODO automate detecting new transitive dependencies https://github.com/open-telemetry/opentelemetry-dotnet-instrumentation/issues/3817 + generatedDeps.Add("System.IO.Pipelines"); + File.Delete(projectGenPath); using (new AssertionScope()) diff --git a/test/OpenTelemetry.AutoInstrumentation.Tests/Util/ActivityHelperTests.cs b/test/OpenTelemetry.AutoInstrumentation.Tests/Util/ActivityHelperTests.cs index 3a91c8ec1..9ae0e4e26 100644 --- a/test/OpenTelemetry.AutoInstrumentation.Tests/Util/ActivityHelperTests.cs +++ b/test/OpenTelemetry.AutoInstrumentation.Tests/Util/ActivityHelperTests.cs @@ -47,8 +47,8 @@ public class ActivityHelperTests using (new AssertionScope()) { - activity.Tags.First(x => x.Key == "otel.status_code").Value.Should().Be("ERROR"); - activity.Tags.First(x => x.Key == "otel.status_description").Value.Should().Be(exceptionMessage); + activity.Status.Should().Be(ActivityStatusCode.Error); + activity.StatusDescription.Should().Be(exceptionMessage); activity.Events.Should().HaveCount(1); } } diff --git a/test/test-applications/integrations/TestApplication.EntityFrameworkCore.Pomelo.MySql/TestApplication.EntityFrameworkCore.Pomelo.MySql.csproj b/test/test-applications/integrations/TestApplication.EntityFrameworkCore.Pomelo.MySql/TestApplication.EntityFrameworkCore.Pomelo.MySql.csproj index bf4390a46..77e1d78f5 100644 --- a/test/test-applications/integrations/TestApplication.EntityFrameworkCore.Pomelo.MySql/TestApplication.EntityFrameworkCore.Pomelo.MySql.csproj +++ b/test/test-applications/integrations/TestApplication.EntityFrameworkCore.Pomelo.MySql/TestApplication.EntityFrameworkCore.Pomelo.MySql.csproj @@ -9,11 +9,11 @@ - - + + diff --git a/test/test-applications/integrations/TestApplication.GrpcNetClient/TestApplication.GrpcNetClient.csproj b/test/test-applications/integrations/TestApplication.GrpcNetClient/TestApplication.GrpcNetClient.csproj index ab8ce561f..3d4c62db3 100644 --- a/test/test-applications/integrations/TestApplication.GrpcNetClient/TestApplication.GrpcNetClient.csproj +++ b/test/test-applications/integrations/TestApplication.GrpcNetClient/TestApplication.GrpcNetClient.csproj @@ -5,9 +5,9 @@ - - + diff --git a/test/test-applications/integrations/TestApplication.MongoDB/TestApplication.MongoDB.csproj b/test/test-applications/integrations/TestApplication.MongoDB/TestApplication.MongoDB.csproj index cbfa5c4fe..dcae898ea 100644 --- a/test/test-applications/integrations/TestApplication.MongoDB/TestApplication.MongoDB.csproj +++ b/test/test-applications/integrations/TestApplication.MongoDB/TestApplication.MongoDB.csproj @@ -12,9 +12,9 @@ - - + diff --git a/test/test-applications/integrations/TestApplication.MySqlConnector/TestApplication.MySqlConnector.csproj b/test/test-applications/integrations/TestApplication.MySqlConnector/TestApplication.MySqlConnector.csproj index ae035d8e0..768f93856 100644 --- a/test/test-applications/integrations/TestApplication.MySqlConnector/TestApplication.MySqlConnector.csproj +++ b/test/test-applications/integrations/TestApplication.MySqlConnector/TestApplication.MySqlConnector.csproj @@ -7,9 +7,9 @@ - - + diff --git a/test/test-applications/integrations/TestApplication.StackExchangeRedis/TestApplication.StackExchangeRedis.csproj b/test/test-applications/integrations/TestApplication.StackExchangeRedis/TestApplication.StackExchangeRedis.csproj index bd1e0158f..198b49479 100644 --- a/test/test-applications/integrations/TestApplication.StackExchangeRedis/TestApplication.StackExchangeRedis.csproj +++ b/test/test-applications/integrations/TestApplication.StackExchangeRedis/TestApplication.StackExchangeRedis.csproj @@ -2,9 +2,9 @@ - - +