Skip to content
New issue

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

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

Already on GitHub? Sign in to your account

Bump OpenTelemetry to 1.5.1 #1255

Merged
merged 7 commits into from
Jun 29, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion NuGet.config
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<packageSources>
<clear />
<add key="NuGet" value="https://api.nuget.org/v3/index.json" />
<!-- Uncomment following source, if you need to use nightly builds for OTel SDK/API
<!-- Uncomment following source, if you need to use nightly builds for OpenTelemetry SDK/API
<add key="MyGet" value="https://www.myget.org/F/opentelemetry/api/v3/index.json" /> -->
</packageSources>
<disabledPackageSources />
Expand Down
2 changes: 1 addition & 1 deletion build/Common.props
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
<MicrosoftOwinPkgVer>[4.2.2,5.0)</MicrosoftOwinPkgVer>
<MicrosoftPublicApiAnalyzersPkgVer>[3.3.3]</MicrosoftPublicApiAnalyzersPkgVer>
<MicrosoftSourceLinkGitHubPkgVer>[1.1.1,2.0)</MicrosoftSourceLinkGitHubPkgVer>
<OpenTelemetryCoreLatestVersion>[1.5.0,2.0)</OpenTelemetryCoreLatestVersion>
<OpenTelemetryCoreLatestVersion>[1.5.1,2.0)</OpenTelemetryCoreLatestVersion>
<OpenTelemetryCoreLatestPrereleaseVersion>[1.5.0-rc.1]</OpenTelemetryCoreLatestPrereleaseVersion>
<StackExchangeRedisPkgVer>[2.1.58,3.0)</StackExchangeRedisPkgVer>
<CassandraCSharpDriverPkgVer>[3.16.0,4.0)</CassandraCSharpDriverPkgVer>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<Nullable>enable</Nullable>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="OpenTelemetry.Exporter.Prometheus.HttpListener" Version="1.5.0-rc.1" />
<PackageReference Include="OpenTelemetry.Exporter.Prometheus.HttpListener" Version="$(OpenTelemetryCoreLatestPrereleaseVersion)" />
<ProjectReference Include="$(RepoRoot)\src\OpenTelemetry.Instrumentation.Process\OpenTelemetry.Instrumentation.Process.csproj" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<Nullable>enable</Nullable>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="OpenTelemetry.Exporter.Prometheus.HttpListener" Version="1.5.0-rc.1" />
<PackageReference Include="OpenTelemetry.Exporter.Prometheus.HttpListener" Version="$(OpenTelemetryCoreLatestPrereleaseVersion)" />
<ProjectReference Include="$(RepoRoot)\src\OpenTelemetry.Instrumentation.Runtime\OpenTelemetry.Instrumentation.Runtime.csproj" />
</ItemGroup>
</Project>
8 changes: 3 additions & 5 deletions src/OpenTelemetry.Contrib.Extensions.AWSXRay/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,15 @@

## Unreleased

