Skip to content

Commit 7f37e53

Browse files
committed
Only use standar otel
1 parent 14c3474 commit 7f37e53

File tree

3 files changed

+7
-19
lines changed

3 files changed

+7
-19
lines changed

src/Directory.Packages.props

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,9 @@
5050
<PackageVersion Include="NUnit" Version="4.3.2" />
5151
<PackageVersion Include="NUnit.Analyzers" Version="4.6.0" />
5252
<PackageVersion Include="NUnit3TestAdapter" Version="4.6.0" />
53+
<PackageVersion Include="OpenTelemetry.Exporter.Console" Version="1.9.0" />
54+
<PackageVersion Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.9.0" />
55+
<PackageVersion Include="OpenTelemetry.Extensions.Hosting" Version="1.9.0" />
5356
<PackageVersion Include="Particular.Approvals" Version="2.0.1" />
5457
<PackageVersion Include="Particular.Licensing.Sources" Version="6.0.1" />
5558
<PackageVersion Include="Particular.LicensingComponent.Report" Version="1.0.0" />

src/ServiceControl.Audit/HostApplicationBuilderExtensions.cs

Lines changed: 4 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ namespace ServiceControl.Audit;
55
using System.Threading;
66
using System.Threading.Tasks;
77
using Auditing;
8-
using Azure.Monitor.OpenTelemetry.Exporter;
98
using Infrastructure;
109
using Infrastructure.Settings;
1110
using Microsoft.AspNetCore.HttpLogging;
@@ -76,20 +75,10 @@ public static void AddServiceControlAudit(this IHostApplicationBuilder builder,
7675
{
7776
b.AddMeter("ServiceControl");
7877

79-
if (Uri.TryCreate(settings.OtelMetricsUrl, UriKind.Absolute, out var uri))
78+
b.AddOtlpExporter(e =>
8079
{
81-
b.AddOtlpExporter(e =>
82-
{
83-
e.Endpoint = uri;
84-
});
85-
}
86-
else
87-
{
88-
b.AddAzureMonitorMetricExporter(o =>
89-
{
90-
o.ConnectionString = settings.OtelMetricsUrl;
91-
});
92-
}
80+
e.Endpoint = new Uri(settings.OtelMetricsUrl);
81+
});
9382

9483
b.AddConsoleExporter();
9584
});
@@ -128,9 +117,6 @@ static void RecordStartup(Settings settings, EndpointConfiguration endpointConfi
128117

129118
var logger = LogManager.GetLogger(typeof(HostApplicationBuilderExtensions));
130119
logger.Info(startupMessage);
131-
endpointConfiguration.GetSettings().AddStartupDiagnosticsSection("Startup", new
132-
{
133-
Settings = settings
134-
});
120+
endpointConfiguration.GetSettings().AddStartupDiagnosticsSection("Startup", new { Settings = settings });
135121
}
136122
}

src/ServiceControl.Audit/ServiceControl.Audit.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
</ItemGroup>
2424

2525
<ItemGroup>
26-
<PackageReference Include="Azure.Monitor.OpenTelemetry.Exporter" />
2726
<PackageReference Include="ByteSize" />
2827
<PackageReference Include="Microsoft.Extensions.Hosting.WindowsServices" />
2928
<PackageReference Include="NServiceBus.CustomChecks" />

0 commit comments

Comments
 (0)