Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump the opentelemetry group with 8 updates #7266

Closed
wants to merge 2 commits into from
Closed

Bump the opentelemetry group with 8 updates #7266

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
42286ac
Bump the opentelemetry group with 8 updates
dependabot[bot] Jan 29, 2025
52fa34b
build fixes
danmoseley Jan 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions Directory.Packages.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,9 +113,9 @@
<PackageVersion Include="Yarp.ReverseProxy" Version="2.2.0" />
<!-- Open Telemetry -->
<PackageVersion Include="Npgsql.OpenTelemetry" Version="9.0.2" />
<PackageVersion Include="OpenTelemetry.Exporter.InMemory" Version="1.9.0" />
<PackageVersion Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.9.0" />
<PackageVersion Include="OpenTelemetry.Extensions.Hosting" Version="1.9.0" />
<PackageVersion Include="OpenTelemetry.Exporter.InMemory" Version="1.10.0" />
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Starting with 1.10 (there is a 1.11.1 btw) the net8.0 target depends on

Microsoft.Extensions.Diagnostics.Abstractions (>= 9.0.0)
Microsoft.Extensions.Logging.Configuration (>= 9.0.0)
System.Diagnostics.DiagnosticSource (>= 9.0.0)

@eerhardt Do we need to split this for net8.0 and net9.0

<PackageVersion Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.10.0" />
<PackageVersion Include="OpenTelemetry.Extensions.Hosting" Version="1.10.0" />
<PackageVersion Include="OpenTelemetry.Instrumentation.GrpcNetClient" Version="1.9.0-beta.1" />
<PackageVersion Include="OpenTelemetry.Instrumentation.Http" Version="1.9.0" />
<PackageVersion Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.9.0" />
Expand Down
14 changes: 7 additions & 7 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,14 +90,14 @@
<MicrosoftExtensionsDiagnosticsHealthChecksLTSVersion>8.0.12</MicrosoftExtensionsDiagnosticsHealthChecksLTSVersion>
<MicrosoftExtensionsFeaturesLTSVersion>8.0.12</MicrosoftExtensionsFeaturesLTSVersion>
<!-- Runtime -->
<MicrosoftExtensionsHostingAbstractionsLTSVersion>8.0.1</MicrosoftExtensionsHostingAbstractionsLTSVersion>
<MicrosoftExtensionsHostingAbstractionsLTSVersion>9.0.0</MicrosoftExtensionsHostingAbstractionsLTSVersion>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These are the LTS versions, so they should not be bumped to 9.0. There is the <MicrosoftExtensionsHostingAbstractions> tag that tracks it.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ah - didn't think of support angle. @eerhardt I think you were already looking at this, perhaps I should clsoe this PR

<MicrosoftExtensionsHostingLTSVersion>8.0.1</MicrosoftExtensionsHostingLTSVersion>
<MicrosoftExtensionsConfigurationAbstractionsLTSVersion>8.0.0</MicrosoftExtensionsConfigurationAbstractionsLTSVersion>
<MicrosoftExtensionsConfigurationBinderLTSVersion>8.0.2</MicrosoftExtensionsConfigurationBinderLTSVersion>
<MicrosoftExtensionsDependencyInjectionAbstractionsLTSVersion>8.0.2</MicrosoftExtensionsDependencyInjectionAbstractionsLTSVersion>
<MicrosoftExtensionsLoggingAbstractionsLTSVersion>8.0.2</MicrosoftExtensionsLoggingAbstractionsLTSVersion>
<MicrosoftExtensionsOptionsLTSVersion>8.0.2</MicrosoftExtensionsOptionsLTSVersion>
<MicrosoftExtensionsPrimitivesLTSVersion>8.0.0</MicrosoftExtensionsPrimitivesLTSVersion>
<MicrosoftExtensionsConfigurationAbstractionsLTSVersion>9.0.0</MicrosoftExtensionsConfigurationAbstractionsLTSVersion>
<MicrosoftExtensionsConfigurationBinderLTSVersion>9.0.0</MicrosoftExtensionsConfigurationBinderLTSVersion>
<MicrosoftExtensionsDependencyInjectionAbstractionsLTSVersion>9.0.0</MicrosoftExtensionsDependencyInjectionAbstractionsLTSVersion>
<MicrosoftExtensionsLoggingAbstractionsLTSVersion>9.0.0</MicrosoftExtensionsLoggingAbstractionsLTSVersion>
<MicrosoftExtensionsOptionsLTSVersion>9.0.0</MicrosoftExtensionsOptionsLTSVersion>
<MicrosoftExtensionsPrimitivesLTSVersion>9.0.0</MicrosoftExtensionsPrimitivesLTSVersion>
<MicrosoftExtensionsHttpLTSVersion>8.0.1</MicrosoftExtensionsHttpLTSVersion>
<SystemFormatsAsn1LTSVersion>8.0.1</SystemFormatsAsn1LTSVersion>
<SystemTextJsonLTSVersion>8.0.5</SystemTextJsonLTSVersion>
Expand Down
2 changes: 1 addition & 1 deletion playground/DatabaseMigration/DatabaseMigration.MigrationService/ApiDbInitializer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ protected override async Task ExecuteAsync(CancellationToken cancellationToken)
}
catch (Exception ex)
{
activity?.RecordException(ex);
activity?.AddException(ex);
throw;
}

Expand Down
4 changes: 2 additions & 2 deletions src/Components/Aspire.Seq/ConfigurationSchema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion ...ring/OpenTelemetry.Instrumentation.ConfluentKafka/OpenTelemetryConsumeResultExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ public static bool TryExtractPropagationContext<TKey, TValue>(
}
catch (Exception ex)
{
processActivity?.SetStatus(Status.Error);
processActivity?.SetStatus(ActivityStatusCode.Error);
processActivity?.SetTag(SemanticConventions.AttributeErrorType, ex.GetType().FullName);
}
finally
Expand Down
2 changes: 1 addition & 1 deletion ...ing/OpenTelemetry.Instrumentation.SqlClient/Implementation/SqlClientDiagnosticListener.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@ public override void OnEventWritten(string name, object payload)

if (this.options.RecordException)
{
activity.RecordException(exception);
activity.AddException(exception);
}
}
else
Expand Down
Loading