From 4b602dd777cc45b70fa62681d8b97f16cdca6305 Mon Sep 17 00:00:00 2001 From: Stef Heyenrath Date: Sun, 18 Jan 2026 17:56:07 +0100 Subject: [PATCH] Small updates to WireMock.Net.OpenTelemetry --- README.md | 1 + .../AspireApp1.AppHostOriginal/Program.cs | 2 +- .../WireMock.Net.OpenTelemetryDemo/Program.cs | 7 +++-- .../WireMock.Net.OpenTelemetryDemo.csproj | 28 +++++++++++-------- .../ActivityTracing/WireMockActivitySource.cs | 3 +- .../WireMockSemanticConventions.cs | 8 +----- .../WireMock.Net.OpenTelemetry.csproj | 4 +-- .../WireMockOpenTelemetryExtensions.cs | 3 +- 8 files changed, 28 insertions(+), 28 deletions(-) diff --git a/README.md b/README.md index bd4a2c27..29b4f48e 100644 --- a/README.md +++ b/README.md @@ -63,6 +63,7 @@ A C# .NET version based on [mock4net](https://github.com/alexvictoor/mock4net) w |   **WireMock.Net.MimePart** | [![NuGet Badge WireMock.Net.MimePart](https://img.shields.io/nuget/v/WireMock.Net.MimePart)](https://www.nuget.org/packages/WireMock.Net.MimePart) | [![MyGet Badge WireMock.Net.MimePart](https://img.shields.io/myget/wiremock-net/vpre/WireMock.Net.MimePart?includePreReleases=true&label=MyGet)](https://www.myget.org/feed/wiremock-net/package/nuget/WireMock.Net.MimePart) |   **WireMock.Net.GraphQL** | [![NuGet Badge WireMock.Net.GraphQL](https://img.shields.io/nuget/v/WireMock.Net.GraphQL)](https://www.nuget.org/packages/WireMock.Net.GraphQL) | [![MyGet Badge WireMock.Net.GraphQL](https://img.shields.io/myget/wiremock-net/vpre/WireMock.Net.GraphQL?includePreReleases=true&label=MyGet)](https://www.myget.org/feed/wiremock-net/package/nuget/WireMock.Net.GraphQL) |   **WireMock.Net.ProtoBuf** | [![NuGet Badge WireMock.Net.ProtoBuf](https://img.shields.io/nuget/v/WireMock.Net.ProtoBuf)](https://www.nuget.org/packages/WireMock.Net.ProtoBuf) | [![MyGet Badge WireMock.Net.ProtoBuf](https://img.shields.io/myget/wiremock-net/vpre/WireMock.Net.ProtoBuf?includePreReleases=true&label=MyGet)](https://www.myget.org/feed/wiremock-net/package/nuget/WireMock.Net.ProtoBuf) +|   **WireMock.Net.OpenTelemetry** | [![NuGet Badge WireMock.Net.OpenTelemetry](https://img.shields.io/nuget/v/WireMock.Net.OpenTelemetry)](https://www.nuget.org/packages/WireMock.Net.ProtoBuf) | [![MyGet Badge WireMock.Net.OpenTelemetry](https://img.shields.io/myget/wiremock-net/vpre/WireMock.Net.OpenTelemetry?includePreReleases=true&label=MyGet)](https://www.myget.org/feed/wiremock-net/package/nuget/WireMock.Net.OpenTelemetry) | | | | |   **WireMock.Net.RestClient** | [![NuGet Badge WireMock.Net.RestClient](https://img.shields.io/nuget/v/WireMock.Net.RestClient)](https://www.nuget.org/packages/WireMock.Net.RestClient) | [![MyGet Badge WireMock.Net.RestClient](https://img.shields.io/myget/wiremock-net/vpre/WireMock.Net.RestClient?includePreReleases=true&label=MyGet)](https://www.myget.org/feed/wiremock-net/package/nuget/WireMock.Net.RestClient) |   **WireMock.Org.RestClient** | [![NuGet Badge WireMock.Org.RestClient](https://img.shields.io/nuget/v/WireMock.Org.RestClient)](https://www.nuget.org/packages/WireMock.Org.RestClient) | [![MyGet Badge WireMock.Org.RestClient](https://img.shields.io/myget/wiremock-net/vpre/WireMock.Org.RestClient?includePreReleases=true&label=MyGet)](https://www.myget.org/feed/wiremock-net/package/nuget/WireMock.Org.RestClient) diff --git a/examples-Aspire/AspireApp1.AppHostOriginal/Program.cs b/examples-Aspire/AspireApp1.AppHostOriginal/Program.cs index db90f730..d8288c47 100644 --- a/examples-Aspire/AspireApp1.AppHostOriginal/Program.cs +++ b/examples-Aspire/AspireApp1.AppHostOriginal/Program.cs @@ -6,4 +6,4 @@ builder.AddProject("webfrontend") .WithExternalHttpEndpoints() .WithReference(apiService); -builder.Build().Run(); \ No newline at end of file +await builder.Build().RunAsync(); \ No newline at end of file diff --git a/examples/WireMock.Net.OpenTelemetryDemo/Program.cs b/examples/WireMock.Net.OpenTelemetryDemo/Program.cs index d12df50d..e7664ba5 100644 --- a/examples/WireMock.Net.OpenTelemetryDemo/Program.cs +++ b/examples/WireMock.Net.OpenTelemetryDemo/Program.cs @@ -4,11 +4,11 @@ using OpenTelemetry; using OpenTelemetry.Trace; +using WireMock.OpenTelemetry; using WireMock.Server; using WireMock.Settings; using WireMock.RequestBuilders; using WireMock.ResponseBuilders; -using WireMock.OpenTelemetry; Console.WriteLine("=== WireMock.Net OpenTelemetry Tracing Demo ===\n"); @@ -31,8 +31,9 @@ Console.WriteLine("=== WireMock.Net OpenTelemetry Tracing Demo ===\n"); // Option 1: Custom TracerProvider with Console exporter for this demo using var tracerProvider = Sdk.CreateTracerProviderBuilder() .AddWireMockInstrumentation(new OpenTelemetryOptions() { ExcludeAdminRequests = true }) - .AddHttpClientInstrumentation() // HTTP client traces (for our test requests) - .AddConsoleExporter() // Export traces to console for demo purposes + .AddHttpClientInstrumentation() // HTTP client traces (for our test requests) + .AddConsoleExporter() // Export traces to console for demo purposes + .AddOtlpExporter() // Export to real OTLP collector (e.g. Jaeger, Tempo, etc.) .Build(); Console.WriteLine("Console Exporter configured to visualize:"); diff --git a/examples/WireMock.Net.OpenTelemetryDemo/WireMock.Net.OpenTelemetryDemo.csproj b/examples/WireMock.Net.OpenTelemetryDemo/WireMock.Net.OpenTelemetryDemo.csproj index e85ad669..5608d759 100644 --- a/examples/WireMock.Net.OpenTelemetryDemo/WireMock.Net.OpenTelemetryDemo.csproj +++ b/examples/WireMock.Net.OpenTelemetryDemo/WireMock.Net.OpenTelemetryDemo.csproj @@ -1,15 +1,21 @@ - - Exe - net8.0 - enable - enable - + + Exe + net8.0 + enable + enable + + + + + + + + + + + + - - - - - diff --git a/src/WireMock.Net.Minimal/Owin/ActivityTracing/WireMockActivitySource.cs b/src/WireMock.Net.Minimal/Owin/ActivityTracing/WireMockActivitySource.cs index d7db92c4..3524d0ad 100644 --- a/src/WireMock.Net.Minimal/Owin/ActivityTracing/WireMockActivitySource.cs +++ b/src/WireMock.Net.Minimal/Owin/ActivityTracing/WireMockActivitySource.cs @@ -2,7 +2,6 @@ #if ACTIVITY_TRACING_SUPPORTED using System; -using System.Collections.Generic; using System.Diagnostics; using WireMock.Logging; @@ -198,4 +197,4 @@ public static class WireMockActivitySource activity.SetTag("exception.stacktrace", exception.ToString()); } } -#endif +#endif \ No newline at end of file diff --git a/src/WireMock.Net.Minimal/Owin/ActivityTracing/WireMockSemanticConventions.cs b/src/WireMock.Net.Minimal/Owin/ActivityTracing/WireMockSemanticConventions.cs index 66360cba..57de76e6 100644 --- a/src/WireMock.Net.Minimal/Owin/ActivityTracing/WireMockSemanticConventions.cs +++ b/src/WireMock.Net.Minimal/Owin/ActivityTracing/WireMockSemanticConventions.cs @@ -1,11 +1,5 @@ // Copyright © WireMock.Net -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - namespace WireMock.Owin.ActivityTracing; /// @@ -31,4 +25,4 @@ internal static class WireMockSemanticConventions public const string RequestGuid = "wiremock.request.guid"; public const string RequestBody = "wiremock.request.body"; public const string ResponseBody = "wiremock.response.body"; -} +} \ No newline at end of file diff --git a/src/WireMock.Net.OpenTelemetry/WireMock.Net.OpenTelemetry.csproj b/src/WireMock.Net.OpenTelemetry/WireMock.Net.OpenTelemetry.csproj index c21960e4..f12c9b86 100644 --- a/src/WireMock.Net.OpenTelemetry/WireMock.Net.OpenTelemetry.csproj +++ b/src/WireMock.Net.OpenTelemetry/WireMock.Net.OpenTelemetry.csproj @@ -1,13 +1,14 @@ + OpenTelemetry exporter support for WireMock.Net WireMock.Net.OpenTelemetry Petr Houška net6.0;net8.0 true + WireMock.OpenTelemetry wiremock;opentelemetry;otel;tracing;telemetry - WireMock {C8F4E6D2-9A3B-4F1C-8D5E-7A2B3C4D5E6F} true true @@ -26,7 +27,6 @@ - diff --git a/src/WireMock.Net.OpenTelemetry/WireMockOpenTelemetryExtensions.cs b/src/WireMock.Net.OpenTelemetry/WireMockOpenTelemetryExtensions.cs index 8626a8a2..d0b8f95a 100644 --- a/src/WireMock.Net.OpenTelemetry/WireMockOpenTelemetryExtensions.cs +++ b/src/WireMock.Net.OpenTelemetry/WireMockOpenTelemetryExtensions.cs @@ -2,7 +2,6 @@ using System; using Microsoft.Extensions.DependencyInjection; -using OpenTelemetry; using OpenTelemetry.Resources; using OpenTelemetry.Trace; @@ -112,4 +111,4 @@ public static class WireMockOpenTelemetryExtensions return tracing; } -} +} \ No newline at end of file