Merge branch 'main' into arm64

open-telemetry · Feb 29, 2024 · 245a8aa · 245a8aa
2 parents b76fa7d + be452bd
commit 245a8aa
Show file tree

Hide file tree

Showing 8 changed files with 26 additions and 23 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -16,7 +16,10 @@ This component adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.h
 
 #### Dependency updates
 
+- Following packages updated
+  - `MongoDB.Driver.Core.Extensions.DiagnosticSources` from `1.3.0` to `1.4.0`.
 - .NET Framework only, following packages updated
+  - `Grpc.Core.Api` from `2.60.0` to `2.61.0`,
   - `Microsoft.Extensions.Options` from `8.0.1` to `8.0.2`,
   - `System.Text.Json` from `8.0.1` to `8.0.2`.
 

diff --git a/build/LibraryVersions.g.cs b/build/LibraryVersions.g.cs
@@ -55,15 +55,15 @@ public static class LibraryVersion
             new List<PackageBuildInfo>
             {
                 new("7.5.0", Array.Empty<string>(), new() {{"GraphQLMicrosoftDI","7.5.0"},{"GraphQLServerTransportsAspNetCore","7.5.0"},{"GraphQLServerUIPlayground","7.5.0"}}),
-                new("7.8.0", Array.Empty<string>(), new() {{"GraphQLMicrosoftDI","7.8.0"},{"GraphQLServerTransportsAspNetCore","7.7.0"},{"GraphQLServerUIPlayground","7.7.0"}}),
+                new("7.8.0", Array.Empty<string>(), new() {{"GraphQLMicrosoftDI","7.8.0"},{"GraphQLServerTransportsAspNetCore","7.7.1"},{"GraphQLServerUIPlayground","7.7.1"}}),
             }
         },
         {
             "TestApplication.GrpcNetClient",
             new List<PackageBuildInfo>
             {
                 new("2.52.0"),
-                new("2.60.0"),
+                new("2.61.0"),
             }
         },
         {
@@ -136,7 +136,7 @@ public static class LibraryVersion
             new List<PackageBuildInfo>
             {
                 new("3.4.0"),
-                new("3.8.0"),
+                new("3.8.1"),
             }
         },
         {
@@ -147,7 +147,7 @@ public static class LibraryVersion
                 new("2.1.50"),
                 new("2.5.61"),
                 new("2.6.66"),
-                new("2.7.17"),
+                new("2.7.23"),
             }
         },
         {

diff --git a/docs/using-the-nuget-packages.md b/docs/using-the-nuget-packages.md
@@ -40,7 +40,7 @@ you to either add the missing instrumentation package or to skip the
 instrumentation of the corresponding package:
 
 ```terminal
-~packages/opentelemetry.autoinstrumentation.buildtasks/1.4.0/build/OpenTelemetry.AutoInstrumentation.BuildTasks.targets(29,5): error : OpenTelemetry.AutoInstrumentation: add a reference to the instrumentation package 'MongoDB.Driver.Core.Extensions.DiagnosticSources' version 1.3.0 or add 'MongoDB.Driver.Core' to the property 'SkippedInstrumentations' to suppress this error.
+~packages/opentelemetry.autoinstrumentation.buildtasks/1.4.0/build/OpenTelemetry.AutoInstrumentation.BuildTasks.targets(29,5): error : OpenTelemetry.AutoInstrumentation: add a reference to the instrumentation package 'MongoDB.Driver.Core.Extensions.DiagnosticSources' version 1.4.0 or add 'MongoDB.Driver.Core' to the property 'SkippedInstrumentations' to suppress this error.
 ```
 
 To resolve the error either add the recommended instrumentation package or skip

diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props
@@ -12,7 +12,7 @@
   </ItemGroup>
   <!-- Versions from OpenTelemetry.AutoInstrumentation.csproj -->
   <ItemGroup>
-    <PackageVersion Include="MongoDB.Driver.Core.Extensions.DiagnosticSources" Version="1.3.0" />
+    <PackageVersion Include="MongoDB.Driver.Core.Extensions.DiagnosticSources" Version="1.4.0" />
     <PackageVersion Include="OpenTelemetry.Exporter.Prometheus.HttpListener" Version="1.7.0-rc.1" />
     <PackageVersion Include="OpenTelemetry.Exporter.Zipkin" Version="1.7.0" />
     <PackageVersion Include="OpenTelemetry.Extensions.Propagators" Version="1.7.0" />
@@ -65,7 +65,7 @@
     <PackageVersion Include="Google.Protobuf" Version="3.25.2" />
     <PackageVersion Include="Grpc" Version="2.46.6" />
     <PackageVersion Include="Grpc.Core" Version="2.46.6" />
-    <PackageVersion Include="Grpc.Core.Api" Version="2.60.0" />
+    <PackageVersion Include="Grpc.Core.Api" Version="2.61.0" />
     <PackageVersion Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
     <PackageVersion Include="Microsoft.Extensions.Configuration.Abstractions" Version="8.0.0" />
     <PackageVersion Include="Microsoft.Extensions.Configuration.Binder" Version="8.0.1" />

diff --git a/...metry.AutoInstrumentation.BuildTasks/OpenTelemetry.AutoInstrumentation.BuildTasks.targets b/...metry.AutoInstrumentation.BuildTasks/OpenTelemetry.AutoInstrumentation.BuildTasks.targets
@@ -7,7 +7,7 @@
         Condition="!$(SkippedInstrumentations.Contains('MongoDB.Driver.Core'))"
         TargetNuGetPackageVersionRange="[2.13.3, 3.0.0)"
         InstrumentationNuGetPackageId="MongoDB.Driver.Core.Extensions.DiagnosticSources"
-        InstrumentationNuGetPackageVersion="1.3.0" />
+        InstrumentationNuGetPackageVersion="1.4.0" />
 
       <InstrumentationTarget
         Include="StackExchange.Redis"

diff --git a/test/Directory.Packages.props b/test/Directory.Packages.props
@@ -8,10 +8,10 @@
     <PackageVersion Include="Google.Protobuf" Version="3.25.2" />
     <PackageVersion Include="GraphQL" Version="7.8.0" />
     <PackageVersion Include="GraphQL.MicrosoftDI" Version="7.8.0" />
-    <PackageVersion Include="GraphQL.Server.Transports.AspNetCore" Version="7.7.0" />
-    <PackageVersion Include="GraphQL.Server.Ui.Playground" Version="7.7.0" />
-    <PackageVersion Include="Grpc.Net.Client" Version="2.60.0" />
-    <PackageVersion Include="Grpc.Net.Client.Web" Version="2.60.0" />
+    <PackageVersion Include="GraphQL.Server.Transports.AspNetCore" Version="7.7.1" />
+    <PackageVersion Include="GraphQL.Server.Ui.Playground" Version="7.7.1" />
+    <PackageVersion Include="Grpc.Net.Client" Version="2.61.0" />
+    <PackageVersion Include="Grpc.Net.Client.Web" Version="2.61.0" />
     <PackageVersion Include="Grpc.Tools" Version="2.51.0" />
     <PackageVersion Include="MassTransit" Version="8.1.3" />
     <PackageVersion Include="Microsoft.AspNetCore" Version="2.2.0" />
@@ -27,7 +27,7 @@
     <PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.0" />
     <PackageVersion Include="Microsoft.Extensions.Hosting" Version="8.0.0" />
     <PackageVersion Include="Microsoft.Extensions.Logging" Version="8.0.0" />
-    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
+    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
     <PackageVersion Include="MongoDB.Driver" Version="2.23.1" />
     <PackageVersion Include="NSubstitute" Version="5.1.0" />
     <PackageVersion Include="MySqlConnector" Version="2.3.5" />
@@ -38,10 +38,10 @@
     <PackageVersion Include="NuGet.Versioning" Version="6.5.0" />
     <PackageVersion Include="OpenTracing" Version="0.12.1" />
     <PackageVersion Include="Pomelo.EntityFrameworkCore.MySql" Version="8.0.0" />
-    <PackageVersion Include="Quartz" Version="3.8.0" />
-    <PackageVersion Include="Quartz.Extensions.DependencyInjection" Version="3.8.0" />
-    <PackageVersion Include="Quartz.Extensions.Hosting" Version="3.8.0" />
-    <PackageVersion Include="StackExchange.Redis" Version="2.7.17" />
+    <PackageVersion Include="Quartz" Version="3.8.1" />
+    <PackageVersion Include="Quartz.Extensions.DependencyInjection" Version="3.8.1" />
+    <PackageVersion Include="Quartz.Extensions.Hosting" Version="3.8.1" />
+    <PackageVersion Include="StackExchange.Redis" Version="2.7.23" />
     <PackageVersion Include="StrongNamer" Version="0.2.5" />
     <PackageVersion Include="System.Collections.Immutable" Version="8.0.0" />
     <PackageVersion Include="System.Data.SqlClient" Version="4.8.6" />
@@ -54,9 +54,9 @@
     <PackageVersion Include="System.ValueTuple" Version="4.5.0" />
     <PackageVersion Include="Testcontainers" Version="3.7.0" />
     <PackageVersion Include="Verify.Xunit" Version="20.8.2" />
-    <PackageVersion Include="xunit" Version="2.6.6" />
+    <PackageVersion Include="xunit" Version="2.7.0" />
     <PackageVersion Include="xunit.abstractions" Version="2.0.3" />
-    <PackageVersion Include="xunit.runner.visualstudio" Version="2.5.6" />
+    <PackageVersion Include="xunit.runner.visualstudio" Version="2.5.7" />
     <PackageVersion Include="Xunit.SkippableFact" Version="1.4.13" />
   </ItemGroup>
 </Project>
diff --git a/test/IntegrationTests/LibraryVersions.g.cs b/test/IntegrationTests/LibraryVersions.g.cs
@@ -71,7 +71,7 @@ public static class LibraryVersion
         new object[] { string.Empty }
 #else
         new object[] { "2.52.0" },
-        new object[] { "2.60.0" },
+        new object[] { "2.61.0" },
 #endif
     };
     public static readonly IReadOnlyCollection<object[]> MassTransit = new List<object[]>
