From d5172f05edec60d6fb0e7174c160eb4cc796c5c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20Kie=C5=82kowicz?= Date: Thu, 18 Jan 2024 13:58:17 +0100 Subject: [PATCH] Bump OpenTelemetry .NET Automatic Instrumentation to 1.3.0 (#405) --- CHANGELOG.md | 7 +++- README.md | 4 +- build/Build.cs | 2 +- docs/advanced-config.md | 6 +-- .../Plugin.cs | 2 +- ...k.OpenTelemetry.AutoInstrumentation.csproj | 10 ++--- .../Traces.cs | 2 +- ...ibutionStructure_alpine-linux.verified.txt | 41 ++----------------- ...s.DistributionStructure_linux.verified.txt | 41 ++----------------- ...sts.DistributionStructure_osx.verified.txt | 41 ++----------------- ...DistributionStructure_windows.verified.txt | 10 +++-- tools/MatrixHelper/InstrumentationData.cs | 28 ++++++------- tools/MatrixHelper/MetadataData.cs | 4 +- tools/MatrixHelper/ResourceDetectorsData.cs | 7 +++- 14 files changed, 59 insertions(+), 146 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index fee4533b..a32f33bc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,12 +5,17 @@ All notable changes to this component are documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). This component adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). -## [Unreleased](https://github.com/signalfx/splunk-otel-dotnet/compare/v1.1.0...HEAD) +## [Unreleased](https://github.com/signalfx/splunk-otel-dotnet/compare/v1.2.1...HEAD) + +This release is built on top of [OpenTelemetry .NET Auto Instrumentation v1.3.0](https://github.com/open-telemetry/opentelemetry-dotnet-instrumentation/releases/tag/v1.3.0). ### Added ### Changed +- Updated [OpenTelemetry .NET Auto Instrumentation](https://github.com/open-telemetry/opentelemetry-dotnet-instrumentation): + [`1.3.0`](https://github.com/open-telemetry/opentelemetry-dotnet-instrumentation/releases/tag/v1.3.0). + ### Deprecated ### Removed diff --git a/README.md b/README.md index 6ab9c4f7..8ec6d922 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # Splunk Distribution of OpenTelemetry .NET -[![OpenTelemetry .NET](https://img.shields.io/badge/OTel-1.6.0-blueviolet)](https://github.com/open-telemetry/opentelemetry-dotnet/releases/tag/core-1.6.0) -[![OpenTelemetry .NET Auto Instrumentation](https://img.shields.io/badge/OTelAuto-v1.1.0-blueviolet)](https://github.com/open-telemetry/opentelemetry-dotnet-instrumentation/releases/tag/v1.1.0) +[![OpenTelemetry .NET](https://img.shields.io/badge/OTel-1.7.0-blueviolet)](https://github.com/open-telemetry/opentelemetry-dotnet/releases/tag/core-1.7.0) +[![OpenTelemetry .NET Auto Instrumentation](https://img.shields.io/badge/OTelAuto-v1.3.0-blueviolet)](https://github.com/open-telemetry/opentelemetry-dotnet-instrumentation/releases/tag/v1.3.0) [![Splunk GDI Specification](https://img.shields.io/badge/GDI-1.6.0-blueviolet)](https://github.com/signalfx/gdi-specification/releases/tag/v1.6.0) [![Keep a Changelog](https://img.shields.io/badge/changelog-Keep%20a%20Changelog-%23E05735)](CHANGELOG.md) [![LICENSE](https://img.shields.io/github/license/signalfx/splunk-otel-dotnet)](LICENSE) diff --git a/build/Build.cs b/build/Build.cs index 5f719fb7..d7086273 100644 --- a/build/Build.cs +++ b/build/Build.cs @@ -16,7 +16,7 @@ partial class Build : NukeBuild [Parameter("Configuration to build - Default is 'Release'")] readonly Configuration Configuration = Configuration.Release; - const string OpenTelemetryAutoInstrumentationDefaultVersion = "v1.2.0"; + const string OpenTelemetryAutoInstrumentationDefaultVersion = "v1.3.0"; [Parameter($"OpenTelemetry AutoInstrumentation dependency version - Default is '{OpenTelemetryAutoInstrumentationDefaultVersion}'")] readonly string OpenTelemetryAutoInstrumentationVersion = OpenTelemetryAutoInstrumentationDefaultVersion; diff --git a/docs/advanced-config.md b/docs/advanced-config.md index fc016195..19797733 100644 --- a/docs/advanced-config.md +++ b/docs/advanced-config.md @@ -7,7 +7,7 @@ ## OpenTelemetry configuration -See [Open Telemetry Auto Instrumentation documentation](https://github.com/open-telemetry/opentelemetry-dotnet-instrumentation/blob/v1.1.0/docs/config.md) +See [Open Telemetry Auto Instrumentation documentation](https://github.com/open-telemetry/opentelemetry-dotnet-instrumentation/blob/v1.3.0/docs/config.md) for configuration details. ## Splunk distribution configuration @@ -23,7 +23,7 @@ Download and install the latest binaries from When running your application, make sure to: -1. Set the [resources](https://github.com/open-telemetry/opentelemetry-dotnet-instrumentation/blob/v1.1.0/docs/config.md#resources). +1. Set the [resources](https://github.com/open-telemetry/opentelemetry-dotnet-instrumentation/blob/v1.3.0/docs/config.md#resources). 1. Set the environment variables from the table below. | Environment variable | .NET version | Value | @@ -45,7 +45,7 @@ When running your application, make sure to: | `OTEL_DOTNET_AUTO_HOME` | All versions | `$INSTALL_DIR` | | `OTEL_DOTNET_AUTO_PLUGINS` | All versions | `Splunk.OpenTelemetry.AutoInstrumentation.Plugin, Splunk.OpenTelemetry.AutoInstrumentation` | -> Some settings can be omitted on .NET. For more information, see the [documentation](https://github.com/open-telemetry/opentelemetry-dotnet-instrumentation/blob/v1.2.0/docs/config.md#net-clr-profiler). +> Some settings can be omitted on .NET. For more information, see the [documentation](https://github.com/open-telemetry/opentelemetry-dotnet-instrumentation/blob/v1.3.0/docs/config.md#net-clr-profiler). ## Splunk plugin settings diff --git a/src/Splunk.OpenTelemetry.AutoInstrumentation/Plugin.cs b/src/Splunk.OpenTelemetry.AutoInstrumentation/Plugin.cs index d9001b8f..a012e97a 100644 --- a/src/Splunk.OpenTelemetry.AutoInstrumentation/Plugin.cs +++ b/src/Splunk.OpenTelemetry.AutoInstrumentation/Plugin.cs @@ -90,7 +90,7 @@ public void ConfigureTracesOptions(AspNetInstrumentationOptions options) /// Configures ASP.NET Core instrumentation options. /// /// Otlp options. - public void ConfigureTracesOptions(AspNetCoreInstrumentationOptions options) + public void ConfigureTracesOptions(AspNetCoreTraceInstrumentationOptions options) { _traces.ConfigureTracesOptions(options); } diff --git a/src/Splunk.OpenTelemetry.AutoInstrumentation/Splunk.OpenTelemetry.AutoInstrumentation.csproj b/src/Splunk.OpenTelemetry.AutoInstrumentation/Splunk.OpenTelemetry.AutoInstrumentation.csproj index 59a2dbb8..2bed42f2 100644 --- a/src/Splunk.OpenTelemetry.AutoInstrumentation/Splunk.OpenTelemetry.AutoInstrumentation.csproj +++ b/src/Splunk.OpenTelemetry.AutoInstrumentation/Splunk.OpenTelemetry.AutoInstrumentation.csproj @@ -15,18 +15,18 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive - - + + - + - + @@ -57,7 +57,7 @@ true - + none diff --git a/src/Splunk.OpenTelemetry.AutoInstrumentation/Traces.cs b/src/Splunk.OpenTelemetry.AutoInstrumentation/Traces.cs index cbe96c75..737e0a63 100644 --- a/src/Splunk.OpenTelemetry.AutoInstrumentation/Traces.cs +++ b/src/Splunk.OpenTelemetry.AutoInstrumentation/Traces.cs @@ -80,7 +80,7 @@ public void ConfigureTracesOptions(AspNetInstrumentationOptions options) #else - public void ConfigureTracesOptions(AspNetCoreInstrumentationOptions options) + public void ConfigureTracesOptions(AspNetCoreTraceInstrumentationOptions options) { if (_settings.TraceResponseHeaderEnabled) { diff --git a/test/Splunk.OpenTelemetry.AutoInstrumentation.IntegrationTests/BuildTests.DistributionStructure_alpine-linux.verified.txt b/test/Splunk.OpenTelemetry.AutoInstrumentation.IntegrationTests/BuildTests.DistributionStructure_alpine-linux.verified.txt index 17a2fad1..1268a56e 100644 --- a/test/Splunk.OpenTelemetry.AutoInstrumentation.IntegrationTests/BuildTests.DistributionStructure_alpine-linux.verified.txt +++ b/test/Splunk.OpenTelemetry.AutoInstrumentation.IntegrationTests/BuildTests.DistributionStructure_alpine-linux.verified.txt @@ -37,11 +37,13 @@ /net/OpenTelemetry.Instrumentation.Wcf.dll, /net/OpenTelemetry.ResourceDetectors.Azure.dll, /net/OpenTelemetry.ResourceDetectors.Container.dll, + /net/OpenTelemetry.ResourceDetectors.Host.dll, + /net/OpenTelemetry.ResourceDetectors.Process.dll, + /net/OpenTelemetry.ResourceDetectors.ProcessRuntime.dll, /net/OpenTelemetry.Shims.OpenTracing.dll, /net/OpenTelemetry.dll, /net/OpenTracing.dll, /net/Splunk.OpenTelemetry.AutoInstrumentation.dll, - /net/System.Diagnostics.DiagnosticSource.dll, /net/System.Private.ServiceModel.dll, /net/System.Security.Permissions.dll, /net/System.ServiceModel.Primitives.dll, @@ -81,40 +83,5 @@ /store/x64/net8.0/microsoft.extensions.logging/8.0.0/lib/net8.0/Microsoft.Extensions.Logging.dll, /store/x64/net8.0/microsoft.extensions.options.configurationextensions/8.0.0/lib/net8.0/Microsoft.Extensions.Options.ConfigurationExtensions.dll, /store/x64/net8.0/microsoft.extensions.options/8.0.0/lib/net8.0/Microsoft.Extensions.Options.dll, - /store/x64/net8.0/microsoft.extensions.primitives/8.0.0/lib/net8.0/Microsoft.Extensions.Primitives.dll, - /store/x86/net6.0/microsoft.extensions.configuration.abstractions/8.0.0/lib/net8.0/Microsoft.Extensions.Configuration.Abstractions.dll, - /store/x86/net6.0/microsoft.extensions.configuration.binder/8.0.0/lib/net8.0/Microsoft.Extensions.Configuration.Binder.dll, - /store/x86/net6.0/microsoft.extensions.configuration/8.0.0/lib/net8.0/Microsoft.Extensions.Configuration.dll, - /store/x86/net6.0/microsoft.extensions.dependencyinjection.abstractions/8.0.0/lib/net8.0/Microsoft.Extensions.DependencyInjection.Abstractions.dll, - /store/x86/net6.0/microsoft.extensions.dependencyinjection/8.0.0/lib/net8.0/Microsoft.Extensions.DependencyInjection.dll, - /store/x86/net6.0/microsoft.extensions.logging.abstractions/8.0.0/lib/net8.0/Microsoft.Extensions.Logging.Abstractions.dll, - /store/x86/net6.0/microsoft.extensions.logging.configuration/8.0.0/lib/net8.0/Microsoft.Extensions.Logging.Configuration.dll, - /store/x86/net6.0/microsoft.extensions.logging/8.0.0/lib/net8.0/Microsoft.Extensions.Logging.dll, - /store/x86/net6.0/microsoft.extensions.options.configurationextensions/8.0.0/lib/net8.0/Microsoft.Extensions.Options.ConfigurationExtensions.dll, - /store/x86/net6.0/microsoft.extensions.options/8.0.0/lib/net8.0/Microsoft.Extensions.Options.dll, - /store/x86/net6.0/microsoft.extensions.primitives/8.0.0/lib/net8.0/Microsoft.Extensions.Primitives.dll, - /store/x86/net6.0/system.diagnostics.diagnosticsource/8.0.0/lib/net8.0/System.Diagnostics.DiagnosticSource.dll, - /store/x86/net7.0/microsoft.extensions.configuration.abstractions/8.0.0/lib/net8.0/Microsoft.Extensions.Configuration.Abstractions.dll, - /store/x86/net7.0/microsoft.extensions.configuration.binder/8.0.0/lib/net8.0/Microsoft.Extensions.Configuration.Binder.dll, - /store/x86/net7.0/microsoft.extensions.configuration/8.0.0/lib/net8.0/Microsoft.Extensions.Configuration.dll, - /store/x86/net7.0/microsoft.extensions.dependencyinjection.abstractions/8.0.0/lib/net8.0/Microsoft.Extensions.DependencyInjection.Abstractions.dll, - /store/x86/net7.0/microsoft.extensions.dependencyinjection/8.0.0/lib/net8.0/Microsoft.Extensions.DependencyInjection.dll, - /store/x86/net7.0/microsoft.extensions.logging.abstractions/8.0.0/lib/net8.0/Microsoft.Extensions.Logging.Abstractions.dll, - /store/x86/net7.0/microsoft.extensions.logging.configuration/8.0.0/lib/net8.0/Microsoft.Extensions.Logging.Configuration.dll, - /store/x86/net7.0/microsoft.extensions.logging/8.0.0/lib/net8.0/Microsoft.Extensions.Logging.dll, - /store/x86/net7.0/microsoft.extensions.options.configurationextensions/8.0.0/lib/net8.0/Microsoft.Extensions.Options.ConfigurationExtensions.dll, - /store/x86/net7.0/microsoft.extensions.options/8.0.0/lib/net8.0/Microsoft.Extensions.Options.dll, - /store/x86/net7.0/microsoft.extensions.primitives/8.0.0/lib/net8.0/Microsoft.Extensions.Primitives.dll, - /store/x86/net7.0/system.diagnostics.diagnosticsource/8.0.0/lib/net8.0/System.Diagnostics.DiagnosticSource.dll, - /store/x86/net8.0/microsoft.extensions.configuration.abstractions/8.0.0/lib/net8.0/Microsoft.Extensions.Configuration.Abstractions.dll, - /store/x86/net8.0/microsoft.extensions.configuration.binder/8.0.0/lib/net8.0/Microsoft.Extensions.Configuration.Binder.dll, - /store/x86/net8.0/microsoft.extensions.configuration/8.0.0/lib/net8.0/Microsoft.Extensions.Configuration.dll, - /store/x86/net8.0/microsoft.extensions.dependencyinjection.abstractions/8.0.0/lib/net8.0/Microsoft.Extensions.DependencyInjection.Abstractions.dll, - /store/x86/net8.0/microsoft.extensions.dependencyinjection/8.0.0/lib/net8.0/Microsoft.Extensions.DependencyInjection.dll, - /store/x86/net8.0/microsoft.extensions.logging.abstractions/8.0.0/lib/net8.0/Microsoft.Extensions.Logging.Abstractions.dll, - /store/x86/net8.0/microsoft.extensions.logging.configuration/8.0.0/lib/net8.0/Microsoft.Extensions.Logging.Configuration.dll, - /store/x86/net8.0/microsoft.extensions.logging/8.0.0/lib/net8.0/Microsoft.Extensions.Logging.dll, - /store/x86/net8.0/microsoft.extensions.options.configurationextensions/8.0.0/lib/net8.0/Microsoft.Extensions.Options.ConfigurationExtensions.dll, - /store/x86/net8.0/microsoft.extensions.options/8.0.0/lib/net8.0/Microsoft.Extensions.Options.dll, - /store/x86/net8.0/microsoft.extensions.primitives/8.0.0/lib/net8.0/Microsoft.Extensions.Primitives.dll + /store/x64/net8.0/microsoft.extensions.primitives/8.0.0/lib/net8.0/Microsoft.Extensions.Primitives.dll ] diff --git a/test/Splunk.OpenTelemetry.AutoInstrumentation.IntegrationTests/BuildTests.DistributionStructure_linux.verified.txt b/test/Splunk.OpenTelemetry.AutoInstrumentation.IntegrationTests/BuildTests.DistributionStructure_linux.verified.txt index 4743f316..16b124bb 100644 --- a/test/Splunk.OpenTelemetry.AutoInstrumentation.IntegrationTests/BuildTests.DistributionStructure_linux.verified.txt +++ b/test/Splunk.OpenTelemetry.AutoInstrumentation.IntegrationTests/BuildTests.DistributionStructure_linux.verified.txt @@ -37,11 +37,13 @@ /net/OpenTelemetry.Instrumentation.Wcf.dll, /net/OpenTelemetry.ResourceDetectors.Azure.dll, /net/OpenTelemetry.ResourceDetectors.Container.dll, + /net/OpenTelemetry.ResourceDetectors.Host.dll, + /net/OpenTelemetry.ResourceDetectors.Process.dll, + /net/OpenTelemetry.ResourceDetectors.ProcessRuntime.dll, /net/OpenTelemetry.Shims.OpenTracing.dll, /net/OpenTelemetry.dll, /net/OpenTracing.dll, /net/Splunk.OpenTelemetry.AutoInstrumentation.dll, - /net/System.Diagnostics.DiagnosticSource.dll, /net/System.Private.ServiceModel.dll, /net/System.Security.Permissions.dll, /net/System.ServiceModel.Primitives.dll, @@ -81,40 +83,5 @@ /store/x64/net8.0/microsoft.extensions.logging/8.0.0/lib/net8.0/Microsoft.Extensions.Logging.dll, /store/x64/net8.0/microsoft.extensions.options.configurationextensions/8.0.0/lib/net8.0/Microsoft.Extensions.Options.ConfigurationExtensions.dll, /store/x64/net8.0/microsoft.extensions.options/8.0.0/lib/net8.0/Microsoft.Extensions.Options.dll, - /store/x64/net8.0/microsoft.extensions.primitives/8.0.0/lib/net8.0/Microsoft.Extensions.Primitives.dll, - /store/x86/net6.0/microsoft.extensions.configuration.abstractions/8.0.0/lib/net8.0/Microsoft.Extensions.Configuration.Abstractions.dll, - /store/x86/net6.0/microsoft.extensions.configuration.binder/8.0.0/lib/net8.0/Microsoft.Extensions.Configuration.Binder.dll, - /store/x86/net6.0/microsoft.extensions.configuration/8.0.0/lib/net8.0/Microsoft.Extensions.Configuration.dll, - /store/x86/net6.0/microsoft.extensions.dependencyinjection.abstractions/8.0.0/lib/net8.0/Microsoft.Extensions.DependencyInjection.Abstractions.dll, - /store/x86/net6.0/microsoft.extensions.dependencyinjection/8.0.0/lib/net8.0/Microsoft.Extensions.DependencyInjection.dll, - /store/x86/net6.0/microsoft.extensions.logging.abstractions/8.0.0/lib/net8.0/Microsoft.Extensions.Logging.Abstractions.dll, - /store/x86/net6.0/microsoft.extensions.logging.configuration/8.0.0/lib/net8.0/Microsoft.Extensions.Logging.Configuration.dll, - /store/x86/net6.0/microsoft.extensions.logging/8.0.0/lib/net8.0/Microsoft.Extensions.Logging.dll, - /store/x86/net6.0/microsoft.extensions.options.configurationextensions/8.0.0/lib/net8.0/Microsoft.Extensions.Options.ConfigurationExtensions.dll, - /store/x86/net6.0/microsoft.extensions.options/8.0.0/lib/net8.0/Microsoft.Extensions.Options.dll, - /store/x86/net6.0/microsoft.extensions.primitives/8.0.0/lib/net8.0/Microsoft.Extensions.Primitives.dll, - /store/x86/net6.0/system.diagnostics.diagnosticsource/8.0.0/lib/net8.0/System.Diagnostics.DiagnosticSource.dll, - /store/x86/net7.0/microsoft.extensions.configuration.abstractions/8.0.0/lib/net8.0/Microsoft.Extensions.Configuration.Abstractions.dll, - /store/x86/net7.0/microsoft.extensions.configuration.binder/8.0.0/lib/net8.0/Microsoft.Extensions.Configuration.Binder.dll, - /store/x86/net7.0/microsoft.extensions.configuration/8.0.0/lib/net8.0/Microsoft.Extensions.Configuration.dll, - /store/x86/net7.0/microsoft.extensions.dependencyinjection.abstractions/8.0.0/lib/net8.0/Microsoft.Extensions.DependencyInjection.Abstractions.dll, - /store/x86/net7.0/microsoft.extensions.dependencyinjection/8.0.0/lib/net8.0/Microsoft.Extensions.DependencyInjection.dll, - /store/x86/net7.0/microsoft.extensions.logging.abstractions/8.0.0/lib/net8.0/Microsoft.Extensions.Logging.Abstractions.dll, - /store/x86/net7.0/microsoft.extensions.logging.configuration/8.0.0/lib/net8.0/Microsoft.Extensions.Logging.Configuration.dll, - /store/x86/net7.0/microsoft.extensions.logging/8.0.0/lib/net8.0/Microsoft.Extensions.Logging.dll, - /store/x86/net7.0/microsoft.extensions.options.configurationextensions/8.0.0/lib/net8.0/Microsoft.Extensions.Options.ConfigurationExtensions.dll, - /store/x86/net7.0/microsoft.extensions.options/8.0.0/lib/net8.0/Microsoft.Extensions.Options.dll, - /store/x86/net7.0/microsoft.extensions.primitives/8.0.0/lib/net8.0/Microsoft.Extensions.Primitives.dll, - /store/x86/net7.0/system.diagnostics.diagnosticsource/8.0.0/lib/net8.0/System.Diagnostics.DiagnosticSource.dll, - /store/x86/net8.0/microsoft.extensions.configuration.abstractions/8.0.0/lib/net8.0/Microsoft.Extensions.Configuration.Abstractions.dll, - /store/x86/net8.0/microsoft.extensions.configuration.binder/8.0.0/lib/net8.0/Microsoft.Extensions.Configuration.Binder.dll, - /store/x86/net8.0/microsoft.extensions.configuration/8.0.0/lib/net8.0/Microsoft.Extensions.Configuration.dll, - /store/x86/net8.0/microsoft.extensions.dependencyinjection.abstractions/8.0.0/lib/net8.0/Microsoft.Extensions.DependencyInjection.Abstractions.dll, - /store/x86/net8.0/microsoft.extensions.dependencyinjection/8.0.0/lib/net8.0/Microsoft.Extensions.DependencyInjection.dll, - /store/x86/net8.0/microsoft.extensions.logging.abstractions/8.0.0/lib/net8.0/Microsoft.Extensions.Logging.Abstractions.dll, - /store/x86/net8.0/microsoft.extensions.logging.configuration/8.0.0/lib/net8.0/Microsoft.Extensions.Logging.Configuration.dll, - /store/x86/net8.0/microsoft.extensions.logging/8.0.0/lib/net8.0/Microsoft.Extensions.Logging.dll, - /store/x86/net8.0/microsoft.extensions.options.configurationextensions/8.0.0/lib/net8.0/Microsoft.Extensions.Options.ConfigurationExtensions.dll, - /store/x86/net8.0/microsoft.extensions.options/8.0.0/lib/net8.0/Microsoft.Extensions.Options.dll, - /store/x86/net8.0/microsoft.extensions.primitives/8.0.0/lib/net8.0/Microsoft.Extensions.Primitives.dll + /store/x64/net8.0/microsoft.extensions.primitives/8.0.0/lib/net8.0/Microsoft.Extensions.Primitives.dll ] diff --git a/test/Splunk.OpenTelemetry.AutoInstrumentation.IntegrationTests/BuildTests.DistributionStructure_osx.verified.txt b/test/Splunk.OpenTelemetry.AutoInstrumentation.IntegrationTests/BuildTests.DistributionStructure_osx.verified.txt index c408ebcc..d4765a26 100644 --- a/test/Splunk.OpenTelemetry.AutoInstrumentation.IntegrationTests/BuildTests.DistributionStructure_osx.verified.txt +++ b/test/Splunk.OpenTelemetry.AutoInstrumentation.IntegrationTests/BuildTests.DistributionStructure_osx.verified.txt @@ -36,11 +36,13 @@ /net/OpenTelemetry.Instrumentation.Wcf.dll, /net/OpenTelemetry.ResourceDetectors.Azure.dll, /net/OpenTelemetry.ResourceDetectors.Container.dll, + /net/OpenTelemetry.ResourceDetectors.Host.dll, + /net/OpenTelemetry.ResourceDetectors.Process.dll, + /net/OpenTelemetry.ResourceDetectors.ProcessRuntime.dll, /net/OpenTelemetry.Shims.OpenTracing.dll, /net/OpenTelemetry.dll, /net/OpenTracing.dll, /net/Splunk.OpenTelemetry.AutoInstrumentation.dll, - /net/System.Diagnostics.DiagnosticSource.dll, /net/System.Private.ServiceModel.dll, /net/System.Security.Permissions.dll, /net/System.ServiceModel.Primitives.dll, @@ -81,40 +83,5 @@ /store/x64/net8.0/microsoft.extensions.logging/8.0.0/lib/net8.0/Microsoft.Extensions.Logging.dll, /store/x64/net8.0/microsoft.extensions.options.configurationextensions/8.0.0/lib/net8.0/Microsoft.Extensions.Options.ConfigurationExtensions.dll, /store/x64/net8.0/microsoft.extensions.options/8.0.0/lib/net8.0/Microsoft.Extensions.Options.dll, - /store/x64/net8.0/microsoft.extensions.primitives/8.0.0/lib/net8.0/Microsoft.Extensions.Primitives.dll, - /store/x86/net6.0/microsoft.extensions.configuration.abstractions/8.0.0/lib/net8.0/Microsoft.Extensions.Configuration.Abstractions.dll, - /store/x86/net6.0/microsoft.extensions.configuration.binder/8.0.0/lib/net8.0/Microsoft.Extensions.Configuration.Binder.dll, - /store/x86/net6.0/microsoft.extensions.configuration/8.0.0/lib/net8.0/Microsoft.Extensions.Configuration.dll, - /store/x86/net6.0/microsoft.extensions.dependencyinjection.abstractions/8.0.0/lib/net8.0/Microsoft.Extensions.DependencyInjection.Abstractions.dll, - /store/x86/net6.0/microsoft.extensions.dependencyinjection/8.0.0/lib/net8.0/Microsoft.Extensions.DependencyInjection.dll, - /store/x86/net6.0/microsoft.extensions.logging.abstractions/8.0.0/lib/net8.0/Microsoft.Extensions.Logging.Abstractions.dll, - /store/x86/net6.0/microsoft.extensions.logging.configuration/8.0.0/lib/net8.0/Microsoft.Extensions.Logging.Configuration.dll, - /store/x86/net6.0/microsoft.extensions.logging/8.0.0/lib/net8.0/Microsoft.Extensions.Logging.dll, - /store/x86/net6.0/microsoft.extensions.options.configurationextensions/8.0.0/lib/net8.0/Microsoft.Extensions.Options.ConfigurationExtensions.dll, - /store/x86/net6.0/microsoft.extensions.options/8.0.0/lib/net8.0/Microsoft.Extensions.Options.dll, - /store/x86/net6.0/microsoft.extensions.primitives/8.0.0/lib/net8.0/Microsoft.Extensions.Primitives.dll, - /store/x86/net6.0/system.diagnostics.diagnosticsource/8.0.0/lib/net8.0/System.Diagnostics.DiagnosticSource.dll, - /store/x86/net7.0/microsoft.extensions.configuration.abstractions/8.0.0/lib/net8.0/Microsoft.Extensions.Configuration.Abstractions.dll, - /store/x86/net7.0/microsoft.extensions.configuration.binder/8.0.0/lib/net8.0/Microsoft.Extensions.Configuration.Binder.dll, - /store/x86/net7.0/microsoft.extensions.configuration/8.0.0/lib/net8.0/Microsoft.Extensions.Configuration.dll, - /store/x86/net7.0/microsoft.extensions.dependencyinjection.abstractions/8.0.0/lib/net8.0/Microsoft.Extensions.DependencyInjection.Abstractions.dll, - /store/x86/net7.0/microsoft.extensions.dependencyinjection/8.0.0/lib/net8.0/Microsoft.Extensions.DependencyInjection.dll, - /store/x86/net7.0/microsoft.extensions.logging.abstractions/8.0.0/lib/net8.0/Microsoft.Extensions.Logging.Abstractions.dll, - /store/x86/net7.0/microsoft.extensions.logging.configuration/8.0.0/lib/net8.0/Microsoft.Extensions.Logging.Configuration.dll, - /store/x86/net7.0/microsoft.extensions.logging/8.0.0/lib/net8.0/Microsoft.Extensions.Logging.dll, - /store/x86/net7.0/microsoft.extensions.options.configurationextensions/8.0.0/lib/net8.0/Microsoft.Extensions.Options.ConfigurationExtensions.dll, - /store/x86/net7.0/microsoft.extensions.options/8.0.0/lib/net8.0/Microsoft.Extensions.Options.dll, - /store/x86/net7.0/microsoft.extensions.primitives/8.0.0/lib/net8.0/Microsoft.Extensions.Primitives.dll, - /store/x86/net7.0/system.diagnostics.diagnosticsource/8.0.0/lib/net8.0/System.Diagnostics.DiagnosticSource.dll, - /store/x86/net8.0/microsoft.extensions.configuration.abstractions/8.0.0/lib/net8.0/Microsoft.Extensions.Configuration.Abstractions.dll, - /store/x86/net8.0/microsoft.extensions.configuration.binder/8.0.0/lib/net8.0/Microsoft.Extensions.Configuration.Binder.dll, - /store/x86/net8.0/microsoft.extensions.configuration/8.0.0/lib/net8.0/Microsoft.Extensions.Configuration.dll, - /store/x86/net8.0/microsoft.extensions.dependencyinjection.abstractions/8.0.0/lib/net8.0/Microsoft.Extensions.DependencyInjection.Abstractions.dll, - /store/x86/net8.0/microsoft.extensions.dependencyinjection/8.0.0/lib/net8.0/Microsoft.Extensions.DependencyInjection.dll, - /store/x86/net8.0/microsoft.extensions.logging.abstractions/8.0.0/lib/net8.0/Microsoft.Extensions.Logging.Abstractions.dll, - /store/x86/net8.0/microsoft.extensions.logging.configuration/8.0.0/lib/net8.0/Microsoft.Extensions.Logging.Configuration.dll, - /store/x86/net8.0/microsoft.extensions.logging/8.0.0/lib/net8.0/Microsoft.Extensions.Logging.dll, - /store/x86/net8.0/microsoft.extensions.options.configurationextensions/8.0.0/lib/net8.0/Microsoft.Extensions.Options.ConfigurationExtensions.dll, - /store/x86/net8.0/microsoft.extensions.options/8.0.0/lib/net8.0/Microsoft.Extensions.Options.dll, - /store/x86/net8.0/microsoft.extensions.primitives/8.0.0/lib/net8.0/Microsoft.Extensions.Primitives.dll + /store/x64/net8.0/microsoft.extensions.primitives/8.0.0/lib/net8.0/Microsoft.Extensions.Primitives.dll ] diff --git a/test/Splunk.OpenTelemetry.AutoInstrumentation.IntegrationTests/BuildTests.DistributionStructure_windows.verified.txt b/test/Splunk.OpenTelemetry.AutoInstrumentation.IntegrationTests/BuildTests.DistributionStructure_windows.verified.txt index 31a8379a..db3c509d 100644 --- a/test/Splunk.OpenTelemetry.AutoInstrumentation.IntegrationTests/BuildTests.DistributionStructure_windows.verified.txt +++ b/test/Splunk.OpenTelemetry.AutoInstrumentation.IntegrationTests/BuildTests.DistributionStructure_windows.verified.txt @@ -36,11 +36,13 @@ \net\OpenTelemetry.Instrumentation.Wcf.dll, \net\OpenTelemetry.ResourceDetectors.Azure.dll, \net\OpenTelemetry.ResourceDetectors.Container.dll, + \net\OpenTelemetry.ResourceDetectors.Host.dll, + \net\OpenTelemetry.ResourceDetectors.Process.dll, + \net\OpenTelemetry.ResourceDetectors.ProcessRuntime.dll, \net\OpenTelemetry.Shims.OpenTracing.dll, \net\OpenTelemetry.dll, \net\OpenTracing.dll, \net\Splunk.OpenTelemetry.AutoInstrumentation.dll, - \net\System.Diagnostics.DiagnosticSource.dll, \net\System.Private.ServiceModel.dll, \net\System.Security.Permissions.dll, \net\System.ServiceModel.Primitives.dll, @@ -83,6 +85,9 @@ \netfx\OpenTelemetry.Instrumentation.Wcf.dll, \netfx\OpenTelemetry.ResourceDetectors.Azure.dll, \netfx\OpenTelemetry.ResourceDetectors.Container.dll, + \netfx\OpenTelemetry.ResourceDetectors.Host.dll, + \netfx\OpenTelemetry.ResourceDetectors.Process.dll, + \netfx\OpenTelemetry.ResourceDetectors.ProcessRuntime.dll, \netfx\OpenTelemetry.Shims.OpenTracing.dll, \netfx\OpenTelemetry.dll, \netfx\OpenTracing.dll, @@ -93,7 +98,6 @@ \netfx\System.Collections.NonGeneric.dll, \netfx\System.Collections.Specialized.dll, \netfx\System.Collections.dll, - \netfx\System.ComponentModel.Annotations.dll, \netfx\System.ComponentModel.EventBasedAsync.dll, \netfx\System.ComponentModel.Primitives.dll, \netfx\System.ComponentModel.TypeConverter.dll, @@ -267,4 +271,4 @@ \store\x86\net8.0\microsoft.extensions.primitives\8.0.0\lib\net8.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/tools/MatrixHelper/InstrumentationData.cs b/tools/MatrixHelper/InstrumentationData.cs index 22496132..b3099bf1 100644 --- a/tools/MatrixHelper/InstrumentationData.cs +++ b/tools/MatrixHelper/InstrumentationData.cs @@ -47,10 +47,9 @@ public static Instrumentation[] GetInstrumentations() var aspNetCoreMetrics = new MetricData[] { - new("http.server.duration", histogram, "Duration of the inbound HTTP request, in the form of count, sum, and histogram buckets. This metric originates multiple metric time series, which might result in increased data ingestion costs. Supported only on .NET prior to 8"), + new("http.server.request.duration", histogram, "Duration of the inbound HTTP request."), // following metrics .NET8+ only new("http.server.active_requests", upDownCounter, "Number of active HTTP server requests. Supported only on .NET8+"), - new("http.server.request.duration", histogram, "Duration of HTTP server requests. Supported only on .NET8+"), new("kestrel.active_connections", upDownCounter, "Number of connections that are currently active on the server. Supported only on .NET8+"), new("kestrel.connection.duration", histogram, "The duration of connections on the server. Supported only on .NET8+"), new("kestrel.rejected_connections", counter, "Number of connections rejected by the server. Connections are rejected when the currently active count exceeds the value configured with MaxConcurrentConnections. Supported only on .NET8+"), @@ -70,12 +69,12 @@ public static Instrumentation[] GetInstrumentations() new("aspnetcore.rate_limiting.requests", counter, "Number of requests that tried to acquire a rate limiting lease. Requests could be rejected by global or endpoint rate limiting policies. Or the request could be canceled while waiting for the lease. Supported only on .NET8+") }; + // TODO var httpClientMetrics = new MetricData[] { - new("http.client.duration", histogram, "Duration of outbound HTTP requests, in the form of count, sum, and histogram buckets. This metric originates multiple metric time series, which might result in increased data ingestion costs. Supported only on .NET Framework and .NET prior to 8"), + new("http.client.request.duration", histogram, "Duration of HTTP client requests."), // following metrics .NET8+ only new("http.client.active_requests", upDownCounter, "Number of outbound HTTP requests that are currently active on the client. Supported only on .NET8+"), - new("http.client.request.duration", histogram, "Duration of HTTP client requests. Supported only on .NET8+"), new("http.client.open_connections", upDownCounter, "Number of outbound HTTP connections that are currently active or idle on the client. Supported only on .NET8+"), new("http.client.connection.duration", histogram, "The duration of successfully established outbound HTTP connections. Supported only on .NET8+"), new("http.client.request.time_in_queue", histogram, "The amount of time requests spent on a queue waiting for an available connection. Supported only on .NET8+"), @@ -84,30 +83,31 @@ public static Instrumentation[] GetInstrumentations() var instrumentations = new Instrumentation[] { - new(new[] { "ASPNET" }, new[] { new InstrumentedComponent("ASP.NET Framework (.NET Framework)", "See general requirements") }, "MVC / WebApi (Only integrated pipeline mode supported). Metrics requires trace instrumentation.", "beta", "community", new[] { new Dependency("ASP.NET Instrumentation for OpenTelemetry", "https://github.com/open-telemetry/opentelemetry-dotnet-contrib/tree/main/src/OpenTelemetry.Instrumentation.AspNet", "https://www.nuget.org/packages/OpenTelemetry.Instrumentation.AspNet", "1.6.0-beta.2", "beta"), new Dependency("ASP.NET Telemetry HttpModule for OpenTelemetry", "https://github.com/open-telemetry/opentelemetry-dotnet-contrib/tree/main/src/OpenTelemetry.Instrumentation.AspNet.TelemetryHttpModule", "https://www.nuget.org/packages/OpenTelemetry.Instrumentation.AspNet.TelemetryHttpModule", "1.6.0-beta.2", "beta") }, new SignalsList[] { new TracesList(), new MetricList(new MetricData("http.server.duration", histogram, "Duration of the inbound HTTP request, in the form of count, sum, and histogram buckets. This metric originates multiple metric time series, which might result in increased data ingestion costs.")) }, Array.Empty()), - new("ASPNETCORE", new InstrumentedComponent("ASP.NET Core", "See general requirements"), "Metrics automatically activates `Microsoft.AspNetCore.Hosting.HttpRequestIn` spans.", "beta", "community", new Dependency("ASP.NET Core Instrumentation for OpenTelemetry .NET", "https://github.com/open-telemetry/opentelemetry-dotnet/tree/main/src/OpenTelemetry.Instrumentation.AspNetCore", "https://www.nuget.org/packages/OpenTelemetry.Instrumentation.AspNetCore", "1.6.0-beta.3", "beta"), new SignalsList[] { new TracesList(), new MetricList(aspNetCoreMetrics) }), + new(new[] { "ASPNET" }, new[] { new InstrumentedComponent("ASP.NET Framework (.NET Framework)", "See general requirements") }, "MVC / WebApi (Only integrated pipeline mode supported). Metrics requires trace instrumentation.", "beta", "community", new[] { new Dependency("ASP.NET Instrumentation for OpenTelemetry", "https://github.com/open-telemetry/opentelemetry-dotnet-contrib/tree/main/src/OpenTelemetry.Instrumentation.AspNet", "https://www.nuget.org/packages/OpenTelemetry.Instrumentation.AspNet", "1.7.0-beta.1", "beta"), new Dependency("ASP.NET Telemetry HttpModule for OpenTelemetry", "https://github.com/open-telemetry/opentelemetry-dotnet-contrib/tree/main/src/OpenTelemetry.Instrumentation.AspNet.TelemetryHttpModule", "https://www.nuget.org/packages/OpenTelemetry.Instrumentation.AspNet.TelemetryHttpModule", "1.6.0-beta.2", "beta") }, new SignalsList[] { new TracesList(), new MetricList(new MetricData("http.server.request.duration", histogram, "Measures the duration of inbound HTTP requests.")) }, Array.Empty()), + new("ASPNETCORE", new InstrumentedComponent("ASP.NET Core", "See general requirements"), "Metrics automatically activates `Microsoft.AspNetCore.Hosting.HttpRequestIn` spans.", "beta", "community", new Dependency("ASP.NET Core Instrumentation for OpenTelemetry .NET", "https://github.com/open-telemetry/opentelemetry-dotnet/tree/main/src/OpenTelemetry.Instrumentation.AspNetCore", "https://www.nuget.org/packages/OpenTelemetry.Instrumentation.AspNetCore", "1.7.0", "beta"), new SignalsList[] { new TracesList(), new MetricList(aspNetCoreMetrics) }), new("AZURE", new InstrumentedComponent("Azure SDK", "`Azure.` prefixed packages, released after October 1, 2021"), null, "beta", "third-party", new TracesList()), new("ELASTICSEARCH", new InstrumentedComponent("Elastic.Clients.Elasticsearch", "8.0.0 to 8.9.3"), "Versions 8.10.0 and higher are supported by `Elastic.Transport` instrumentation.", "beta", "third-party", new TracesList()), new("ELASTICTRANSPORT", new InstrumentedComponent("Elastic.Transport", "0.4.16 and higher"), null, "beta", "third-party", new TracesList()), - new("ENTITYFRAMEWORKCORE", new InstrumentedComponent("Microsoft.EntityFrameworkCore", "6.0.12 and higher"), "Not supported on .NET Framework", "beta", "community", new Dependency("EntityFrameworkCore Instrumentation for OpenTelemetry .NET", "https://github.com/open-telemetry/opentelemetry-dotnet-contrib/tree/main/src/OpenTelemetry.Instrumentation.EntityFrameworkCore", "https://www.nuget.org/packages/OpenTelemetry.Instrumentation.EntityFrameworkCore", "1.0.0-beta.8", "beta"), new SignalsList[] { new TracesList() }), + new("ENTITYFRAMEWORKCORE", new InstrumentedComponent("Microsoft.EntityFrameworkCore", "6.0.12 and higher"), "Not supported on .NET Framework", "beta", "community", new Dependency("EntityFrameworkCore Instrumentation for OpenTelemetry .NET", "https://github.com/open-telemetry/opentelemetry-dotnet-contrib/tree/main/src/OpenTelemetry.Instrumentation.EntityFrameworkCore", "https://www.nuget.org/packages/OpenTelemetry.Instrumentation.EntityFrameworkCore", "1.0.0-beta.9", "beta"), new SignalsList[] { new TracesList() }), new(new[] { "GRAPHQL" }, new[] { new InstrumentedComponent("GraphQL", "7.5.0 and higher") }, "Not supported on .NET Framework", "beta", "third-party", Array.Empty(), new SignalsList[] { new TracesList() }, new Setting[] { new("OTEL_DOTNET_AUTO_GRAPHQL_SET_DOCUMENT", "Whether the GraphQL instrumentation can pass raw queries as a `graphql.document` attribute. As queries might contain sensitive information, the default value is `false`.", "false", "boolean", SettingsData.InstrumentationCategory) }), new("GRPCNETCLIENT", new InstrumentedComponent("Grpc.Net.Client", "2.52.0 to 3.0.0"), null, "beta", "community", new Dependency("Grpc.Net.Client Instrumentation for OpenTelemetry", "https://github.com/open-telemetry/opentelemetry-dotnet/tree/main/src/OpenTelemetry.Instrumentation.GrpcNetClient", "https://www.nuget.org/packages/OpenTelemetry.Instrumentation.GrpcNetClient", "1.6.0-beta.3", "beta"), new SignalsList[] { new TracesList() }), - new(new[] { "HTTPCLIENT" }, new[] { new InstrumentedComponent("System.Net.Http.HttpClient", "See general requirements"), new InstrumentedComponent("System.Net.HttpWebRequest", "See general requirements") }, null, "beta", "community", new[] { new Dependency("HttpClient and HttpWebRequest instrumentation for OpenTelemetry", "https://github.com/open-telemetry/opentelemetry-dotnet/tree/main/src/OpenTelemetry.Instrumentation.Http", "https://www.nuget.org/packages/OpenTelemetry.Instrumentation.Http", "1.6.0-beta.3", "beta") }, new SignalsList[] { new TracesList(), new MetricList(httpClientMetrics) }, Array.Empty()), + new(new[] { "HTTPCLIENT" }, new[] { new InstrumentedComponent("System.Net.Http.HttpClient", "See general requirements"), new InstrumentedComponent("System.Net.HttpWebRequest", "See general requirements") }, null, "beta", "community", new[] { new Dependency("HttpClient and HttpWebRequest instrumentation for OpenTelemetry", "https://github.com/open-telemetry/opentelemetry-dotnet/tree/main/src/OpenTelemetry.Instrumentation.Http", "https://www.nuget.org/packages/OpenTelemetry.Instrumentation.Http", "1.7.0", "beta") }, new SignalsList[] { new TracesList(), new MetricList(httpClientMetrics) }, Array.Empty()), + new("KAFKA", new InstrumentedComponent("Confluent.Kafka", "1.4.0 to 3.0.0"), null, "beta", "community", new TracesList()), new("MASSTRANSIT", new InstrumentedComponent("MassTransit", "8.0.0 and higher"), "Not supported on .NET Framework", "beta", "third-party", new TracesList()), new("MONGODB", new InstrumentedComponent("MongoDB.Driver.Core", "2.13.3 to 3.0.0"), "Not supported on .NET Framework", "beta", "third-party", new TracesList()), new("MYSQLCONNECTOR", new InstrumentedComponent("MySqlConnector", "2.0.0 and higher"), null, "beta", "third-party", new TracesList()), new("MYSQLDATA", new InstrumentedComponent("MySql.Data", "8.1.0 and higher"), "Not supported on .NET Framework", "beta", "third-party", new TracesList()), new("NPGSQL", new InstrumentedComponent("Npgsql", "6.0.0 and higher"), null, "beta", "third-party", new TracesList()), new(new[] { "NSERVICEBUS" }, new[] { new InstrumentedComponent("NServiceBus", "8.0.0 and higher") }, null, "beta", "third-party", Array.Empty(), new SignalsList[] { new TracesList(), new MetricList(new MetricData("nservicebus.messaging.successes", counter, "Number of messages successfully processed by the endpoint."), new MetricData("nservicebus.messaging.fetches", counter, "Number of messages retrieved from the queue by the endpoint."), new MetricData("nservicebus.messaging.failures", counter, "Number of messages unsuccessfully processed by the endpoint.")) }, Array.Empty()), - new("QUARTZ", new InstrumentedComponent("Quartz", "3.4.0 and higher"), "Not supported on .NET Framework 4.7.1 and lower", "beta", "community", new Dependency("QuartzNET Instrumentation for OpenTelemetry .NET", "https://github.com/open-telemetry/opentelemetry-dotnet-contrib/tree/main/src/OpenTelemetry.Instrumentation.Quartz", "https://www.nuget.org/packages/OpenTelemetry.Instrumentation.Quartz", "1.0.0-alpha.3", "alpha"), new SignalsList[] { new TracesList() }), + new("QUARTZ", new InstrumentedComponent("Quartz", "3.4.0 and higher"), "Not supported on .NET Framework 4.7.1 and lower", "beta", "community", new Dependency("QuartzNET Instrumentation for OpenTelemetry .NET", "https://github.com/open-telemetry/opentelemetry-dotnet-contrib/tree/main/src/OpenTelemetry.Instrumentation.Quartz", "https://www.nuget.org/packages/OpenTelemetry.Instrumentation.Quartz", "1.0.0-beta.1", "beta"), new SignalsList[] { new TracesList() }), new(new[] { "SQLCLIENT" }, new[] { new InstrumentedComponent("Microsoft.Data.SqlClient", "v3.* is not supported on .NET Framework"), new InstrumentedComponent("System.Data.SqlClient", "4.8.5 and higher"), new InstrumentedComponent("System.Data", "Shipped with .NET Framework") }, null, "beta", "community", Array.Empty(), new SignalsList[] { new TracesList() }, Array.Empty()), - new("STACKEXCHANGEREDIS", new InstrumentedComponent("StackExchange.Redis", "2.0.405 to 3.0.0"), "Not supported on .NET Framework", "beta", "community", new Dependency("StackExchange.Redis Instrumentation for OpenTelemetry", "https://github.com/open-telemetry/opentelemetry-dotnet-contrib/tree/main/src/OpenTelemetry.Instrumentation.StackExchangeRedis", "https://www.nuget.org/packages/OpenTelemetry.Instrumentation.StackExchangeRedis", "1.0.0-rc9.12", "beta"), new SignalsList[] { new TracesList() }), - new(new[] { "WCFCLIENT", "WCFSERVICE" }, new[] { new InstrumentedComponent("System.ServiceModel", "4.7.0 and higher of `System.ServiceModel.Primitives`") }, "Service side not supported on .NET. `WCFCLIENT for client side instrumentation and `WCFSERVICE` for service side instrumentation", "beta", "community", new[] { new Dependency("WCF Instrumentation for OpenTelemetry .NET", "https://github.com/open-telemetry/opentelemetry-dotnet-contrib/tree/main/src/OpenTelemetry.Instrumentation.Wcf", "https://www.nuget.org/packages/OpenTelemetry.Instrumentation.Wcf", "1.0.0-rc.13", "beta") }, new SignalsList[] { new TracesList() }, Array.Empty()), + new("STACKEXCHANGEREDIS", new InstrumentedComponent("StackExchange.Redis", "2.0.405 to 3.0.0"), "Not supported on .NET Framework", "beta", "community", new Dependency("StackExchange.Redis Instrumentation for OpenTelemetry", "https://github.com/open-telemetry/opentelemetry-dotnet-contrib/tree/main/src/OpenTelemetry.Instrumentation.StackExchangeRedis", "https://www.nuget.org/packages/OpenTelemetry.Instrumentation.StackExchangeRedis", "1.0.0-rc9.13", "beta"), new SignalsList[] { new TracesList() }), + new(new[] { "WCFCLIENT", "WCFSERVICE" }, new[] { new InstrumentedComponent("System.ServiceModel", "4.7.0 and higher of `System.ServiceModel.Primitives`") }, "Service side not supported on .NET. `WCFCLIENT for client side instrumentation and `WCFSERVICE` for service side instrumentation", "beta", "community", new[] { new Dependency("WCF Instrumentation for OpenTelemetry .NET", "https://github.com/open-telemetry/opentelemetry-dotnet-contrib/tree/main/src/OpenTelemetry.Instrumentation.Wcf", "https://www.nuget.org/packages/OpenTelemetry.Instrumentation.Wcf", "1.0.0-rc.14", "beta") }, new SignalsList[] { new TracesList() }, Array.Empty()), - new("NETRUNTIME", new InstrumentedComponent(".NET runtime", null), null, "beta", "community", new Dependency("Runtime Instrumentation for OpenTelemetry .NET", "https://github.com/open-telemetry/opentelemetry-dotnet-contrib/tree/main/src/OpenTelemetry.Instrumentation.Runtime", "https://www.nuget.org/packages/OpenTelemetry.Instrumentation.Runtime", "1.5.1", "stable"), new SignalsList[] { new MetricList(netRuntimeMetrics) }), - new("PROCESS", new InstrumentedComponent("Process", null), null, "beta", "community", new Dependency("Process Instrumentation for OpenTelemetry .NET", "https://github.com/open-telemetry/opentelemetry-dotnet-contrib/tree/main/src/OpenTelemetry.Instrumentation.Process", "https://www.nuget.org/packages/OpenTelemetry.Instrumentation.Process", "0.5.0-beta.3", "beta"), new SignalsList[] { new MetricList(new MetricData("process.memory.usage", upDownCounter, "The amount of physical memory allocated for this process."), new("process.memory.virtual", upDownCounter, "The amount of committed virtual memory for this process."), new MetricData("process.cpu.time", counter, "Total CPU seconds broken down by different states, such as user and system."), new("process.cpu.count", upDownCounter, "Total CPU seconds broken down by different states, such as user and system."), new("process.threads", upDownCounter, "Process threads count.")) }), + new("NETRUNTIME", new InstrumentedComponent(".NET runtime", null), null, "beta", "community", new Dependency("Runtime Instrumentation for OpenTelemetry .NET", "https://github.com/open-telemetry/opentelemetry-dotnet-contrib/tree/main/src/OpenTelemetry.Instrumentation.Runtime", "https://www.nuget.org/packages/OpenTelemetry.Instrumentation.Runtime", "1.7.0", "stable"), new SignalsList[] { new MetricList(netRuntimeMetrics) }), + new("PROCESS", new InstrumentedComponent("Process", null), null, "beta", "community", new Dependency("Process Instrumentation for OpenTelemetry .NET", "https://github.com/open-telemetry/opentelemetry-dotnet-contrib/tree/main/src/OpenTelemetry.Instrumentation.Process", "https://www.nuget.org/packages/OpenTelemetry.Instrumentation.Process", "0.5.0-beta.4", "beta"), new SignalsList[] { new MetricList(new MetricData("process.memory.usage", upDownCounter, "The amount of physical memory allocated for this process."), new("process.memory.virtual", upDownCounter, "The amount of committed virtual memory for this process."), new MetricData("process.cpu.time", counter, "Total CPU seconds broken down by different states, such as user and system."), new("process.cpu.count", upDownCounter, "Total CPU seconds broken down by different states, such as user and system."), new("process.threads", upDownCounter, "Process threads count.")) }), - new("ILOGGER", new InstrumentedComponent("Microsoft.Extensions.Logging", "6.0.0 and higher"), "Not supported on .NET Framework", "beta", "community", new LogLists()) + new("ILOGGER", new InstrumentedComponent("Microsoft.Extensions.Logging", "8.0.0 and higher"), "Not supported on .NET Framework", "beta", "community", new LogLists()) }; return instrumentations; diff --git a/tools/MatrixHelper/MetadataData.cs b/tools/MatrixHelper/MetadataData.cs index 241e63ae..7327e5ba 100644 --- a/tools/MatrixHelper/MetadataData.cs +++ b/tools/MatrixHelper/MetadataData.cs @@ -27,8 +27,8 @@ public static AllInOne GetAllInOne() version: typeof(MetadataData).Assembly.GetCustomAttribute()!.InformationalVersion.Split('+')[0], dependencies: new Dependency[] { - new("OpenTelemetry .NET", "https://github.com/open-telemetry/opentelemetry-dotnet", null, "1.6.0", "stable"), - new("OpenTelemetry .NET Automatic Instrumentation", "https://github.com/open-telemetry/opentelemetry-dotnet-instrumentation", null, "1.2.0", "stable"), + new("OpenTelemetry .NET", "https://github.com/open-telemetry/opentelemetry-dotnet", null, "1.7.0", "stable"), + new("OpenTelemetry .NET Automatic Instrumentation", "https://github.com/open-telemetry/opentelemetry-dotnet-instrumentation", null, "1.3.0", "stable"), }, settings: SettingsData.GetSettings(), instrumentations: InstrumentationData.GetInstrumentations(), diff --git a/tools/MatrixHelper/ResourceDetectorsData.cs b/tools/MatrixHelper/ResourceDetectorsData.cs index 1aa47b3b..dde9ae09 100644 --- a/tools/MatrixHelper/ResourceDetectorsData.cs +++ b/tools/MatrixHelper/ResourceDetectorsData.cs @@ -22,8 +22,11 @@ public static ResourceDetector[] GetResourceDetectors() { return new ResourceDetector[] { - new("AZUREAPPSERVICE", "Azure App Service detector.", new Attribute[] { new("azure.app.service.stamp"), new("cloud.platform"), new("cloud.provider"), new("cloud.resource_id"), new("cloud.region"), new("deployment.environment"), new("host.id"), new("service.instance.id"), new("service.name") }, "beta", "community", new Dependency("Resource Detectors for Azure cloud environments", "https://github.com/open-telemetry/opentelemetry-dotnet-contrib/tree/main/src/OpenTelemetry.ResourceDetectors.Azure", "https://www.nuget.org/packages/OpenTelemetry.ResourceDetectors.Azure", "1.0.0-beta.3", "beta")), - new("CONTAINER", "Container detector. For example, Docker or Podman containers.", new Attribute[] { new("container.id") }, "beta", "community", new Dependency("Container Resource Detectors", "https://github.com/open-telemetry/opentelemetry-dotnet-contrib/tree/main/src/OpenTelemetry.ResourceDetectors.Container", "https://www.nuget.org/packages/OpenTelemetry.ResourceDetectors.Container", "1.0.0-beta.4", "beta")), + new("AZUREAPPSERVICE", "Azure App Service detector.", new Attribute[] { new("azure.app.service.stamp"), new("cloud.platform"), new("cloud.provider"), new("cloud.resource_id"), new("cloud.region"), new("deployment.environment"), new("host.id"), new("service.instance.id"), new("service.name") }, "beta", "community", new Dependency("Resource Detectors for Azure cloud environments", "https://github.com/open-telemetry/opentelemetry-dotnet-contrib/tree/main/src/OpenTelemetry.ResourceDetectors.Azure", "https://www.nuget.org/packages/OpenTelemetry.ResourceDetectors.Azure", "1.0.0-beta.4", "beta")), + new("CONTAINER", "Container detector. For example, Docker or Podman containers.", new Attribute[] { new("container.id") }, "beta", "community", new Dependency("Container Resource Detectors", "https://github.com/open-telemetry/opentelemetry-dotnet-contrib/tree/main/src/OpenTelemetry.ResourceDetectors.Container", "https://www.nuget.org/packages/OpenTelemetry.ResourceDetectors.Container", "1.0.0-beta.5", "beta")), + new("HOST", "Host detector.", new Attribute[] { new("host.name") }, "alpha", "community", new Dependency("Host Resource Detectors", "https://github.com/open-telemetry/opentelemetry-dotnet-contrib/tree/main/src/OpenTelemetry.ResourceDetectors.Host", "https://www.nuget.org/packages/OpenTelemetry.ResourceDetectors.Host", "0.1.0-alpha.2", "alpha")), + new("PROCESS", "Process detector.", new Attribute[] { new("process.pid") }, "alpha", "community", new Dependency("Process Resource Detectors", "https://github.com/open-telemetry/opentelemetry-dotnet-contrib/tree/main/src/OpenTelemetry.ResourceDetectors.Process", "https://www.nuget.org/packages/OpenTelemetry.ResourceDetectors.Process", "0.1.0-alpha.2", "alpha")), + new("PROCESSRUNTIME", "Process Runtime detector.", new Attribute[] { new("process.runtime.description"), new("process.runtime.name"), new("process.runtime.version") }, "alpha", "community", new Dependency("Process Runtime Resource Detectors", "https://github.com/open-telemetry/opentelemetry-dotnet-contrib/tree/main/src/OpenTelemetry.ResourceDetectors.ProcessRuntime", "https://www.nuget.org/packages/OpenTelemetry.ResourceDetectors.ProcessRuntime", "0.1.0-alpha.2", "alpha")), }; } }