Various telemetry updates

exceptionless · Oct 31, 2024 · 8ca4f2e · 8ca4f2e
1 parent 5e3ab1d
commit 8ca4f2e
Show file tree

Hide file tree

Showing 7 changed files with 54 additions and 14 deletions.
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -16,7 +16,7 @@
     <EmbedUntrackedSources>true</EmbedUntrackedSources>
     <ReferenceFoundatioSource>false</ReferenceFoundatioSource>
     <ReferenceFoundatioRepositoriesSource>false</ReferenceFoundatioRepositoriesSource>
-    <FoundatioVersion>11.0.5</FoundatioVersion>
+    <FoundatioVersion>11.0.6-alpha.0.18</FoundatioVersion>
     <AccelerateBuildsInVisualStudio>true</AccelerateBuildsInVisualStudio>
   </PropertyGroup>
 

diff --git a/src/Exceptionless.Insulation/Exceptionless.Insulation.csproj b/src/Exceptionless.Insulation/Exceptionless.Insulation.csproj
@@ -2,12 +2,12 @@
   <ItemGroup>
     <PackageReference Include="Geocoding.Google" Version="4.0.1" />
     <PackageReference Include="MaxMind.GeoIP2" Version="5.2.0" />
-    <PackageReference Include="Foundatio.Aliyun" Version="$(FoundatioVersion)" />
-    <PackageReference Include="Foundatio.AWS" Version="$(FoundatioVersion)" />
-    <PackageReference Include="Foundatio.AzureStorage" Version="$(FoundatioVersion)" />
-    <PackageReference Include="Foundatio.Minio" Version="$(FoundatioVersion)" />
-    <PackageReference Include="Foundatio.RabbitMQ" Version="$(FoundatioVersion)" />
-    <PackageReference Include="Foundatio.Redis" Version="$(FoundatioVersion)" />
+    <PackageReference Include="Foundatio.Aliyun" Version="11.0.5" />
+    <PackageReference Include="Foundatio.AWS" Version="11.0.5" />
+    <PackageReference Include="Foundatio.AzureStorage" Version="11.0.5" />
+    <PackageReference Include="Foundatio.Minio" Version="11.0.5" />
+    <PackageReference Include="Foundatio.RabbitMQ" Version="11.0.5" />
+    <PackageReference Include="Foundatio.Redis" Version="11.0.5" />
     <PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="9.0.0-rc.2.24473.5" />
     <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="9.0.0-rc.2.24473.5" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.0-rc.2.24473.5" />

diff --git a/src/Exceptionless.Job/Program.cs b/src/Exceptionless.Job/Program.cs
@@ -62,8 +62,7 @@ public static IHostBuilder CreateHostBuilder(string[] args)
         var options = AppOptions.ReadFromConfiguration(config);
         var apmConfig = new ApmConfig(config, $"job-{jobOptions.JobName.ToLowerUnderscoredWords('-')}", options.InformationalVersion, options.CacheOptions.Provider == "redis");
 
-        var configDictionary = config.ToDictionary("Serilog");
-        Log.Information("Bootstrapping Exceptionless {JobName} job(s) in {AppMode} mode ({InformationalVersion}) on {MachineName} with settings {@Settings}", jobOptions.JobName ?? "All", environment, options.InformationalVersion, Environment.MachineName, configDictionary);
+        Log.Information("Bootstrapping Exceptionless {JobName} job(s) in {AppMode} mode ({InformationalVersion}) on {MachineName} with options {@Options}", jobOptions.JobName ?? "All", environment, options.InformationalVersion, Environment.MachineName, options);
 
         var builder = Host.CreateDefaultBuilder()
             .UseEnvironment(environment)

diff --git a/src/Exceptionless.Job/appsettings.Development.yml b/src/Exceptionless.Job/appsettings.Development.yml
@@ -13,7 +13,7 @@ BaseURL: 'http://localhost:9001/#!'
 
 Serilog:
   MinimumLevel:
-    Default: Debug
+    Default: Information
 
 Apm:
   EnableLogs: false

