diff --git a/build/Common.props b/build/Common.props index ff82b6647f..f67b57da36 100644 --- a/build/Common.props +++ b/build/Common.props @@ -34,16 +34,15 @@ Refer to https://docs.microsoft.com/en-us/nuget/concepts/package-versioning for semver syntax. --> [5.0.0,6.0) - [8.0.1,) [2.1.0,5.0) - [8.0.0,) - [8.0.0,) + [9.0.0,) + [9.0.0,) [1.0.3,2.0) [4.2.2,5.0) [3.11.0-beta1.23525.2] [8.0.0,9.0) [1.9.0-beta.2] - [1.9.0,2.0) + [1.10.0,2.0) [1.10.0-rc.1] [2.6.122,3.0) [2.4.0,3.0) diff --git a/examples/AspNet/Controllers/WeatherForecastController.cs b/examples/AspNet/Controllers/WeatherForecastController.cs index bf26ac9955..c51fe1a49a 100644 --- a/examples/AspNet/Controllers/WeatherForecastController.cs +++ b/examples/AspNet/Controllers/WeatherForecastController.cs @@ -89,7 +89,7 @@ public async Task GetData() [HttpPost] public async Task PostData() { - string value1 = Baggage.GetBaggage("key1"); + string? value1 = Baggage.GetBaggage("key1"); if (string.IsNullOrEmpty(value1)) { throw new InvalidOperationException("Key1 was not found on Baggage."); diff --git a/examples/AspNet/Web.config b/examples/AspNet/Web.config index e143e102d4..57e033590c 100644 --- a/examples/AspNet/Web.config +++ b/examples/AspNet/Web.config @@ -40,19 +40,23 @@ - + - - + + + + + + - + - + @@ -84,7 +88,7 @@ - + diff --git a/examples/wcf/client-core/Examples.Wcf.Client.DotNet.csproj b/examples/wcf/client-core/Examples.Wcf.Client.DotNet.csproj index 75dc57fc09..8786127849 100644 --- a/examples/wcf/client-core/Examples.Wcf.Client.DotNet.csproj +++ b/examples/wcf/client-core/Examples.Wcf.Client.DotNet.csproj @@ -9,7 +9,6 @@ - diff --git a/src/OpenTelemetry.Exporter.Geneva/CHANGELOG.md b/src/OpenTelemetry.Exporter.Geneva/CHANGELOG.md index 317de4751a..68287b629d 100644 --- a/src/OpenTelemetry.Exporter.Geneva/CHANGELOG.md +++ b/src/OpenTelemetry.Exporter.Geneva/CHANGELOG.md @@ -19,8 +19,8 @@ For configuration details see: [OtlpProtobufEncoding](./README.md#otlpprotobufencoding). -* Update OpenTelemetry SDK version to `1.10.0-rc.1`. - ([#2294](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/2294)) +* Update OpenTelemetry SDK version to `1.10.0`. + ([#2317](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/2317)) ## 1.9.0 diff --git a/src/OpenTelemetry.Exporter.Geneva/Common.GenevaExporter.props b/src/OpenTelemetry.Exporter.Geneva/Common.GenevaExporter.props index 78181066e1..5570a7a1fe 100644 --- a/src/OpenTelemetry.Exporter.Geneva/Common.GenevaExporter.props +++ b/src/OpenTelemetry.Exporter.Geneva/Common.GenevaExporter.props @@ -1,6 +1,6 @@ - $(OpenTelemetryCoreLatestPrereleaseVersion) + $(OpenTelemetryCoreLatestVersion) diff --git a/src/OpenTelemetry.Exporter.InfluxDB/CHANGELOG.md b/src/OpenTelemetry.Exporter.InfluxDB/CHANGELOG.md index 414cccd813..1928acb44e 100644 --- a/src/OpenTelemetry.Exporter.InfluxDB/CHANGELOG.md +++ b/src/OpenTelemetry.Exporter.InfluxDB/CHANGELOG.md @@ -7,6 +7,9 @@ [CVE-2024-43485](https://github.com/advisories/GHSA-8g4q-xg66-9fp4). ([#2202](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/2202)) +* Updated OpenTelemetry core component version(s) to `1.10.0`. + ([#2317](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/2317)) + ## 1.0.0-alpha.4 Released 2024-Oct-02 diff --git a/src/OpenTelemetry.Exporter.Instana/CHANGELOG.md b/src/OpenTelemetry.Exporter.Instana/CHANGELOG.md index 65df2e05a7..ca9a35d921 100644 --- a/src/OpenTelemetry.Exporter.Instana/CHANGELOG.md +++ b/src/OpenTelemetry.Exporter.Instana/CHANGELOG.md @@ -6,8 +6,8 @@ The lowest supported version is .NET Framework 4.6.2. ([#1050](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/1050)) -* Updated OpenTelemetry core component version(s) to `1.9.0`. - ([#1888](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/1888)) +* Updated OpenTelemetry core component version(s) to `1.10.0`. + ([#2317](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/2317)) ## 1.0.3 diff --git a/src/OpenTelemetry.Exporter.OneCollector/CHANGELOG.md b/src/OpenTelemetry.Exporter.OneCollector/CHANGELOG.md index b4f4b438cc..877f084dd0 100644 --- a/src/OpenTelemetry.Exporter.OneCollector/CHANGELOG.md +++ b/src/OpenTelemetry.Exporter.OneCollector/CHANGELOG.md @@ -15,9 +15,10 @@ also be applied to subsequent `LogRecord`s in the same batch. ([#2205](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/2205)) -* Update OpenTelemetry SDK version to `1.10.0-rc.1` and removed the direct - reference to `Microsoft.Extensions.Configuration.Binder`. - ([#2295](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/2295)) +* Update OpenTelemetry SDK version to `1.10.0` and removed the direct reference + to `Microsoft.Extensions.Configuration.Binder`. + ([#2295](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/2295), + [#2317](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/2317)) ## 1.9.3 diff --git a/src/OpenTelemetry.Exporter.OneCollector/OpenTelemetry.Exporter.OneCollector.csproj b/src/OpenTelemetry.Exporter.OneCollector/OpenTelemetry.Exporter.OneCollector.csproj index c8d10cef7d..9057a060ab 100644 --- a/src/OpenTelemetry.Exporter.OneCollector/OpenTelemetry.Exporter.OneCollector.csproj +++ b/src/OpenTelemetry.Exporter.OneCollector/OpenTelemetry.Exporter.OneCollector.csproj @@ -18,7 +18,7 @@ - $(OpenTelemetryCoreLatestPrereleaseVersion) + $(OpenTelemetryCoreLatestVersion) $(DefineConstants);EXPOSE_EXPERIMENTAL_FEATURES diff --git a/src/OpenTelemetry.Exporter.Stackdriver/CHANGELOG.md b/src/OpenTelemetry.Exporter.Stackdriver/CHANGELOG.md index 5028755fcd..7ffc98164d 100644 --- a/src/OpenTelemetry.Exporter.Stackdriver/CHANGELOG.md +++ b/src/OpenTelemetry.Exporter.Stackdriver/CHANGELOG.md @@ -2,9 +2,6 @@ ## Unreleased -* Updated OpenTelemetry core component version(s) to `1.9.0`. - ([#1888](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/1888)) - * Drop support for .NET 6 as this target is no longer supported and add .NET Standard 2.0 target. ([#2127](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/2127)) @@ -14,6 +11,9 @@ * Google.Cloud.Trace.V2 3.3.0 -> 3.5.0 ([#2127](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/2127)) +* Updated OpenTelemetry core component version(s) to `1.10.0`. + ([#2317](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/2317)) + ## 1.0.0-beta.6 Released 2024-Apr-22 diff --git a/src/OpenTelemetry.Extensions.AWS/.publicApi/PublicAPI.Unshipped.txt b/src/OpenTelemetry.Extensions.AWS/.publicApi/PublicAPI.Unshipped.txt index a7a1588b77..cc69db22ab 100644 --- a/src/OpenTelemetry.Extensions.AWS/.publicApi/PublicAPI.Unshipped.txt +++ b/src/OpenTelemetry.Extensions.AWS/.publicApi/PublicAPI.Unshipped.txt @@ -2,7 +2,7 @@ OpenTelemetry.Extensions.AWS.AWSXRayIdGenerator OpenTelemetry.Extensions.AWS.Trace.AWSXRayPropagator OpenTelemetry.Extensions.AWS.Trace.AWSXRayPropagator.AWSXRayPropagator() -> void OpenTelemetry.Trace.TracerProviderBuilderExtensions -override OpenTelemetry.Extensions.AWS.Trace.AWSXRayPropagator.Extract(OpenTelemetry.Context.Propagation.PropagationContext context, T carrier, System.Func!>! getter) -> OpenTelemetry.Context.Propagation.PropagationContext +override OpenTelemetry.Extensions.AWS.Trace.AWSXRayPropagator.Extract(OpenTelemetry.Context.Propagation.PropagationContext context, T carrier, System.Func?>! getter) -> OpenTelemetry.Context.Propagation.PropagationContext override OpenTelemetry.Extensions.AWS.Trace.AWSXRayPropagator.Fields.get -> System.Collections.Generic.ISet! override OpenTelemetry.Extensions.AWS.Trace.AWSXRayPropagator.Inject(OpenTelemetry.Context.Propagation.PropagationContext context, T carrier, System.Action! setter) -> void static OpenTelemetry.Trace.TracerProviderBuilderExtensions.AddXRayTraceId(this OpenTelemetry.Trace.TracerProviderBuilder! builder) -> OpenTelemetry.Trace.TracerProviderBuilder! diff --git a/src/OpenTelemetry.Extensions.AWS/CHANGELOG.md b/src/OpenTelemetry.Extensions.AWS/CHANGELOG.md index 90a29a6b95..472b28d538 100644 --- a/src/OpenTelemetry.Extensions.AWS/CHANGELOG.md +++ b/src/OpenTelemetry.Extensions.AWS/CHANGELOG.md @@ -8,6 +8,9 @@ * Removed the unused `System.Text.Json` reference. ([#2209](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/2209)) +* Updated OpenTelemetry core component version(s) to `1.10.0`. + ([#2317](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/2317)) + ## 1.3.0-beta.2 Released 2024-Sep-24 diff --git a/src/OpenTelemetry.Extensions.AWS/Trace/AWSXRayPropagator.cs b/src/OpenTelemetry.Extensions.AWS/Trace/AWSXRayPropagator.cs index 8927b136f7..bad3b9a9d6 100644 --- a/src/OpenTelemetry.Extensions.AWS/Trace/AWSXRayPropagator.cs +++ b/src/OpenTelemetry.Extensions.AWS/Trace/AWSXRayPropagator.cs @@ -38,7 +38,7 @@ public class AWSXRayPropagator : TextMapPropagator public override ISet Fields => new HashSet() { AWSXRayTraceHeaderKey }; /// - public override PropagationContext Extract(PropagationContext context, T carrier, Func> getter) + public override PropagationContext Extract(PropagationContext context, T carrier, Func?> getter) { if (context.ActivityContext.IsValid()) { diff --git a/src/OpenTelemetry.Extensions.Enrichment/CHANGELOG.md b/src/OpenTelemetry.Extensions.Enrichment/CHANGELOG.md index a00f3d58cf..d29aa9b9ed 100644 --- a/src/OpenTelemetry.Extensions.Enrichment/CHANGELOG.md +++ b/src/OpenTelemetry.Extensions.Enrichment/CHANGELOG.md @@ -5,8 +5,8 @@ * Make Extensions.Enrichment AoT compatible. ([#1541](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/1541)) -* Updated OpenTelemetry core component version(s) to `1.9.0`. - ([#1888](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/1888)) - * Drop support for .NET 6 as this target is no longer supported. ([#2126](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/2126)) + +* Updated OpenTelemetry core component version(s) to `1.10.0`. + ([#2317](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/2317)) diff --git a/src/OpenTelemetry.Extensions/CHANGELOG.md b/src/OpenTelemetry.Extensions/CHANGELOG.md index e382789b8d..a0848e428f 100644 --- a/src/OpenTelemetry.Extensions/CHANGELOG.md +++ b/src/OpenTelemetry.Extensions/CHANGELOG.md @@ -8,9 +8,6 @@ * Update BaggageActivityProcessor to require baggage key predicate. ([#1816](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/1816)) -* Updated OpenTelemetry core component version(s) to `1.9.0`. - ([#1888](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/1888)) - * Added rate limiting sampler which limits the number of traces to the specified rate per second. For details see [RateLimitingSampler](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/tree/main/src/OpenTelemetry.Extensions#ratelimitingsampler). @@ -19,6 +16,9 @@ rate per second. For details see * Drop support for .NET 6 as this target is no longer supported and add .NET 8 target. ([#2124](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/2124)) +* Updated OpenTelemetry core component version(s) to `1.10.0`. + ([#2317](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/2317)) + ## 1.0.0-beta.5 Released 2024-May-08 diff --git a/src/OpenTelemetry.Extensions/Internal/ActivityEventAttachingLogProcessor.cs b/src/OpenTelemetry.Extensions/Internal/ActivityEventAttachingLogProcessor.cs index fbd1737966..0c2c7dd059 100644 --- a/src/OpenTelemetry.Extensions/Internal/ActivityEventAttachingLogProcessor.cs +++ b/src/OpenTelemetry.Extensions/Internal/ActivityEventAttachingLogProcessor.cs @@ -3,7 +3,6 @@ using System.Diagnostics; using OpenTelemetry.Internal; -using OpenTelemetry.Trace; namespace OpenTelemetry.Logs; @@ -88,7 +87,7 @@ public override void OnEnd(LogRecord data) if (data.Exception != null) { - activity.RecordException(data.Exception); + activity.AddException(data.Exception); } } } diff --git a/src/OpenTelemetry.Instrumentation.AWS/Implementation/Tracing/AWSTraceSpan.cs b/src/OpenTelemetry.Instrumentation.AWS/Implementation/Tracing/AWSTraceSpan.cs index 4e1e494b35..a825155d7f 100644 --- a/src/OpenTelemetry.Instrumentation.AWS/Implementation/Tracing/AWSTraceSpan.cs +++ b/src/OpenTelemetry.Instrumentation.AWS/Implementation/Tracing/AWSTraceSpan.cs @@ -59,8 +59,10 @@ public override void RecordException(Exception exception, Attributes? attributes var tags = attributes != null ? new TagList(attributes.AllAttributes.ToArray()) : default; - this.activity.RecordException(exception, tags); + this.activity.AddException(exception, tags); +#pragma warning disable CS0618 // Type or member is obsolete this.activity.SetStatus(Status.Error.WithDescription(exception.Message)); +#pragma warning restore CS0618 // Type or member is obsolete } public override void End() diff --git a/src/OpenTelemetry.Instrumentation.AWSLambda/AWSLambdaWrapper.cs b/src/OpenTelemetry.Instrumentation.AWSLambda/AWSLambdaWrapper.cs index 9ba0410d08..ab5930feec 100644 --- a/src/OpenTelemetry.Instrumentation.AWSLambda/AWSLambdaWrapper.cs +++ b/src/OpenTelemetry.Instrumentation.AWSLambda/AWSLambdaWrapper.cs @@ -191,8 +191,10 @@ private static void OnException(Activity? activity, Exception exception) { if (activity.IsAllDataRequested) { - activity.RecordException(exception); + activity.AddException(exception); +#pragma warning disable CS0618 // Type or member is obsolete activity.SetStatus(Status.Error.WithDescription(exception.Message)); +#pragma warning restore CS0618 // Type or member is obsolete } } } diff --git a/src/OpenTelemetry.Instrumentation.AspNet.TelemetryHttpModule/CHANGELOG.md b/src/OpenTelemetry.Instrumentation.AspNet.TelemetryHttpModule/CHANGELOG.md index 204d68c917..21b04d012c 100644 --- a/src/OpenTelemetry.Instrumentation.AspNet.TelemetryHttpModule/CHANGELOG.md +++ b/src/OpenTelemetry.Instrumentation.AspNet.TelemetryHttpModule/CHANGELOG.md @@ -10,6 +10,9 @@ implementations](https://github.com/open-telemetry/opentelemetry-dotnet/tree/main/docs/trace/extending-the-sdk#sampler). ([#1871](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/1871)) +* Updated OpenTelemetry core component version(s) to `1.10.0`. + ([#2317](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/2317)) + ## 1.9.0-beta.1 Released 2024-Jun-18 diff --git a/src/OpenTelemetry.Instrumentation.AspNet/CHANGELOG.md b/src/OpenTelemetry.Instrumentation.AspNet/CHANGELOG.md index 19a6894f61..316b980d59 100644 --- a/src/OpenTelemetry.Instrumentation.AspNet/CHANGELOG.md +++ b/src/OpenTelemetry.Instrumentation.AspNet/CHANGELOG.md @@ -6,6 +6,9 @@ `IConfiguration`. ([#1976](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/1976)) +* Updated OpenTelemetry core component version(s) to `1.10.0`. + ([#2317](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/2317)) + ## 1.9.0-beta.1 Released 2024-Jun-18 @@ -44,9 +47,11 @@ Released 2024-Apr-05 * **Breaking Change**: Renamed `AspNetInstrumentationOptions` to `AspNetTraceInstrumentationOptions`. ([#1604](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/1604)) + * **Breaking Change**: `server.address` and `server.port` no longer added for `http.server.request.duration` metric. ([#1606](https://github.com/open-telemetry/opentelemetry-dotnet/pull/1606)) + * **Breaking change** Spans names and attributes will be set as per [HTTP semantic convention v1.24.0](https://github.com/open-telemetry/semantic-conventions/blob/v1.24.0/docs/http/http-spans.md): * span names follows: `{HTTP method} [route name if available]` pattern @@ -62,6 +67,7 @@ Released 2024-Apr-05 * `url.scheme` added with `http` or `https` value, * `user_agent.original` replaces `http.user_agent`. ([#1607](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/1607)) + * `ActivitySource.Version` is set to NuGet package version. ([#1624](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/1624)) @@ -252,6 +258,7 @@ Released 2021-Mar-19 and ActivityProcessors. Samplers, ActivityProcessor.OnStart will now get the Activity before any enrichment done by the instrumentation. ([#1836](https://github.com/open-telemetry/opentelemetry-dotnet/pull/1836)) + * Performance optimization by leveraging sampling decision and short circuiting activity enrichment. ([#1903](https://github.com/open-telemetry/opentelemetry-dotnet/pull/1903)) @@ -276,8 +283,10 @@ Released 2020-Nov-5 CompositeTextMapPropagator. IPropagator is renamed to TextMapPropagator and changed from interface to abstract class. ([#1427](https://github.com/open-telemetry/opentelemetry-dotnet/pull/1427)) + * Propagators.DefaultTextMapPropagator will be used as the default Propagator. ([#1427](https://github.com/open-telemetry/opentelemetry-dotnet/pull/1428)) + * Removed Propagator from Instrumentation Options. Instrumentation now always respect the Propagator.DefaultTextMapPropagator. ([#1448](https://github.com/open-telemetry/opentelemetry-dotnet/pull/1448)) @@ -290,6 +299,7 @@ Released 2020-Oct-16 Activity.CustomProperty. To enrich activity, use the Enrich action on the instrumentation. ([#1261](https://github.com/open-telemetry/opentelemetry-dotnet/pull/1261)) + * Span Status is populated as per new spec ([#1313](https://github.com/open-telemetry/opentelemetry-dotnet/pull/1313)) @@ -313,6 +323,7 @@ Released 2020-08-28 BaggageFormat)`. Baggage sent via the [W3C Baggage](https://github.com/w3c/baggage/blob/master/baggage/HTTP_HEADER_FORMAT.md) header will now be parsed and set on incoming Http spans. + * Renamed `ITextPropagator` to `IPropagator` ([#1190](https://github.com/open-telemetry/opentelemetry-dotnet/pull/1190)) diff --git a/src/OpenTelemetry.Instrumentation.AspNet/Implementation/HttpInListener.cs b/src/OpenTelemetry.Instrumentation.AspNet/Implementation/HttpInListener.cs index f038d522b6..03f5751a34 100644 --- a/src/OpenTelemetry.Instrumentation.AspNet/Implementation/HttpInListener.cs +++ b/src/OpenTelemetry.Instrumentation.AspNet/Implementation/HttpInListener.cs @@ -146,7 +146,7 @@ private void OnException(Activity activity, HttpContext context, Exception excep { if (this.options.RecordException) { - activity.RecordException(exception); + activity.AddException(exception); } activity.SetStatus(ActivityStatusCode.Error, exception.Message); diff --git a/src/OpenTelemetry.Instrumentation.AspNetCore/CHANGELOG.md b/src/OpenTelemetry.Instrumentation.AspNetCore/CHANGELOG.md index be111b2388..eb7c0d907b 100644 --- a/src/OpenTelemetry.Instrumentation.AspNetCore/CHANGELOG.md +++ b/src/OpenTelemetry.Instrumentation.AspNetCore/CHANGELOG.md @@ -5,6 +5,9 @@ * Drop support for .NET 6 as this target is no longer supported. ([#2138](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/2138)) +* Updated OpenTelemetry core component version(s) to `1.10.0`. + ([#2317](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/2317)) + ## 1.9.0 Released 2024-Jun-17 diff --git a/src/OpenTelemetry.Instrumentation.AspNetCore/Implementation/HttpInListener.cs b/src/OpenTelemetry.Instrumentation.AspNetCore/Implementation/HttpInListener.cs index 26eafb164d..5ac36618e3 100644 --- a/src/OpenTelemetry.Instrumentation.AspNetCore/Implementation/HttpInListener.cs +++ b/src/OpenTelemetry.Instrumentation.AspNetCore/Implementation/HttpInListener.cs @@ -320,7 +320,7 @@ public void OnException(Activity activity, object? payload) if (this.options.RecordException) { - activity.RecordException(exc); + activity.AddException(exc); } activity.SetStatus(ActivityStatusCode.Error); diff --git a/src/OpenTelemetry.Instrumentation.Cassandra/CHANGELOG.md b/src/OpenTelemetry.Instrumentation.Cassandra/CHANGELOG.md index 25b73d906b..480fbf3dc3 100644 --- a/src/OpenTelemetry.Instrumentation.Cassandra/CHANGELOG.md +++ b/src/OpenTelemetry.Instrumentation.Cassandra/CHANGELOG.md @@ -2,6 +2,9 @@ ## Unreleased +* Updated OpenTelemetry core component version(s) to `1.10.0`. + ([#2317](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/2317)) + ## 1.0.0-beta.2 Released 2024-Oct-02 diff --git a/src/OpenTelemetry.Instrumentation.ConfluentKafka/CHANGELOG.md b/src/OpenTelemetry.Instrumentation.ConfluentKafka/CHANGELOG.md index 932234cb6e..cfa2dcb4f8 100644 --- a/src/OpenTelemetry.Instrumentation.ConfluentKafka/CHANGELOG.md +++ b/src/OpenTelemetry.Instrumentation.ConfluentKafka/CHANGELOG.md @@ -6,6 +6,9 @@ and add .NET Standard 2.0 target. ([#2142](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/2142)) +* Updated OpenTelemetry core component version(s) to `1.10.0`. + ([#2317](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/2317)) + ## 0.1.0-alpha.2 Released 2024-Sep-18 diff --git a/src/OpenTelemetry.Instrumentation.ConfluentKafka/OpenTelemetryConsumeResultExtensions.cs b/src/OpenTelemetry.Instrumentation.ConfluentKafka/OpenTelemetryConsumeResultExtensions.cs index 5e302b50c6..c1d650e2aa 100644 --- a/src/OpenTelemetry.Instrumentation.ConfluentKafka/OpenTelemetryConsumeResultExtensions.cs +++ b/src/OpenTelemetry.Instrumentation.ConfluentKafka/OpenTelemetryConsumeResultExtensions.cs @@ -113,7 +113,9 @@ public static bool TryExtractPropagationContext( } catch (Exception ex) { +#pragma warning disable CS0618 // Type or member is obsolete processActivity?.SetStatus(Status.Error); +#pragma warning restore CS0618 // Type or member is obsolete processActivity?.SetTag(SemanticConventions.AttributeErrorType, ex.GetType().FullName); } finally diff --git a/src/OpenTelemetry.Instrumentation.ElasticsearchClient/CHANGELOG.md b/src/OpenTelemetry.Instrumentation.ElasticsearchClient/CHANGELOG.md index 5d444bb333..360b855a70 100644 --- a/src/OpenTelemetry.Instrumentation.ElasticsearchClient/CHANGELOG.md +++ b/src/OpenTelemetry.Instrumentation.ElasticsearchClient/CHANGELOG.md @@ -12,14 +12,14 @@ Redact `username` and `password` part of the `url.full`. ([#1684](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/1684)) -* Updated OpenTelemetry core component version(s) to `1.9.0`. - ([#1888](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/1888)) - * Lowered the `System.Text.Json` reference to `4.7.2` for `net462` and `netstandard2.0` targets in response to [CVE-2024-43485](https://msrc.microsoft.com/update-guide/vulnerability/CVE-2024-43485). ([#2198](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/2198)) +* Updated OpenTelemetry core component version(s) to `1.10.0`. + ([#2317](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/2317)) + ## 1.0.0-beta.5 Released 2023-Oct-24 diff --git a/src/OpenTelemetry.Instrumentation.ElasticsearchClient/Implementation/ElasticsearchRequestPipelineDiagnosticListener.cs b/src/OpenTelemetry.Instrumentation.ElasticsearchClient/Implementation/ElasticsearchRequestPipelineDiagnosticListener.cs index 5f57879521..4f927fbd45 100644 --- a/src/OpenTelemetry.Instrumentation.ElasticsearchClient/Implementation/ElasticsearchRequestPipelineDiagnosticListener.cs +++ b/src/OpenTelemetry.Instrumentation.ElasticsearchClient/Implementation/ElasticsearchRequestPipelineDiagnosticListener.cs @@ -254,27 +254,27 @@ private void OnStopActivity(Activity activity, object? payload) var failureReason = this.failureReasonFetcher.Fetch(originalException); if (failureReason != null) { - activity.SetStatus(Status.Error.WithDescription($"{failureReason} {originalException.Message}")); + activity.SetStatus(ActivityStatusCode.Error, description: $"{failureReason} {originalException.Message}"); } var responseBody = this.responseBodyFetcher.Fetch(payload); if (responseBody != null && responseBody.Length > 0) { var response = Encoding.UTF8.GetString(responseBody); - activity.SetStatus(Status.Error.WithDescription($"{failureReason} {originalException.Message}\r\n{response}")); + activity.SetStatus(ActivityStatusCode.Error, description: $"{failureReason} {originalException.Message}\r\n{response}"); } if (originalException is HttpRequestException) { if (originalException.InnerException is SocketException { SocketErrorCode: SocketError.HostNotFound }) { - activity.SetStatus(Status.Error.WithDescription(originalException.Message)); + activity.SetStatus(ActivityStatusCode.Error, description: originalException.Message); return; } if (originalException.InnerException != null) { - activity.SetStatus(Status.Error.WithDescription(originalException.Message)); + activity.SetStatus(ActivityStatusCode.Error, description: originalException.Message); } } } diff --git a/src/OpenTelemetry.Instrumentation.EntityFrameworkCore/CHANGELOG.md b/src/OpenTelemetry.Instrumentation.EntityFrameworkCore/CHANGELOG.md index 2c8fc2c1de..0522374f01 100644 --- a/src/OpenTelemetry.Instrumentation.EntityFrameworkCore/CHANGELOG.md +++ b/src/OpenTelemetry.Instrumentation.EntityFrameworkCore/CHANGELOG.md @@ -24,6 +24,9 @@ [spans](https://github.com/open-telemetry/semantic-conventions/blob/v1.28.0/docs/database/database-spans.md). ([#2130](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/2130)) +* Updated OpenTelemetry core component version(s) to `1.10.0`. + ([#2317](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/2317)) + ## 1.0.0-beta.12 Released 2024-Jun-18 diff --git a/src/OpenTelemetry.Instrumentation.EntityFrameworkCore/Implementation/EntityFrameworkDiagnosticListener.cs b/src/OpenTelemetry.Instrumentation.EntityFrameworkCore/Implementation/EntityFrameworkDiagnosticListener.cs index 322c35c587..ef526d8c74 100644 --- a/src/OpenTelemetry.Instrumentation.EntityFrameworkCore/Implementation/EntityFrameworkDiagnosticListener.cs +++ b/src/OpenTelemetry.Instrumentation.EntityFrameworkCore/Implementation/EntityFrameworkDiagnosticListener.cs @@ -295,7 +295,9 @@ public override void OnEventWritten(string name, object? payload) { if (this.exceptionFetcher.Fetch(payload) is Exception exception) { +#pragma warning disable CS0618 // Type or member is obsolete activity.SetStatus(Status.Error.WithDescription(exception.Message)); +#pragma warning restore CS0618 // Type or member is obsolete } else { diff --git a/src/OpenTelemetry.Instrumentation.EventCounters/CHANGELOG.md b/src/OpenTelemetry.Instrumentation.EventCounters/CHANGELOG.md index 256a6c645b..0a2aa7b9c4 100644 --- a/src/OpenTelemetry.Instrumentation.EventCounters/CHANGELOG.md +++ b/src/OpenTelemetry.Instrumentation.EventCounters/CHANGELOG.md @@ -5,8 +5,8 @@ * `Meter.Version` is set to NuGet package version. ([#1624](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/1624)) -* Updated OpenTelemetry core component version(s) to `1.9.0`. - ([#1888](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/1888)) +* Updated OpenTelemetry core component version(s) to `1.10.0`. + ([#2317](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/2317)) ## 1.5.1-alpha.1 diff --git a/src/OpenTelemetry.Instrumentation.GrpcCore/CHANGELOG.md b/src/OpenTelemetry.Instrumentation.GrpcCore/CHANGELOG.md index 70c54522c2..78e27daa5f 100644 --- a/src/OpenTelemetry.Instrumentation.GrpcCore/CHANGELOG.md +++ b/src/OpenTelemetry.Instrumentation.GrpcCore/CHANGELOG.md @@ -2,12 +2,13 @@ ## Unreleased -* Updated OpenTelemetry core component version(s) to `1.9.0`. - ([#1888](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/1888)) * Updated minimal supported version of `Grpc.Core.Api` to `2.46.6`. ([#1936](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/1936), [#1940](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/1940)) +* Updated OpenTelemetry core component version(s) to `1.10.0`. + ([#2317](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/2317)) + ## 1.0.0-beta.6 Released 2024-May-21 diff --git a/src/OpenTelemetry.Instrumentation.GrpcCore/RpcScope.cs b/src/OpenTelemetry.Instrumentation.GrpcCore/RpcScope.cs index 24571bacb6..23bc198e72 100644 --- a/src/OpenTelemetry.Instrumentation.GrpcCore/RpcScope.cs +++ b/src/OpenTelemetry.Instrumentation.GrpcCore/RpcScope.cs @@ -218,7 +218,7 @@ private void StopActivity(Exception exception) if (this.activity!.IsAllDataRequested && this.recordException) { - this.activity.RecordException(exception); + this.activity.AddException(exception); } this.StopActivity((int)grpcStatusCode, markAsCompleted: false); diff --git a/src/OpenTelemetry.Instrumentation.GrpcNetClient/CHANGELOG.md b/src/OpenTelemetry.Instrumentation.GrpcNetClient/CHANGELOG.md index ab16d3d6d2..ce1cb42da1 100644 --- a/src/OpenTelemetry.Instrumentation.GrpcNetClient/CHANGELOG.md +++ b/src/OpenTelemetry.Instrumentation.GrpcNetClient/CHANGELOG.md @@ -5,6 +5,9 @@ * Drop support for .NET 6 as this target is no longer supported. ([#2150](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/2150)) +* Updated OpenTelemetry core component version(s) to `1.10.0`. + ([#2317](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/2317)) + ## 1.9.0-beta.1 Released 2024-Jun-17 diff --git a/src/OpenTelemetry.Instrumentation.Hangfire/CHANGELOG.md b/src/OpenTelemetry.Instrumentation.Hangfire/CHANGELOG.md index 55724ff852..682addf2e2 100644 --- a/src/OpenTelemetry.Instrumentation.Hangfire/CHANGELOG.md +++ b/src/OpenTelemetry.Instrumentation.Hangfire/CHANGELOG.md @@ -2,6 +2,9 @@ ## Unreleased +* Updated OpenTelemetry core component version(s) to `1.10.0`. + ([#2317](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/2317)) + ## 1.9.0-beta.1 Released 2024-Oct-02 diff --git a/src/OpenTelemetry.Instrumentation.Hangfire/Implementation/HangfireInstrumentationJobFilterAttribute.cs b/src/OpenTelemetry.Instrumentation.Hangfire/Implementation/HangfireInstrumentationJobFilterAttribute.cs index 0f0afaaa2a..df367de5d3 100644 --- a/src/OpenTelemetry.Instrumentation.Hangfire/Implementation/HangfireInstrumentationJobFilterAttribute.cs +++ b/src/OpenTelemetry.Instrumentation.Hangfire/Implementation/HangfireInstrumentationJobFilterAttribute.cs @@ -131,7 +131,7 @@ private void SetStatusAndRecordException(Activity activity, Exception exception) if (this.options.RecordException) { - activity.RecordException(exception); + activity.AddException(exception); } } } diff --git a/src/OpenTelemetry.Instrumentation.Http/CHANGELOG.md b/src/OpenTelemetry.Instrumentation.Http/CHANGELOG.md index 77f97966fd..beb4f6db93 100644 --- a/src/OpenTelemetry.Instrumentation.Http/CHANGELOG.md +++ b/src/OpenTelemetry.Instrumentation.Http/CHANGELOG.md @@ -5,6 +5,9 @@ * Drop support for .NET 6 as this target is no longer supported. ([#2152](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/2152)) +* Updated OpenTelemetry core component version(s) to `1.10.0`. + ([#2317](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/2317)) + ## 1.9.0 Released 2024-Jun-17 diff --git a/src/OpenTelemetry.Instrumentation.Http/Implementation/HttpHandlerDiagnosticListener.cs b/src/OpenTelemetry.Instrumentation.Http/Implementation/HttpHandlerDiagnosticListener.cs index 5b65c673d0..f7b98fac07 100644 --- a/src/OpenTelemetry.Instrumentation.Http/Implementation/HttpHandlerDiagnosticListener.cs +++ b/src/OpenTelemetry.Instrumentation.Http/Implementation/HttpHandlerDiagnosticListener.cs @@ -266,7 +266,7 @@ public void OnException(Activity activity, object? payload) if (this.options.RecordException) { - activity.RecordException(exc); + activity.AddException(exc); } if (exc is HttpRequestException) diff --git a/src/OpenTelemetry.Instrumentation.Http/Implementation/HttpWebRequestActivitySource.netfx.cs b/src/OpenTelemetry.Instrumentation.Http/Implementation/HttpWebRequestActivitySource.netfx.cs index 7f8ba01066..df48fd4807 100644 --- a/src/OpenTelemetry.Instrumentation.Http/Implementation/HttpWebRequestActivitySource.netfx.cs +++ b/src/OpenTelemetry.Instrumentation.Http/Implementation/HttpWebRequestActivitySource.netfx.cs @@ -178,7 +178,7 @@ private static void AddExceptionEvent(Exception exception, Activity activity) if (TracingOptions.RecordException) { - activity.RecordException(exception); + activity.AddException(exception); } try diff --git a/src/OpenTelemetry.Instrumentation.Owin/CHANGELOG.md b/src/OpenTelemetry.Instrumentation.Owin/CHANGELOG.md index e775f6e7b8..956886a70b 100644 --- a/src/OpenTelemetry.Instrumentation.Owin/CHANGELOG.md +++ b/src/OpenTelemetry.Instrumentation.Owin/CHANGELOG.md @@ -7,9 +7,6 @@ attribute schema. ([#2028](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/2028)) -* Updated OpenTelemetry core component version(s) to `1.9.0`. - ([#1888](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/1888)) - * Updated registration extension code to retrieve environment variables through `IConfiguration`. ([#1973](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/1973)) @@ -19,6 +16,9 @@ `OpenTelemetry` (SDK) package. ([#1977](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/1977)) +* Updated OpenTelemetry core component version(s) to `1.10.0`. + ([#2317](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/2317)) + ## 1.0.0-rc.6 Released 2024-Apr-19 diff --git a/src/OpenTelemetry.Instrumentation.Owin/Implementation/DiagnosticsMiddleware.cs b/src/OpenTelemetry.Instrumentation.Owin/Implementation/DiagnosticsMiddleware.cs index 56092245f4..bc509a794d 100644 --- a/src/OpenTelemetry.Instrumentation.Owin/Implementation/DiagnosticsMiddleware.cs +++ b/src/OpenTelemetry.Instrumentation.Owin/Implementation/DiagnosticsMiddleware.cs @@ -150,14 +150,16 @@ private static void RequestEnd(IOwinContext owinContext, Exception? exception, l if (exception != null) { +#pragma warning disable CS0618 // Type or member is obsolete activity.SetStatus(Status.Error); +#pragma warning restore CS0618 // Type or member is obsolete if (OwinInstrumentationActivitySource.Options?.RecordException == true) { - activity.RecordException(exception); + activity.AddException(exception); } } - else if (activity.GetStatus().StatusCode == StatusCode.Unset) + else if (activity.Status == ActivityStatusCode.Unset) { activity.SetStatus(SpanHelper.ResolveActivityStatusForHttpStatusCode(activity.Kind, response.StatusCode)); } diff --git a/src/OpenTelemetry.Instrumentation.Process/CHANGELOG.md b/src/OpenTelemetry.Instrumentation.Process/CHANGELOG.md index bde93ea437..5d53d76d65 100644 --- a/src/OpenTelemetry.Instrumentation.Process/CHANGELOG.md +++ b/src/OpenTelemetry.Instrumentation.Process/CHANGELOG.md @@ -2,6 +2,9 @@ ## Unreleased +* Updated OpenTelemetry core component version(s) to `1.10.0`. + ([#2317](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/2317)) + ## 0.5.0-beta.7 Released 2024-Sep-25 diff --git a/src/OpenTelemetry.Instrumentation.Quartz/CHANGELOG.md b/src/OpenTelemetry.Instrumentation.Quartz/CHANGELOG.md index 3aa58ef9ce..f9ad69cdbf 100644 --- a/src/OpenTelemetry.Instrumentation.Quartz/CHANGELOG.md +++ b/src/OpenTelemetry.Instrumentation.Quartz/CHANGELOG.md @@ -2,6 +2,9 @@ ## Unreleased +* Updated OpenTelemetry core component version(s) to `1.10.0`. + ([#2317](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/2317)) + ## 1.0.0-beta.3 Released 2024-Jun-18 diff --git a/src/OpenTelemetry.Instrumentation.Quartz/Implementation/QuartzDiagnosticListener.cs b/src/OpenTelemetry.Instrumentation.Quartz/Implementation/QuartzDiagnosticListener.cs index 9f390287d9..242df493f5 100644 --- a/src/OpenTelemetry.Instrumentation.Quartz/Implementation/QuartzDiagnosticListener.cs +++ b/src/OpenTelemetry.Instrumentation.Quartz/Implementation/QuartzDiagnosticListener.cs @@ -137,10 +137,12 @@ private void OnException(Activity activity, object? payload) if (this.options.RecordException) { - activity.RecordException(exc); + activity.AddException(exc); } +#pragma warning disable CS0618 // Type or member is obsolete activity.SetStatus(Status.Error.WithDescription(exc.Message)); +#pragma warning restore CS0618 // Type or member is obsolete try { diff --git a/src/OpenTelemetry.Instrumentation.Runtime/CHANGELOG.md b/src/OpenTelemetry.Instrumentation.Runtime/CHANGELOG.md index 1f71e065ef..069bc27ee2 100644 --- a/src/OpenTelemetry.Instrumentation.Runtime/CHANGELOG.md +++ b/src/OpenTelemetry.Instrumentation.Runtime/CHANGELOG.md @@ -5,6 +5,9 @@ * Drop support for .NET 6 as this target is no longer supported and add .NET 8 target. ([#2155](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/2155)) +* Updated OpenTelemetry core component version(s) to `1.10.0`. + ([#2317](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/2317)) + ## 1.9.0 Released 2024-Jun-18 diff --git a/src/OpenTelemetry.Instrumentation.SqlClient/CHANGELOG.md b/src/OpenTelemetry.Instrumentation.SqlClient/CHANGELOG.md index d69cfbd959..244489dff9 100644 --- a/src/OpenTelemetry.Instrumentation.SqlClient/CHANGELOG.md +++ b/src/OpenTelemetry.Instrumentation.SqlClient/CHANGELOG.md @@ -4,6 +4,7 @@ * Drop support for .NET 6 as this target is no longer supported. ([#2159](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/2159)) + * The new database semantic conventions can be opted in to by setting the `OTEL_SEMCONV_STABILITY_OPT_IN` environment variable. This allows for a transition period for users to experiment with the new semantic conventions @@ -28,26 +29,34 @@ [#2277](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/2277), [#2262](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/2262), [#2279](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/2279)) + * **Breaking change**: The `peer.service` and `server.socket.address` attributes are no longer emitted. Users should rely on the `server.address` attribute for the same information. Note that `server.address` is only included when the `EnableConnectionLevelAttributes` option is enabled. ([#2229](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/2229)) + * **Breaking change**: When `EnableConnectionLevelAttributes` is enabled, the `server.port` attribute will now be written as an integer to be compliant with the [semantic conventions](https://github.com/open-telemetry/semantic-conventions/blob/main/docs/attributes-registry/server.md). Previously, it was written as a string. ([#2233](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/2233)) + * The `EnableConnectionLevelAttributes` option is now enabled by default. ([#2249](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/2249)) + * The following attributes are now provided when starting an activity for a database call: `db.system`, `db.name` (old conventions), `db.namespace` (new conventions), `server.address`, and `server.port`. These attributes are now available for sampling decisions. ([#2277](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/2277)) + * **Breaking change**: The `SetDbStatementForStoredProcedure` option has been removed. ([#TBD](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/TBD)) +* Updated OpenTelemetry core component version(s) to `1.10.0`. + ([#2317](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/2317)) + ## 1.9.0-beta.1 Released 2024-Jun-17 diff --git a/src/OpenTelemetry.Instrumentation.SqlClient/Implementation/SqlClientDiagnosticListener.cs b/src/OpenTelemetry.Instrumentation.SqlClient/Implementation/SqlClientDiagnosticListener.cs index c5d234550e..1478cca3ff 100644 --- a/src/OpenTelemetry.Instrumentation.SqlClient/Implementation/SqlClientDiagnosticListener.cs +++ b/src/OpenTelemetry.Instrumentation.SqlClient/Implementation/SqlClientDiagnosticListener.cs @@ -224,7 +224,7 @@ public override void OnEventWritten(string name, object? payload) if (options.RecordException) { - activity.RecordException(exception); + activity.AddException(exception); } } else diff --git a/src/OpenTelemetry.Instrumentation.StackExchangeRedis/CHANGELOG.md b/src/OpenTelemetry.Instrumentation.StackExchangeRedis/CHANGELOG.md index 252b9bf246..e73e8e34e4 100644 --- a/src/OpenTelemetry.Instrumentation.StackExchangeRedis/CHANGELOG.md +++ b/src/OpenTelemetry.Instrumentation.StackExchangeRedis/CHANGELOG.md @@ -5,6 +5,9 @@ * Drop support for .NET 6 as this target is no longer supported and add .NET 8 target. ([#2160](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/2160)) +* Updated OpenTelemetry core component version(s) to `1.10.0`. + ([#2317](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/2317)) + ## 1.9.0-beta.1 Released 2024-Jul-23 @@ -12,6 +15,7 @@ Released 2024-Jul-23 * Add support for instrumenting `IConnectionMultiplexer` which is added with service key. ([#1885](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/1885)) + * Update `StackExchange.Redis` version to `2.6.122`, resolving warnings about [CVE-2021-24112](https://github.com/advisories/GHSA-rxg9-xrhp-64gj). ([#1961](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/1961)) diff --git a/src/OpenTelemetry.Instrumentation.Wcf/CHANGELOG.md b/src/OpenTelemetry.Instrumentation.Wcf/CHANGELOG.md index 5a8143925e..e5e4f3a2b7 100644 --- a/src/OpenTelemetry.Instrumentation.Wcf/CHANGELOG.md +++ b/src/OpenTelemetry.Instrumentation.Wcf/CHANGELOG.md @@ -5,6 +5,9 @@ * Drop support for .NET 6 as this target is no longer supported and add .NET 8 target. ([#2263](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/2263)) +* Updated OpenTelemetry core component version(s) to `1.10.0`. + ([#2317](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/2317)) + ## 1.0.0-rc.18 Released 2024-Oct-28 diff --git a/src/OpenTelemetry.Instrumentation.Wcf/Implementation/ClientChannelInstrumentation.cs b/src/OpenTelemetry.Instrumentation.Wcf/Implementation/ClientChannelInstrumentation.cs index ae569c3cf2..f6d4b58058 100644 --- a/src/OpenTelemetry.Instrumentation.Wcf/Implementation/ClientChannelInstrumentation.cs +++ b/src/OpenTelemetry.Instrumentation.Wcf/Implementation/ClientChannelInstrumentation.cs @@ -94,7 +94,9 @@ public static void AfterRequestCompleted(Message? reply, RequestTelemetryState? { if (reply == null || reply.IsFault) { +#pragma warning disable CS0618 // Type or member is obsolete activity.SetStatus(Status.Error); +#pragma warning restore CS0618 // Type or member is obsolete } if (reply != null) diff --git a/src/OpenTelemetry.Instrumentation.Wcf/Implementation/TelemetryDispatchMessageInspector.cs b/src/OpenTelemetry.Instrumentation.Wcf/Implementation/TelemetryDispatchMessageInspector.cs index 9c2c981b05..3741f0b832 100644 --- a/src/OpenTelemetry.Instrumentation.Wcf/Implementation/TelemetryDispatchMessageInspector.cs +++ b/src/OpenTelemetry.Instrumentation.Wcf/Implementation/TelemetryDispatchMessageInspector.cs @@ -123,7 +123,9 @@ public void BeforeSendReply(ref Message reply, object? correlationState) { if (reply.IsFault) { +#pragma warning disable CS0618 // Type or member is obsolete activity.SetStatus(Status.Error); +#pragma warning restore CS0618 // Type or member is obsolete } activity.SetTag(WcfInstrumentationConstants.SoapReplyActionTag, reply.Headers.Action); diff --git a/src/OpenTelemetry.Resources.AWS/CHANGELOG.md b/src/OpenTelemetry.Resources.AWS/CHANGELOG.md index 76396646ea..a7f3bdd855 100644 --- a/src/OpenTelemetry.Resources.AWS/CHANGELOG.md +++ b/src/OpenTelemetry.Resources.AWS/CHANGELOG.md @@ -2,9 +2,6 @@ ## Unreleased -* Updated OpenTelemetry core component version(s) to `1.9.0`. - ([#1888](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/1888)) - * Drop support for .NET 6 as this target is no longer supported and add .NET Standard 2.0 target. ([#2164](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/2164)) @@ -15,6 +12,9 @@ [CVE-2024-43485](https://msrc.microsoft.com/update-guide/vulnerability/CVE-2024-43485). ([#2196](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/2196)) +* Updated OpenTelemetry core component version(s) to `1.10.0`. + ([#2317](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/2317)) + ## 1.5.0-beta.1 Released 2024-Jun-04 diff --git a/src/OpenTelemetry.Resources.Azure/CHANGELOG.md b/src/OpenTelemetry.Resources.Azure/CHANGELOG.md index a8da6ce17b..882b013ea0 100644 --- a/src/OpenTelemetry.Resources.Azure/CHANGELOG.md +++ b/src/OpenTelemetry.Resources.Azure/CHANGELOG.md @@ -10,6 +10,9 @@ [CVE-2024-43485](https://msrc.microsoft.com/update-guide/vulnerability/CVE-2024-43485). ([#2198](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/2198)) +* Updated OpenTelemetry core component version(s) to `1.10.0`. + ([#2317](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/2317)) + ## 1.0.0-beta.9 Released 2024-Sep-24 diff --git a/src/OpenTelemetry.Resources.Container/CHANGELOG.md b/src/OpenTelemetry.Resources.Container/CHANGELOG.md index 85c7614e00..47ef54a9cf 100644 --- a/src/OpenTelemetry.Resources.Container/CHANGELOG.md +++ b/src/OpenTelemetry.Resources.Container/CHANGELOG.md @@ -6,6 +6,9 @@ and add .NET 8/.NET Standard 2.0 targets. ([#2166](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/2166)) +* Updated OpenTelemetry core component version(s) to `1.10.0`. + ([#2317](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/2317)) + ## 1.0.0-beta.9 Released 2024-Jun-18 diff --git a/src/OpenTelemetry.Resources.Gcp/CHANGELOG.md b/src/OpenTelemetry.Resources.Gcp/CHANGELOG.md index 3daabc8726..b072361a38 100644 --- a/src/OpenTelemetry.Resources.Gcp/CHANGELOG.md +++ b/src/OpenTelemetry.Resources.Gcp/CHANGELOG.md @@ -6,9 +6,6 @@ is accessible via `AddGcpDetector` extension method on `ResourceBuilder`. ([#1691](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/1691)) -* Updated OpenTelemetry core component version(s) to `1.9.0`. - ([#1888](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/1888)) - * Drop support for .NET 6 as this target is no longer supported and add .NET 8 target. ([#2167](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/2167)) @@ -16,3 +13,6 @@ minimum version of `8.0.5` in response to [CVE-2024-43485](https://msrc.microsoft.com/update-guide/vulnerability/CVE-2024-43485). ([#2198](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/2198)) + +* Updated OpenTelemetry core component version(s) to `1.10.0`. + ([#2317](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/2317)) diff --git a/src/OpenTelemetry.Resources.Host/CHANGELOG.md b/src/OpenTelemetry.Resources.Host/CHANGELOG.md index a07b292e58..8109eb733d 100644 --- a/src/OpenTelemetry.Resources.Host/CHANGELOG.md +++ b/src/OpenTelemetry.Resources.Host/CHANGELOG.md @@ -6,6 +6,9 @@ and add .NET 8/.NET Standard 2.0 targets. ([#2168](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/2168)) +* Updated OpenTelemetry core component version(s) to `1.10.0`. + ([#2317](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/2317)) + ## 0.1.0-beta.3 Released 2024-Aug-30 diff --git a/src/OpenTelemetry.Resources.OperatingSystem/CHANGELOG.md b/src/OpenTelemetry.Resources.OperatingSystem/CHANGELOG.md index 4775cc550e..0cc52c09fe 100644 --- a/src/OpenTelemetry.Resources.OperatingSystem/CHANGELOG.md +++ b/src/OpenTelemetry.Resources.OperatingSystem/CHANGELOG.md @@ -6,6 +6,9 @@ and add .NET 8/.NET Standard 2.0 targets. ([#2169](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/2169)) +* Updated OpenTelemetry core component version(s) to `1.10.0`. + ([#2317](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/2317)) + ## 0.1.0-alpha.4 Released 2024-Sep-09 diff --git a/src/OpenTelemetry.Resources.Process/CHANGELOG.md b/src/OpenTelemetry.Resources.Process/CHANGELOG.md index 75f0743c3c..ef692be8cd 100644 --- a/src/OpenTelemetry.Resources.Process/CHANGELOG.md +++ b/src/OpenTelemetry.Resources.Process/CHANGELOG.md @@ -6,6 +6,9 @@ and add .NET 8/.NET Standard 2.0 targets. ([#2170](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/2170)) +* Updated OpenTelemetry core component version(s) to `1.10.0`. + ([#2317](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/2317)) + ## 0.1.0-beta.3 Released 2024-Sep-25 diff --git a/src/OpenTelemetry.Resources.ProcessRuntime/CHANGELOG.md b/src/OpenTelemetry.Resources.ProcessRuntime/CHANGELOG.md index 5c820fc189..aed621d76c 100644 --- a/src/OpenTelemetry.Resources.ProcessRuntime/CHANGELOG.md +++ b/src/OpenTelemetry.Resources.ProcessRuntime/CHANGELOG.md @@ -6,6 +6,9 @@ and add .NET 8/.NET Standard 2.0 targets. ([#2171](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/2171)) +* Updated OpenTelemetry core component version(s) to `1.10.0`. + ([#2317](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/2317)) + ## 0.1.0-beta.2 Released 2024-Jun-18 diff --git a/src/OpenTelemetry.Sampler.AWS/CHANGELOG.md b/src/OpenTelemetry.Sampler.AWS/CHANGELOG.md index 1a1de86b04..6c3514b50c 100644 --- a/src/OpenTelemetry.Sampler.AWS/CHANGELOG.md +++ b/src/OpenTelemetry.Sampler.AWS/CHANGELOG.md @@ -14,6 +14,9 @@ * Removed the `System.Net.Http` package reference from all targets. ([#2197](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/2197)) +* Updated OpenTelemetry core component version(s) to `1.10.0`. + ([#2317](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/2317)) + ## 0.1.0-alpha.2 Released 2024-Sep-09 diff --git a/test/OpenTelemetry.Instrumentation.AWS.Tests/TestAWSClientInstrumentation.cs b/test/OpenTelemetry.Instrumentation.AWS.Tests/TestAWSClientInstrumentation.cs index 7d466c0cf4..62dab131ce 100644 --- a/test/OpenTelemetry.Instrumentation.AWS.Tests/TestAWSClientInstrumentation.cs +++ b/test/OpenTelemetry.Instrumentation.AWS.Tests/TestAWSClientInstrumentation.cs @@ -65,7 +65,7 @@ public async Task TestDDBScanSuccessful() this.ValidateAWSActivity(awssdk_activity, parent); this.ValidateDynamoActivityTags(awssdk_activity); - Assert.Equal(Status.Unset, awssdk_activity.GetStatus()); + Assert.Equal(ActivityStatusCode.Unset, awssdk_activity.Status); Assert.Equal(requestId, Utils.GetTagValue(awssdk_activity, "aws.request_id")); } @@ -110,7 +110,7 @@ public async Task TestDDBSubtypeScanSuccessful() this.ValidateAWSActivity(awssdk_activity, parent); this.ValidateDynamoActivityTags(awssdk_activity); - Assert.Equal(Status.Unset, awssdk_activity.GetStatus()); + Assert.Equal(ActivityStatusCode.Unset, awssdk_activity.Status); Assert.Equal(requestId, Utils.GetTagValue(awssdk_activity, "aws.request_id")); } @@ -169,7 +169,8 @@ public async Task TestDDBScanUnsuccessful() this.ValidateDynamoActivityTags(awssdk_activity); Assert.Equal(requestId, Utils.GetTagValue(awssdk_activity, "aws.request_id")); - Assert.Equal(Status.Error.WithDescription("Exception of type 'Amazon.Runtime.AmazonServiceException' was thrown."), awssdk_activity.GetStatus()); + Assert.Equal(ActivityStatusCode.Error, awssdk_activity.Status); + Assert.Equal("Exception of type 'Amazon.Runtime.AmazonServiceException' was thrown.", awssdk_activity.StatusDescription); Assert.Equal("exception", awssdk_activity.Events.First().Name); } @@ -215,7 +216,7 @@ public async Task TestSQSSendMessageSuccessful() this.ValidateAWSActivity(awssdk_activity, parent); this.ValidateSqsActivityTags(awssdk_activity); - Assert.Equal(Status.Unset, awssdk_activity.GetStatus()); + Assert.Equal(ActivityStatusCode.Unset, awssdk_activity.Status); Assert.Equal(requestId, Utils.GetTagValue(awssdk_activity, "aws.request_id")); } @@ -256,7 +257,7 @@ public async Task TestBedrockGetGuardrailSuccessful() this.ValidateAWSActivity(awssdk_activity, parent); this.ValidateBedrockActivityTags(awssdk_activity); - Assert.Equal(Status.Unset, awssdk_activity.GetStatus()); + Assert.Equal(ActivityStatusCode.Unset, awssdk_activity.Status); Assert.Equal(requestId, Utils.GetTagValue(awssdk_activity, "aws.request_id")); } @@ -297,7 +298,7 @@ public async Task TestBedrockRuntimeInvokeModelSuccessful() this.ValidateAWSActivity(awssdk_activity, parent); this.ValidateBedrockRuntimeActivityTags(awssdk_activity); - Assert.Equal(Status.Unset, awssdk_activity.GetStatus()); + Assert.Equal(ActivityStatusCode.Unset, awssdk_activity.Status); Assert.Equal(requestId, Utils.GetTagValue(awssdk_activity, "aws.request_id")); } @@ -338,7 +339,7 @@ public async Task TestBedrockAgentGetAgentSuccessful() this.ValidateAWSActivity(awssdk_activity, parent); this.ValidateBedrockAgentAgentOpsActivityTags(awssdk_activity); - Assert.Equal(Status.Unset, awssdk_activity.GetStatus()); + Assert.Equal(ActivityStatusCode.Unset, awssdk_activity.Status); Assert.Equal(requestId, Utils.GetTagValue(awssdk_activity, "aws.request_id")); } @@ -379,7 +380,7 @@ public async Task TestBedrockAgentGetKnowledgeBaseSuccessful() this.ValidateAWSActivity(awssdk_activity, parent); this.ValidateBedrockAgentKnowledgeBaseOpsActivityTags(awssdk_activity); - Assert.Equal(Status.Unset, awssdk_activity.GetStatus()); + Assert.Equal(ActivityStatusCode.Unset, awssdk_activity.Status); Assert.Equal(requestId, Utils.GetTagValue(awssdk_activity, "aws.request_id")); } @@ -420,7 +421,7 @@ public async Task TestBedrockAgentGetDataSourceSuccessful() this.ValidateAWSActivity(awssdk_activity, parent); this.ValidateBedrockAgentDataSourceOpsActivityTags(awssdk_activity); - Assert.Equal(Status.Unset, awssdk_activity.GetStatus()); + Assert.Equal(ActivityStatusCode.Unset, awssdk_activity.Status); Assert.Equal(requestId, Utils.GetTagValue(awssdk_activity, "aws.request_id")); } @@ -467,7 +468,7 @@ public async Task TestBedrockAgentRuntimeInvokeAgentSuccessful() this.ValidateAWSActivity(awssdk_activity, parent); this.ValidateBedrockAgentRuntimeAgentOpsActivityTags(awssdk_activity); - Assert.Equal(Status.Unset, awssdk_activity.GetStatus()); + Assert.Equal(ActivityStatusCode.Unset, awssdk_activity.Status); Assert.Equal(requestId, Utils.GetTagValue(awssdk_activity, "aws.request_id")); } @@ -508,7 +509,7 @@ public async Task TestBedrockAgentRuntimeRetrieveSuccessful() this.ValidateAWSActivity(awssdk_activity, parent); this.ValidateBedrockAgentRuntimeKnowledgeBaseOpsActivityTags(awssdk_activity); - Assert.Equal(Status.Unset, awssdk_activity.GetStatus()); + Assert.Equal(ActivityStatusCode.Unset, awssdk_activity.Status); Assert.Equal(requestId, Utils.GetTagValue(awssdk_activity, "aws.request_id")); } diff --git a/test/OpenTelemetry.Instrumentation.AspNet.TelemetryHttpModule.Tests/ActivityHelperTest.cs b/test/OpenTelemetry.Instrumentation.AspNet.TelemetryHttpModule.Tests/ActivityHelperTest.cs index 93d9c59ea2..18c4a538d1 100644 --- a/test/OpenTelemetry.Instrumentation.AspNet.TelemetryHttpModule.Tests/ActivityHelperTest.cs +++ b/test/OpenTelemetry.Instrumentation.AspNet.TelemetryHttpModule.Tests/ActivityHelperTest.cs @@ -550,7 +550,7 @@ private class NoopTextMapPropagator : TextMapPropagator { public override ISet? Fields => null; - public override PropagationContext Extract(PropagationContext context, T carrier, Func> getter) + public override PropagationContext Extract(PropagationContext context, T carrier, Func?> getter) { return default; } diff --git a/test/OpenTelemetry.Instrumentation.AspNetCore.Tests/BasicTests.cs b/test/OpenTelemetry.Instrumentation.AspNetCore.Tests/BasicTests.cs index 1d0ad5aa7f..abbf3148c5 100644 --- a/test/OpenTelemetry.Instrumentation.AspNetCore.Tests/BasicTests.cs +++ b/test/OpenTelemetry.Instrumentation.AspNetCore.Tests/BasicTests.cs @@ -1188,7 +1188,7 @@ private class ExtractOnlyPropagator(ActivityContext activityContext, Baggage bag public override ISet Fields => throw new NotImplementedException(); - public override PropagationContext Extract(PropagationContext context, T carrier, Func> getter) + public override PropagationContext Extract(PropagationContext context, T carrier, Func?> getter) { return new PropagationContext(this.activityContext, this.baggage); } diff --git a/test/OpenTelemetry.Instrumentation.ElasticsearchClient.Tests/ElasticsearchClientTests.cs b/test/OpenTelemetry.Instrumentation.ElasticsearchClient.Tests/ElasticsearchClientTests.cs index 5e23f346c5..95266c5528 100644 --- a/test/OpenTelemetry.Instrumentation.ElasticsearchClient.Tests/ElasticsearchClientTests.cs +++ b/test/OpenTelemetry.Instrumentation.ElasticsearchClient.Tests/ElasticsearchClientTests.cs @@ -9,7 +9,6 @@ using OpenTelemetry.Tests; using OpenTelemetry.Trace; using Xunit; -using Status = OpenTelemetry.Trace.Status; namespace OpenTelemetry.Instrumentation.ElasticsearchClient.Tests; @@ -68,7 +67,7 @@ public async Task CanCaptureGetById() Assert.NotEmpty(debugInfo); Assert.Contains("Successful (200) low level call", debugInfo); - Assert.Equal(Status.Unset, searchActivity.GetStatus()); + Assert.Equal(ActivityStatusCode.Unset, searchActivity.Status); // Assert.Equal(expectedResource, searchActivity.GetResource()); } @@ -121,7 +120,7 @@ public async Task CanCaptureGetByIdNotFound() Assert.NotEmpty(debugInfo); Assert.Contains("Successful (404) low level call", debugInfo); - Assert.Equal(Status.Unset, searchActivity.GetStatus()); + Assert.Equal(ActivityStatusCode.Error, searchActivity.Status); // Assert.Equal(expectedResource, searchActivity.GetResource()); } @@ -173,7 +172,7 @@ public async Task CanCaptureSearchCall() Assert.NotEmpty(debugInfo); Assert.Contains("Successful (200) low level call", debugInfo); - Assert.Equal(Status.Unset, searchActivity.GetStatus()); + Assert.Equal(ActivityStatusCode.Unset, searchActivity.Status); // Assert.Equal(expectedResource, searchActivity.GetResource()); } @@ -405,7 +404,7 @@ public async Task CanCaptureSearchCallWithDebugMode() Assert.NotEmpty(debugInfo); Assert.Contains("Successful (200) low level call", debugInfo); - Assert.Equal(Status.Unset, searchActivity.GetStatus()); + Assert.Equal(ActivityStatusCode.Unset, searchActivity.Status); // Assert.Equal(expectedResource, searchActivity.GetResource()); } @@ -472,7 +471,7 @@ public async Task CanCaptureSearchCallWithParseAndFormatRequestOption() }".Replace("\r\n", "\n"), debugInfo.Replace("\r\n", "\n")); - Assert.Equal(Status.Unset, searchActivity.GetStatus()); + Assert.Equal(ActivityStatusCode.Unset, searchActivity.Status); // Assert.Equal(expectedResource, searchActivity.GetResource()); } @@ -524,7 +523,7 @@ public async Task CanCaptureSearchCallWithoutDebugMode() Assert.NotEmpty(debugInfo); Assert.DoesNotContain("123", debugInfo); - Assert.Equal(Status.Unset, searchActivity.GetStatus()); + Assert.Equal(ActivityStatusCode.Unset, searchActivity.Status); // Assert.Equal(expectedResource, searchActivity.GetResource()); } @@ -576,7 +575,7 @@ public async Task CanCaptureMultipleIndiceSearchCall() Assert.NotEmpty(debugInfo); Assert.Contains("Successful (200) low level call", debugInfo); - Assert.Equal(Status.Unset, searchActivity.GetStatus()); + Assert.Equal(ActivityStatusCode.Unset, searchActivity.Status); // Assert.Equal(expectedResource, searchActivity.GetResource()); } @@ -629,8 +628,7 @@ public async Task CanCaptureElasticsearchClientException() Assert.NotEmpty(debugInfo); Assert.Contains("Unsuccessful (500) low level call", debugInfo); - var status = searchActivity.GetStatus(); - Assert.Equal(Status.Error.StatusCode, status.StatusCode); + Assert.Equal(ActivityStatusCode.Error, searchActivity.Status); // Assert.Equal(expectedResource, searchActivity.GetResource()); } @@ -682,7 +680,7 @@ public async Task CanCaptureCatRequest() Assert.NotEmpty(debugInfo); Assert.Contains("Successful (200) low level call", debugInfo); - Assert.Equal(Status.Unset, searchActivity.GetStatus()); + Assert.Equal(ActivityStatusCode.Unset, searchActivity.Status); // Assert.Equal(expectedResource, searchActivity.GetResource()); } diff --git a/test/OpenTelemetry.Instrumentation.EntityFrameworkCore.Tests/EntityFrameworkDiagnosticListenerTests.cs b/test/OpenTelemetry.Instrumentation.EntityFrameworkCore.Tests/EntityFrameworkDiagnosticListenerTests.cs index 6610d02ffd..7974ef93de 100644 --- a/test/OpenTelemetry.Instrumentation.EntityFrameworkCore.Tests/EntityFrameworkDiagnosticListenerTests.cs +++ b/test/OpenTelemetry.Instrumentation.EntityFrameworkCore.Tests/EntityFrameworkDiagnosticListenerTests.cs @@ -283,13 +283,12 @@ private static void VerifyActivityData(Activity activity, bool isError = false, if (!isError) { - Assert.Equal(Status.Unset, activity.GetStatus()); + Assert.Equal(ActivityStatusCode.Unset, activity.Status); } else { - Status status = activity.GetStatus(); - Assert.Equal(StatusCode.Error, status.StatusCode); - Assert.Equal("SQLite Error 1: 'no such table: no_table'.", status.Description); + Assert.Equal(ActivityStatusCode.Error, activity.Status); + Assert.Equal("SQLite Error 1: 'no such table: no_table'.", activity.StatusDescription); Assert.Contains(activity.Tags, t => t.Key == SpanAttributeConstants.StatusDescriptionKey); } } diff --git a/test/OpenTelemetry.Instrumentation.GrpcNetClient.Tests/GrpcTests.client.cs b/test/OpenTelemetry.Instrumentation.GrpcNetClient.Tests/GrpcTests.client.cs index de6e55d223..2db706c0a3 100644 --- a/test/OpenTelemetry.Instrumentation.GrpcNetClient.Tests/GrpcTests.client.cs +++ b/test/OpenTelemetry.Instrumentation.GrpcNetClient.Tests/GrpcTests.client.cs @@ -18,7 +18,6 @@ using OpenTelemetry.Instrumentation.GrpcNetClient.Implementation; using OpenTelemetry.Trace; using Xunit; -using Status = OpenTelemetry.Trace.Status; namespace OpenTelemetry.Instrumentation.Grpc.Tests; @@ -100,7 +99,7 @@ public void GrpcClientCallsAreCollectedSuccessfully(string baseAddress, bool sho } Assert.Equal(uri.Port, activity.GetTagValue(SemanticConventions.AttributeServerPort)); - Assert.Equal(Status.Unset, activity.GetStatus()); + Assert.Equal(ActivityStatusCode.Unset, activity.Status); // Tags added by the library then removed from the instrumentation Assert.Null(activity.GetTagValue(GrpcTagHelper.GrpcMethodTagName)); diff --git a/test/OpenTelemetry.Instrumentation.GrpcNetClient.Tests/GrpcTests.server.cs b/test/OpenTelemetry.Instrumentation.GrpcNetClient.Tests/GrpcTests.server.cs index 5d16091ed3..ce2105e591 100644 --- a/test/OpenTelemetry.Instrumentation.GrpcNetClient.Tests/GrpcTests.server.cs +++ b/test/OpenTelemetry.Instrumentation.GrpcNetClient.Tests/GrpcTests.server.cs @@ -13,7 +13,6 @@ using OpenTelemetry.Instrumentation.Grpc.Services.Tests; using OpenTelemetry.Trace; using Xunit; -using Status = OpenTelemetry.Trace.Status; namespace OpenTelemetry.Instrumentation.Grpc.Tests; @@ -83,7 +82,7 @@ public void GrpcAspNetCoreInstrumentationAddsCorrectAttributes(string? enableGrp Assert.NotNull(activity.GetTagValue(GrpcTagHelper.GrpcStatusCodeTagName)); } - Assert.Equal(Status.Unset, activity.GetStatus()); + Assert.Equal(ActivityStatusCode.Unset, activity.Status); // The following are http.* attributes that are also included on the span for the gRPC invocation. Assert.Equal("localhost", activity.GetTagValue(SemanticConventions.AttributeServerAddress)); @@ -160,7 +159,7 @@ public void GrpcAspNetCoreInstrumentationAddsCorrectAttributesWhenItCreatesNewAc Assert.NotNull(activity.GetTagValue(GrpcTagHelper.GrpcStatusCodeTagName)); } - Assert.Equal(Status.Unset, activity.GetStatus()); + Assert.Equal(ActivityStatusCode.Unset, activity.Status); // The following are http.* attributes that are also included on the span for the gRPC invocation. Assert.Equal("localhost", activity.GetTagValue(SemanticConventions.AttributeNetHostName)); diff --git a/test/OpenTelemetry.Instrumentation.Owin.Tests/DiagnosticsMiddlewareTests.cs b/test/OpenTelemetry.Instrumentation.Owin.Tests/DiagnosticsMiddlewareTests.cs index 849b30f0c3..eea813ec36 100644 --- a/test/OpenTelemetry.Instrumentation.Owin.Tests/DiagnosticsMiddlewareTests.cs +++ b/test/OpenTelemetry.Instrumentation.Owin.Tests/DiagnosticsMiddlewareTests.cs @@ -200,7 +200,7 @@ Owin has finished to inspect the activity status. */ if (generateRemoteException) { - Assert.Equal(Status.Error, activity.GetStatus()); + Assert.Equal(ActivityStatusCode.Error, activity.Status); if (recordException) { @@ -209,7 +209,7 @@ Owin has finished to inspect the activity status. */ } else { - Assert.Equal(Status.Unset, activity.GetStatus()); + Assert.Equal(ActivityStatusCode.Unset, activity.Status); } if (enrich && !enrichmentException) diff --git a/test/OpenTelemetry.Instrumentation.SqlClient.Tests/SqlClientIntegrationTests.cs b/test/OpenTelemetry.Instrumentation.SqlClient.Tests/SqlClientIntegrationTests.cs index 6c13ba7171..2185963f9e 100644 --- a/test/OpenTelemetry.Instrumentation.SqlClient.Tests/SqlClientIntegrationTests.cs +++ b/test/OpenTelemetry.Instrumentation.SqlClient.Tests/SqlClientIntegrationTests.cs @@ -90,13 +90,11 @@ public void SuccessfulCommandTest( if (isFailure) { #if NET - var status = activity.GetStatus(); Assert.Equal(ActivityStatusCode.Error, activity.Status); Assert.Equal("Divide by zero error encountered.", activity.StatusDescription); Assert.EndsWith("SqlException", activity.GetTagValue(SemanticConventions.AttributeErrorType) as string); Assert.Equal("8134", activity.GetTagValue(SemanticConventions.AttributeDbResponseStatusCode)); #else - var status = activity.GetStatus(); Assert.Equal(ActivityStatusCode.Error, activity.Status); Assert.Equal("8134", activity.StatusDescription); Assert.EndsWith("SqlException", activity.GetTagValue(SemanticConventions.AttributeErrorType) as string); diff --git a/test/OpenTelemetry.Instrumentation.SqlClient.Tests/SqlClientTests.cs b/test/OpenTelemetry.Instrumentation.SqlClient.Tests/SqlClientTests.cs index c02e01d2a2..1587d407a1 100644 --- a/test/OpenTelemetry.Instrumentation.SqlClient.Tests/SqlClientTests.cs +++ b/test/OpenTelemetry.Instrumentation.SqlClient.Tests/SqlClientTests.cs @@ -439,7 +439,6 @@ internal static void VerifyActivityData( } else { - var status = activity.GetStatus(); Assert.Equal(ActivityStatusCode.Error, activity.Status); Assert.NotNull(activity.StatusDescription); diff --git a/test/OpenTelemetry.Instrumentation.StackExchangeRedis.Tests/StackExchangeRedisCallsInstrumentationTests.cs b/test/OpenTelemetry.Instrumentation.StackExchangeRedis.Tests/StackExchangeRedisCallsInstrumentationTests.cs index 4ede2553fa..acf0081639 100644 --- a/test/OpenTelemetry.Instrumentation.StackExchangeRedis.Tests/StackExchangeRedisCallsInstrumentationTests.cs +++ b/test/OpenTelemetry.Instrumentation.StackExchangeRedis.Tests/StackExchangeRedisCallsInstrumentationTests.cs @@ -411,7 +411,7 @@ private static void VerifyActivityData(Activity activity, bool isSet, EndPoint e } } - Assert.Equal(Status.Unset, activity.GetStatus()); + Assert.Equal(ActivityStatusCode.Unset, activity.Status); Assert.Equal("redis", activity.GetTagValue(SemanticConventions.AttributeDbSystem)); Assert.Equal(0, activity.GetTagValue(StackExchangeRedisConnectionInstrumentation.RedisDatabaseIndexKeyName)); diff --git a/test/Shared/CustomTextMapPropagator.cs b/test/Shared/CustomTextMapPropagator.cs index 436879e8b5..97aea2f6a7 100644 --- a/test/Shared/CustomTextMapPropagator.cs +++ b/test/Shared/CustomTextMapPropagator.cs @@ -22,7 +22,7 @@ internal sealed class CustomTextMapPropagator : TextMapPropagator #pragma warning restore SA1010 // Opening square brackets should be spaced correctly #pragma warning restore SA1201 // Elements should appear in the correct order - public override PropagationContext Extract(PropagationContext context, T carrier, Func> getter) + public override PropagationContext Extract(PropagationContext context, T carrier, Func?> getter) { if (this.TraceId != default && this.SpanId != default) { diff --git a/test/Shared/TestTextMapPropagator.cs b/test/Shared/TestTextMapPropagator.cs index 5ce7fd9bd3..adabbde7d7 100644 --- a/test/Shared/TestTextMapPropagator.cs +++ b/test/Shared/TestTextMapPropagator.cs @@ -13,7 +13,7 @@ internal class TestTextMapPropagator : TextMapPropagator public override ISet Fields => throw new NotImplementedException(); - public override PropagationContext Extract(PropagationContext context, T carrier, Func> getter) + public override PropagationContext Extract(PropagationContext context, T carrier, Func?> getter) { this.Extracted?.Invoke(); return context; @@ -24,7 +24,7 @@ public override void Inject(PropagationContext context, T carrier, Action((c, k, v) => setter(c, k, v)); this.OnInject?.Invoke( context, - carrier, + carrier!, new Action((c, k, v) => setter((T)c, k, v))); } }