Skip to content

Commit 299d004

Browse files
matt-hensleypyohannes
matt-hensley
and
pyohannes
authored
Upgrade to upstream SDK 1.8.1 (+ other dependencies) (#93)
* update dependency versions * Remove warnings around AWS resource detectors --------- Co-authored-by: Johannes Tax <johannes.tax@grafana.com>
1 parent f846681 commit 299d004

File tree

6 files changed

+88
-20
lines changed

6 files changed

+88
-20
lines changed

‎CHANGELOG.md

+68
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,73 @@
11
# Changelog
22

3+
## Unreleased
4+
5+
### BREAKING CHANGES
6+
7+
* Use 1.8.1 of OpenTelemetry.Instrumentation.Http
8+
* **Breaking Change**: Fixed tracing instrumentation so that by default any
9+
values detected in the query string component of requests are replaced with
10+
the text `Redacted` when building the `url.full` tag. For example,
11+
`?key1=value1&key2=value2` becomes `?key1=Redacted&key2=Redacted`. You can
12+
disable this redaction by setting the environment variable
13+
`OTEL_DOTNET_EXPERIMENTAL_HTTPCLIENT_DISABLE_URL_QUERY_REDACTION` to `true`.
14+
([#5532](https://github.com/open-telemetry/opentelemetry-dotnet/pull/5532))
15+
16+
* Use 1.8.1 of OpenTelemetry.Instrumentation.AspNetCore
17+
* **Breaking Change**: Fixed tracing instrumentation so that by default any
18+
values detected in the query string component of requests are replaced with
19+
the text `Redacted` when building the `url.full` tag. For example,
20+
`?key1=value1&key2=value2` becomes `?key1=Redacted&key2=Redacted`. You can
21+
disable this redaction by setting the environment variable
22+
`OTEL_DOTNET_EXPERIMENTAL_HTTPCLIENT_DISABLE_URL_QUERY_REDACTION` to `true`.
23+
([#5532](https://github.com/open-telemetry/opentelemetry-dotnet/pull/5532))
24+
25+
### Bug Fixes
26+
27+
* Use 1.8.1 of OpenTelemetry
28+
* Fixed an issue in Logging where unwanted objects (processors, exporters, etc.)
29+
could be created inside delegates automatically executed by the Options API
30+
during configuration reload.
31+
([#5514](https://github.com/open-telemetry/opentelemetry-dotnet/pull/5514))
32+
* Include changes from the following versions:
33+
* [1.8.0](https://github.com/open-telemetry/opentelemetry-dotnet/releases/tag/core-1.8.0)
34+
35+
* Use 1.8.1 of OpenTelemetry.Exporter.OpenTelemetryProtocol
36+
* Fix native AoT warnings in `OpenTelemetry.Exporter.OpenTelemetryProtocol`.
37+
([#5520](https://github.com/open-telemetry/opentelemetry-dotnet/pull/5520))
38+
39+
* Use 1.8.1 of OpenTelemetry.Instrumentation.AspNetCore
40+
* Includes fixes from [1.8.0](https://github.com/open-telemetry/opentelemetry-dotnet/releases/tag/Instrumentation.AspNetCore-1.8.0)
41+
42+
* Use 1.8.1 of OpenTelemetry.Instrumentation.Http
43+
* Includes fixes from [1.8.0](https://github.com/open-telemetry/opentelemetry-dotnet/releases/tag/Instrumentation.Http-1.8.0)
44+
45+
### New features
46+
47+
* Use 1.8.0 of OpenTelemetry.Exporter.Console
48+
* Added support for `ActivitySource.Version` property. ([#5472](https://github.com/open-telemetry/opentelemetry-dotnet/pull/5472))
49+
50+
* Use 1.8.0-beta.1 of OpenTelemetry.Instrumentation.GrpcNetClient
51+
52+
* Use 1.8.0 of OpenTelemetry.Instrumentation.Runtime
53+
* `Meter.Version` is set to NuGet package version. ([#1624](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/1624))
54+
* Update `OpenTelemetry.Api` to `1.8.0`. ([#1624](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/1624))
55+
56+
* Use 1.8.0-beta.1 of OpenTelemetry.Instrumentation.SqlClient
57+
58+
* Use 0.5.0-beta.5 of OpenTelemetry.Instrumentation.Process
59+
* `Meter.Version` is set to NuGet package version. ([#1624](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/1624))
60+
* Update `OpenTelemetry.Api` to `1.8.0`. ([#1624](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/1624))
61+
62+
* Use 1.0.0-beta.6 of OpenTelemetry.ResourceDetectors.Azure
63+
* Update `OpenTelemetry.Api` to `1.8.0`. ([#1635](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/1635))
64+
65+
* Use 0.1.0-alpha.3 of OpenTelemetry.ResourceDetectors.Host
66+
* Update `OpenTelemetry.Api` to `1.8.0`. ([#1635](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/1635))
67+
68+
* Use 0.1.0-alpha.3 of OpenTelemetry.ResourceDetectors.ProcessRuntime
69+
* Update `OpenTelemetry.Api` to `1.8.0`. ([#1635](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/1635))
70+
371
## 0.7.0-beta.4
472

573
### Bug fixes

‎examples/net6.0/aspnetcore/aspnetcore.csproj

+3-3
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@
1010
</PropertyGroup>
1111

1212
<ItemGroup>
13-
<PackageReference Include="Microsoft.Data.SqlClient" Version="5.1.1" />
14-
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.19.4" />
15-
<PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.7.0" />
13+
<PackageReference Include="Microsoft.Data.SqlClient" Version="5.2.0" />
14+
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.20.1" />
15+
<PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.8.1" />
1616
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
1717
</ItemGroup>
1818

‎examples/net8.0/aspnetcore/aspnetcore.csproj

+4-4
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@
1010
</PropertyGroup>
1111

1212
<ItemGroup>
13-
<PackageReference Include="Microsoft.Data.SqlClient" Version="5.1.1" />
14-
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.19.4" />
15-
<PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.7.0" />
16-
<PackageReference Include="OpenTelemetry.Exporter.Console" Version="1.7.0" />
13+
<PackageReference Include="Microsoft.Data.SqlClient" Version="5.2.0" />
14+
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.20.1" />
15+
<PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.8.1" />
16+
<PackageReference Include="OpenTelemetry.Exporter.Console" Version="1.8.1" />
1717
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
1818
</ItemGroup>
1919

‎src/Grafana.OpenTelemetry.Base/Grafana.OpenTelemetry.Base.csproj

+7-7
Original file line numberDiff line numberDiff line change
@@ -27,22 +27,22 @@
2727
<PrivateAssets>all</PrivateAssets>
2828
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2929
</PackageReference>
30-
<PackageReference Include="OpenTelemetry" Version="1.7.0" />
31-
<PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.7.0" />
30+
<PackageReference Include="OpenTelemetry" Version="1.8.1" />
31+
<PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.8.1" />
3232
</ItemGroup>
3333

3434
<!-- Stable instrumentation packages -->
3535
<ItemGroup>
3636
<PackageReference Include="MySql.Data.OpenTelemetry" Version="8.2.0" />
37-
<PackageReference Include="OpenTelemetry.Instrumentation.Runtime" Version="1.7.0" />
37+
<PackageReference Include="OpenTelemetry.Instrumentation.Runtime" Version="1.8.0" />
3838
</ItemGroup>
3939

4040
<!-- Non-stable instrumentation packages with no dependencies -->
4141
<ItemGroup>
42-
<PackageReference Include="OpenTelemetry.Instrumentation.GrpcNetClient" Version="1.6.0-beta.3" />
43-
<PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.7.1" />
44-
<PackageReference Include="OpenTelemetry.Instrumentation.Process" Version="0.5.0-beta.3" />
45-
<PackageReference Include="OpenTelemetry.Instrumentation.SqlClient" Version="1.6.0-beta.3" />
42+
<PackageReference Include="OpenTelemetry.Instrumentation.GrpcNetClient" Version="1.8.0-beta.1" />
43+
<PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.8.1" />
44+
<PackageReference Include="OpenTelemetry.Instrumentation.Process" Version="0.5.0-beta.5" />
45+
<PackageReference Include="OpenTelemetry.Instrumentation.SqlClient" Version="1.8.0-beta.1" />
4646

4747
<PackageReference Include="OpenTelemetry.ResourceDetectors.Azure" Version="1.0.0-beta.4" />
4848
<PackageReference Include="OpenTelemetry.ResourceDetectors.Container" Version="1.0.0-beta.5" />

‎src/Grafana.OpenTelemetry/Grafana.OpenTelemetry.csproj

+3-3
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343

4444
<!-- Stable instrumentation packages with dependencies, only .NET -->
4545
<ItemGroup Condition=" '$(TargetFramework)' != 'net462' ">
46-
<PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.7.0" /> <!-- needed for AspNetCore -->
46+
<PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.8.1" /> <!-- needed for AspNetCore -->
4747
</ItemGroup>
4848

4949
<!-- Non-stable instrumentation packages with dependencies, both .NET framework and .NET -->
@@ -52,7 +52,7 @@
5252
<PackageReference Include="OpenTelemetry.Instrumentation.AWSLambda" Version="1.2.0-beta.1" />
5353
<PackageReference Include="OpenTelemetry.Instrumentation.Cassandra" Version="1.0.0-beta.1" />
5454
<PackageReference Include="OpenTelemetry.Instrumentation.ElasticsearchClient" Version="1.0.0-beta.5" />
55-
<PackageReference Include="OpenTelemetry.Instrumentation.EntityFrameworkCore" Version="1.0.0-beta.8" />
55+
<PackageReference Include="OpenTelemetry.Instrumentation.EntityFrameworkCore" Version="1.0.0-beta.11" />
5656
<PackageReference Include="OpenTelemetry.Instrumentation.Hangfire" Version="1.5.0-beta.1" />
5757
<PackageReference Include="OpenTelemetry.Instrumentation.MySqlData" Version="1.0.0-beta.7" />
5858
<PackageReference Include="OpenTelemetry.Instrumentation.Quartz" Version="1.0.0-alpha.3" />
@@ -62,7 +62,7 @@
6262

6363
<!-- Non-stable instrumentation packages with dependencies, only .NET -->
6464
<ItemGroup Condition=" '$(TargetFramework)' != 'net462' ">
65-
<PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.7.1" />
65+
<PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.8.1" />
6666
</ItemGroup>
6767

6868
<!-- Non-stable instrumentation packages with dependencies, only .NET framework -->

‎src/Grafana.OpenTelemetry/OpenTelemetryBuilderExtension.cs

+3-3
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@ public static class OpenTelemetryBuilderExtension
2121
/// <summary>
2222
/// Sets up tracing and metrics with the OpenTelemetry .NET distribution for Grafana.
2323
/// </summary>
24-
/// <param name="builder">A <see cref="OpenTelemetryBuilder"/></param>
24+
/// <param name="builder">A <see cref="IOpenTelemetryBuilder"/></param>
2525
/// <param name="configure">A callback for customizing default Grafana OpenTelemetry settings</param>
26-
/// <returns>A modified <see cref="OpenTelemetryBuilder"/> </returns>
27-
public static OpenTelemetryBuilder UseGrafana(this OpenTelemetryBuilder builder, Action<GrafanaOpenTelemetrySettings> configure = default)
26+
/// <returns>A modified <see cref="IOpenTelemetryBuilder"/> </returns>
27+
public static IOpenTelemetryBuilder UseGrafana(this IOpenTelemetryBuilder builder, Action<GrafanaOpenTelemetrySettings> configure = default)
2828
{
2929
return builder
3030
.WithTracing(tracerProviderBuilder => tracerProviderBuilder.UseGrafana(configure))

0 commit comments

Comments
 (0)