Skip to content
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
74 changes: 39 additions & 35 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,48 +18,52 @@ This component adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.h

### Changed

- Changed minimal supported version of `Microsoft.Extensions.Logging`
for `ILOGGER` instrumentation from `9.0.0` to `8.0.0`.

#### Dependency updates

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

- Following packages updated
- `OpenTelemetry.Instrumentation.GrpcNetClient` from `1.12.0-beta.1` to `1.13.0-beta.1`,
- `OpenTelemetry.Instrumentation.Http` from `1.12.0` to `1.13.0`,
- `OpenTelemetry.Instrumentation.Process` from `1.12.0-beta.1` to `1.13.0-beta.1`,
- `OpenTelemetry.Instrumentation.Quartz` from `1.12.0-beta.1` to `1.13.0-beta.1`,
- `OpenTelemetry.Instrumentation.Runtime` from `1.12.0` to `1.13.0`,
- `OpenTelemetry.Instrumentation.SqlClient` from `1.12.0-beta.2` to `1.13.0-beta.1`,
- `OpenTelemetry.Instrumentation.Wcf` from `1.12.0-beta.1` to `1.13.0-beta.2`,
- `OpenTelemetry.Resources.Azure` from `1.12.0-beta.1` to `1.13.0-beta.1`,
- `OpenTelemetry.Resources.Host` from `1.12.0-beta.1` to `1.13.0-beta.1`,
- `OpenTelemetry.Resources.OperatingSystem` from `1.12.0-beta.1` to `1.13.0-beta.1`,
- `OpenTelemetry.Resources.Process` from `1.12.0-beta.1` to `1.13.0-beta.1`,
- `OpenTelemetry.Resources.ProcessRuntime` from `1.12.0-beta.1` to `1.13.0-beta.1`.
- `OpenTelemetry.Instrumentation.GrpcNetClient` from `1.12.0-beta.1` to `1.14.0-beta.1`,
- `OpenTelemetry.Instrumentation.Http` from `1.12.0` to `1.14.0`,
- `OpenTelemetry.Instrumentation.Process` from `1.12.0-beta.1` to `1.14.0-beta.2`,
- `OpenTelemetry.Instrumentation.Quartz` from `1.12.0-beta.1` to `1.14.0-beta.2`,
- `OpenTelemetry.Instrumentation.Runtime` from `1.12.0` to `1.14.0`,
- `OpenTelemetry.Instrumentation.SqlClient` from `1.12.0-beta.2` to `1.14.0-beta.1`,
- `OpenTelemetry.Instrumentation.Wcf` from `1.12.0-beta.1` to `1.14.0-beta.1`,
- `OpenTelemetry.Resources.Azure` from `1.12.0-beta.1` to `1.14.0-beta.1`,
- `OpenTelemetry.Resources.Host` from `1.12.0-beta.1` to `1.14.0-beta.1`,
- `OpenTelemetry.Resources.OperatingSystem` from `1.12.0-beta.1` to `1.14.0-beta.1`,
- `OpenTelemetry.Resources.Process` from `1.12.0-beta.1` to `1.14.0-beta.1`,
- `OpenTelemetry.Resources.ProcessRuntime` from `1.12.0-beta.1` to `1.14.0-beta.1`.
- .NET only, following packages updated
- `OpenTelemetry.Instrumentation.AspNetCore` from `1.12.0` to `1.13.0`,
- `OpenTelemetry.Instrumentation.EntityFrameworkCore` from `1.12.0-beta.2` to `1.13.0-beta.1`,
- `OpenTelemetry.Instrumentation.StackExchangeRedis` from `1.12.0-beta.2` to `1.13.0-beta.1`,
- `OpenTelemetry.Resources.Container` from `1.12.0-beta.1` to `1.13.0-beta.1`.
- `OpenTelemetry.Instrumentation.AspNetCore` from `1.12.0` to `1.14.0`,
- `OpenTelemetry.Instrumentation.EntityFrameworkCore` from `1.12.0-beta.2` to `1.14.0-beta.2`,
- `OpenTelemetry.Instrumentation.StackExchangeRedis` from `1.12.0-beta.2` to `1.14.0-beta.1`,
- `OpenTelemetry.Resources.Container` from `1.12.0-beta.1` to `1.14.0-beta.1`,
- `System.Diagnostics.DiagnosticSource` from `9.0.0` to `10.0.0`.
- .NET Framework only, following packages updated
- `Microsoft.Bcl.AsyncInterfaces` from `9.0.8` to `9.0.10`,
- `Microsoft.Extensions.Configuration` from `9.0.8` to `9.0.10`,
- `Microsoft.Extensions.Configuration.Abstractions` from `9.0.8` to `9.0.10`,
- `Microsoft.Extensions.Configuration.Binder` from `9.0.8` to `9.0.10`,
- `Microsoft.Extensions.DependencyInjection` from `9.0.8` to `9.0.10`,
- `Microsoft.Extensions.DependencyInjection.Abstractions` from `9.0.8` to `9.0.10`,
- `Microsoft.Extensions.Diagnostics.Abstractions` from `9.0.8` to `9.0.10`,
- `Microsoft.Extensions.Logging` from `9.0.8` to `9.0.10`,
- `Microsoft.Extensions.Logging.Abstractions` from `9.0.8` to `9.0.10`,
- `Microsoft.Extensions.Logging.Configuration` from `9.0.8` to `9.0.10`,
- `Microsoft.Extensions.Options` from `9.0.8` to `9.0.10`,
- `Microsoft.Extensions.Options.ConfigurationExtensions` from `9.0.8` to `9.0.10`,
- `Microsoft.Extensions.Primitives` from `9.0.8` to `9.0.10`,
- `OpenTelemetry.Instrumentation.AspNet` from `1.12.0-beta.1` to `1.13.0-rc.1`,
- `System.Diagnostics.DiagnosticSource` from `9.0.8` to `9.0.10`,
- `System.IO.Pipelines` from `9.0.8` to `9.0.10`,
- `System.Text.Encodings.Web` from `9.0.8` to `9.0.10`,
- `System.Text.Json` from `9.0.8` to `9.0.10`.
- `Microsoft.Bcl.AsyncInterfaces` from `9.0.8` to `10.0.0`,
- `Microsoft.Extensions.Configuration` from `9.0.8` to `10.0.0`,
- `Microsoft.Extensions.Configuration.Abstractions` from `9.0.8` to `10.0.0`,
- `Microsoft.Extensions.Configuration.Binder` from `9.0.8` to `10.0.0`,
- `Microsoft.Extensions.DependencyInjection` from `9.0.8` to `10.0.0`,
- `Microsoft.Extensions.DependencyInjection.Abstractions` from `9.0.8` to `10.0.0`,
- `Microsoft.Extensions.Diagnostics.Abstractions` from `9.0.8` to `10.0.0`,
- `Microsoft.Extensions.Logging` from `9.0.8` to `10.0.0`,
- `Microsoft.Extensions.Logging.Abstractions` from `9.0.8` to `10.0.0`,
- `Microsoft.Extensions.Logging.Configuration` from `9.0.8` to `10.0.0`,
- `Microsoft.Extensions.Options` from `9.0.8` to `10.0.0`,
- `Microsoft.Extensions.Options.ConfigurationExtensions` from `9.0.8` to `10.0.0`,
- `Microsoft.Extensions.Primitives` from `9.0.8` to `10.0.0`,
- `OpenTelemetry.Instrumentation.AspNet` from `1.12.0-beta.1` to `1.14.0-rc.1`,
- `System.Diagnostics.DiagnosticSource` from `9.0.8` to `10.0.0`,
- `System.IO.Pipelines` from `9.0.8` to `10.0.0`,
- `System.Text.Encodings.Web` from `9.0.8` to `10.0.0`,
- `System.Text.Json` from `9.0.8` to `10.0.0`.

