OpenTelemetry updates (#1541)

* OpenTelemetry updates * Couple tweaks * Fix environment * Filter out websocket API
exceptionless · Apr 7, 2024 · 48b2851 · 48b2851
1 parent 5033f18
commit 48b2851
Show file tree

Hide file tree

Showing 15 changed files with 199 additions and 162 deletions.
diff --git a/k8s/elastic-monitor.yaml b/k8s/elastic-monitor.yaml
@@ -115,12 +115,12 @@ metadata:
   name: elastic-monitor
   namespace: elastic-system
   annotations:
-    kubernetes.io/ingress.class: "nginx"
     cert-manager.io/cluster-issuer: letsencrypt-prod
     nginx.ingress.kubernetes.io/backend-protocol: "HTTPS"
     nginx.ingress.kubernetes.io/proxy-ssl-verify: "off"
     nginx.ingress.kubernetes.io/ssl-redirect: "true"
 spec:
+  ingressClassName: nginx
   tls:
     - hosts:
         - kibana.exceptionless.io

diff --git a/k8s/ex-prod-values.yaml b/k8s/ex-prod-values.yaml
@@ -37,9 +37,6 @@ config:
   EX_TestEmailAddress: "[email protected]"
   EX_EnableArchive: "false"
   EX_Serilog__MinimumLevel__Default: "Warning"
-  EX_Apm__Endpoint: http://apm.elastic-system.svc:8200
+  EX_OTEL_EXPORTER_OTLP_ENDPOINT: http://apm.elastic-system.svc:8200
   EX_Apm__EnableLogs: "true"
-  EX_Apm__EnableMetrics: "true"
-  EX_Apm__EnableTracing: "true"
   EX_Apm__FullDetails: "true"
-  EX_Apm__Insecure: "true"
diff --git a/src/Exceptionless.Job/Exceptionless.Job.csproj b/src/Exceptionless.Job/Exceptionless.Job.csproj
@@ -20,6 +20,7 @@
     <PackageReference Include="OpenTelemetry.Instrumentation.StackExchangeRedis" Version="1.0.0-rc9.14" />
     <PackageReference Include="OpenTelemetry.Instrumentation.ElasticsearchClient" Version="1.0.0-beta.5" />
     <PackageReference Include="OpenTelemetry.Instrumentation.Runtime" Version="1.8.0" />
+    <PackageReference Include="OpenTelemetry.Instrumentation.Process" Version="0.5.0-beta.5" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/Exceptionless.Job/Program.cs b/src/Exceptionless.Job/Program.cs
@@ -100,8 +100,7 @@ public static IHostBuilder CreateHostBuilder(string[] args)
                         if (!String.IsNullOrEmpty(options.ExceptionlessApiKey) && !String.IsNullOrEmpty(options.ExceptionlessServerUrl))
                             app.UseExceptionless(ExceptionlessClient.Default);
 
-                        if (apmConfig.EnableMetrics)
-                            app.UseOpenTelemetryPrometheusScrapingEndpoint();
+                        app.UseOpenTelemetryPrometheusScrapingEndpoint();
 
                         app.UseHealthChecks("/health", new HealthCheckOptions
                         {

diff --git a/src/Exceptionless.Job/appsettings.Development.yml b/src/Exceptionless.Job/appsettings.Development.yml
@@ -16,11 +16,7 @@ Serilog:
     Default: Debug
 
 Apm:
-  #Endpoint: http://host.docker.internal:8200
-  Insecure: true
   EnableLogs: false
-  EnableTracing: false
-  EnableMetrics: true
   FullDetails: true
   Debug: false
   Console: false
diff --git a/src/Exceptionless.Job/appsettings.Staging.yml b/src/Exceptionless.Job/appsettings.Staging.yml
@@ -20,7 +20,7 @@ Serilog:
     Default: Warning
   WriteTo:
   - Name: Console
-    Args: 
+    Args:
       theme: "Serilog.Sinks.SystemConsole.Themes.ConsoleTheme::None, Serilog.Sinks.Console"
 
 Apm:

diff --git a/src/Exceptionless.Job/appsettings.yml b/src/Exceptionless.Job/appsettings.yml
@@ -17,7 +17,7 @@ Serilog:
       Foundatio: Information
   WriteTo:
   - Name: Console
-    Args: 
+    Args:
       theme: "Serilog.Sinks.SystemConsole.Themes.AnsiConsoleTheme::Literate, Serilog.Sinks.Console"
   Enrich:
   - FromLogContext
@@ -27,8 +27,5 @@ Serilog:
 Apm:
   ServiceName: exceptionless
   EnableLogs: true
-  EnableTracing: true
-  EnableMetrics: true
-  SampleRate: 1.0
   FullDetails: true
-  Debug: false
+  Debug: false