Skip to content

Commit 48b2851

Browse files
authored
OpenTelemetry updates (#1541)
* OpenTelemetry updates * Couple tweaks * Fix environment * Filter out websocket API
1 parent 5033f18 commit 48b2851

15 files changed

+199
-162
lines changed

k8s/elastic-monitor.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,12 +115,12 @@ metadata:
115115
name: elastic-monitor
116116
namespace: elastic-system
117117
annotations:
118-
kubernetes.io/ingress.class: "nginx"
119118
cert-manager.io/cluster-issuer: letsencrypt-prod
120119
nginx.ingress.kubernetes.io/backend-protocol: "HTTPS"
121120
nginx.ingress.kubernetes.io/proxy-ssl-verify: "off"
122121
nginx.ingress.kubernetes.io/ssl-redirect: "true"
123122
spec:
123+
ingressClassName: nginx
124124
tls:
125125
- hosts:
126126
- kibana.exceptionless.io

k8s/ex-prod-values.yaml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,6 @@ config:
3737
EX_TestEmailAddress: "test@exceptionless.io"
3838
EX_EnableArchive: "false"
3939
EX_Serilog__MinimumLevel__Default: "Warning"
40-
EX_Apm__Endpoint: http://apm.elastic-system.svc:8200
40+
EX_OTEL_EXPORTER_OTLP_ENDPOINT: http://apm.elastic-system.svc:8200
4141
EX_Apm__EnableLogs: "true"
42-
EX_Apm__EnableMetrics: "true"
43-
EX_Apm__EnableTracing: "true"
4442
EX_Apm__FullDetails: "true"
45-
EX_Apm__Insecure: "true"

src/Exceptionless.Job/Exceptionless.Job.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
<PackageReference Include="OpenTelemetry.Instrumentation.StackExchangeRedis" Version="1.0.0-rc9.14" />
2121
<PackageReference Include="OpenTelemetry.Instrumentation.ElasticsearchClient" Version="1.0.0-beta.5" />
2222
<PackageReference Include="OpenTelemetry.Instrumentation.Runtime" Version="1.8.0" />
23+
<PackageReference Include="OpenTelemetry.Instrumentation.Process" Version="0.5.0-beta.5" />
2324
</ItemGroup>
2425

2526
<ItemGroup>

src/Exceptionless.Job/Program.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,8 +100,7 @@ public static IHostBuilder CreateHostBuilder(string[] args)
100100
if (!String.IsNullOrEmpty(options.ExceptionlessApiKey) && !String.IsNullOrEmpty(options.ExceptionlessServerUrl))
101101
app.UseExceptionless(ExceptionlessClient.Default);
102102

103-
if (apmConfig.EnableMetrics)
104-
app.UseOpenTelemetryPrometheusScrapingEndpoint();
103+
app.UseOpenTelemetryPrometheusScrapingEndpoint();
105104

106105
app.UseHealthChecks("/health", new HealthCheckOptions
107106
{

src/Exceptionless.Job/appsettings.Development.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,7 @@ Serilog:
1616
Default: Debug
1717

1818
Apm:
19-
#Endpoint: http://host.docker.internal:8200
20-
Insecure: true
2119
EnableLogs: false
22-
EnableTracing: false
23-
EnableMetrics: true
2420
FullDetails: true
2521
Debug: false
2622
Console: false

src/Exceptionless.Job/appsettings.Staging.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ Serilog:
2020
Default: Warning
2121
WriteTo:
2222
- Name: Console
23-
Args:
23+
Args:
2424
theme: "Serilog.Sinks.SystemConsole.Themes.ConsoleTheme::None, Serilog.Sinks.Console"
2525

2626
Apm:

src/Exceptionless.Job/appsettings.yml

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ Serilog:
1717
Foundatio: Information
1818
WriteTo:
1919
- Name: Console
20-
Args:
20+
Args:
2121
theme: "Serilog.Sinks.SystemConsole.Themes.AnsiConsoleTheme::Literate, Serilog.Sinks.Console"
2222
Enrich:
2323
- FromLogContext
@@ -27,8 +27,5 @@ Serilog:
2727
Apm:
2828
ServiceName: exceptionless
2929
EnableLogs: true
30-
EnableTracing: true
31-
EnableMetrics: true
32-
SampleRate: 1.0
3330
FullDetails: true
34-
Debug: false
31+
Debug: false

0 commit comments

Comments
 (0)