Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update Otel hosting package to 1.4 #204

Merged
merged 1 commit into from
Mar 16, 2023
Merged

Update Otel hosting package to 1.4 #204

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 1 addition & 1 deletion Directory.Packages.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand Down
2 changes: 1 addition & 1 deletion src/Core/test/Eventuous.Tests.Subscriptions/RegistrationTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) { }
Expand Down
7 changes: 4 additions & 3 deletions src/Diagnostics/src/Eventuous.Diagnostics.OpenTelemetry/MeterProviderBuilderExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand All @@ -48,6 +48,7 @@ static MeterProviderBuilder AddMetrics<T>(this MeterProviderBuilder builder, Tag
}
);
}
) : builder;
)
: builder;
}
}
}
25 changes: 15 additions & 10 deletions src/Diagnostics/test/Eventuous.Tests.OpenTelemetry/MetricsTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";

Expand All @@ -18,7 +20,7 @@ public MetricsTests(ITestOutputHelper outputHelper) {
_output = outputHelper;

_es = new TestEventListener(outputHelper);

EventuousDiagnostics.AddDefaultTag("test", "foo");

var builder = new WebHostBuilder()
Expand All @@ -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));
Expand All @@ -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() {
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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);