maint: Update OpenTelemetry instrumentation packages (#334)

## Which problem is this PR solving? Bumps OpenTelemetry instrumentation packages to latest. ## Short description of the changes - Bump instrumentation pacakages to latest --------- Co-authored-by: cartermp <[email protected]>
honeycombio · Mar 1, 2023 · 704e234 · 704e234
1 parent 2f89cba
commit 704e234
Show file tree

Hide file tree

Showing 9 changed files with 31 additions and 28 deletions.
diff --git a/examples/aspnetcore-fsharp/Program.fs b/examples/aspnetcore-fsharp/Program.fs
@@ -9,6 +9,8 @@ open Microsoft.Extensions.Configuration
 
 open Giraffe
 open Giraffe.EndpointRouting
+
+open OpenTelemetry
 open OpenTelemetry.Trace
 open OpenTelemetry.Metrics
 open Honeycomb.OpenTelemetry
@@ -17,12 +19,13 @@ let configureServices (services: IServiceCollection) (honeycombOptions: Honeycom
     services
         .AddRouting()
         .AddGiraffe()
-        .AddOpenTelemetryTracing(fun otelBuilder ->
+        .AddOpenTelemetry()
+        .WithTracing(fun otelBuilder ->
             otelBuilder
                 .AddHoneycomb(honeycombOptions)
                 .AddAspNetCoreInstrumentationWithBaggage()
             |> ignore)
-        .AddOpenTelemetryMetrics(fun otelBuilder ->
+        .WithMetrics(fun otelBuilder ->
             otelBuilder.AddHoneycomb(honeycombOptions)
             |> ignore)
     |> ignore

diff --git a/examples/aspnetcore-fsharp/aspnetcore-fsharp.fsproj b/examples/aspnetcore-fsharp/aspnetcore-fsharp.fsproj
@@ -13,7 +13,7 @@
 
   <ItemGroup>
     <PackageReference Include="Giraffe" Version="6.0.0" />
-    <PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.0.0-rc9.9" />
+    <PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.4.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/examples/aspnetcore-redis/Program.cs b/examples/aspnetcore-redis/Program.cs
@@ -15,9 +15,9 @@
 
 var honeycombOptions = builder.Configuration.GetHoneycombOptions();
 
-builder.Services.AddOpenTelemetryTracing(otelBuilder =>
+builder.Services.AddOpenTelemetry().WithTracing(otelBuilder =>
     otelBuilder
-        .AddHoneycomb(builder.Configuration)
+        .AddHoneycomb(honeycombOptions)
         .AddAspNetCoreInstrumentationWithBaggage()
         .AddRedisInstrumentation(redis)
 );

diff --git a/examples/aspnetcore-redis/aspnetcoreredis.csproj b/examples/aspnetcore-redis/aspnetcoreredis.csproj
@@ -12,7 +12,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.0.0-rc9.9" />
+    <PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.4.0" />
     <PackageReference Include="OpenTelemetry.Instrumentation.StackExchangeRedis" Version="1.0.0-rc9.7" />
   </ItemGroup>
 

diff --git a/examples/aspnetcore/Program.cs b/examples/aspnetcore/Program.cs
@@ -1,5 +1,6 @@
 using OpenTelemetry.Metrics;
 using OpenTelemetry.Trace;
+
 using System.Diagnostics.Metrics;
 
 var builder = WebApplication.CreateBuilder(args);
@@ -8,7 +9,7 @@
 var honeycombOptions = builder.Configuration.GetHoneycombOptions();
 
 // Setup OpenTelemetry Tracing
-builder.Services.AddOpenTelemetryTracing(otelBuilder =>
+builder.Services.AddOpenTelemetry().WithTracing(otelBuilder =>
     otelBuilder
         .AddHoneycomb(honeycombOptions)
         .AddAspNetCoreInstrumentationWithBaggage()
@@ -18,7 +19,7 @@
 builder.Services.AddSingleton(TracerProvider.Default.GetTracer(honeycombOptions.ServiceName));
 
 // Setup OpenTelemetry Metrics
-builder.Services.AddOpenTelemetryMetrics(otelBuilder =>
+builder.Services.AddOpenTelemetry().WithMetrics(otelBuilder =>
     otelBuilder.AddHoneycomb(honeycombOptions)
 );
 

diff --git a/examples/aspnetcore/aspnetcore.csproj b/examples/aspnetcore/aspnetcore.csproj
@@ -12,7 +12,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.0.0-rc9.9" />
+    <PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.4.0" />
   </ItemGroup>
 
 </Project>
diff --git a/...penTelemetry.CommonInstrumentations/Honeycomb.OpenTelemetry.CommonInstrumentations.csproj b/...penTelemetry.CommonInstrumentations/Honeycomb.OpenTelemetry.CommonInstrumentations.csproj
@@ -26,31 +26,30 @@
     <RepositoryType>git</RepositoryType>
   </PropertyGroup>
 
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net6.0' ">
+  <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp' And
+                        $([MSBuild]::VersionGreaterThanOrEquals($(_TargetFrameworkVersionWithoutV), '6.0'))">
     <ProjectReference Include="..\Honeycomb.OpenTelemetry.Instrumentation.AspNetCore\Honeycomb.OpenTelemetry.Instrumentation.AspNetCore.csproj" />
   </ItemGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'net462' ">
     <PackageReference Include="OpenTelemetry.Instrumentation.Owin" Version="1.0.0-rc.3" />
-    <PackageReference Include="OpenTelemetry.Instrumentation.AspNet" Version="1.0.0-rc9.6" />
+    <PackageReference Include="OpenTelemetry.Instrumentation.AspNet" Version="1.0.0-rc9.8" />
   </ItemGroup>
 
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net6.0' ">
-    <PackageReference Include="OpenTelemetry.Instrumentation.GrpcNetClient" Version="1.0.0-rc9.9" />
-  </ItemGroup>
-
-  <ItemGroup Condition=" '$(TargetFramework)' != 'net462' ">
-    <PackageReference Include="OpenTelemetry.Instrumentation.Quartz" Version="1.0.0-alpha.1" />
+  <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp' And
+                        $([MSBuild]::VersionGreaterThanOrEquals($(_TargetFrameworkVersionWithoutV), '6.0'))">
+    <PackageReference Include="OpenTelemetry.Instrumentation.GrpcNetClient" Version="1.0.0-rc9.14" />
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Npgsql.OpenTelemetry" Version="6.0.7" />
-    <PackageReference Include="OpenTelemetry.Instrumentation.EntityFrameworkCore" Version="1.0.0-beta.3" />
-    <PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.0.0-rc9.9" />
-    <PackageReference Include="OpenTelemetry.Instrumentation.MySqlData" Version="1.0.0-beta.4" />
-    <PackageReference Include="OpenTelemetry.Instrumentation.SqlClient" Version="1.0.0-rc9.9" />
-    <PackageReference Include="OpenTelemetry.Instrumentation.StackExchangeRedis" Version="1.0.0-rc9.7" />
-    <PackageReference Include="OpenTelemetry.Instrumentation.Wcf" Version="1.0.0-rc.7" />
+    <PackageReference Include="Npgsql.OpenTelemetry" Version="7.0.2" />
+    <PackageReference Include="OpenTelemetry.Instrumentation.EntityFrameworkCore" Version="1.0.0-beta.5" />
+    <PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.0.0-rc9.14" />
+    <PackageReference Include="OpenTelemetry.Instrumentation.MySqlData" Version="1.0.0-beta.6" />
+    <PackageReference Include="OpenTelemetry.Instrumentation.SqlClient" Version="1.0.0-rc9.14" />
+    <PackageReference Include="OpenTelemetry.Instrumentation.StackExchangeRedis" Version="1.0.0-rc9.8" />
+    <PackageReference Include="OpenTelemetry.Instrumentation.Wcf" Version="1.0.0-rc.9" />
+    <PackageReference Include="OpenTelemetry.Instrumentation.Quartz" Version="1.0.0-alpha.2" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/...etry.Instrumentation.AspNetCore/Honeycomb.OpenTelemetry.Instrumentation.AspNetCore.csproj b/...etry.Instrumentation.AspNetCore/Honeycomb.OpenTelemetry.Instrumentation.AspNetCore.csproj
@@ -27,7 +27,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.0.0-rc9.9" />
+    <PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.0.0-rc9.14" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/Honeycomb.OpenTelemetry/Honeycomb.OpenTelemetry.csproj b/src/Honeycomb.OpenTelemetry/Honeycomb.OpenTelemetry.csproj
@@ -26,9 +26,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="OpenTelemetry" Version="1.3.1" />
-    <PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.3.1" />
-    <PackageReference Include="OpenTelemetry.Exporter.Console" Version="1.3.1" />
+    <PackageReference Include="OpenTelemetry" Version="1.4.0" />
+    <PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.4.0" />
+    <PackageReference Include="OpenTelemetry.Exporter.Console" Version="1.4.0" />
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
     <PackageReference Include="Microsoft.Extensions.Configuration.CommandLine" Version="6.0.0" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="6.0.0" />