@@ -153,7 +153,7 @@ public static class LibraryVersion
         new object[] { string.Empty }
 #else
         new object[] { "3.4.0" },
-        new object[] { "3.8.0" },
+        new object[] { "3.8.1" },
 #endif
     };
     public static readonly IReadOnlyCollection<object[]> StackExchangeRedis = new List<object[]>
@@ -165,7 +165,7 @@ public static class LibraryVersion
         new object[] { "2.1.50" },
         new object[] { "2.5.61" },
         new object[] { "2.6.66" },
-        new object[] { "2.7.17" },
+        new object[] { "2.7.23" },
 #endif
     };
     public static readonly IReadOnlyCollection<object[]> WCFCoreClient = new List<object[]>

diff --git a/tools/Directory.Packages.props b/tools/Directory.Packages.props
@@ -1,7 +1,7 @@
 <Project>
   <Import Project="..\Directory.Packages.props" />
   <ItemGroup>
-    <PackageVersion Include="McMaster.Extensions.CommandLineUtils" Version="4.1.0" />
+    <PackageVersion Include="McMaster.Extensions.CommandLineUtils" Version="4.1.1" />
     <PackageVersion Include="Microsoft.Build" Version="17.6.3" />
     <PackageVersion Include="NuGet.ProjectModel" Version="6.9.1" />
     <PackageVersion Include="System.IO.Abstractions" Version="20.0.15" />