From 8f2f11071af3d562c13fd187428173f3e2af7b04 Mon Sep 17 00:00:00 2001 From: Utkarsh Umesan Pillai <66651184+utpilla@users.noreply.github.com> Date: Mon, 11 Dec 2023 14:54:01 -0800 Subject: [PATCH 1/3] Update OTel SDK version to 1.7.0 (#1486) --- build/Common.nonprod.props | 1 - build/Common.props | 2 +- .../wcf/client-core/Examples.Wcf.Client.DotNet.csproj | 4 ++-- src/OpenTelemetry.Exporter.Geneva/CHANGELOG.md | 3 +++ .../Common.GenevaExporter.props | 2 +- src/OpenTelemetry.Exporter.InfluxDB/CHANGELOG.md | 3 +++ src/OpenTelemetry.Exporter.Instana/CHANGELOG.md | 4 ++-- .../OpenTelemetry.Exporter.Instana.csproj | 6 +++++- src/OpenTelemetry.Exporter.OneCollector/CHANGELOG.md | 3 +++ src/OpenTelemetry.Exporter.Stackdriver/CHANGELOG.md | 4 ++-- src/OpenTelemetry.Extensions.AWS/CHANGELOG.md | 4 ++-- src/OpenTelemetry.Extensions/CHANGELOG.md | 4 ++-- .../CHANGELOG.md | 3 +++ src/OpenTelemetry.Instrumentation.Cassandra/CHANGELOG.md | 4 ++-- .../CHANGELOG.md | 3 +++ ...enTelemetry.Instrumentation.ElasticsearchClient.csproj | 4 ++++ .../CHANGELOG.md | 3 +++ .../CHANGELOG.md | 4 ++-- src/OpenTelemetry.Instrumentation.GrpcCore/CHANGELOG.md | 2 ++ src/OpenTelemetry.Instrumentation.Hangfire/CHANGELOG.md | 5 +++-- src/OpenTelemetry.Instrumentation.Owin/CHANGELOG.md | 4 ++-- src/OpenTelemetry.Instrumentation.Process/CHANGELOG.md | 4 ++-- src/OpenTelemetry.Instrumentation.Quartz/CHANGELOG.md | 4 ++-- src/OpenTelemetry.Instrumentation.Runtime/CHANGELOG.md | 4 ++-- .../CHANGELOG.md | 3 +++ src/OpenTelemetry.Instrumentation.Wcf/CHANGELOG.md | 3 +++ src/OpenTelemetry.ResourceDetectors.AWS/CHANGELOG.md | 4 ++-- .../OpenTelemetry.ResourceDetectors.AWS.csproj | 4 ++++ src/OpenTelemetry.ResourceDetectors.Azure/CHANGELOG.md | 2 ++ .../CHANGELOG.md | 4 ++-- .../CHANGELOG.md | 3 +++ .../OpenTelemetry.ResourceDetectors.ProcessRuntime.csproj | 1 + src/OpenTelemetry.Sampler.AWS/CHANGELOG.md | 4 ++-- .../LogRecordCommonSchemaJsonHttpPostBenchmarks.cs | 2 +- .../LogRecordCommonSchemaJsonSerializerTests.cs | 2 +- .../ActivityEventAttachingLogProcessorTests.cs | 8 ++++---- .../OpenTelemetry.Extensions.Tests.csproj | 4 ---- .../OpenTelemetry.Instrumentation.Quartz.Tests.csproj | 1 - 38 files changed, 84 insertions(+), 45 deletions(-) diff --git a/build/Common.nonprod.props b/build/Common.nonprod.props index fece09322f..05a82c657d 100644 --- a/build/Common.nonprod.props +++ b/build/Common.nonprod.props @@ -22,7 +22,6 @@ --> [0.13.10,0.14) [2.3.1,3.0) - [5.0.0,7.0) [17.7.2,18.0) [4.18.4,5.0) $(OpenTelemetryCoreLatestVersion) diff --git a/build/Common.props b/build/Common.props index 22a2dd71fb..b0dc596895 100644 --- a/build/Common.props +++ b/build/Common.props @@ -35,7 +35,7 @@ [4.2.2,5.0) [3.3.3] [1.1.1,2.0) - [1.6.0,2.0) + [1.7.0,2.0) [1.7.0-rc.1] [2.1.58,3.0) [3.16.0,4.0) diff --git a/examples/wcf/client-core/Examples.Wcf.Client.DotNet.csproj b/examples/wcf/client-core/Examples.Wcf.Client.DotNet.csproj index 3fa7c8ea19..1da3e3ade7 100644 --- a/examples/wcf/client-core/Examples.Wcf.Client.DotNet.csproj +++ b/examples/wcf/client-core/Examples.Wcf.Client.DotNet.csproj @@ -8,8 +8,8 @@ - - + + diff --git a/src/OpenTelemetry.Exporter.Geneva/CHANGELOG.md b/src/OpenTelemetry.Exporter.Geneva/CHANGELOG.md index 72340f827d..546cdf92b3 100644 --- a/src/OpenTelemetry.Exporter.Geneva/CHANGELOG.md +++ b/src/OpenTelemetry.Exporter.Geneva/CHANGELOG.md @@ -2,6 +2,9 @@ ## Unreleased +* Update OpenTelemetry SDK version to `1.7.0`. + ([#1486](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/1486)) + ## 1.7.0-rc.1 Released 2023-Dec-05 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 6fb6853f03..3912bad5a3 100644 --- a/src/OpenTelemetry.Exporter.InfluxDB/CHANGELOG.md +++ b/src/OpenTelemetry.Exporter.InfluxDB/CHANGELOG.md @@ -2,6 +2,9 @@ ## Unreleased +* Update OpenTelemetry SDK version to `1.7.0`. + ([#1486](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/1486)) + ## 1.0.0-alpha.3 Released 2023-Oct-13 diff --git a/src/OpenTelemetry.Exporter.Instana/CHANGELOG.md b/src/OpenTelemetry.Exporter.Instana/CHANGELOG.md index fc9fe6fc35..8e227d4ed6 100644 --- a/src/OpenTelemetry.Exporter.Instana/CHANGELOG.md +++ b/src/OpenTelemetry.Exporter.Instana/CHANGELOG.md @@ -2,8 +2,8 @@ ## Unreleased -* Update OpenTelemetry SDK version to `1.6.0`. - ([#1344](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/1344)) +* Update OpenTelemetry SDK version to `1.7.0`. + ([#1486](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/1486)) * Drop support for .NET Framework 4.6.1. The lowest supported version is .NET Framework 4.6.2. ([#1050](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/1050)) diff --git a/src/OpenTelemetry.Exporter.Instana/OpenTelemetry.Exporter.Instana.csproj b/src/OpenTelemetry.Exporter.Instana/OpenTelemetry.Exporter.Instana.csproj index aa210ce942..6bf7265650 100644 --- a/src/OpenTelemetry.Exporter.Instana/OpenTelemetry.Exporter.Instana.csproj +++ b/src/OpenTelemetry.Exporter.Instana/OpenTelemetry.Exporter.Instana.csproj @@ -2,7 +2,7 @@ - netstandard2.0;net462 + netstandard2.0;$(NetFrameworkMinimumSupportedVersion) Instana Tracing APM Instana .NET Exporter for OpenTelemetry Exporter.Instana- @@ -14,4 +14,8 @@ + + + + diff --git a/src/OpenTelemetry.Exporter.OneCollector/CHANGELOG.md b/src/OpenTelemetry.Exporter.OneCollector/CHANGELOG.md index 453fbeb992..ae8f6ce8cf 100644 --- a/src/OpenTelemetry.Exporter.OneCollector/CHANGELOG.md +++ b/src/OpenTelemetry.Exporter.OneCollector/CHANGELOG.md @@ -2,6 +2,9 @@ ## Unreleased +* Update OpenTelemetry SDK version to `1.7.0`. + ([#1486](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/1486)) + ## 1.6.0 Released 2023-Oct-25 diff --git a/src/OpenTelemetry.Exporter.Stackdriver/CHANGELOG.md b/src/OpenTelemetry.Exporter.Stackdriver/CHANGELOG.md index 8625decb38..fbc1d739ec 100644 --- a/src/OpenTelemetry.Exporter.Stackdriver/CHANGELOG.md +++ b/src/OpenTelemetry.Exporter.Stackdriver/CHANGELOG.md @@ -2,8 +2,8 @@ ## Unreleased -* Update OpenTelemetry SDK version to `1.6.0`. - ([#1344](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/1344)) +* Update OpenTelemetry SDK version to `1.7.0`. + ([#1486](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/1486)) ## 1.0.0-beta.4 diff --git a/src/OpenTelemetry.Extensions.AWS/CHANGELOG.md b/src/OpenTelemetry.Extensions.AWS/CHANGELOG.md index 24187e865d..b56695232f 100644 --- a/src/OpenTelemetry.Extensions.AWS/CHANGELOG.md +++ b/src/OpenTelemetry.Extensions.AWS/CHANGELOG.md @@ -2,8 +2,8 @@ ## Unreleased -* Updates to 1.6.0 of OpenTelemetry SDK. - ([#1344](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/1344)) +* Update OpenTelemetry SDK version to `1.7.0`. + ([#1486](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/1486)) ## 1.3.0-beta.1 diff --git a/src/OpenTelemetry.Extensions/CHANGELOG.md b/src/OpenTelemetry.Extensions/CHANGELOG.md index e4c18b64f4..6493396250 100644 --- a/src/OpenTelemetry.Extensions/CHANGELOG.md +++ b/src/OpenTelemetry.Extensions/CHANGELOG.md @@ -5,8 +5,8 @@ * Add LogToActivityEventConversionOptions.Filter callback ([#1059](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/1059)) -* Update OpenTelemetry SDK version to `1.6.0`. - ([#1344](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/1344)) +* Update OpenTelemetry SDK version to `1.7.0`. + ([#1486](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/1486)) ## 1.0.0-beta.4 diff --git a/src/OpenTelemetry.Instrumentation.AspNet.TelemetryHttpModule/CHANGELOG.md b/src/OpenTelemetry.Instrumentation.AspNet.TelemetryHttpModule/CHANGELOG.md index a300bf0c1b..b97a02b1ea 100644 --- a/src/OpenTelemetry.Instrumentation.AspNet.TelemetryHttpModule/CHANGELOG.md +++ b/src/OpenTelemetry.Instrumentation.AspNet.TelemetryHttpModule/CHANGELOG.md @@ -2,6 +2,9 @@ ## Unreleased +* Update `OpenTelemetry.Api` to `1.7.0`. + ([#1486](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/1486)) + ## 1.6.0-beta.2 Released 2023-Nov-06 diff --git a/src/OpenTelemetry.Instrumentation.Cassandra/CHANGELOG.md b/src/OpenTelemetry.Instrumentation.Cassandra/CHANGELOG.md index 36ef3e4e21..111be2ef79 100644 --- a/src/OpenTelemetry.Instrumentation.Cassandra/CHANGELOG.md +++ b/src/OpenTelemetry.Instrumentation.Cassandra/CHANGELOG.md @@ -2,8 +2,8 @@ ## Unreleased -* Updates to 1.6.0 of OpenTelemetry SDK. - ([#1344](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/1344)) +* Update OpenTelemetry SDK version to `1.7.0`. + ([#1486](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/1486)) ## 1.0.0-beta.1 diff --git a/src/OpenTelemetry.Instrumentation.ElasticsearchClient/CHANGELOG.md b/src/OpenTelemetry.Instrumentation.ElasticsearchClient/CHANGELOG.md index 37108607bd..4dd3a9b1e0 100644 --- a/src/OpenTelemetry.Instrumentation.ElasticsearchClient/CHANGELOG.md +++ b/src/OpenTelemetry.Instrumentation.ElasticsearchClient/CHANGELOG.md @@ -2,6 +2,9 @@ ## Unreleased +* Update OpenTelemetry SDK version to `1.7.0`. + ([#1486](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/1486)) + ## 1.0.0-beta.5 Released 2023-Oct-24 diff --git a/src/OpenTelemetry.Instrumentation.ElasticsearchClient/OpenTelemetry.Instrumentation.ElasticsearchClient.csproj b/src/OpenTelemetry.Instrumentation.ElasticsearchClient/OpenTelemetry.Instrumentation.ElasticsearchClient.csproj index 86bf2da20b..1f56188df9 100644 --- a/src/OpenTelemetry.Instrumentation.ElasticsearchClient/OpenTelemetry.Instrumentation.ElasticsearchClient.csproj +++ b/src/OpenTelemetry.Instrumentation.ElasticsearchClient/OpenTelemetry.Instrumentation.ElasticsearchClient.csproj @@ -18,6 +18,10 @@ + + + + diff --git a/src/OpenTelemetry.Instrumentation.EntityFrameworkCore/CHANGELOG.md b/src/OpenTelemetry.Instrumentation.EntityFrameworkCore/CHANGELOG.md index 9105a6b124..c4b3f7c62d 100644 --- a/src/OpenTelemetry.Instrumentation.EntityFrameworkCore/CHANGELOG.md +++ b/src/OpenTelemetry.Instrumentation.EntityFrameworkCore/CHANGELOG.md @@ -2,6 +2,9 @@ ## Unreleased +* Update OpenTelemetry SDK version to `1.7.0`. + ([#1486](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/1486)) + ## 1.0.0-beta.8 Released 2023-Oct-24 diff --git a/src/OpenTelemetry.Instrumentation.EventCounters/CHANGELOG.md b/src/OpenTelemetry.Instrumentation.EventCounters/CHANGELOG.md index 0feb5d5842..aac23e50b6 100644 --- a/src/OpenTelemetry.Instrumentation.EventCounters/CHANGELOG.md +++ b/src/OpenTelemetry.Instrumentation.EventCounters/CHANGELOG.md @@ -2,8 +2,8 @@ ## Unreleased -* Update OpenTelemetry.Api to 1.6.0. - ([#1344](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/1344)) +* Update `OpenTelemetry.Api` to `1.7.0`. + ([#1486](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/1486)) ## 1.5.1-alpha.1 diff --git a/src/OpenTelemetry.Instrumentation.GrpcCore/CHANGELOG.md b/src/OpenTelemetry.Instrumentation.GrpcCore/CHANGELOG.md index 4a7693ac6d..f0e42313cd 100644 --- a/src/OpenTelemetry.Instrumentation.GrpcCore/CHANGELOG.md +++ b/src/OpenTelemetry.Instrumentation.GrpcCore/CHANGELOG.md @@ -8,6 +8,8 @@ ([#1344](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/1344)) * Update minimal supported version of `Google.Protobuf` to `3.15.0`. ([#1456](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/1456)) +* Update `OpenTelemetry.Api` to `1.7.0`. + ([#1486](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/1486)) ## 1.0.0-beta.5 diff --git a/src/OpenTelemetry.Instrumentation.Hangfire/CHANGELOG.md b/src/OpenTelemetry.Instrumentation.Hangfire/CHANGELOG.md index e41410d31e..6d24250490 100644 --- a/src/OpenTelemetry.Instrumentation.Hangfire/CHANGELOG.md +++ b/src/OpenTelemetry.Instrumentation.Hangfire/CHANGELOG.md @@ -2,8 +2,9 @@ ## Unreleased -* Update OTel API version to `1.6.0`. - ([#1344](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/1344)) +* Update `OpenTelemetry.Api.ProviderBuilderExtensions` to `1.7.0`. + * Update `OpenTelemetry.Api` to `1.7.0`. + ([#1486](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/1486)) * Added overloads which accept a name to the `TracerProviderBuilder` `HangfireInstrumentationOptions` extension to allow for more fine-grained diff --git a/src/OpenTelemetry.Instrumentation.Owin/CHANGELOG.md b/src/OpenTelemetry.Instrumentation.Owin/CHANGELOG.md index ec16d15b46..b818af9fb5 100644 --- a/src/OpenTelemetry.Instrumentation.Owin/CHANGELOG.md +++ b/src/OpenTelemetry.Instrumentation.Owin/CHANGELOG.md @@ -2,8 +2,8 @@ ## Unreleased -* Updated OpenTelemetry SDK to 1.6.0 - ([#1344](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/1344)) +* Updated OpenTelemetry SDK to 1.7.0. + ([#1486](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/1486)) * Removes `AddOwinInstrumentation` method with default configure parameter. ([#929](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/929)) * Adds HTTP server metrics via `AddOwinInstrumentation` extension method on `MeterProviderBuilder` diff --git a/src/OpenTelemetry.Instrumentation.Process/CHANGELOG.md b/src/OpenTelemetry.Instrumentation.Process/CHANGELOG.md index fc435aeb3b..d315d69808 100644 --- a/src/OpenTelemetry.Instrumentation.Process/CHANGELOG.md +++ b/src/OpenTelemetry.Instrumentation.Process/CHANGELOG.md @@ -2,8 +2,8 @@ ## Unreleased -* Update OpenTelemetry API to 1.6.0 - ([#1344](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/1344)) +* Update `OpenTelemetry.Api` to `1.7.0`. + ([#1486](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/1486)) ## 0.5.0-beta.3 diff --git a/src/OpenTelemetry.Instrumentation.Quartz/CHANGELOG.md b/src/OpenTelemetry.Instrumentation.Quartz/CHANGELOG.md index 4676dee4af..a520c719c8 100644 --- a/src/OpenTelemetry.Instrumentation.Quartz/CHANGELOG.md +++ b/src/OpenTelemetry.Instrumentation.Quartz/CHANGELOG.md @@ -5,8 +5,8 @@ * Fix issue of multiple instances of OpenTelemetry-Instrumentation EventSource being created ([#1362](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/1362)) -* Update OpenTelemetry.Api to 1.6.0. - ([#1344](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/1344)) +* Update `OpenTelemetry.Api` to `1.7.0`. + ([#1486](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/1486)) ## 1.0.0-alpha.3 diff --git a/src/OpenTelemetry.Instrumentation.Runtime/CHANGELOG.md b/src/OpenTelemetry.Instrumentation.Runtime/CHANGELOG.md index 49cae6d79f..b541c75950 100644 --- a/src/OpenTelemetry.Instrumentation.Runtime/CHANGELOG.md +++ b/src/OpenTelemetry.Instrumentation.Runtime/CHANGELOG.md @@ -2,8 +2,8 @@ ## Unreleased -* Update OpenTelemetry API to 1.6.0 - ([#1344](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/1344)) +* Update `OpenTelemetry.Api` to `1.7.0`. + ([#1486](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/1486)) ## 1.5.1 diff --git a/src/OpenTelemetry.Instrumentation.StackExchangeRedis/CHANGELOG.md b/src/OpenTelemetry.Instrumentation.StackExchangeRedis/CHANGELOG.md index 26bae0ac4a..d452bbc308 100644 --- a/src/OpenTelemetry.Instrumentation.StackExchangeRedis/CHANGELOG.md +++ b/src/OpenTelemetry.Instrumentation.StackExchangeRedis/CHANGELOG.md @@ -2,6 +2,9 @@ ## Unreleased +* Update `OpenTelemetry.Api.ProviderBuilderExtensions` version to `1.7.0`. + ([#1486](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/1486)) + ## 1.0.0-rc9.12 Released 2023-Nov-01 diff --git a/src/OpenTelemetry.Instrumentation.Wcf/CHANGELOG.md b/src/OpenTelemetry.Instrumentation.Wcf/CHANGELOG.md index fd35609cca..1bce6c18eb 100644 --- a/src/OpenTelemetry.Instrumentation.Wcf/CHANGELOG.md +++ b/src/OpenTelemetry.Instrumentation.Wcf/CHANGELOG.md @@ -2,6 +2,9 @@ ## Unreleased +* Update OpenTelemetry SDK version to `1.7.0`. + ([#1486](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/1486)) + ## 1.0.0-rc.13 Released 2023-Oct-30 diff --git a/src/OpenTelemetry.ResourceDetectors.AWS/CHANGELOG.md b/src/OpenTelemetry.ResourceDetectors.AWS/CHANGELOG.md index 6a94208117..85684ae331 100644 --- a/src/OpenTelemetry.ResourceDetectors.AWS/CHANGELOG.md +++ b/src/OpenTelemetry.ResourceDetectors.AWS/CHANGELOG.md @@ -2,8 +2,8 @@ ## Unreleased -* Update OpenTelemetry SDK version to `1.6.0`. - ([#1344](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/1344)) +* Update OpenTelemetry SDK version to `1.7.0`. + ([#1486](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/1486)) * Fix AWS EBS Resource Detector working on linux. ([#1350](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/1350)) diff --git a/src/OpenTelemetry.ResourceDetectors.AWS/OpenTelemetry.ResourceDetectors.AWS.csproj b/src/OpenTelemetry.ResourceDetectors.AWS/OpenTelemetry.ResourceDetectors.AWS.csproj index bf14fa2ce6..b5ad0ad470 100644 --- a/src/OpenTelemetry.ResourceDetectors.AWS/OpenTelemetry.ResourceDetectors.AWS.csproj +++ b/src/OpenTelemetry.ResourceDetectors.AWS/OpenTelemetry.ResourceDetectors.AWS.csproj @@ -17,6 +17,10 @@ + + + + diff --git a/src/OpenTelemetry.ResourceDetectors.Azure/CHANGELOG.md b/src/OpenTelemetry.ResourceDetectors.Azure/CHANGELOG.md index 201ed431e9..f0642f5d18 100644 --- a/src/OpenTelemetry.ResourceDetectors.Azure/CHANGELOG.md +++ b/src/OpenTelemetry.ResourceDetectors.Azure/CHANGELOG.md @@ -4,6 +4,8 @@ * Added NET6 target framework to support Trimming. ([#1405](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/1405)) +* Update OpenTelemetry SDK version to `1.7.0`. + ([#1486](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/1486)) ## 1.0.0-beta.3 diff --git a/src/OpenTelemetry.ResourceDetectors.Container/CHANGELOG.md b/src/OpenTelemetry.ResourceDetectors.Container/CHANGELOG.md index 76f6218b5a..993cf0424a 100644 --- a/src/OpenTelemetry.ResourceDetectors.Container/CHANGELOG.md +++ b/src/OpenTelemetry.ResourceDetectors.Container/CHANGELOG.md @@ -2,8 +2,8 @@ ## Unreleased -* Updates to 1.6.0 of OpenTelemetry SDK. - ([#1344](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/1344)) +* Update OpenTelemetry SDK version to `1.7.0`. + ([#1486](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/1486)) ## 1.0.0-beta.4 diff --git a/src/OpenTelemetry.ResourceDetectors.ProcessRuntime/CHANGELOG.md b/src/OpenTelemetry.ResourceDetectors.ProcessRuntime/CHANGELOG.md index 88b9ab59c6..221c846b0b 100644 --- a/src/OpenTelemetry.ResourceDetectors.ProcessRuntime/CHANGELOG.md +++ b/src/OpenTelemetry.ResourceDetectors.ProcessRuntime/CHANGELOG.md @@ -2,6 +2,9 @@ ## Unreleased +* Update OpenTelemetry SDK version to `1.7.0`. + ([#1486](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/1486)) + ## 0.1.0-alpha.1 Released 2023-Dec-04 diff --git a/src/OpenTelemetry.ResourceDetectors.ProcessRuntime/OpenTelemetry.ResourceDetectors.ProcessRuntime.csproj b/src/OpenTelemetry.ResourceDetectors.ProcessRuntime/OpenTelemetry.ResourceDetectors.ProcessRuntime.csproj index 5bb3fc7f40..546004afde 100644 --- a/src/OpenTelemetry.ResourceDetectors.ProcessRuntime/OpenTelemetry.ResourceDetectors.ProcessRuntime.csproj +++ b/src/OpenTelemetry.ResourceDetectors.ProcessRuntime/OpenTelemetry.ResourceDetectors.ProcessRuntime.csproj @@ -8,5 +8,6 @@ + diff --git a/src/OpenTelemetry.Sampler.AWS/CHANGELOG.md b/src/OpenTelemetry.Sampler.AWS/CHANGELOG.md index 36a41a1816..a28f47d696 100644 --- a/src/OpenTelemetry.Sampler.AWS/CHANGELOG.md +++ b/src/OpenTelemetry.Sampler.AWS/CHANGELOG.md @@ -8,5 +8,5 @@ Initial release of `OpenTelemetry.Sampler.AWS`. ([#1091](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/1091), [#1124](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/1124)) -* Update OpenTelemetry SDK version to `1.6.0`. - ([#1344](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/1344)) +* Update OpenTelemetry SDK version to `1.7.0`. + ([#1486](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/1486)) diff --git a/test/OpenTelemetry.Exporter.OneCollector.Benchmarks/LogRecordCommonSchemaJsonHttpPostBenchmarks.cs b/test/OpenTelemetry.Exporter.OneCollector.Benchmarks/LogRecordCommonSchemaJsonHttpPostBenchmarks.cs index 7900174973..51643933c0 100644 --- a/test/OpenTelemetry.Exporter.OneCollector.Benchmarks/LogRecordCommonSchemaJsonHttpPostBenchmarks.cs +++ b/test/OpenTelemetry.Exporter.OneCollector.Benchmarks/LogRecordCommonSchemaJsonHttpPostBenchmarks.cs @@ -176,7 +176,7 @@ public void ForEachScope(Action callback, TState state) } } - public IDisposable Push(object state) + public IDisposable Push(object? state) { throw new NotImplementedException(); } diff --git a/test/OpenTelemetry.Exporter.OneCollector.Tests/LogRecordCommonSchemaJsonSerializerTests.cs b/test/OpenTelemetry.Exporter.OneCollector.Tests/LogRecordCommonSchemaJsonSerializerTests.cs index ca9bc789b4..d706e6355e 100644 --- a/test/OpenTelemetry.Exporter.OneCollector.Tests/LogRecordCommonSchemaJsonSerializerTests.cs +++ b/test/OpenTelemetry.Exporter.OneCollector.Tests/LogRecordCommonSchemaJsonSerializerTests.cs @@ -326,7 +326,7 @@ public void ForEachScope(Action callback, TState state) } } - public IDisposable Push(object state) + public IDisposable Push(object? state) { throw new NotImplementedException(); } diff --git a/test/OpenTelemetry.Extensions.Tests/ActivityEventAttachingLogProcessorTests.cs b/test/OpenTelemetry.Extensions.Tests/ActivityEventAttachingLogProcessorTests.cs index 183e59049a..54874eb090 100644 --- a/test/OpenTelemetry.Extensions.Tests/ActivityEventAttachingLogProcessorTests.cs +++ b/test/OpenTelemetry.Extensions.Tests/ActivityEventAttachingLogProcessorTests.cs @@ -79,7 +79,7 @@ public void AttachLogsToActivityEventTest( Activity? activity = this.activitySource.StartActivity("Test"); Assert.NotNull(activity); - using IDisposable scope = logger.BeginScope("{NodeId}", 99); + using IDisposable? scope = logger.BeginScope("{NodeId}", 99); logger.LogInformation(eventId, "Hello OpenTelemetry {UserId}!", 8); @@ -89,7 +89,7 @@ public void AttachLogsToActivityEventTest( innerActivity = this.activitySource.StartActivity("InnerTest"); Assert.NotNull(innerActivity); - using IDisposable innerScope = logger.BeginScope("{RequestId}", "1234"); + using IDisposable? innerScope = logger.BeginScope("{RequestId}", "1234"); logger.LogError(new InvalidOperationException("Goodbye OpenTelemetry."), "Exception event."); @@ -211,7 +211,7 @@ public void AttachLogsToActivityEventTest_Filter( Activity? activity = this.activitySource.StartActivity("Test"); Assert.NotNull(activity); - using IDisposable scope = logger.BeginScope("{NodeId}", 99); + using IDisposable? scope = logger.BeginScope("{NodeId}", 99); logger.LogInformation(eventId, "Hello OpenTelemetry {UserId}!", 8); @@ -220,7 +220,7 @@ public void AttachLogsToActivityEventTest_Filter( var innerActivity = this.activitySource.StartActivity("InnerTest"); Assert.NotNull(innerActivity); - using IDisposable innerScope = logger.BeginScope("{RequestId}", "1234"); + using IDisposable? innerScope = logger.BeginScope("{RequestId}", "1234"); logger.LogError(new InvalidOperationException("Goodbye OpenTelemetry."), "Exception event."); diff --git a/test/OpenTelemetry.Extensions.Tests/OpenTelemetry.Extensions.Tests.csproj b/test/OpenTelemetry.Extensions.Tests/OpenTelemetry.Extensions.Tests.csproj index 393df0e152..aa1088457d 100644 --- a/test/OpenTelemetry.Extensions.Tests/OpenTelemetry.Extensions.Tests.csproj +++ b/test/OpenTelemetry.Extensions.Tests/OpenTelemetry.Extensions.Tests.csproj @@ -7,10 +7,6 @@ $(TargetFrameworks);net462 - - - - diff --git a/test/OpenTelemetry.Instrumentation.Quartz.Tests/OpenTelemetry.Instrumentation.Quartz.Tests.csproj b/test/OpenTelemetry.Instrumentation.Quartz.Tests/OpenTelemetry.Instrumentation.Quartz.Tests.csproj index d8b0c23530..a9171bb47f 100644 --- a/test/OpenTelemetry.Instrumentation.Quartz.Tests/OpenTelemetry.Instrumentation.Quartz.Tests.csproj +++ b/test/OpenTelemetry.Instrumentation.Quartz.Tests/OpenTelemetry.Instrumentation.Quartz.Tests.csproj @@ -8,7 +8,6 @@ - From a60dc5a54a599ceefd629aef2f0c97ee17f49072 Mon Sep 17 00:00:00 2001 From: Utkarsh Umesan Pillai <66651184+utpilla@users.noreply.github.com> Date: Mon, 11 Dec 2023 15:54:35 -0800 Subject: [PATCH 2/3] [Exporter.Geneva] Update CHANGELOG for 1.7.0 (#1489) --- src/OpenTelemetry.Exporter.Geneva/CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/OpenTelemetry.Exporter.Geneva/CHANGELOG.md b/src/OpenTelemetry.Exporter.Geneva/CHANGELOG.md index 546cdf92b3..bcbbc3f0bb 100644 --- a/src/OpenTelemetry.Exporter.Geneva/CHANGELOG.md +++ b/src/OpenTelemetry.Exporter.Geneva/CHANGELOG.md @@ -2,6 +2,10 @@ ## Unreleased +## 1.7.0 + +Released 2023-Dec-11 + * Update OpenTelemetry SDK version to `1.7.0`. ([#1486](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/1486)) From 4640cba7a3839fe6304c6e0ebff66755ccc53927 Mon Sep 17 00:00:00 2001 From: Utkarsh Umesan Pillai <66651184+utpilla@users.noreply.github.com> Date: Mon, 11 Dec 2023 16:29:16 -0800 Subject: [PATCH 3/3] Fix build errors (#1488) --- .../PointDataExtensions.cs | 2 +- .../OpenTelemetry.Exporter.Instana.csproj | 12 +++++++++--- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/OpenTelemetry.Exporter.InfluxDB/PointDataExtensions.cs b/src/OpenTelemetry.Exporter.InfluxDB/PointDataExtensions.cs index 45ab06c1e0..7896fb1ecc 100644 --- a/src/OpenTelemetry.Exporter.InfluxDB/PointDataExtensions.cs +++ b/src/OpenTelemetry.Exporter.InfluxDB/PointDataExtensions.cs @@ -12,7 +12,7 @@ public static PointData Tags(this PointData pointData, ReadOnlyTagCollection tag { foreach (var tag in tags) { - pointData = pointData.Tag(tag.Key, tag.Value.ToString()); + pointData = pointData.Tag(tag.Key, tag.Value?.ToString()); } return pointData; diff --git a/src/OpenTelemetry.Exporter.Instana/OpenTelemetry.Exporter.Instana.csproj b/src/OpenTelemetry.Exporter.Instana/OpenTelemetry.Exporter.Instana.csproj index 6bf7265650..a3a126f1d8 100644 --- a/src/OpenTelemetry.Exporter.Instana/OpenTelemetry.Exporter.Instana.csproj +++ b/src/OpenTelemetry.Exporter.Instana/OpenTelemetry.Exporter.Instana.csproj @@ -12,10 +12,16 @@ - - - + +