diff --git a/CHANGELOG.md b/CHANGELOG.md index d78d83225f..1a1f23a534 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -30,6 +30,8 @@ This component adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.h #### Dependency updates +- Following packages updated + - `OpenTelemetry.Instrumentation.SqlClient` from `1.14.0-beta.1` to `1.14.0-rc.1`. - .NET Framework only, following packages updated - `OpenTelemetry.Instrumentation.AspNet` from `1.14.0-rc.1` to `1.14.0`. diff --git a/build/LibraryVersions.g.cs b/build/LibraryVersions.g.cs index 48e99e3ea1..d86d1434a2 100644 --- a/build/LibraryVersions.g.cs +++ b/build/LibraryVersions.g.cs @@ -26,7 +26,7 @@ public static partial class LibraryVersion "TestApplication.Elasticsearch", [ new("8.15.10"), - new("9.2.1"), + new("9.2.2"), ] }, { @@ -51,7 +51,7 @@ public static partial class LibraryVersion [ new("7.5.0", additionalMetaData: new() { { "GraphQLMicrosoftDI", "7.5.0" }, { "GraphQLServerTransportsAspNetCore", "7.5.0" }, { "GraphQLServerUIPGraphiQL", "7.5.0" } }), new("8.0.2", additionalMetaData: new() { { "GraphQLMicrosoftDI", "8.0.2" }, { "GraphQLServerTransportsAspNetCore", "8.0.2" }, { "GraphQLServerUIPGraphiQL", "8.0.2" } }), - new("8.7.0", additionalMetaData: new() { { "GraphQLMicrosoftDI", "8.7.0" }, { "GraphQLServerTransportsAspNetCore", "8.3.2" }, { "GraphQLServerUIPGraphiQL", "8.3.2" } }), + new("8.8.3", additionalMetaData: new() { { "GraphQLMicrosoftDI", "8.8.3" }, { "GraphQLServerTransportsAspNetCore", "8.3.3" }, { "GraphQLServerUIPGraphiQL", "8.3.3" } }), ] }, { @@ -81,7 +81,7 @@ public static partial class LibraryVersion "TestApplication.MassTransit", [ new("8.3.0"), - new("8.5.5"), + new("8.5.7"), ] }, { @@ -170,7 +170,7 @@ public static partial class LibraryVersion "TestApplication.StackExchangeRedis", [ new("2.6.122"), - new("2.9.32"), + new("2.10.1"), ] }, { @@ -187,7 +187,7 @@ public static partial class LibraryVersion [ new("1.8.2"), new("1.9.2"), - new("2.12.0"), + new("2.13.0"), ] }, { diff --git a/docker/centos-stream9.dockerfile b/docker/centos-stream9.dockerfile index b7b161b1f1..9f16c25b9b 100644 --- a/docker/centos-stream9.dockerfile +++ b/docker/centos-stream9.dockerfile @@ -1,4 +1,4 @@ -FROM quay.io/centos/centos:stream9@sha256:5d83c1191669f1baef408c19b19082d8cc61997c5a16c72aa57a4a53cf0fd449 +FROM quay.io/centos/centos:stream9@sha256:ffd1ba47ce1a32ffb2cc6e17de8024313ff76f9a122063f386400a28ab790abf # Install dotnet sdk RUN dnf install -y \ diff --git a/docs/plugins.md b/docs/plugins.md index 999dfea9e1..ab59f717ca 100644 --- a/docs/plugins.md +++ b/docs/plugins.md @@ -123,7 +123,7 @@ public class MyPlugin | OpenTelemetry.Instrumentation.GrpcNetClient.GrpcClientTraceInstrumentationOptions | OpenTelemetry.Instrumentation.GrpcNetClient | 1.14.0-beta.1 | | OpenTelemetry.Instrumentation.Http.HttpClientTraceInstrumentationOptions | OpenTelemetry.Instrumentation.Http | 1.14.0 | | OpenTelemetry.Instrumentation.Quartz.QuartzInstrumentationOptions | OpenTelemetry.Instrumentation.Quartz | 1.14.0-beta.2 | -| OpenTelemetry.Instrumentation.SqlClient.SqlClientTraceInstrumentationOptions | OpenTelemetry.Instrumentation.SqlClient | 1.14.0-beta.1 | +| OpenTelemetry.Instrumentation.SqlClient.SqlClientTraceInstrumentationOptions | OpenTelemetry.Instrumentation.SqlClient | 1.14.0-rc.1 | | OpenTelemetry.Instrumentation.StackExchangeRedis.StackExchangeRedisInstrumentationOptions | OpenTelemetry.Instrumentation.StackExchangeRedis | 1.14.0-beta.1 | | OpenTelemetry.Instrumentation.Wcf.WcfInstrumentationOptions | OpenTelemetry.Instrumentation.Wcf | 1.14.0-beta.1 | diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props index ebabc5c828..4f938257f7 100644 --- a/src/Directory.Packages.props +++ b/src/Directory.Packages.props @@ -24,7 +24,7 @@ - + @@ -38,7 +38,7 @@ - + diff --git a/src/OpenTelemetry.AutoInstrumentation.Native/netfx_assembly_redirection.h b/src/OpenTelemetry.AutoInstrumentation.Native/netfx_assembly_redirection.h index 4004fc8668..393c9d87e4 100644 --- a/src/OpenTelemetry.AutoInstrumentation.Native/netfx_assembly_redirection.h +++ b/src/OpenTelemetry.AutoInstrumentation.Native/netfx_assembly_redirection.h @@ -49,7 +49,7 @@ void CorProfiler::InitNetFxAssemblyRedirectsMap() { L"OpenTelemetry.Instrumentation.Process", {1, 14, 0, 798} }, { L"OpenTelemetry.Instrumentation.Quartz", {1, 14, 0, 797} }, { L"OpenTelemetry.Instrumentation.Runtime", {1, 14, 0, 775} }, - { L"OpenTelemetry.Instrumentation.SqlClient", {1, 14, 0, 768} }, + { L"OpenTelemetry.Instrumentation.SqlClient", {1, 14, 0, 863} }, { L"OpenTelemetry.Instrumentation.StackExchangeRedis", {1, 14, 0, 765} }, { L"OpenTelemetry.Instrumentation.Wcf", {1, 14, 0, 773} }, { L"OpenTelemetry.Resources.Azure", {1, 14, 0, 766} }, @@ -194,7 +194,7 @@ void CorProfiler::InitNetFxAssemblyRedirectsMap() { L"OpenTelemetry.Instrumentation.Process", {1, 14, 0, 798} }, { L"OpenTelemetry.Instrumentation.Quartz", {1, 14, 0, 797} }, { L"OpenTelemetry.Instrumentation.Runtime", {1, 14, 0, 775} }, - { L"OpenTelemetry.Instrumentation.SqlClient", {1, 14, 0, 768} }, + { L"OpenTelemetry.Instrumentation.SqlClient", {1, 14, 0, 863} }, { L"OpenTelemetry.Instrumentation.StackExchangeRedis", {1, 14, 0, 765} }, { L"OpenTelemetry.Instrumentation.Wcf", {1, 14, 0, 773} }, { L"OpenTelemetry.Resources.Azure", {1, 14, 0, 766} }, @@ -338,7 +338,7 @@ void CorProfiler::InitNetFxAssemblyRedirectsMap() { L"OpenTelemetry.Instrumentation.Process", {1, 14, 0, 798} }, { L"OpenTelemetry.Instrumentation.Quartz", {1, 14, 0, 797} }, { L"OpenTelemetry.Instrumentation.Runtime", {1, 14, 0, 775} }, - { L"OpenTelemetry.Instrumentation.SqlClient", {1, 14, 0, 768} }, + { L"OpenTelemetry.Instrumentation.SqlClient", {1, 14, 0, 863} }, { L"OpenTelemetry.Instrumentation.StackExchangeRedis", {1, 14, 0, 765} }, { L"OpenTelemetry.Instrumentation.Wcf", {1, 14, 0, 773} }, { L"OpenTelemetry.Resources.Azure", {1, 14, 0, 766} }, @@ -400,7 +400,7 @@ void CorProfiler::InitNetFxAssemblyRedirectsMap() { L"OpenTelemetry.Instrumentation.Process", {1, 14, 0, 798} }, { L"OpenTelemetry.Instrumentation.Quartz", {1, 14, 0, 797} }, { L"OpenTelemetry.Instrumentation.Runtime", {1, 14, 0, 775} }, - { L"OpenTelemetry.Instrumentation.SqlClient", {1, 14, 0, 768} }, + { L"OpenTelemetry.Instrumentation.SqlClient", {1, 14, 0, 863} }, { L"OpenTelemetry.Instrumentation.StackExchangeRedis", {1, 14, 0, 765} }, { L"OpenTelemetry.Instrumentation.Wcf", {1, 14, 0, 773} }, { L"OpenTelemetry.Resources.Azure", {1, 14, 0, 766} }, diff --git a/test/Directory.Packages.props b/test/Directory.Packages.props index 10c0024826..c1a54b673c 100644 --- a/test/Directory.Packages.props +++ b/test/Directory.Packages.props @@ -2,23 +2,23 @@ - + - - - - - - + + + + + + - - + + @@ -50,22 +50,22 @@ - + - + - + - - + + - + \ No newline at end of file diff --git a/test/IntegrationTests/AzureCollectionFixture.cs b/test/IntegrationTests/AzureCollectionFixture.cs index d233456ac9..046d158955 100644 --- a/test/IntegrationTests/AzureCollectionFixture.cs +++ b/test/IntegrationTests/AzureCollectionFixture.cs @@ -43,8 +43,7 @@ public async Task DisposeAsync() private static async Task LaunchAzureContainerAsync(int port) { - var containersBuilder = new ContainerBuilder() - .WithImage(AzureStorageImage) + var containersBuilder = new ContainerBuilder(AzureStorageImage) .WithName($"azure-storage-{port}") .WithPortBinding(port, BlobServicePort) .WithWaitStrategy(Wait.ForUnixContainer().UntilInternalTcpPortIsAvailable(BlobServicePort)); diff --git a/test/IntegrationTests/IISContainerTestHelper.cs b/test/IntegrationTests/IISContainerTestHelper.cs index 0f88ea4515..ea3429616a 100644 --- a/test/IntegrationTests/IISContainerTestHelper.cs +++ b/test/IntegrationTests/IISContainerTestHelper.cs @@ -25,8 +25,7 @@ public static async Task StartContainerAsync( Directory.CreateDirectory(logPath); testOutputHelper.WriteLine("Collecting docker logs to: " + logPath); - var builder = new ContainerBuilder() - .WithImage(imageName) + var builder = new ContainerBuilder(imageName) .WithCleanUp(cleanUp: true) .WithName($"{imageName}-{webPort}") .WithNetwork(networkName) diff --git a/test/IntegrationTests/KafkaCollectionFixture.cs b/test/IntegrationTests/KafkaCollectionFixture.cs index 625ba0fe41..7fa9e55506 100644 --- a/test/IntegrationTests/KafkaCollectionFixture.cs +++ b/test/IntegrationTests/KafkaCollectionFixture.cs @@ -59,8 +59,7 @@ public async Task DisposeAsync() private async Task LaunchKafkaContainer(INetwork? containerNetwork) { - var container = new ContainerBuilder() - .WithImage(KafkaImage) + var container = new ContainerBuilder(KafkaImage) .WithName(_kafkaContainerName) .WithPortBinding(Port) .WithEnvironment("KAFKA_BROKER_ID", "1") diff --git a/test/IntegrationTests/LibraryVersions.g.cs b/test/IntegrationTests/LibraryVersions.g.cs index f9ea208794..6776df3c90 100644 --- a/test/IntegrationTests/LibraryVersions.g.cs +++ b/test/IntegrationTests/LibraryVersions.g.cs @@ -39,7 +39,7 @@ public static TheoryData Elasticsearch string.Empty, #else "8.15.10", - "9.2.1", + "9.2.2", #endif ]; return theoryData; @@ -91,7 +91,7 @@ public static TheoryData GraphQL #else "7.5.0", "8.0.2", - "8.7.0", + "8.8.3", #endif ]; return theoryData; @@ -157,7 +157,7 @@ public static TheoryData MassTransit string.Empty, #else "8.3.0", - "8.5.5", + "8.5.7", #endif ]; return theoryData; @@ -372,7 +372,7 @@ public static TheoryData StackExchangeRedis string.Empty, #else "2.6.122", - "2.9.32", + "2.10.1", #endif ]; return theoryData; @@ -409,7 +409,7 @@ public static TheoryData Kafka #else "1.8.2", "1.9.2", - "2.12.0", + "2.13.0", #endif ]; return theoryData; diff --git a/test/IntegrationTests/MongoDBCollectionFixture.cs b/test/IntegrationTests/MongoDBCollectionFixture.cs index 5d19545dbe..a4e32211af 100644 --- a/test/IntegrationTests/MongoDBCollectionFixture.cs +++ b/test/IntegrationTests/MongoDBCollectionFixture.cs @@ -45,8 +45,7 @@ public async Task DisposeAsync() private static async Task LaunchMongoContainerAsync(int port) { var waitForOs = await GetWaitForOSTypeAsync().ConfigureAwait(false); - var mongoContainersBuilder = new ContainerBuilder() - .WithImage(MongoDBImage) + var mongoContainersBuilder = new ContainerBuilder(MongoDBImage) .WithName($"mongo-db-{port}") .WithPortBinding(port, MongoDBPort) .WithWaitStrategy(waitForOs.UntilInternalTcpPortIsAvailable(MongoDBPort)); diff --git a/test/IntegrationTests/MySqlCollectionFixture.cs b/test/IntegrationTests/MySqlCollectionFixture.cs index 7b0bdebe2b..85aec9cbe7 100644 --- a/test/IntegrationTests/MySqlCollectionFixture.cs +++ b/test/IntegrationTests/MySqlCollectionFixture.cs @@ -43,8 +43,7 @@ public async Task DisposeAsync() private static async Task LaunchMySqlContainerAsync(int port) { - var containersBuilder = new ContainerBuilder() - .WithImage(MySqlImage) + var containersBuilder = new ContainerBuilder(MySqlImage) .WithName($"mysql-{port}") .WithPortBinding(port, MySqlPort) .WithEnvironment("MYSQL_ALLOW_EMPTY_PASSWORD", "true") diff --git a/test/IntegrationTests/OracleCollectionFixture.cs b/test/IntegrationTests/OracleCollectionFixture.cs index 111a663499..63712156a5 100644 --- a/test/IntegrationTests/OracleCollectionFixture.cs +++ b/test/IntegrationTests/OracleCollectionFixture.cs @@ -68,8 +68,7 @@ private static async Task ShutdownOracleContainerAsync(IContainer container) private async Task LaunchOracleContainerAsync(int port) { - var containersBuilder = new ContainerBuilder() - .WithImage(OracleImage) + var containersBuilder = new ContainerBuilder(OracleImage) .WithEnvironment("ORACLE_RANDOM_PASSWORD", "yes") .WithEnvironment("APP_USER", "appuser") .WithEnvironment("APP_USER_PASSWORD", Password) diff --git a/test/IntegrationTests/PostgresCollectionFixture.cs b/test/IntegrationTests/PostgresCollectionFixture.cs index eba2a62be4..d6eb913a92 100644 --- a/test/IntegrationTests/PostgresCollectionFixture.cs +++ b/test/IntegrationTests/PostgresCollectionFixture.cs @@ -43,8 +43,7 @@ public async Task DisposeAsync() private static async Task LaunchPostgresContainerAsync(int port) { - var containersBuilder = new ContainerBuilder() - .WithImage(PostgresImage) + var containersBuilder = new ContainerBuilder(PostgresImage) .WithName($"postgres-{port}") .WithPortBinding(port, PostgresPort) .WithEnvironment("POSTGRES_HOST_AUTH_METHOD", "trust") diff --git a/test/IntegrationTests/RabbitMqCollectionFixture.cs b/test/IntegrationTests/RabbitMqCollectionFixture.cs index 05e6d6a710..eb3b5ea572 100644 --- a/test/IntegrationTests/RabbitMqCollectionFixture.cs +++ b/test/IntegrationTests/RabbitMqCollectionFixture.cs @@ -61,8 +61,7 @@ public void SkipIfUnsupportedPlatform() private static async Task LaunchRabbitMqContainerAsync(int port) { - var containersBuilder = new ContainerBuilder() - .WithImage(RabbitMqImage) + var containersBuilder = new ContainerBuilder(RabbitMqImage) .WithName($"rabbitmq-{port}") .WithPortBinding(port, RabbitMqPort) .WithWaitStrategy(Wait.ForUnixContainer().UntilInternalTcpPortIsAvailable(RabbitMqPort)); diff --git a/test/IntegrationTests/RedisCollectionFixture.cs b/test/IntegrationTests/RedisCollectionFixture.cs index 53806916bf..621886e405 100644 --- a/test/IntegrationTests/RedisCollectionFixture.cs +++ b/test/IntegrationTests/RedisCollectionFixture.cs @@ -43,8 +43,7 @@ public async Task DisposeAsync() private static async Task LaunchRedisContainerAsync(int port) { - var containersBuilder = new ContainerBuilder() - .WithImage(RedisImage) + var containersBuilder = new ContainerBuilder(RedisImage) .WithName($"redis-{port}") .WithPortBinding(port, RedisPort) .WithWaitStrategy(Wait.ForUnixContainer().UntilInternalTcpPortIsAvailable(RedisPort)); diff --git a/test/IntegrationTests/SqlClientSystemDataTests.cs b/test/IntegrationTests/SqlClientSystemDataTests.cs index 90f3ceb55e..4acd0f5fab 100644 --- a/test/IntegrationTests/SqlClientSystemDataTests.cs +++ b/test/IntegrationTests/SqlClientSystemDataTests.cs @@ -40,11 +40,11 @@ public void SqlClientIlRewrite(bool enableIlRewrite) if (enableIlRewrite) { - collector.Expect("OpenTelemetry.Instrumentation.SqlClient", span => span.Attributes.Any(attr => attr.Key == "db.statement" && !string.IsNullOrWhiteSpace(attr.Value?.StringValue))); + collector.Expect("OpenTelemetry.Instrumentation.SqlClient", span => span.Attributes.Any(attr => attr.Key == "db.query.text" && !string.IsNullOrWhiteSpace(attr.Value?.StringValue))); } else { - collector.Expect("OpenTelemetry.Instrumentation.SqlClient", span => span.Attributes.All(attr => attr.Key != "db.statement")); + collector.Expect("OpenTelemetry.Instrumentation.SqlClient", span => span.Attributes.All(attr => attr.Key != "db.query.text")); } RunTestApplication(); diff --git a/test/IntegrationTests/SqlServerCollectionFixture.cs b/test/IntegrationTests/SqlServerCollectionFixture.cs index 8492dc398b..a211aa4c7a 100644 --- a/test/IntegrationTests/SqlServerCollectionFixture.cs +++ b/test/IntegrationTests/SqlServerCollectionFixture.cs @@ -70,8 +70,7 @@ private static async Task ShutdownSqlServerContainerAsync(IContainer container) private async Task LaunchSqlServerContainerAsync() { - var databaseContainersBuilder = new ContainerBuilder() - .WithImage(DatabaseImage) + var databaseContainersBuilder = new ContainerBuilder(DatabaseImage) .WithName($"sql-server-{Port}") .WithPortBinding(Port, DatabasePort) .WithEnvironment("SA_PASSWORD", Password) diff --git a/test/IntegrationTests/WcfIISTests.cs b/test/IntegrationTests/WcfIISTests.cs index 3dcf350e4c..40d5455130 100644 --- a/test/IntegrationTests/WcfIISTests.cs +++ b/test/IntegrationTests/WcfIISTests.cs @@ -97,8 +97,7 @@ private async Task StartContainerAsync(int netTcpPort, int httpPort) Directory.CreateDirectory(logPath); Output.WriteLine("Collecting docker logs to: " + logPath); - var builder = new ContainerBuilder() - .WithImage(imageName) + var builder = new ContainerBuilder(imageName) .WithCleanUp(cleanUp: true) .WithName(imageName) .WithNetwork(networkName) diff --git a/tools/Directory.Packages.props b/tools/Directory.Packages.props index 68186aee15..e5bbf10c88 100644 --- a/tools/Directory.Packages.props +++ b/tools/Directory.Packages.props @@ -4,7 +4,7 @@ - +