Skip to content
Merged
Show file tree
Hide file tree
Changes from 5 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
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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`.

Expand Down
10 changes: 5 additions & 5 deletions build/LibraryVersions.g.cs
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ public static partial class LibraryVersion
"TestApplication.Elasticsearch",
[
new("8.15.10"),
new("9.2.1"),
new("9.2.2"),
]
},
{
Expand All @@ -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" } }),
]
},
{
Expand Down Expand Up @@ -81,7 +81,7 @@ public static partial class LibraryVersion
"TestApplication.MassTransit",
[
new("8.3.0"),
new("8.5.5"),
new("8.5.7"),
]
},
{
Expand Down Expand Up @@ -170,7 +170,7 @@ public static partial class LibraryVersion
"TestApplication.StackExchangeRedis",
[
new("2.6.122"),
new("2.9.32"),
new("2.10.1"),
]
},
{
Expand All @@ -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"),
]
},
{
Expand Down
2 changes: 1 addition & 1 deletion docker/centos-stream9.dockerfile
Original file line number Diff line number Diff line change
@@ -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 \
Expand Down
2 changes: 1 addition & 1 deletion docs/plugins.md
Original file line number Diff line number Diff line change
Expand Up @@ -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 |

Expand Down
4 changes: 2 additions & 2 deletions src/Directory.Packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<PackageVersion Include="OpenTelemetry.Instrumentation.Process" Version="1.14.0-beta.2" />
<PackageVersion Include="OpenTelemetry.Instrumentation.Quartz" Version="1.14.0-beta.2" />
<PackageVersion Include="OpenTelemetry.Instrumentation.Runtime" Version="1.14.0" />
<PackageVersion Include="OpenTelemetry.Instrumentation.SqlClient" Version="1.14.0-beta.1" />
<PackageVersion Include="OpenTelemetry.Instrumentation.SqlClient" Version="1.14.0-rc.1" />
<PackageVersion Include="OpenTelemetry.Instrumentation.StackExchangeRedis" Version="1.14.0-beta.1" />
<PackageVersion Include="OpenTelemetry.Shims.OpenTracing" Version="1.14.0-beta.1" />
<PackageVersion Include="OpenTelemetry.Resources.Azure" Version="1.14.0-beta.1" />
Expand All @@ -38,7 +38,7 @@
<!-- Versions from SourceGenerators.csproj -->
<ItemGroup>
<PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="4.14.0" />
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.14.0" />
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="5.0.0" />
</ItemGroup>
<!-- Versions from CommonExcludedAssets.props -->
<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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} },
Expand Down Expand Up @@ -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} },
Expand Down Expand Up @@ -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} },
Expand Down Expand Up @@ -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} },
Expand Down
30 changes: 15 additions & 15 deletions test/Directory.Packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -2,23 +2,23 @@
<Import Project="..\Directory.Packages.props" />
<ItemGroup>
<PackageVersion Include="Azure.Storage.Blobs" Version="12.26.0" />
<PackageVersion Include="Confluent.Kafka" Version="2.12.0" />
<PackageVersion Include="Confluent.Kafka" Version="2.13.0" />
<PackageVersion Include="CoreWCF.Http" Version="1.8.0" />
<PackageVersion Include="CoreWCF.NetTcp" Version="1.8.0" />
<PackageVersion Include="CoreWCF.Primitives" Version="1.8.0" />
<PackageVersion Include="Elastic.Clients.Elasticsearch" Version="9.2.1" />
<PackageVersion Include="Google.Protobuf" Version="3.33.1" />
<PackageVersion Include="GraphQL" Version="8.7.0" />
<PackageVersion Include="GraphQL.MicrosoftDI" Version="8.7.0" />
<PackageVersion Include="GraphQL.Server.Transports.AspNetCore" Version="8.3.2" />
<PackageVersion Include="GraphQL.Server.Ui.GraphiQL" Version="8.3.2" />
<PackageVersion Include="Elastic.Clients.Elasticsearch" Version="9.2.2" />
<PackageVersion Include="Google.Protobuf" Version="3.33.4" />
<PackageVersion Include="GraphQL" Version="8.8.3" />
<PackageVersion Include="GraphQL.MicrosoftDI" Version="8.8.3" />
<PackageVersion Include="GraphQL.Server.Transports.AspNetCore" Version="8.3.3" />
<PackageVersion Include="GraphQL.Server.Ui.GraphiQL" Version="8.3.3" />
<PackageVersion Include="Grpc.AspNetCore" Version="2.67.0" />
<PackageVersion Include="Grpc.Net.Client" Version="2.67.0" />
<PackageVersion Include="Grpc.Net.Client.Web" Version="2.67.0" />
<PackageVersion Include="Grpc.Tools" Version="2.68.1" />
<PackageVersion Include="log4net" Version="3.2.0" />
<PackageVersion Include="MassTransit" Version="8.5.5" />
<PackageVersion Include="Microsoft.AspNetCore.SignalR.Client" Version="10.0.0" />
<PackageVersion Include="MassTransit" Version="8.5.7" />
<PackageVersion Include="Microsoft.AspNetCore.SignalR.Client" Version="10.0.2" />
<PackageVersion Include="Microsoft.Build" Version="15.9.20" />
<PackageVersion Include="Microsoft.Build.Utilities.Core" Version="15.9.20" />
<PackageVersion Include="Microsoft.Data.SqlClient" Version="6.1.3" />
Expand Down Expand Up @@ -50,22 +50,22 @@
<PackageVersion Include="Quartz.Extensions.DependencyInjection" Version="3.15.1" />
<PackageVersion Include="Quartz.Extensions.Hosting" Version="3.15.1" />
<PackageVersion Include="RabbitMQ.Client" Version="7.2.0" />
<PackageVersion Include="StackExchange.Redis" Version="2.9.32" />
<PackageVersion Include="StackExchange.Redis" Version="2.10.1" />
<PackageVersion Include="StrongNamer" Version="0.2.5" />
<PackageVersion Include="System.Collections.Immutable" Version="10.0.0" />
<PackageVersion Include="System.Data.SqlClient" Version="4.9.0" />
<PackageVersion Include="System.Diagnostics.DiagnosticSource" Version="10.0.0" />
<PackageVersion Include="System.Reactive" Version="6.1.0" />
<PackageVersion Include="System.Security.Cryptography.Pkcs" Version="10.0.0" />
<PackageVersion Include="System.Security.Cryptography.Pkcs" Version="10.0.2" />
<PackageVersion Include="System.ServiceModel.Http" Version="10.0.652802" />
<PackageVersion Include="System.ServiceModel.NetTcp" Version="10.0.652802" />
<PackageVersion Include="System.ServiceModel.Primitives" Version="10.0.652802" />
<PackageVersion Include="System.Text.Json" Version="10.0.0" />
<PackageVersion Include="System.Text.Json" Version="10.0.2" />
<PackageVersion Include="System.ValueTuple" Version="4.6.1" />
<PackageVersion Include="Testcontainers" Version="4.8.1" />
<PackageVersion Include="Verify.Xunit" Version="31.7.1" />
<PackageVersion Include="Testcontainers" Version="4.10.0" />
<PackageVersion Include="Verify.Xunit" Version="31.9.4" />
<PackageVersion Include="xunit" Version="2.9.3" />
<PackageVersion Include="xunit.runner.visualstudio" Version="2.8.2" />
<PackageVersion Include="Xunit.SkippableFact" Version="1.5.23" />
<PackageVersion Include="Xunit.SkippableFact" Version="1.5.61" />
</ItemGroup>
</Project>
3 changes: 1 addition & 2 deletions test/IntegrationTests/AzureCollectionFixture.cs
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,7 @@ public async Task DisposeAsync()

private static async Task<IContainer> 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));
Expand Down
3 changes: 1 addition & 2 deletions test/IntegrationTests/IISContainerTestHelper.cs
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,7 @@ public static async Task<IContainer> 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)
Expand Down
3 changes: 1 addition & 2 deletions test/IntegrationTests/KafkaCollectionFixture.cs
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,7 @@ public async Task DisposeAsync()

private async Task<IContainer?> LaunchKafkaContainer(INetwork? containerNetwork)
{
var container = new ContainerBuilder()
.WithImage(KafkaImage)
var container = new ContainerBuilder(KafkaImage)
.WithName(_kafkaContainerName)
.WithPortBinding(Port)
.WithEnvironment("KAFKA_BROKER_ID", "1")
Expand Down
10 changes: 5 additions & 5 deletions test/IntegrationTests/LibraryVersions.g.cs
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ public static TheoryData<string> Elasticsearch
string.Empty,
#else
"8.15.10",
"9.2.1",
"9.2.2",
#endif
];
return theoryData;
Expand Down Expand Up @@ -91,7 +91,7 @@ public static TheoryData<string> GraphQL
#else
"7.5.0",
"8.0.2",
"8.7.0",
"8.8.3",
#endif
];
return theoryData;
Expand Down Expand Up @@ -157,7 +157,7 @@ public static TheoryData<string> MassTransit
string.Empty,
#else
"8.3.0",
"8.5.5",
"8.5.7",
#endif
];
return theoryData;
Expand Down Expand Up @@ -372,7 +372,7 @@ public static TheoryData<string> StackExchangeRedis
string.Empty,
#else
"2.6.122",
"2.9.32",
"2.10.1",
#endif
];
return theoryData;
Expand Down Expand Up @@ -409,7 +409,7 @@ public static TheoryData<string> Kafka
#else
"1.8.2",
"1.9.2",
"2.12.0",
"2.13.0",
#endif
];
return theoryData;
Expand Down
3 changes: 1 addition & 2 deletions test/IntegrationTests/MongoDBCollectionFixture.cs
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,7 @@ public async Task DisposeAsync()
private static async Task<IContainer> 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));
Expand Down
3 changes: 1 addition & 2 deletions test/IntegrationTests/MySqlCollectionFixture.cs
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,7 @@ public async Task DisposeAsync()

private static async Task<IContainer> 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")
Expand Down
3 changes: 1 addition & 2 deletions test/IntegrationTests/OracleCollectionFixture.cs
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,7 @@ private static async Task ShutdownOracleContainerAsync(IContainer container)

private async Task<IContainer> 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)
Expand Down
3 changes: 1 addition & 2 deletions test/IntegrationTests/PostgresCollectionFixture.cs
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,7 @@ public async Task DisposeAsync()

private static async Task<IContainer> 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")
Expand Down
3 changes: 1 addition & 2 deletions test/IntegrationTests/RabbitMqCollectionFixture.cs
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,7 @@ public void SkipIfUnsupportedPlatform()

private static async Task<IContainer> 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));
Expand Down
3 changes: 1 addition & 2 deletions test/IntegrationTests/RedisCollectionFixture.cs
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,7 @@ public async Task DisposeAsync()

private static async Task<IContainer> 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));
Expand Down
3 changes: 1 addition & 2 deletions test/IntegrationTests/SqlServerCollectionFixture.cs
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,7 @@ private static async Task ShutdownSqlServerContainerAsync(IContainer container)

private async Task<IContainer> LaunchSqlServerContainerAsync()
{
var databaseContainersBuilder = new ContainerBuilder()
.WithImage(DatabaseImage)
var databaseContainersBuilder = new ContainerBuilder(DatabaseImage)
.WithName($"sql-server-{Port}")
.WithPortBinding(Port, DatabasePort)
.WithEnvironment("SA_PASSWORD", Password)
Expand Down
3 changes: 1 addition & 2 deletions test/IntegrationTests/WcfIISTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -97,8 +97,7 @@ private async Task<IContainer> 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)
Expand Down
2 changes: 1 addition & 1 deletion tools/Directory.Packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<PackageVersion Include="McMaster.Extensions.CommandLineUtils" Version="4.1.1" />
<PackageVersion Include="Microsoft.Build" Version="17.14.28" />
<PackageVersion Include="NuGet.ProjectModel" Version="7.0.0" />
<PackageVersion Include="System.IO.Abstractions" Version="22.0.16" />
<PackageVersion Include="System.IO.Abstractions" Version="22.1.0" />
<PackageVersion Include="Valleysoft.DockerfileModel" Version="1.2.0" />
<PackageVersion Include="YamlDotNet" Version="16.3.0" />
</ItemGroup>
Expand Down
Loading