#### Dependencies on .NET Framework

Expand Down
12 changes: 6 additions & 6 deletions Directory.Packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
<ItemGroup>
<PackageVersion Include="DotNet.ReproducibleBuilds" Version="1.2.39" />
<PackageVersion Include="MinVer" Version="6.0.0" />
<PackageVersion Include="OpenTelemetry" Version="1.13.1" />
<PackageVersion Include="OpenTelemetry.Api" Version="1.13.1" />
<PackageVersion Include="OpenTelemetry.Exporter.Console" Version="1.13.1" />
<PackageVersion Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.13.1" />
<PackageVersion Include="OpenTelemetry.Instrumentation.Http" Version="1.13.0" />
<PackageVersion Include="OpenTelemetry.Instrumentation.Wcf" Version="1.13.0-beta.2" />
<PackageVersion Include="OpenTelemetry" Version="1.14.0" />
<PackageVersion Include="OpenTelemetry.Api" Version="1.14.0" />
<PackageVersion Include="OpenTelemetry.Exporter.Console" Version="1.14.0" />
<PackageVersion Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.14.0" />
<PackageVersion Include="OpenTelemetry.Instrumentation.Http" Version="1.14.0" />
<PackageVersion Include="OpenTelemetry.Instrumentation.Wcf" Version="1.14.0-beta.1" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion build/Directory.Packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@
<PackageVersion Include="Microsoft.Build" Version="17.14.28" />
<!-- Microsoft.Build.Tasks.Core is an indirect reference from Nuke.Common. Fixes https://github.com/advisories/GHSA-w3q9-fxm7-j8fq -->
<PackageVersion Include="Microsoft.Build.Tasks.Core" Version="17.14.28" />
<PackageVersion Include="Nuget.CommandLine" Version="6.14.0" />
<PackageVersion Include="Nuget.CommandLine" Version="7.0.0" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion build/Extensions/DepsJsonExtensions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ public static void RollFrameworkForward(this JsonObject depsJson, string runtime

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

foreach (var duplicatedLibrary in duplicatedLibraries)
{
Expand Down
12 changes: 6 additions & 6 deletions build/LibraryVersions.g.cs
Original file line number Diff line number Diff line change
Expand Up @@ -26,15 +26,15 @@ public static partial class LibraryVersion
"TestApplication.Elasticsearch",
[
new("8.15.10"),
new("9.2.0"),
new("9.2.1"),
]
},
{
"TestApplication.EntityFrameworkCore",
[
new("6.0.35"),
new("8.0.10"),
new("9.0.10"),
new("9.0.11"),
]
},
{
Expand Down Expand Up @@ -102,7 +102,7 @@ public static partial class LibraryVersion
"TestApplication.MySqlConnector",
[
new("2.0.0"),
new("2.4.0"),
new("2.5.0"),
]
},
{
Expand Down Expand Up @@ -131,14 +131,14 @@ public static partial class LibraryVersion
"TestApplication.OracleMda.NetFramework",
[
new("23.5.1", supportedFrameworks: [ "net472" ]),
new("23.9.1", supportedFrameworks: [ "net472" ]),
new("23.26.0", supportedFrameworks: [ "net472" ]),
]
},
{
"TestApplication.OracleMda.Core",
[
new("23.5.1"),
new("23.9.1"),
new("23.26.0"),
]
},
{
Expand All @@ -154,7 +154,7 @@ public static partial class LibraryVersion
new("5.1.2"),
new("6.8.1"),
new("7.0.0"),
new("7.1.2"),
new("7.2.0"),
]
},
{
Expand Down
6 changes: 3 additions & 3 deletions docs/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -54,9 +54,9 @@ OpenTelemetry .NET Automatic Instrumentation is built on top of
[OpenTelemetry .NET](https://github.com/open-telemetry/opentelemetry-dotnet):

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

You can find all references in
[OpenTelemetry.AutoInstrumentation.csproj](../src/OpenTelemetry.AutoInstrumentation/OpenTelemetry.AutoInstrumentation.csproj)
Expand Down
Loading
Loading