diff --git a/CHANGELOG.md b/CHANGELOG.md
index f78d35c69..5837dfa42 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -47,7 +47,29 @@ This component adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.h
- `OpenTelemetry.Instrumentation.EntityFrameworkCore` from `1.11.0-beta.2` to `1.12.0-beta.2`,
- `OpenTelemetry.Instrumentation.StackExchangeRedis` from `1.11.0-beta.2` to `1.12.0-beta.1`.
- .NET Framework only, following packages updated
- - `OpenTelemetry.Instrumentation.AspNet` from `1.11.0-beta.2` to `1.12.0-beta.1`.
+ - `Microsoft.Bcl.AsyncInterfaces` from `9.0.2` to `9.0.6`,
+ - `Microsoft.Extensions.Configuration` from `9.0.2` to `9.0.6`,
+ - `Microsoft.Extensions.Configuration.Abstractions` from `9.0.2` to `9.0.6`,
+ - `Microsoft.Extensions.Configuration.Binder` from `9.0.2` to `9.0.6`,
+ - `Microsoft.Extensions.DependencyInjection` from `9.0.2` to `9.0.6`,
+ - `Microsoft.Extensions.DependencyInjection.Abstractions` from `9.0.2` to `9.0.6`,
+ - `Microsoft.Extensions.Diagnostics.Abstractions` from `9.0.2` to `9.0.6`,
+ - `Microsoft.Extensions.Logging` from `9.0.2` to `9.0.6`,
+ - `Microsoft.Extensions.Logging.Abstractions` from `9.0.2` to `9.0.6`,
+ - `Microsoft.Extensions.Logging.Configuration` from `9.0.2` to `9.0.6`,
+ - `Microsoft.Extensions.Options` from `9.0.2` to `9.0.6`,
+ - `Microsoft.Extensions.Options.ConfigurationExtensions` from `9.0.2` to `9.0.6`,
+ - `Microsoft.Extensions.Primitives` from `9.0.2` to `9.0.6`,
+ - `OpenTelemetry.Instrumentation.AspNet` from `1.11.0-beta.2` to `1.12.0-beta.1`,
+ - `System.Buffers` from `4.6.0` to `4.6.1`,
+ - `System.Diagnostics.DiagnosticSource` from `9.0.2` to `9.0.6`,
+ - `System.IO.Pipelines` from `9.0.2` to `9.0.6`,
+ - `System.Memory` from `4.6.0` to `4.6.3`,
+ - `System.Numerics.Vectors` from `4.6.0` to `4.6.1`,
+ - `System.Runtime.CompilerServices.Unsafe` from `6.1.0` to `6.1.2`,
+ - `System.Threading.Tasks.Extensions` update from `4.6.0` to `4.6.3`,
+ - `System.Text.Json` update from `9.0.2` to `9.0.6`.
+ - `System.ValueTuple` from `4.5.0` to `4.6.1`.
### Deprecated
diff --git a/Directory.Packages.props b/Directory.Packages.props
index fe5533f37..f48d305f9 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -4,7 +4,7 @@
-
+
diff --git a/build/Directory.Packages.props b/build/Directory.Packages.props
index 6cf7058bf..27937e609 100644
--- a/build/Directory.Packages.props
+++ b/build/Directory.Packages.props
@@ -4,6 +4,6 @@
-
+
diff --git a/build/LibraryVersions.g.cs b/build/LibraryVersions.g.cs
index a4d0c0e34..02d54579f 100644
--- a/build/LibraryVersions.g.cs
+++ b/build/LibraryVersions.g.cs
@@ -19,14 +19,14 @@ public static partial class LibraryVersion
"TestApplication.Azure",
[
new("12.22.2"),
- new("12.24.0"),
+ new("12.24.1"),
]
},
{
"TestApplication.Elasticsearch",
[
new("8.15.10"),
- new("8.17.4"),
+ new("9.0.7"),
]
},
{
@@ -34,7 +34,7 @@ public static partial class LibraryVersion
[
new("6.0.35"),
new("8.0.10"),
- new("9.0.4"),
+ new("9.0.6"),
]
},
{
@@ -65,14 +65,14 @@ public static partial class LibraryVersion
"TestApplication.Log4NetBridge",
[
new("2.0.13"),
- new("3.0.4"),
+ new("3.1.0"),
]
},
{
"TestApplication.MassTransit",
[
new("8.3.0"),
- new("8.4.0"),
+ new("8.5.0"),
]
},
{
@@ -95,7 +95,7 @@ public static partial class LibraryVersion
new("2.19.0", supportedFrameworks: [ "net9.0", "net8.0", "net462" ]),
new("2.30.0", supportedFrameworks: [ "net9.0", "net8.0", "net462" ]),
new("3.0.0", supportedFrameworks: [ "net9.0", "net8.0", "net472" ]),
- new("3.3.0", supportedFrameworks: [ "net9.0", "net8.0", "net472" ]),
+ new("3.4.0", supportedFrameworks: [ "net9.0", "net8.0", "net472" ]),
]
},
{
@@ -161,7 +161,7 @@ public static partial class LibraryVersion
"TestApplication.StackExchangeRedis",
[
new("2.6.122"),
- new("2.8.31"),
+ new("2.8.41"),
]
},
{
@@ -178,7 +178,7 @@ public static partial class LibraryVersion
new("1.4.0", supportedPlatforms: [ "x64" ]),
new("1.6.2"),
new("1.8.2"),
- new("2.10.0"),
+ new("2.10.1"),
]
},
};
diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props
index e60b2c2b6..e0ff2aab7 100644
--- a/src/Directory.Packages.props
+++ b/src/Directory.Packages.props
@@ -2,7 +2,7 @@
-
+
@@ -34,7 +34,7 @@
-
+
@@ -46,29 +46,29 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
\ No newline at end of file
diff --git a/src/OpenTelemetry.AutoInstrumentation.Native/netfx_assembly_redirection.h b/src/OpenTelemetry.AutoInstrumentation.Native/netfx_assembly_redirection.h
index 5f3fbf8ea..147df915e 100644
--- a/src/OpenTelemetry.AutoInstrumentation.Native/netfx_assembly_redirection.h
+++ b/src/OpenTelemetry.AutoInstrumentation.Native/netfx_assembly_redirection.h
@@ -18,19 +18,19 @@ void CorProfiler::InitNetFxAssemblyRedirectsMap()
const USHORT auto_major = atoi(AUTO_MAJOR);
assembly_version_redirect_map_.insert({
- { L"Microsoft.Bcl.AsyncInterfaces", {9, 0, 0, 2} },
- { L"Microsoft.Extensions.Configuration", {9, 0, 0, 2} },
- { L"Microsoft.Extensions.Configuration.Abstractions", {9, 0, 0, 2} },
- { L"Microsoft.Extensions.Configuration.Binder", {9, 0, 0, 2} },
- { L"Microsoft.Extensions.DependencyInjection", {9, 0, 0, 2} },
- { L"Microsoft.Extensions.DependencyInjection.Abstractions", {9, 0, 0, 2} },
- { L"Microsoft.Extensions.Diagnostics.Abstractions", {9, 0, 0, 2} },
- { L"Microsoft.Extensions.Logging", {9, 0, 0, 2} },
- { L"Microsoft.Extensions.Logging.Abstractions", {9, 0, 0, 2} },
- { L"Microsoft.Extensions.Logging.Configuration", {9, 0, 0, 2} },
- { L"Microsoft.Extensions.Options", {9, 0, 0, 2} },
- { L"Microsoft.Extensions.Options.ConfigurationExtensions", {9, 0, 0, 2} },
- { L"Microsoft.Extensions.Primitives", {9, 0, 0, 2} },
+ { L"Microsoft.Bcl.AsyncInterfaces", {9, 0, 0, 6} },
+ { L"Microsoft.Extensions.Configuration", {9, 0, 0, 6} },
+ { L"Microsoft.Extensions.Configuration.Abstractions", {9, 0, 0, 6} },
+ { L"Microsoft.Extensions.Configuration.Binder", {9, 0, 0, 6} },
+ { L"Microsoft.Extensions.DependencyInjection", {9, 0, 0, 6} },
+ { L"Microsoft.Extensions.DependencyInjection.Abstractions", {9, 0, 0, 6} },
+ { L"Microsoft.Extensions.Diagnostics.Abstractions", {9, 0, 0, 6} },
+ { L"Microsoft.Extensions.Logging", {9, 0, 0, 6} },
+ { L"Microsoft.Extensions.Logging.Abstractions", {9, 0, 0, 6} },
+ { L"Microsoft.Extensions.Logging.Configuration", {9, 0, 0, 6} },
+ { L"Microsoft.Extensions.Options", {9, 0, 0, 6} },
+ { L"Microsoft.Extensions.Options.ConfigurationExtensions", {9, 0, 0, 6} },
+ { L"Microsoft.Extensions.Primitives", {9, 0, 0, 6} },
{ L"Microsoft.Win32.Primitives", {4, 0, 3, 0} },
{ L"OpenTelemetry", {1, 0, 0, 0} },
{ L"OpenTelemetry.Api", {1, 0, 0, 0} },
@@ -58,7 +58,7 @@ void CorProfiler::InitNetFxAssemblyRedirectsMap()
{ L"OpenTelemetry.Shims.OpenTracing", {1, 0, 0, 0} },
{ L"OpenTracing", {0, 12, 1, 0} },
{ L"System.AppContext", {4, 1, 2, 0} },
- { L"System.Buffers", {4, 0, 4, 0} },
+ { L"System.Buffers", {4, 0, 5, 0} },
{ L"System.Collections", {4, 0, 11, 0} },
{ L"System.Collections.Concurrent", {4, 0, 11, 0} },
{ L"System.Collections.NonGeneric", {4, 0, 3, 0} },
@@ -71,7 +71,7 @@ void CorProfiler::InitNetFxAssemblyRedirectsMap()
{ L"System.Data.Common", {4, 2, 0, 0} },
{ L"System.Diagnostics.Contracts", {4, 0, 1, 0} },
{ L"System.Diagnostics.Debug", {4, 0, 11, 0} },
- { L"System.Diagnostics.DiagnosticSource", {9, 0, 0, 2} },
+ { L"System.Diagnostics.DiagnosticSource", {9, 0, 0, 6} },
{ L"System.Diagnostics.FileVersionInfo", {4, 0, 2, 0} },
{ L"System.Diagnostics.Process", {4, 1, 2, 0} },
{ L"System.Diagnostics.StackTrace", {4, 1, 0, 0} },
@@ -93,14 +93,14 @@ void CorProfiler::InitNetFxAssemblyRedirectsMap()
{ L"System.IO.FileSystem.Watcher", {4, 0, 2, 0} },
{ L"System.IO.IsolatedStorage", {4, 0, 2, 0} },
{ L"System.IO.MemoryMappedFiles", {4, 0, 2, 0} },
- { L"System.IO.Pipelines", {9, 0, 0, 2} },
+ { L"System.IO.Pipelines", {9, 0, 0, 6} },
{ L"System.IO.Pipes", {4, 0, 2, 0} },
{ L"System.IO.UnmanagedMemoryStream", {4, 0, 3, 0} },
{ L"System.Linq", {4, 1, 2, 0} },
{ L"System.Linq.Expressions", {4, 1, 2, 0} },
{ L"System.Linq.Parallel", {4, 0, 1, 0} },
{ L"System.Linq.Queryable", {4, 0, 1, 0} },
- { L"System.Memory", {4, 0, 2, 0} },
+ { L"System.Memory", {4, 0, 5, 0} },
{ L"System.Net.Http", {4, 2, 0, 0} },
{ L"System.Net.NameResolution", {4, 0, 2, 0} },
{ L"System.Net.NetworkInformation", {4, 1, 2, 0} },
@@ -112,7 +112,7 @@ void CorProfiler::InitNetFxAssemblyRedirectsMap()
{ L"System.Net.WebHeaderCollection", {4, 0, 1, 0} },
{ L"System.Net.WebSockets", {4, 0, 2, 0} },
{ L"System.Net.WebSockets.Client", {4, 0, 2, 0} },
- { L"System.Numerics.Vectors", {4, 1, 5, 0} },
+ { L"System.Numerics.Vectors", {4, 1, 6, 0} },
{ L"System.ObjectModel", {4, 0, 11, 0} },
{ L"System.Reflection", {4, 1, 2, 0} },
{ L"System.Reflection.Extensions", {4, 0, 1, 0} },
@@ -121,7 +121,7 @@ void CorProfiler::InitNetFxAssemblyRedirectsMap()
{ L"System.Resources.ResourceManager", {4, 0, 1, 0} },
{ L"System.Resources.Writer", {4, 0, 2, 0} },
{ L"System.Runtime", {4, 1, 2, 0} },
- { L"System.Runtime.CompilerServices.Unsafe", {6, 0, 1, 0} },
+ { L"System.Runtime.CompilerServices.Unsafe", {6, 0, 3, 0} },
{ L"System.Runtime.CompilerServices.VisualC", {4, 0, 2, 0} },
{ L"System.Runtime.Extensions", {4, 1, 2, 0} },
{ L"System.Runtime.Handles", {4, 0, 1, 0} },
@@ -148,12 +148,12 @@ void CorProfiler::InitNetFxAssemblyRedirectsMap()
{ L"System.Threading", {4, 0, 11, 0} },
{ L"System.Threading.Overlapped", {4, 1, 0, 0} },
{ L"System.Threading.Tasks", {4, 0, 11, 0} },
- { L"System.Threading.Tasks.Extensions", {4, 2, 1, 0} },
+ { L"System.Threading.Tasks.Extensions", {4, 2, 4, 0} },
{ L"System.Threading.Tasks.Parallel", {4, 0, 1, 0} },
{ L"System.Threading.Thread", {4, 0, 2, 0} },
{ L"System.Threading.ThreadPool", {4, 0, 12, 0} },
{ L"System.Threading.Timer", {4, 0, 1, 0} },
- { L"System.ValueTuple", {4, 0, 3, 0} },
+ { L"System.ValueTuple", {4, 0, 5, 0} },
{ L"System.Xml.ReaderWriter", {4, 1, 1, 0} },
{ L"System.Xml.XDocument", {4, 0, 11, 0} },
{ L"System.Xml.XmlDocument", {4, 0, 3, 0} },
diff --git a/test/Directory.Packages.props b/test/Directory.Packages.props
index 7049a24d7..83815c9df 100644
--- a/test/Directory.Packages.props
+++ b/test/Directory.Packages.props
@@ -1,10 +1,10 @@
-
-
-
-
+
+
+
+
@@ -13,29 +13,29 @@
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
+
@@ -44,21 +44,21 @@
-
+
-
+
-
+
-
+
-
+
diff --git a/test/IntegrationTests/LibraryVersions.g.cs b/test/IntegrationTests/LibraryVersions.g.cs
index 3119f083b..02d90fdb0 100644
--- a/test/IntegrationTests/LibraryVersions.g.cs
+++ b/test/IntegrationTests/LibraryVersions.g.cs
@@ -23,7 +23,7 @@ public static partial class LibraryVersion
string.Empty,
#else
"12.22.2",
- "12.24.0",
+ "12.24.1",
#endif
];
return theoryData;
@@ -39,7 +39,7 @@ public static partial class LibraryVersion
string.Empty,
#else
"8.15.10",
- "8.17.4",
+ "9.0.7",
#endif
];
return theoryData;
@@ -56,7 +56,7 @@ public static partial class LibraryVersion
#else
"6.0.35",
"8.0.10",
- "9.0.4",
+ "9.0.6",
#endif
];
return theoryData;
@@ -123,7 +123,7 @@ public static partial class LibraryVersion
string.Empty,
#else
"2.0.13",
- "3.0.4",
+ "3.1.0",
#endif
];
return theoryData;
@@ -139,7 +139,7 @@ public static partial class LibraryVersion
string.Empty,
#else
"8.3.0",
- "8.4.0",
+ "8.5.0",
#endif
];
return theoryData;
@@ -196,7 +196,7 @@ public static partial class LibraryVersion
"3.0.0",
#endif
#if NET9_0 || NET8_0 || NET462
- "3.3.0",
+ "3.4.0",
#endif
#endif
];
@@ -354,7 +354,7 @@ public static partial class LibraryVersion
string.Empty,
#else
"2.6.122",
- "2.8.31",
+ "2.8.41",
#endif
];
return theoryData;
@@ -388,7 +388,7 @@ public static partial class LibraryVersion
#else
"1.6.2",
"1.8.2",
- "2.10.0",
+ "2.10.1",
#endif
];
return theoryData;
diff --git a/test/test-applications/integrations/TestApplication.Elasticsearch/Program.cs b/test/test-applications/integrations/TestApplication.Elasticsearch/Program.cs
index 424cf0e47..2a42659d0 100644
--- a/test/test-applications/integrations/TestApplication.Elasticsearch/Program.cs
+++ b/test/test-applications/integrations/TestApplication.Elasticsearch/Program.cs
@@ -1,7 +1,6 @@
// Copyright The OpenTelemetry Authors
// SPDX-License-Identifier: Apache-2.0
-using System;
using Elastic.Clients.Elasticsearch;
using Elastic.Transport;
using TestApplication.Shared;
@@ -23,7 +22,7 @@ var client = new ElasticsearchClient(settings);
try
{
await client.SearchAsync(s =>
- s.Index("test-index").From(0).Size(10).Query(q => q.Term(t => t.Field(to => to.Id))));
+ s.Indices("test-index").From(0).Size(10).Query(q => q.Term(t => t.Field(to => to.Id))));
}
catch (UnexpectedTransportException)
{
diff --git a/tools/Directory.Packages.props b/tools/Directory.Packages.props
index 9ce0c9167..4799cca3b 100644
--- a/tools/Directory.Packages.props
+++ b/tools/Directory.Packages.props
@@ -2,9 +2,9 @@
-
-
-
+
+
+