diff --git a/src/Exceptionless.Web/ApmExtensions.cs b/src/Exceptionless.Web/ApmExtensions.cs
@@ -28,7 +28,7 @@ public static IHostBuilder AddApm(this IHostBuilder builder, ApmConfig config)
         builder.ConfigureServices(services =>
         {
             services.AddSingleton(config);
-            services.AddHostedService(sp => new SelfDiagnosticsLoggingHostedService(sp.GetRequiredService<ILoggerFactory>(), config.Debug ? EventLevel.Verbose : null));
+            //services.AddHostedService(sp => new SelfDiagnosticsLoggingHostedService(sp.GetRequiredService<ILoggerFactory>(), config.Debug ? EventLevel.Verbose : null));
 
             services.AddOpenTelemetry().WithTracing(b =>
             {
@@ -41,6 +41,9 @@ public static IHostBuilder AddApm(this IHostBuilder builder, ApmConfig config)
                         if (context.Request.Path.StartsWithSegments("/api/v2/push", StringComparison.OrdinalIgnoreCase))
                             return false;
 
+                        if (context.Request.Path.StartsWithSegments("/health", StringComparison.OrdinalIgnoreCase))
+                            return false;
+
                         if (context.Request.Headers.UserAgent.ToString().Contains("HealthChecker"))
                             return false;
 
@@ -84,7 +87,30 @@ public static IHostBuilder AddApm(this IHostBuilder builder, ApmConfig config)
                     b.AddConsoleExporter();
 
                 if (config.EnableExporter)
+                {
+                    b.AddProcessor(new FilteringProcessor(activity =>
+                    {
+                        // filter out insignificant activities
+                        if (config.MinDurationMs > 0 && activity.Duration < TimeSpan.FromMilliseconds(config.MinDurationMs))
+                            return false;
+
+                        if (activity is { DisplayName: "LLEN", Parent: null })
+                            return false;
+
+                        if (activity.DisplayName == "Elasticsearch HEAD")
+                            return false;
+
+                        if (activity.GetTagItem("db.statement") is not string statement)
+                            return true;
+
+                        if (statement.EndsWith("__PING__"))
+                            return false;
+
+                        return true;
+                    }));
+
                     b.AddOtlpExporter();
+                }
             });
 
             services.AddOpenTelemetry().WithMetrics(b =>
@@ -174,3 +200,19 @@ public ApmConfig(IConfigurationRoot config, string processName, string? serviceV
     public bool Debug => _apmConfig.GetValue("Debug", false);
     public bool Console => _apmConfig.GetValue("Console", false);
 }
+
+public class FilteringProcessor : BaseProcessor<Activity>
+{
+    private readonly Func<Activity, bool> _filter;
+
+    public FilteringProcessor(Func<Activity, bool> filter)
+    {
+        _filter = filter ?? throw new ArgumentNullException(nameof(filter));
+    }
+
+    public override void OnEnd(Activity activity)
+    {
+        if (!_filter(activity))
+            activity.ActivityTraceFlags &= ~ActivityTraceFlags.Recorded;
+    }
+}
diff --git a/src/Exceptionless.Web/Program.cs b/src/Exceptionless.Web/Program.cs
@@ -63,8 +63,7 @@ public static IHostBuilder CreateHostBuilder(IConfigurationRoot config, string e
         var options = AppOptions.ReadFromConfiguration(config);
         var apmConfig = new ApmConfig(config, "web", options.InformationalVersion, options.CacheOptions.Provider == "redis");
 
-        var configDictionary = config.ToDictionary("Serilog");
-        Log.Information("Bootstrapping Exceptionless Web in {AppMode} mode ({InformationalVersion}) on {MachineName} with settings {@Settings}", environment, options.InformationalVersion, Environment.MachineName, configDictionary);
+        Log.Information("Bootstrapping Exceptionless Web in {AppMode} mode ({InformationalVersion}) on {MachineName} with options {@Options}", environment, options.InformationalVersion, Environment.MachineName, options);
 
         SetClientEnvironmentVariablesInDevelopmentMode(options);
 

diff --git a/src/Exceptionless.Web/appsettings.Development.yml b/src/Exceptionless.Web/appsettings.Development.yml
@@ -21,7 +21,7 @@ RunJobsInProcess: true
 
 Serilog:
   MinimumLevel:
-    Default: Debug
+    Default: Information
 
 Apm:
   EnableLogs: true