Code review.

open-telemetry · Apr 28, 2023 · 6576a96 · 6576a96
1 parent 9fcb417
commit 6576a96
Show file tree

Hide file tree

Showing 7 changed files with 28 additions and 21 deletions.
diff --git a/src/OpenTelemetry/.publicApi/net462/PublicAPI.Unshipped.txt b/src/OpenTelemetry/.publicApi/net462/PublicAPI.Unshipped.txt
@@ -35,6 +35,8 @@ OpenTelemetry.Metrics.ExponentialHistogramData.ZeroCount.get -> long
 OpenTelemetry.Metrics.MetricType.ExponentialHistogram = 80 -> OpenTelemetry.Metrics.MetricType
 OpenTelemetry.Metrics.TraceBasedExemplarFilter
 OpenTelemetry.Metrics.TraceBasedExemplarFilter.TraceBasedExemplarFilter() -> void
+override OpenTelemetry.BaseExportProcessor<T>.ToString() -> string!
+override OpenTelemetry.BaseProcessor<T>.ToString() -> string!
 static OpenTelemetry.Metrics.MeterProviderBuilderExtensions.SetExemplarFilter(this OpenTelemetry.Metrics.MeterProviderBuilder! meterProviderBuilder, OpenTelemetry.Metrics.ExemplarFilter! exemplarFilter) -> OpenTelemetry.Metrics.MeterProviderBuilder!
 ~abstract OpenTelemetry.Metrics.ExemplarFilter.ShouldSample(double value, System.ReadOnlySpan<System.Collections.Generic.KeyValuePair<string, object>> tags) -> bool
 ~abstract OpenTelemetry.Metrics.ExemplarFilter.ShouldSample(long value, System.ReadOnlySpan<System.Collections.Generic.KeyValuePair<string, object>> tags) -> bool

diff --git a/src/OpenTelemetry/.publicApi/net6.0/PublicAPI.Unshipped.txt b/src/OpenTelemetry/.publicApi/net6.0/PublicAPI.Unshipped.txt
@@ -35,6 +35,8 @@ OpenTelemetry.Metrics.ExponentialHistogramData.ZeroCount.get -> long
 OpenTelemetry.Metrics.MetricType.ExponentialHistogram = 80 -> OpenTelemetry.Metrics.MetricType
 OpenTelemetry.Metrics.TraceBasedExemplarFilter
 OpenTelemetry.Metrics.TraceBasedExemplarFilter.TraceBasedExemplarFilter() -> void
+override OpenTelemetry.BaseExportProcessor<T>.ToString() -> string!
+override OpenTelemetry.BaseProcessor<T>.ToString() -> string!
 static OpenTelemetry.Metrics.MeterProviderBuilderExtensions.SetExemplarFilter(this OpenTelemetry.Metrics.MeterProviderBuilder! meterProviderBuilder, OpenTelemetry.Metrics.ExemplarFilter! exemplarFilter) -> OpenTelemetry.Metrics.MeterProviderBuilder!
 ~abstract OpenTelemetry.Metrics.ExemplarFilter.ShouldSample(double value, System.ReadOnlySpan<System.Collections.Generic.KeyValuePair<string, object>> tags) -> bool
 ~abstract OpenTelemetry.Metrics.ExemplarFilter.ShouldSample(long value, System.ReadOnlySpan<System.Collections.Generic.KeyValuePair<string, object>> tags) -> bool

diff --git a/src/OpenTelemetry/.publicApi/netstandard2.0/PublicAPI.Unshipped.txt b/src/OpenTelemetry/.publicApi/netstandard2.0/PublicAPI.Unshipped.txt
@@ -35,6 +35,8 @@ OpenTelemetry.Metrics.ExponentialHistogramData.ZeroCount.get -> long
 OpenTelemetry.Metrics.MetricType.ExponentialHistogram = 80 -> OpenTelemetry.Metrics.MetricType
 OpenTelemetry.Metrics.TraceBasedExemplarFilter
 OpenTelemetry.Metrics.TraceBasedExemplarFilter.TraceBasedExemplarFilter() -> void
+override OpenTelemetry.BaseExportProcessor<T>.ToString() -> string!
+override OpenTelemetry.BaseProcessor<T>.ToString() -> string!
 static OpenTelemetry.Metrics.MeterProviderBuilderExtensions.SetExemplarFilter(this OpenTelemetry.Metrics.MeterProviderBuilder! meterProviderBuilder, OpenTelemetry.Metrics.ExemplarFilter! exemplarFilter) -> OpenTelemetry.Metrics.MeterProviderBuilder!
 ~abstract OpenTelemetry.Metrics.ExemplarFilter.ShouldSample(double value, System.ReadOnlySpan<System.Collections.Generic.KeyValuePair<string, object>> tags) -> bool
 ~abstract OpenTelemetry.Metrics.ExemplarFilter.ShouldSample(long value, System.ReadOnlySpan<System.Collections.Generic.KeyValuePair<string, object>> tags) -> bool

diff --git a/src/OpenTelemetry/.publicApi/netstandard2.1/PublicAPI.Unshipped.txt b/src/OpenTelemetry/.publicApi/netstandard2.1/PublicAPI.Unshipped.txt
@@ -35,6 +35,8 @@ OpenTelemetry.Metrics.ExponentialHistogramData.ZeroCount.get -> long
 OpenTelemetry.Metrics.MetricType.ExponentialHistogram = 80 -> OpenTelemetry.Metrics.MetricType
 OpenTelemetry.Metrics.TraceBasedExemplarFilter
 OpenTelemetry.Metrics.TraceBasedExemplarFilter.TraceBasedExemplarFilter() -> void
