update otel to 1.6.0 (#2064)

* update otel to 1.6.0 * fix build issues
asynkron · Oct 11, 2023 · 4582870 · 4582870
1 parent a4bccef
commit 4582870
Show file tree

Hide file tree

Showing 11 changed files with 19 additions and 15 deletions.
diff --git a/benchmarks/AutoClusterBenchmark/AutoClusterBenchmark.csproj b/benchmarks/AutoClusterBenchmark/AutoClusterBenchmark.csproj
@@ -29,7 +29,7 @@
         <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="6.0.0" />
         <PackageReference Include="MongoDB.Driver" Version="2.19.0" />
         <PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
-        <PackageReference Include="OpenTelemetry.Exporter.Jaeger" Version="1.1.0" />
+        <PackageReference Include="OpenTelemetry.Exporter.Jaeger" Version="1.5.1" />
         <PackageReference Include="Serilog" Version="2.12.0" />
         <PackageReference Include="Serilog.Extensions.Logging" Version="3.1.0" />
         <PackageReference Include="Serilog.Sinks.Console" Version="4.1.0" />

diff --git a/benchmarks/ClusterBenchmark/ClusterBenchmark.csproj b/benchmarks/ClusterBenchmark/ClusterBenchmark.csproj
@@ -24,7 +24,7 @@
         <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="6.0.0" />
         <PackageReference Include="MongoDB.Driver" Version="2.19.0" />
         <PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
-        <PackageReference Include="OpenTelemetry.Exporter.Jaeger" Version="1.1.0" />
+        <PackageReference Include="OpenTelemetry.Exporter.Jaeger" Version="1.5.1" />
         <PackageReference Include="Serilog" Version="2.12.0" />
         <PackageReference Include="Serilog.Extensions.Logging" Version="3.1.0" />
         <PackageReference Include="Serilog.Sinks.Console" Version="4.1.0" />

diff --git a/benchmarks/SkyriseMini/Client/SkyriseMiniClient.csproj b/benchmarks/SkyriseMini/Client/SkyriseMiniClient.csproj
@@ -22,8 +22,8 @@
         <PrivateAssets>all</PrivateAssets>
         <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       </PackageReference>
-      <PackageReference Include="OpenTelemetry" Version="1.3.1" />
-      <PackageReference Include="OpenTelemetry.Api" Version="1.3.1" />
+      <PackageReference Include="OpenTelemetry" Version="1.6.0" />
+      <PackageReference Include="OpenTelemetry.Api" Version="1.6.0" />
       <PackageReference Include="OpenTelemetry.Exporter.Prometheus" Version="1.3.0-rc.2" />
       <PackageReference Include="prometheus-net" Version="6.0.0" />
       <PackageReference Include="Serilog.AspNetCore" Version="6.0.1" />

diff --git a/benchmarks/SkyriseMini/Server/SkyriseMiniServer.csproj b/benchmarks/SkyriseMini/Server/SkyriseMiniServer.csproj
@@ -22,8 +22,8 @@
         <PrivateAssets>all</PrivateAssets>
         <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       </PackageReference>
-      <PackageReference Include="OpenTelemetry" Version="1.3.1" />
-      <PackageReference Include="OpenTelemetry.Api" Version="1.3.1" />
+      <PackageReference Include="OpenTelemetry" Version="1.6.0" />
+      <PackageReference Include="OpenTelemetry.Api" Version="1.6.0" />
       <PackageReference Include="OpenTelemetry.Exporter.Prometheus" Version="1.3.0-rc.2" />
       <PackageReference Include="prometheus-net" Version="6.0.0" />
       <PackageReference Include="Serilog.AspNetCore" Version="6.0.1" />

diff --git a/examples/ActorMetrics/ActorMetrics.csproj b/examples/ActorMetrics/ActorMetrics.csproj
@@ -11,7 +11,7 @@
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
         <PackageReference Include="OpenTelemetry.Exporter.Prometheus" Version="1.3.0-rc.2" />
-        <PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.0.0-rc9" />
+        <PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.6.0" />
         <PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.0.0-rc9.12" />
         <PackageReference Include="Swashbuckle.AspNetCore" Version="6.4.0" />
     </ItemGroup>

diff --git a/examples/ActorMetrics/Startup.cs b/examples/ActorMetrics/Startup.cs
@@ -29,11 +29,12 @@ public void ConfigureServices(IServiceCollection services)
             c.SwaggerDoc("v1", new OpenApiInfo { Title = "WebApplication1", Version = "v1" });
         });
 
