From 42286acf8b537cbd2e4066f78459b59590266cd6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 29 Jan 2025 01:21:59 +0000 Subject: [PATCH 1/2] Bump the opentelemetry group with 8 updates Bumps the opentelemetry group with 8 updates: | Package | From | To | | --- | --- | --- | | [Microsoft.Extensions.Configuration.Binder](https://github.com/dotnet/runtime) | `8.0.2` | `9.0.0` | | [OpenTelemetry.Exporter.OpenTelemetryProtocol](https://github.com/open-telemetry/opentelemetry-dotnet) | `1.9.0` | `1.10.0` | | [Microsoft.Extensions.DependencyInjection.Abstractions](https://github.com/dotnet/runtime) | `8.0.2` | `9.0.0` | | [Microsoft.Extensions.Hosting.Abstractions](https://github.com/dotnet/runtime) | `8.0.1` | `9.0.0` | | [Microsoft.Extensions.Logging.Abstractions](https://github.com/dotnet/runtime) | `8.0.2` | `9.0.0` | | [Microsoft.Extensions.Primitives](https://github.com/dotnet/runtime) | `8.0.0` | `9.0.0` | | [OpenTelemetry.Extensions.Hosting](https://github.com/open-telemetry/opentelemetry-dotnet) | `1.9.0` | `1.10.0` | | [OpenTelemetry.Exporter.InMemory](https://github.com/open-telemetry/opentelemetry-dotnet) | `1.9.0` | `1.10.0` | Updates `Microsoft.Extensions.Configuration.Binder` from 8.0.2 to 9.0.0 - [Release notes](https://github.com/dotnet/runtime/releases) - [Commits](https://github.com/dotnet/runtime/compare/v8.0.2...v9.0.0) Updates `OpenTelemetry.Exporter.OpenTelemetryProtocol` from 1.9.0 to 1.10.0 - [Release notes](https://github.com/open-telemetry/opentelemetry-dotnet/releases) - [Changelog](https://github.com/open-telemetry/opentelemetry-dotnet/blob/main/RELEASENOTES.md) - [Commits](https://github.com/open-telemetry/opentelemetry-dotnet/compare/core-1.9.0...core-1.10.0) Updates `Microsoft.Extensions.Configuration.Binder` from 8.0.2 to 9.0.0 - [Release notes](https://github.com/dotnet/runtime/releases) - [Commits](https://github.com/dotnet/runtime/compare/v8.0.2...v9.0.0) Updates `Microsoft.Extensions.DependencyInjection.Abstractions` from 8.0.2 to 9.0.0 - [Release notes](https://github.com/dotnet/runtime/releases) - [Commits](https://github.com/dotnet/runtime/compare/v8.0.2...v9.0.0) Updates `Microsoft.Extensions.Hosting.Abstractions` from 8.0.1 to 9.0.0 - [Release notes](https://github.com/dotnet/runtime/releases) - [Commits](https://github.com/dotnet/runtime/compare/v8.0.1...v9.0.0) Updates `Microsoft.Extensions.Logging.Abstractions` from 8.0.2 to 9.0.0 - [Release notes](https://github.com/dotnet/runtime/releases) - [Commits](https://github.com/dotnet/runtime/compare/v8.0.2...v9.0.0) Updates `Microsoft.Extensions.Primitives` from 8.0.0 to 9.0.0 - [Release notes](https://github.com/dotnet/runtime/releases) - [Commits](https://github.com/dotnet/runtime/compare/v8.0.0...v9.0.0) Updates `OpenTelemetry.Extensions.Hosting` from 1.9.0 to 1.10.0 - [Release notes](https://github.com/open-telemetry/opentelemetry-dotnet/releases) - [Changelog](https://github.com/open-telemetry/opentelemetry-dotnet/blob/main/RELEASENOTES.md) - [Commits](https://github.com/open-telemetry/opentelemetry-dotnet/compare/core-1.9.0...core-1.10.0) Updates `OpenTelemetry.Exporter.InMemory` from 1.9.0 to 1.10.0 - [Release notes](https://github.com/open-telemetry/opentelemetry-dotnet/releases) - [Changelog](https://github.com/open-telemetry/opentelemetry-dotnet/blob/main/RELEASENOTES.md) - [Commits](https://github.com/open-telemetry/opentelemetry-dotnet/compare/core-1.9.0...core-1.10.0) --- updated-dependencies: - dependency-name: Microsoft.Extensions.Configuration.Binder dependency-type: direct:production update-type: version-update:semver-major dependency-group: opentelemetry - dependency-name: OpenTelemetry.Exporter.OpenTelemetryProtocol dependency-type: direct:production update-type: version-update:semver-minor dependency-group: opentelemetry - dependency-name: Microsoft.Extensions.Configuration.Binder dependency-type: direct:production update-type: version-update:semver-major dependency-group: opentelemetry - dependency-name: Microsoft.Extensions.DependencyInjection.Abstractions dependency-type: direct:production update-type: version-update:semver-major dependency-group: opentelemetry - dependency-name: Microsoft.Extensions.Hosting.Abstractions dependency-type: direct:production update-type: version-update:semver-major dependency-group: opentelemetry - dependency-name: Microsoft.Extensions.Logging.Abstractions dependency-type: direct:production update-type: version-update:semver-major dependency-group: opentelemetry - dependency-name: Microsoft.Extensions.Primitives dependency-type: direct:production update-type: version-update:semver-major dependency-group: opentelemetry - dependency-name: OpenTelemetry.Extensions.Hosting dependency-type: direct:production update-type: version-update:semver-minor dependency-group: opentelemetry - dependency-name: OpenTelemetry.Exporter.InMemory dependency-type: direct:production update-type: version-update:semver-minor dependency-group: opentelemetry ... Signed-off-by: dependabot[bot] --- Directory.Packages.props | 6 +++--- eng/Versions.props | 14 +++++++------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index 2e83abf41a..f8c2efe03a 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -113,9 +113,9 @@ - - - + + + diff --git a/eng/Versions.props b/eng/Versions.props index d778c99ba8..ac02a98222 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -90,14 +90,14 @@ 8.0.12 8.0.12 - 8.0.1 + 9.0.0 8.0.1 - 8.0.0 - 8.0.2 - 8.0.2 - 8.0.2 - 8.0.2 - 8.0.0 + 9.0.0 + 9.0.0 + 9.0.0 + 9.0.0 + 9.0.0 + 9.0.0 8.0.1 8.0.1 8.0.5 From 52fa34be336c5e95aeff66d21457307aeb8708dd Mon Sep 17 00:00:00 2001 From: Dan Moseley Date: Thu, 30 Jan 2025 10:11:08 -0700 Subject: [PATCH 2/2] build fixes --- .../DatabaseMigration.MigrationService/ApiDbInitializer.cs | 2 +- src/Components/Aspire.Seq/ConfigurationSchema.json | 4 ++-- .../OpenTelemetryConsumeResultExtensions.cs | 2 +- .../Implementation/SqlClientDiagnosticListener.cs | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/playground/DatabaseMigration/DatabaseMigration.MigrationService/ApiDbInitializer.cs b/playground/DatabaseMigration/DatabaseMigration.MigrationService/ApiDbInitializer.cs index ee624cc1ca..1d036eec97 100644 --- a/playground/DatabaseMigration/DatabaseMigration.MigrationService/ApiDbInitializer.cs +++ b/playground/DatabaseMigration/DatabaseMigration.MigrationService/ApiDbInitializer.cs @@ -31,7 +31,7 @@ protected override async Task ExecuteAsync(CancellationToken cancellationToken) } catch (Exception ex) { - activity?.RecordException(ex); + activity?.AddException(ex); throw; } diff --git a/src/Components/Aspire.Seq/ConfigurationSchema.json b/src/Components/Aspire.Seq/ConfigurationSchema.json index 6fccbbbdee..dd36f5d233 100644 --- a/src/Components/Aspire.Seq/ConfigurationSchema.json +++ b/src/Components/Aspire.Seq/ConfigurationSchema.json @@ -67,7 +67,7 @@ "Grpc", "HttpProtobuf" ], - "description": "Gets or sets the the OTLP transport protocol." + "description": "Gets or sets the OTLP transport protocol." }, "TimeoutMilliseconds": { "type": "integer", @@ -122,7 +122,7 @@ "Grpc", "HttpProtobuf" ], - "description": "Gets or sets the the OTLP transport protocol." + "description": "Gets or sets the OTLP transport protocol." }, "TimeoutMilliseconds": { "type": "integer", diff --git a/src/Vendoring/OpenTelemetry.Instrumentation.ConfluentKafka/OpenTelemetryConsumeResultExtensions.cs b/src/Vendoring/OpenTelemetry.Instrumentation.ConfluentKafka/OpenTelemetryConsumeResultExtensions.cs index 43ffc7308a..30bad7e119 100644 --- a/src/Vendoring/OpenTelemetry.Instrumentation.ConfluentKafka/OpenTelemetryConsumeResultExtensions.cs +++ b/src/Vendoring/OpenTelemetry.Instrumentation.ConfluentKafka/OpenTelemetryConsumeResultExtensions.cs @@ -131,7 +131,7 @@ public static bool TryExtractPropagationContext( } catch (Exception ex) { - processActivity?.SetStatus(Status.Error); + processActivity?.SetStatus(ActivityStatusCode.Error); processActivity?.SetTag(SemanticConventions.AttributeErrorType, ex.GetType().FullName); } finally diff --git a/src/Vendoring/OpenTelemetry.Instrumentation.SqlClient/Implementation/SqlClientDiagnosticListener.cs b/src/Vendoring/OpenTelemetry.Instrumentation.SqlClient/Implementation/SqlClientDiagnosticListener.cs index ad42830bb0..423d00e7ee 100644 --- a/src/Vendoring/OpenTelemetry.Instrumentation.SqlClient/Implementation/SqlClientDiagnosticListener.cs +++ b/src/Vendoring/OpenTelemetry.Instrumentation.SqlClient/Implementation/SqlClientDiagnosticListener.cs @@ -184,7 +184,7 @@ public override void OnEventWritten(string name, object payload) if (this.options.RecordException) { - activity.RecordException(exception); + activity.AddException(exception); } } else