+override OpenTelemetry.BaseExportProcessor<T>.ToString() -> string!
+override OpenTelemetry.BaseProcessor<T>.ToString() -> string!
 static OpenTelemetry.Metrics.MeterProviderBuilderExtensions.SetExemplarFilter(this OpenTelemetry.Metrics.MeterProviderBuilder! meterProviderBuilder, OpenTelemetry.Metrics.ExemplarFilter! exemplarFilter) -> OpenTelemetry.Metrics.MeterProviderBuilder!
 ~abstract OpenTelemetry.Metrics.ExemplarFilter.ShouldSample(double value, System.ReadOnlySpan<System.Collections.Generic.KeyValuePair<string, object>> tags) -> bool
 ~abstract OpenTelemetry.Metrics.ExemplarFilter.ShouldSample(long value, System.ReadOnlySpan<System.Collections.Generic.KeyValuePair<string, object>> tags) -> bool

diff --git a/src/OpenTelemetry/BaseExportProcessor.cs b/src/OpenTelemetry/BaseExportProcessor.cs
@@ -48,6 +48,7 @@ public abstract class BaseExportProcessor<T> : BaseProcessor<T>
         where T : class
     {
         protected readonly BaseExporter<T> exporter;
+        private readonly string friendlyTypeName;
         private bool disposed;
 
         /// <summary>
@@ -58,11 +59,16 @@ protected BaseExportProcessor(BaseExporter<T> exporter)
         {
             Guard.ThrowIfNull(exporter);
 
+            this.friendlyTypeName = $"{this.GetType().Name}<{exporter.GetType().Name}>";
             this.exporter = exporter;
         }
 
         internal BaseExporter<T> Exporter => this.exporter;
 
+        /// <inheritdoc />
+        public override string ToString()
+            => this.friendlyTypeName;
+
         /// <inheritdoc />
         public sealed override void OnStart(T data)
         {

diff --git a/src/OpenTelemetry/BaseProcessor.cs b/src/OpenTelemetry/BaseProcessor.cs
@@ -153,6 +153,10 @@ public void Dispose()
             GC.SuppressFinalize(this);
         }
 
+        /// <inheritdoc/>
+        public override string ToString()
+            => this.typeName;
+
         internal virtual void SetParentProvider(BaseProvider parentProvider)
         {
             this.ParentProvider = parentProvider;

diff --git a/src/OpenTelemetry/Logs/LoggerProviderSdk.cs b/src/OpenTelemetry/Logs/LoggerProviderSdk.cs
@@ -61,33 +61,24 @@ public LoggerProviderSdk(
             configureProviderBuilder.ConfigureBuilder(serviceProvider!, state);
         }
 
-        StringBuilder processorsAdded = new StringBuilder();
-        StringBuilder instrumentationFactoriesAdded = new StringBuilder();
-
         var resourceBuilder = state.ResourceBuilder ?? ResourceBuilder.CreateDefault();
         resourceBuilder.ServiceProvider = serviceProvider;
         this.Resource = resourceBuilder.Build();
 
         foreach (var processor in state.Processors)
         {
             this.AddProcessor(processor);
-            processorsAdded.Append(processor.GetType());
-            processorsAdded.Append(';');
         }
 
+        StringBuilder instrumentationFactoriesAdded = new StringBuilder();
+
         foreach (var instrumentation in state.Instrumentation)
         {
             this.instrumentations.Add(instrumentation.Instance);
             instrumentationFactoriesAdded.Append(instrumentation.Name);
             instrumentationFactoriesAdded.Append(';');
         }
 
-        if (processorsAdded.Length != 0)
-        {
-            processorsAdded.Remove(processorsAdded.Length - 1, 1);
-            OpenTelemetrySdkEventSource.Log.LoggerProviderSdkEvent($"Processors added = \"{processorsAdded}\".");
-        }
-
         if (instrumentationFactoriesAdded.Length != 0)
         {
             instrumentationFactoriesAdded.Remove(instrumentationFactoriesAdded.Length - 1, 1);
@@ -107,42 +98,40 @@ public LoggerProviderSdk(
 
     public void AddProcessor(BaseProcessor<LogRecord> processor)
     {
-        OpenTelemetrySdkEventSource.Log.LoggerProviderSdkEvent("Started adding processor.");
-
         Guard.ThrowIfNull(processor);
 
         processor.SetParentProvider(this);
 
-        StringBuilder processorAdded = new StringBuilder();
-
         if (this.threadStaticPool != null && this.ContainsBatchProcessor(processor))
         {
             OpenTelemetrySdkEventSource.Log.LoggerProviderSdkEvent("Using shared thread pool.");
 
             this.threadStaticPool = null;
         }
 
+        StringBuilder processorAdded = new StringBuilder();
+
         if (this.Processor == null)
         {
-            processorAdded.Append("Setting processor to ");
+            processorAdded.Append("Setting processor to '");
             processorAdded.Append(processor);
+            processorAdded.Append('\'');
 
             this.Processor = processor;
         }
         else if (this.Processor is CompositeProcessor<LogRecord> compositeProcessor)
         {
-            processorAdded.Append("Adding processor ");
+            processorAdded.Append("Adding processor '");
             processorAdded.Append(processor);
-            processorAdded.Append(" to composite processor");
+            processorAdded.Append("' to composite processor");
 
             compositeProcessor.AddProcessor(processor);
         }
         else
         {
-            processorAdded.Append("Creating new composite processor with processor ");
-            processorAdded.Append(this.Processor);
-            processorAdded.Append(" and adding new processor ");
+            processorAdded.Append("Creating new composite processor and adding new processor '");
             processorAdded.Append(processor);
+            processorAdded.Append('\'');
 
             var newCompositeProcessor = new CompositeProcessor<LogRecord>(new[]
             {