Skip to content

Commit f2d70bd

Browse files
KielekKielek
authored
Bump OpenTelemetry to 1.14.0 (#4602)
1 parent 8c322d1 commit f2d70bd

File tree

31 files changed

+465
-460
lines changed

31 files changed

+465
-460
lines changed

‎CHANGELOG.md‎

Lines changed: 39 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -18,48 +18,52 @@ This component adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.h
1818

1919
### Changed
2020

21+
- Changed minimal supported version of `Microsoft.Extensions.Logging`
22+
for `ILOGGER` instrumentation from `9.0.0` to `8.0.0`.
23+
2124
#### Dependency updates
2225

2326
- Updated [Core components](https://github.com/open-telemetry/opentelemetry-dotnet/blob/main/VERSIONING.md#core-components):
24-
[`1.13.1`](https://github.com/open-telemetry/opentelemetry-dotnet/releases/tag/core-1.13.1).
27+
[`1.14.0`](https://github.com/open-telemetry/opentelemetry-dotnet/releases/tag/core-1.14.0).
2528

2629
- Following packages updated
27-
- `OpenTelemetry.Instrumentation.GrpcNetClient` from `1.12.0-beta.1` to `1.13.0-beta.1`,
28-
- `OpenTelemetry.Instrumentation.Http` from `1.12.0` to `1.13.0`,
29-
- `OpenTelemetry.Instrumentation.Process` from `1.12.0-beta.1` to `1.13.0-beta.1`,
30-
- `OpenTelemetry.Instrumentation.Quartz` from `1.12.0-beta.1` to `1.13.0-beta.1`,
31-
- `OpenTelemetry.Instrumentation.Runtime` from `1.12.0` to `1.13.0`,
32-
- `OpenTelemetry.Instrumentation.SqlClient` from `1.12.0-beta.2` to `1.13.0-beta.1`,
33-
- `OpenTelemetry.Instrumentation.Wcf` from `1.12.0-beta.1` to `1.13.0-beta.2`,
34-
- `OpenTelemetry.Resources.Azure` from `1.12.0-beta.1` to `1.13.0-beta.1`,
35-
- `OpenTelemetry.Resources.Host` from `1.12.0-beta.1` to `1.13.0-beta.1`,
36-
- `OpenTelemetry.Resources.OperatingSystem` from `1.12.0-beta.1` to `1.13.0-beta.1`,
37-
- `OpenTelemetry.Resources.Process` from `1.12.0-beta.1` to `1.13.0-beta.1`,
38-
- `OpenTelemetry.Resources.ProcessRuntime` from `1.12.0-beta.1` to `1.13.0-beta.1`.
30+
- `OpenTelemetry.Instrumentation.GrpcNetClient` from `1.12.0-beta.1` to `1.14.0-beta.1`,
31+
- `OpenTelemetry.Instrumentation.Http` from `1.12.0` to `1.14.0`,
32+
- `OpenTelemetry.Instrumentation.Process` from `1.12.0-beta.1` to `1.14.0-beta.2`,
33+
- `OpenTelemetry.Instrumentation.Quartz` from `1.12.0-beta.1` to `1.14.0-beta.2`,
34+
- `OpenTelemetry.Instrumentation.Runtime` from `1.12.0` to `1.14.0`,
35+
- `OpenTelemetry.Instrumentation.SqlClient` from `1.12.0-beta.2` to `1.14.0-beta.1`,
36+
- `OpenTelemetry.Instrumentation.Wcf` from `1.12.0-beta.1` to `1.14.0-beta.1`,
37+
- `OpenTelemetry.Resources.Azure` from `1.12.0-beta.1` to `1.14.0-beta.1`,
38+
- `OpenTelemetry.Resources.Host` from `1.12.0-beta.1` to `1.14.0-beta.1`,
39+
- `OpenTelemetry.Resources.OperatingSystem` from `1.12.0-beta.1` to `1.14.0-beta.1`,
40+
- `OpenTelemetry.Resources.Process` from `1.12.0-beta.1` to `1.14.0-beta.1`,
41+
- `OpenTelemetry.Resources.ProcessRuntime` from `1.12.0-beta.1` to `1.14.0-beta.1`.
3942
- .NET only, following packages updated
40-
- `OpenTelemetry.Instrumentation.AspNetCore` from `1.12.0` to `1.13.0`,
41-
- `OpenTelemetry.Instrumentation.EntityFrameworkCore` from `1.12.0-beta.2` to `1.13.0-beta.1`,
42-
- `OpenTelemetry.Instrumentation.StackExchangeRedis` from `1.12.0-beta.2` to `1.13.0-beta.1`,
43-
- `OpenTelemetry.Resources.Container` from `1.12.0-beta.1` to `1.13.0-beta.1`.
43+
- `OpenTelemetry.Instrumentation.AspNetCore` from `1.12.0` to `1.14.0`,
44+
- `OpenTelemetry.Instrumentation.EntityFrameworkCore` from `1.12.0-beta.2` to `1.14.0-beta.2`,
45+
- `OpenTelemetry.Instrumentation.StackExchangeRedis` from `1.12.0-beta.2` to `1.14.0-beta.1`,
46+
- `OpenTelemetry.Resources.Container` from `1.12.0-beta.1` to `1.14.0-beta.1`,
47+
- `System.Diagnostics.DiagnosticSource` from `9.0.0` to `10.0.0`.
4448
- .NET Framework only, following packages updated
45-
- `Microsoft.Bcl.AsyncInterfaces` from `9.0.8` to `9.0.10`,
46-
- `Microsoft.Extensions.Configuration` from `9.0.8` to `9.0.10`,
47-
- `Microsoft.Extensions.Configuration.Abstractions` from `9.0.8` to `9.0.10`,
48-
- `Microsoft.Extensions.Configuration.Binder` from `9.0.8` to `9.0.10`,
49-
- `Microsoft.Extensions.DependencyInjection` from `9.0.8` to `9.0.10`,
50-
- `Microsoft.Extensions.DependencyInjection.Abstractions` from `9.0.8` to `9.0.10`,
51-
- `Microsoft.Extensions.Diagnostics.Abstractions` from `9.0.8` to `9.0.10`,
52-
- `Microsoft.Extensions.Logging` from `9.0.8` to `9.0.10`,
53-
- `Microsoft.Extensions.Logging.Abstractions` from `9.0.8` to `9.0.10`,
54-
- `Microsoft.Extensions.Logging.Configuration` from `9.0.8` to `9.0.10`,
55-
- `Microsoft.Extensions.Options` from `9.0.8` to `9.0.10`,
56-
- `Microsoft.Extensions.Options.ConfigurationExtensions` from `9.0.8` to `9.0.10`,
57-
- `Microsoft.Extensions.Primitives` from `9.0.8` to `9.0.10`,
58-
- `OpenTelemetry.Instrumentation.AspNet` from `1.12.0-beta.1` to `1.13.0-rc.1`,
59-
- `System.Diagnostics.DiagnosticSource` from `9.0.8` to `9.0.10`,
60-
- `System.IO.Pipelines` from `9.0.8` to `9.0.10`,
61-
- `System.Text.Encodings.Web` from `9.0.8` to `9.0.10`,
62-
- `System.Text.Json` from `9.0.8` to `9.0.10`.
49+
- `Microsoft.Bcl.AsyncInterfaces` from `9.0.8` to `10.0.0`,
50+
- `Microsoft.Extensions.Configuration` from `9.0.8` to `10.0.0`,
51+
- `Microsoft.Extensions.Configuration.Abstractions` from `9.0.8` to `10.0.0`,
52+
- `Microsoft.Extensions.Configuration.Binder` from `9.0.8` to `10.0.0`,
53+
- `Microsoft.Extensions.DependencyInjection` from `9.0.8` to `10.0.0`,
54+
- `Microsoft.Extensions.DependencyInjection.Abstractions` from `9.0.8` to `10.0.0`,
55+
- `Microsoft.Extensions.Diagnostics.Abstractions` from `9.0.8` to `10.0.0`,
56+
- `Microsoft.Extensions.Logging` from `9.0.8` to `10.0.0`,
57+
- `Microsoft.Extensions.Logging.Abstractions` from `9.0.8` to `10.0.0`,
58+
- `Microsoft.Extensions.Logging.Configuration` from `9.0.8` to `10.0.0`,
59+
- `Microsoft.Extensions.Options` from `9.0.8` to `10.0.0`,
60+
- `Microsoft.Extensions.Options.ConfigurationExtensions` from `9.0.8` to `10.0.0`,
61+
- `Microsoft.Extensions.Primitives` from `9.0.8` to `10.0.0`,
62+
- `OpenTelemetry.Instrumentation.AspNet` from `1.12.0-beta.1` to `1.14.0-rc.1`,
63+
- `System.Diagnostics.DiagnosticSource` from `9.0.8` to `10.0.0`,
64+
- `System.IO.Pipelines` from `9.0.8` to `10.0.0`,
65+
- `System.Text.Encodings.Web` from `9.0.8` to `10.0.0`,
66+
- `System.Text.Json` from `9.0.8` to `10.0.0`.
6367

6468
#### Dependencies on .NET Framework
6569

‎Directory.Packages.props‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@
55
<ItemGroup>
66
<PackageVersion Include="DotNet.ReproducibleBuilds" Version="1.2.39" />
77
<PackageVersion Include="MinVer" Version="6.0.0" />
8-
<PackageVersion Include="OpenTelemetry" Version="1.13.1" />
9-
<PackageVersion Include="OpenTelemetry.Api" Version="1.13.1" />
10-
<PackageVersion Include="OpenTelemetry.Exporter.Console" Version="1.13.1" />
11-
<PackageVersion Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.13.1" />
12-
<PackageVersion Include="OpenTelemetry.Instrumentation.Http" Version="1.13.0" />
13-
<PackageVersion Include="OpenTelemetry.Instrumentation.Wcf" Version="1.13.0-beta.2" />
8+
<PackageVersion Include="OpenTelemetry" Version="1.14.0" />
9+
<PackageVersion Include="OpenTelemetry.Api" Version="1.14.0" />
10+
<PackageVersion Include="OpenTelemetry.Exporter.Console" Version="1.14.0" />
11+
<PackageVersion Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.14.0" />
12+
<PackageVersion Include="OpenTelemetry.Instrumentation.Http" Version="1.14.0" />
13+
<PackageVersion Include="OpenTelemetry.Instrumentation.Wcf" Version="1.14.0-beta.1" />
1414
</ItemGroup>
1515
</Project>

‎build/Directory.Packages.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@
88
<PackageVersion Include="Microsoft.Build" Version="17.14.28" />
99
<!-- Microsoft.Build.Tasks.Core is an indirect reference from Nuke.Common. Fixes https://github.com/advisories/GHSA-w3q9-fxm7-j8fq -->
1010
<PackageVersion Include="Microsoft.Build.Tasks.Core" Version="17.14.28" />
11-
<PackageVersion Include="Nuget.CommandLine" Version="6.14.0" />
11+
<PackageVersion Include="Nuget.CommandLine" Version="7.0.0" />
1212
</ItemGroup>
1313
</Project>

‎build/Extensions/DepsJsonExtensions.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ public static void RollFrameworkForward(this JsonObject depsJson, string runtime
122122

123123
public static void RemoveDuplicatedLibraries(this JsonObject depsJson, ReadOnlyCollection<AbsolutePath> architectureStores)
124124
{
125-
var duplicatedLibraries = new List<(string Name, string Version)>(0);
125+
var duplicatedLibraries = new List<(string Name, string Version)> { ("Microsoft.Extensions.Configuration.Binder", "8.0.0") };
126126

127127
foreach (var duplicatedLibrary in duplicatedLibraries)
128128
{

‎build/LibraryVersions.g.cs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,15 +26,15 @@ public static partial class LibraryVersion
2626
"TestApplication.Elasticsearch",
2727
[
2828
new("8.15.10"),
29-
new("9.2.0"),
29+
new("9.2.1"),
3030
]
3131
},
3232
{
3333
"TestApplication.EntityFrameworkCore",
3434
[
3535
new("6.0.35"),
3636
new("8.0.10"),
37-
new("9.0.10"),
37+
new("9.0.11"),
3838
]
3939
},
4040
{
@@ -102,7 +102,7 @@ public static partial class LibraryVersion
102102
"TestApplication.MySqlConnector",
103103
[
104104
new("2.0.0"),
105-
new("2.4.0"),
105+
new("2.5.0"),
106106
]
107107
},
108108
{
@@ -131,14 +131,14 @@ public static partial class LibraryVersion
131131
"TestApplication.OracleMda.NetFramework",
132132
[
133133
new("23.5.1", supportedFrameworks: [ "net472" ]),
134-
new("23.9.1", supportedFrameworks: [ "net472" ]),
134+
new("23.26.0", supportedFrameworks: [ "net472" ]),
135135
]
136136
},
137137
{
138138
"TestApplication.OracleMda.Core",
139139
[
140140
new("23.5.1"),
141-
new("23.9.1"),
141+
new("23.26.0"),
142142
]
143143
},
144144
{
@@ -154,7 +154,7 @@ public static partial class LibraryVersion
154154
new("5.1.2"),
155155
new("6.8.1"),
156156
new("7.0.0"),
157-
new("7.1.2"),
157+
new("7.2.0"),
158158
]
159159
},
160160
{

‎docs/README.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,9 +54,9 @@ OpenTelemetry .NET Automatic Instrumentation is built on top of
5454
[OpenTelemetry .NET](https://github.com/open-telemetry/opentelemetry-dotnet):
5555

5656
- [Core components](https://github.com/open-telemetry/opentelemetry-dotnet/blob/main/VERSIONING.md#core-components):
57-
[`1.13.1`](https://github.com/open-telemetry/opentelemetry-dotnet/releases/tag/core-1.13.0)
58-
- `System.Diagnostics.DiagnosticSource`: [`9.0.0`](https://www.nuget.org/packages/System.Diagnostics.DiagnosticSource/9.0.0)
59-
referencing `System.Runtime.CompilerServices.Unsafe`: [`6.0.0`](https://www.nuget.org/packages/System.Runtime.CompilerServices.Unsafe/6.0.0)
57+
[`1.14.0`](https://github.com/open-telemetry/opentelemetry-dotnet/releases/tag/core-1.10.0)
58+
- `System.Diagnostics.DiagnosticSource`: [`10.0.0`](https://www.nuget.org/packages/System.Diagnostics.DiagnosticSource/10.0.0)
59+
referencing `System.Runtime.CompilerServices.Unsafe`: [`6.1.2`](https://www.nuget.org/packages/System.Runtime.CompilerServices.Unsafe/6.1.2)
6060

6161
You can find all references in
6262
[OpenTelemetry.AutoInstrumentation.csproj](../src/OpenTelemetry.AutoInstrumentation/OpenTelemetry.AutoInstrumentation.csproj)

0 commit comments

Comments
 (0)