* Updates to 1.5.0 of OpenTelemetry SDK.
([#1220](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/1220))
* Updates to 1.5.1 of OpenTelemetry SDK.
([#1255](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/1255))
* Enhancement - AWSXRayIdGenerator - Generate X-Ray IDs with global Random
instance instead of recreating with ThreadLocal
([#380](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/380))
* Raised minimum .NET version to `net462`
([#875](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/875))
* Replaced Newtonsoft.Json dependency with System.Text.Json
([#1092](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/1092))
* Updated OTel SDK package version to 1.3.1
([#875](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/875))
* Enhancement - AWSECSResourceDetector - Implement `aws.{ecs.*,log.*}` resource
attributes with data from ECS Metadata endpoint v4
([#875](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/875))
Expand Down Expand Up @@ -43,7 +41,7 @@ Released 2022-May-18
Released 2021-Sep-20

* Added AWS resource detectors ([#149](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/149))
* Updated OTel SDK package version to 1.1.0
* Updated OpenTelemetry SDK package version to 1.1.0
([#100](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/100))

## 1.0.1
Expand Down
19 changes: 11 additions & 8 deletions src/OpenTelemetry.Exporter.Geneva/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@

## Unreleased

* Update OpenTelemetry SDK version to `1.5.1`.
([#1255](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/1255))

## 1.5.0

Released 2023-Jun-14
Expand Down Expand Up @@ -46,7 +49,7 @@ Released 2023-Jun-05
* Add support for abstract domain sockets.
([#1199](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/1199))

* Update OTel SDK version to `1.5.0-rc.1`.
* Update OpenTelemetry SDK version to `1.5.0-rc.1`.
([#1210](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/1210))

## 1.5.0-alpha.3
Expand Down Expand Up @@ -106,7 +109,7 @@ Released 2023-Mar-13
the connection.
([#935](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/935))

* Update OTel SDK version to `1.5.0-alpha.1`.
* Update OpenTelemetry SDK version to `1.5.0-alpha.1`.
* Update GenevaMetricExporter to use TLV format serialization.
* Add support for exporting exemplars.
([#1069](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/1069))
Expand Down Expand Up @@ -239,9 +242,9 @@ Released 2022-Oct-17
It will also not support string values that contain non-ASCII characters.
[646](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/646)

* Update OTel SDK version to `1.4.0-beta.2`. Add support for exporting Histogram
Min and Max. If the histogram does not contain min and max, the exporter
exports both the values as zero.
* Update OpenTelemetry SDK version to `1.4.0-beta.2`. Add support for exporting
Histogram Min and Max. If the histogram does not contain min and max,
the exporter exports both the values as zero.
[#704](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/704)

## 1.4.0-beta.1
Expand All @@ -263,7 +266,7 @@ Released 2022-Jul-28
`GenevaMetricExporter`.
[397](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/397)

* Update OTel SDK version to `1.3.0`.
* Update OpenTelemetry SDK version to `1.3.0`.
[427](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/427)

* Remove support for .NET Framework 4.6.1. The minimum .NET Framework version
Expand Down Expand Up @@ -337,7 +340,7 @@ NuGet.
[303](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/303)
is the PR that introduced this bug to GenevaMetricExporterExtensions.cs

* Update OTel SDK version to `1.2.0`.
* Update OpenTelemetry SDK version to `1.2.0`.
[319](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/319)

## 1.2.4 Broken
Expand All @@ -357,5 +360,5 @@ special casing "{OriginalFormat}" only.
had a single KeyValuePair.
[295](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/295)

* Update OTel SDK version to `1.2.0-rc5`.
* Update OpenTelemetry SDK version to `1.2.0-rc5`.
[308](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/308)
Original file line number Diff line number Diff line change
Expand Up @@ -141,10 +141,8 @@ internal int SerializeLogRecord(LogRecord logRecord)
// `LogRecord.State` and `LogRecord.StateValues` were marked Obsolete in https://github.com/open-telemetry/opentelemetry-dotnet/pull/4334
#pragma warning disable 0618
IReadOnlyList<KeyValuePair<string, object>> listKvp;
if (logRecord.State == null)
if (logRecord.StateValues != null)
utpilla marked this conversation as resolved.
Show resolved Hide resolved
{
// When State is null, OTel SDK guarantees StateValues is populated
// TODO: Debug.Assert?
listKvp = logRecord.StateValues;
}
else
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -190,10 +190,8 @@ internal void SerializeLogRecord(LogRecord logRecord)

// `LogRecord.State` and `LogRecord.StateValues` were marked Obsolete in https://github.com/open-telemetry/opentelemetry-dotnet/pull/4334
#pragma warning disable 0618
if (logRecord.State == null)
if (logRecord.StateValues != null)
{
// When State is null, OTel SDK guarantees StateValues is populated
// TODO: Debug.Assert?
listKvp = logRecord.StateValues;
}
else
Expand Down
3 changes: 3 additions & 0 deletions src/OpenTelemetry.Exporter.InfluxDB/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@

## Unreleased

* Updates to 1.5.1 of OpenTelemetry SDK.
([#1255](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/1255))

## 1.0.0-alpha.2

Released 2023-Jun-20
Expand Down
8 changes: 4 additions & 4 deletions src/OpenTelemetry.Exporter.Instana/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

## Unreleased

* Update OTel SDK version to `1.5.0`.
([#1220](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/1220))
* Update OpenTelemetry SDK version to `1.5.1`.
([#1255](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/1255))
* 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))
Expand All @@ -14,7 +14,7 @@ Released 2023-Feb-21

* Fixes issue in span serialization process introduced in 1.0.2 version.
([#979](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/979))
* Update OTel SDK version to `1.3.2`.
* Update OpenTelemetry SDK version to `1.3.2`.
([#917](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/917))

## 1.0.2
Expand All @@ -35,7 +35,7 @@ Released 2022-Nov-02
[376](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/376)
* Application is crashing if environment variables are not defined
[385](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/385)
* Update OTel SDK version to `1.3.1`.
* Update OpenTelemetry SDK version to `1.3.1`.
([#749](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/749))

## 1.0.0
Expand Down
3 changes: 3 additions & 0 deletions src/OpenTelemetry.Exporter.OneCollector/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,9 @@
non-zero on `LogRecord`s.
([#1127](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/1127))

* Update OpenTelemetry to 1.5.1
([#1255](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/1255))

## 0.1.0-alpha.2

Released 2023-Mar-6
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -133,11 +133,11 @@ protected override void SerializeItemToJson(Resource resource, LogRecord item, C

string? body = null;

if (item.StateValues != null)
if (item.Attributes != null)
{
for (int i = 0; i < item.StateValues.Count; i++)
for (int i = 0; i < item.Attributes.Count; i++)
{
var attribute = item.StateValues[i];
var attribute = item.Attributes[i];

if (string.IsNullOrEmpty(attribute.Key))
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="OpenTelemetry" Version="[1.4.0,2.0.0)" />
<PackageReference Include="OpenTelemetry" Version="$(OpenTelemetryCoreLatestVersion)" />
<PackageReference Include="System.Text.Json" Version="$(SystemTextJsonPkgVer)" Condition="'$(TargetFramework)' != 'net7.0' AND '$(TargetFramework)' != 'net6.0'" />
</ItemGroup>

Expand Down
1 change: 0 additions & 1 deletion src/OpenTelemetry.Exporter.OneCollector/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ dotnet add package --prerelease OpenTelemetry.Exporter.OneCollector
using var logFactory = LoggerFactory.Create(builder => builder
.AddOpenTelemetry(builder =>
{
builder.ParseStateValues = true;
builder.IncludeScopes = true;
builder.AddOneCollectorExporter("InstrumentationKey=instrumentation-key-here");
}));
Expand Down
12 changes: 6 additions & 6 deletions src/OpenTelemetry.Exporter.Stackdriver/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

## Unreleased

* Update OTel SDK version to `1.5.0`.
([#1220](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/1220))
* Update OpenTelemetry SDK version to `1.5.1`.
([#1255](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/1255))

## 1.0.0-beta.4

Expand All @@ -12,14 +12,14 @@ Released 2022-Dec-07
* Fix the issue of incorrect handling of null attributes.
([#566](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/566))
* Support for Google Cloud Dependencies up to 3.x.x
and OTel SDK package to 1.3.1
and OpenTelemetry SDK package to 1.3.1
([#794](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/794))

## 1.0.0-beta.3

Released 2022-Jul-22

* Updated OTel SDK package version to 1.2.0
* Updated OpenTelemetry SDK package version to 1.2.0
* Updated minimum full framework support to net462
* Update Google.Cloud.Monitoring.V3 2.1.0 -> 2.6.0
* Update Google.Cloud.Monitoring.V3 2.0.0 -> 2.3.0
Expand All @@ -43,10 +43,10 @@ Released 2022-Jul-22

## 1.0.0-beta1

* Update OTel SDK package version to 1.1.0
* Update OpenTelemetry SDK package version to 1.1.0
* Log exceptions when failing to export data to stackdriver

## Initial Release

* Updated OTel SDK package version to 1.1.0-beta1
* Updated OpenTelemetry SDK package version to 1.1.0-beta1
([#100](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/100))
3 changes: 3 additions & 0 deletions src/OpenTelemetry.Extensions/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@
* Add LogToActivityEventConversionOptions.Filter callback
([#1059](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/1059))

* Update OpenTelemetry SDK version to `1.5.1`.
([#1255](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/1255))

## 1.0.0-beta.4

Released 2023-Feb-27
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -78,17 +78,17 @@ public override void OnEnd(LogRecord data)

data.ForEachScope(ProcessScope, new State(tags, this));

if (data.StateValues != null)
if (data.Attributes != null)
{
try
{
this.options.StateConverter?.Invoke(tags, data.StateValues);
this.options.StateConverter?.Invoke(tags, data.Attributes);
}
#pragma warning disable CA1031 // Do not catch general exception types
catch (Exception ex)
#pragma warning restore CA1031 // Do not catch general exception types
{
OpenTelemetryExtensionsEventSource.Log.LogProcessorException($"Processing state of type [{data.State?.GetType().FullName}]", ex);
OpenTelemetryExtensionsEventSource.Log.LogProcessorException($"Processing attributes for LogRecord with CategoryName [{data.CategoryName}]", ex);
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="OpenTelemetry" Version="[1.4.0,2.0.0)" />
<PackageReference Include="OpenTelemetry" Version="$(OpenTelemetryCoreLatestVersion)" />
</ItemGroup>

</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@

## Unreleased

* Update `OpenTelemetry.Api` to `1.5.1`.
([#1255](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/1255))

## 1.0.0-rc9.9

Released 2023-Jun-09
Expand Down
4 changes: 2 additions & 2 deletions src/OpenTelemetry.Instrumentation.Cassandra/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

## Unreleased

* Updates to 1.5.0 of OpenTelemetry SDK.
([#1220](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/1220))
* Updates to 1.5.1 of OpenTelemetry SDK.
([#1255](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/1255))

## 1.0.0-beta.1

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@

## Unreleased

* Updated OTel SDK package version to 1.5.0
([#1220](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/1220))
* Updated OpenTelemetry SDK package version to 1.5.1
([#1255](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/1255))

## 1.0.0-beta.4

Released 2023-Mar-06

* Updated OTel SDK package version to 1.4.0
* Updated OpenTelemetry SDK package version to 1.4.0
([#1019](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/1019))
* Update minimum full framework support to net462
* Requests that get an HTTP status code of 404 are not marked as an error span status
Expand Down Expand Up @@ -42,10 +42,10 @@ Released 2023-Mar-06

Released 2021-June-17

* Updated OTel SDK package version to 1.1.0-beta4
* Updated OpenTelemetry SDK package version to 1.1.0-beta4
([#136](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/136))

## Initial Release

* Updated OTel SDK package version to 1.1.0-beta1
* Updated OpenTelemetry SDK package version to 1.1.0-beta1
([#100](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/100))
Loading