-        services.AddOpenTelemetryMetrics(b => b
+        services.AddOpenTelemetry().WithMetrics(b => b
             .AddProtoActorInstrumentation()
             .AddAspNetCoreInstrumentation()
             .AddPrometheusExporter(prom => prom.ScrapeResponseCacheDurationMilliseconds = 1000)
         );
+
 
         RunDummyCluster.Run();
     }

diff --git a/src/Proto.OpenTelemetry/Proto.OpenTelemetry.csproj b/src/Proto.OpenTelemetry/Proto.OpenTelemetry.csproj
@@ -5,8 +5,8 @@
         <LangVersion>10</LangVersion>
     </PropertyGroup>
     <ItemGroup>
-        <PackageReference Include="OpenTelemetry" Version="1.3.1" />
-        <PackageReference Include="OpenTelemetry.Api" Version="1.3.1" />
+        <PackageReference Include="OpenTelemetry" Version="1.6.0" />
+        <PackageReference Include="OpenTelemetry.Api" Version="1.6.0" />
     </ItemGroup>
     <ItemGroup>
         <ProjectReference Include="..\Proto.Actor\Proto.Actor.csproj" />

diff --git a/tests/Proto.Cluster.Tests/ClusterFixture.cs b/tests/Proto.Cluster.Tests/ClusterFixture.cs
@@ -9,6 +9,7 @@
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using OpenTelemetry;
+using OpenTelemetry.Exporter;
 using OpenTelemetry.Logs;
 using OpenTelemetry.Resources;
 using OpenTelemetry.Trace;
@@ -223,7 +224,7 @@ private static void InitOpenTelemetryTracing()
                     {
                         options
                             .SetResourceBuilder(builder)
-                            .AddOtlpExporter(o =>
+                            .AddOtlpExporter( (OtlpExporterOptions  o)  =>
                             {
                                 o.Endpoint = endpoint;
                                 o.ExportProcessorType = ExportProcessorType.Batch;

diff --git a/tests/Proto.Cluster.Tests/GithubActionsReporter.cs b/tests/Proto.Cluster.Tests/GithubActionsReporter.cs
@@ -13,7 +13,9 @@ namespace Proto.Cluster.Tests;
 public class GithubActionsReporter
 {
     private readonly string _reportName;
+#pragma warning disable CS0618 // Type or member is obsolete
     private static readonly ILogger Logger = Log.CreateLogger<GithubActionsReporter>();
+#pragma warning restore CS0618 // Type or member is obsolete
     public const string ActivitySourceName = "Proto.Cluster.Tests";
 
     private static readonly ActivitySource ActivitySource = new(ActivitySourceName);

diff --git a/tests/Proto.Cluster.Tests/Proto.Cluster.Tests.csproj b/tests/Proto.Cluster.Tests/Proto.Cluster.Tests.csproj
@@ -15,9 +15,9 @@
     <ItemGroup>
         <PackageReference Include="Grpc.Tools" Version="2.51.0" PrivateAssets="All" />
         <PackageReference Include="IsExternalInit.System.Runtime.CompilerServices" Version="1.0.0" />
-        <PackageReference Include="OpenTelemetry.Exporter.Jaeger" Version="1.4.0-beta.3" />
-        <PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.4.0-beta.3" />
-        <PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol.Logs" Version="1.4.0-beta.3" />
+        <PackageReference Include="OpenTelemetry.Exporter.Jaeger" Version="1.5.1" />
+        <PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.6.0" />
+
         <PackageReference Include="System.Interactive.Async" Version="6.0.1" />
     </ItemGroup>
     <ItemGroup>

diff --git a/tests/Proto.OpenTelemetry.Tests/Proto.OpenTelemetry.Tests.csproj b/tests/Proto.OpenTelemetry.Tests/Proto.OpenTelemetry.Tests.csproj
@@ -13,7 +13,7 @@
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="OpenTelemetry" Version="1.3.1" />
+        <PackageReference Include="OpenTelemetry" Version="1.6.0" />
 
         <PackageReference Include="coverlet.collector" Version="3.1.1">
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>