Update Otel hosting package to 1.4 (#204)

Eventuous · Mar 16, 2023 · b6f4567 · b6f4567
1 parent 020a1b5
commit b6f4567
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 15 deletions.
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -20,7 +20,7 @@
     <PackageVersion Include="System.Diagnostics.DiagnosticSource" Version="$(MicrosoftExtensionsVer)" />
     <PackageVersion Include="System.Reactive" Version="5.0.0" />
     <PackageVersion Include="System.Linq.Async" Version="6.0.1" />
-    <PackageVersion Include="OpenTelemetry.Extensions.Hosting" Version="1.0.0-rc9.4" />
+    <PackageVersion Include="OpenTelemetry.Extensions.Hosting" Version="1.4.0" />
     <PackageVersion Include="EventStore.Client.Grpc.PersistentSubscriptions" Version="22.0.0" />
     <PackageVersion Include="EventStore.Client.Grpc.Streams" Version="22.0.0" />
     <PackageVersion Include="MongoDB.Driver" Version="2.19.0" />

diff --git a/src/Core/test/Eventuous.Tests.Subscriptions/RegistrationTests.cs b/src/Core/test/Eventuous.Tests.Subscriptions/RegistrationTests.cs
@@ -120,7 +120,7 @@ public static void ConfigureServices(IServiceCollection services) {
                     .AddEventHandler<Handler2>()
             );
 
-            services.AddOpenTelemetryMetrics(builder => builder.AddEventuousSubscriptions());
+            services.AddOpenTelemetry().WithMetrics(builder => builder.AddEventuousSubscriptions());
         }
 
         public void Configure(IApplicationBuilder app) { }

diff --git a/src/Diagnostics/src/Eventuous.Diagnostics.OpenTelemetry/MeterProviderBuilderExtensions.cs b/src/Diagnostics/src/Eventuous.Diagnostics.OpenTelemetry/MeterProviderBuilderExtensions.cs
@@ -35,7 +35,7 @@ public static MeterProviderBuilder AddEventuous(this MeterProviderBuilder builde
 
     static MeterProviderBuilder AddMetrics<T>(this MeterProviderBuilder builder, TagList? customTags = null)
         where T : class, IWithCustomTags {
-        builder.GetServices().AddSingleton<T>();
+        builder.ConfigureServices(services => services.AddSingleton<T>());
 
         return builder is IDeferredMeterProviderBuilder deferredMeterProviderBuilder
             ? deferredMeterProviderBuilder.Configure(
@@ -48,6 +48,7 @@ static MeterProviderBuilder AddMetrics<T>(this MeterProviderBuilder builder, Tag
                         }
                     );
                 }
-            ) : builder;
+            )
+            : builder;
     }
-}
+}
diff --git a/src/Diagnostics/test/Eventuous.Tests.OpenTelemetry/MetricsTests.cs b/src/Diagnostics/test/Eventuous.Tests.OpenTelemetry/MetricsTests.cs
@@ -2,11 +2,13 @@
 using Eventuous.EventStore.Producers;
 using Eventuous.EventStore.Subscriptions;
 using Eventuous.Sut.Subs;
+// ReSharper disable ConditionIsAlwaysTrueOrFalseAccordingToNullableAPIContract
 
 namespace Eventuous.Tests.OpenTelemetry;
 
 public sealed class MetricsTests : IAsyncLifetime, IDisposable {
-    static MetricsTests() => TypeMap.Instance.RegisterKnownEventTypes(typeof(TestEvent).Assembly);
+    static MetricsTests()
+        => TypeMap.Instance.RegisterKnownEventTypes(typeof(TestEvent).Assembly);
 
     const string SubscriptionId = "test-sub";
 
@@ -18,7 +20,7 @@ public MetricsTests(ITestOutputHelper outputHelper) {
         _output   = outputHelper;
 
         _es = new TestEventListener(outputHelper);
-        
+
         EventuousDiagnostics.AddDefaultTag("test", "foo");
 
         var builder = new WebHostBuilder()
@@ -36,11 +38,12 @@ public MetricsTests(ITestOutputHelper outputHelper) {
                             .AddEventHandler<TestHandler>()
                     );
 
-                    services.AddOpenTelemetryMetrics(
-                        builder => builder
-                            .AddEventuousSubscriptions()
-                            .AddReader(new BaseExportingMetricReader(_exporter))
-                    );
+                    services.AddOpenTelemetry()
+                        .WithMetrics(
+                            builder => builder
+                                .AddEventuousSubscriptions()
+                                .AddReader(new BaseExportingMetricReader(_exporter))
+                        );
                 }
             )
             .ConfigureLogging(cfg => cfg.AddXunit(outputHelper));
@@ -49,7 +52,8 @@ public MetricsTests(ITestOutputHelper outputHelper) {
     }
 
     [Fact]
-    public void CollectorShouldNotFail() => _exporter.Collect(Timeout.Infinite).Should().BeTrue();
+    public void CollectorShouldNotFail()
+        => _exporter.Collect(Timeout.Infinite).Should().BeTrue();
 
     [Fact]
     public void ShouldMeasureSubscriptionGapCount() {
@@ -90,7 +94,8 @@ public async Task InitializeAsync() {
         await Task.Delay(1000);
     }
 
-    public Task DisposeAsync() => Task.CompletedTask;
+    public Task DisposeAsync()
+        => Task.CompletedTask;
 
     readonly TestServer        _host;
     readonly TestExporter      _exporter;
@@ -157,4 +162,4 @@ public void Dispose() {
     }
 }
 
-record MetricValue(string Name, string[] Keys, object[] Values, double Value);
+record MetricValue(string Name, string[] Keys, object[] Values, double Value);