Merge pull request #24114 from abpframework/auto-merge/rel-9-3/4104

Merge branch rel-10.0 with rel-9.3

framework/src/Volo.Abp.Core/Volo/Abp/AbpApplicationBase.cs

@@ -185,8 +185,7 @@ public abstract class AbpApplicationBase : IAbpApplication
         {
             try
             {
-                using var scope = ServiceProvider.CreateScope();
-                var logger = scope.ServiceProvider.GetRequiredService<ILogger<AbpApplicationBase>>();
+                var logger = Services.GetInitLogger<AbpApplicationBase>();
                 logger.LogException(ex, LogLevel.Trace);
             }
             catch

framework/src/Volo.Abp.Core/Volo/Abp/Internal/Telemetry/Activity/Providers/TelemetryActivityEventBuilder.cs

@@ -8,7 +8,7 @@ using Volo.Abp.Internal.Telemetry.Constants;
 
 namespace Volo.Abp.Internal.Telemetry.Activity.Providers;
 
-public class TelemetryActivityEventBuilder : ITelemetryActivityEventBuilder, ISingletonDependency
+public class TelemetryActivityEventBuilder : ITelemetryActivityEventBuilder, ITransientDependency
 {
     private readonly List<ITelemetryActivityEventEnricher> _activityEnrichers;
 
@@ -31,7 +31,7 @@ public class TelemetryActivityEventBuilder : ITelemetryActivityEventBuilder, ISi
             {
                //ignored
             }
-            
+
             if (context.IsTerminated)
             {
                 return null;
@@ -40,10 +40,10 @@ public class TelemetryActivityEventBuilder : ITelemetryActivityEventBuilder, ISi
 
         return context.Current;
     }
-    
+
     private static bool FilterEnricher(ITelemetryActivityEventEnricher enricher)
     {
-        return ProxyHelper.GetUnProxiedType(enricher).Assembly.FullName!.StartsWith(TelemetryConsts.VoloNameSpaceFilter) && 
+        return ProxyHelper.GetUnProxiedType(enricher).Assembly.FullName!.StartsWith(TelemetryConsts.VoloNameSpaceFilter) &&
                enricher is not IHasParentTelemetryActivityEventEnricher<TelemetryActivityEventEnricher>;
     }
-}
+}