Merge branch 'main' into reyang/discourage-activity-events-in-loop

reyang · web-flow · commit b31a73595e90 · 2024-03-26T13:58:17.000-07:00
diff --git a/OpenTelemetry.sln b/OpenTelemetry.sln
@@ -343,6 +343,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "dedicated-pipeline", "docs\
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Configuration", "Configuration", "{87A20A76-D524-4AAC-AF92-8725BFED0415}"
 	ProjectSection(SolutionItems) = preProject
+		src\Shared\Configuration\IConfigurationExtensionsLogger.cs = src\Shared\Configuration\IConfigurationExtensionsLogger.cs
 		src\Shared\Configuration\OpenTelemetryConfigurationExtensions.cs = src\Shared\Configuration\OpenTelemetryConfigurationExtensions.cs
 	EndProjectSection
 EndProject
diff --git a/src/OpenTelemetry.Exporter.OpenTelemetryProtocol/Implementation/ExperimentalOptions.cs b/src/OpenTelemetry.Exporter.OpenTelemetryProtocol/Implementation/ExperimentalOptions.cs
@@ -24,12 +24,12 @@ public ExperimentalOptions()
 
     public ExperimentalOptions(IConfiguration configuration)
     {
-        if (configuration.TryGetBoolValue(EmitLogEventEnvVar, out var emitLogEventAttributes))
+        if (configuration.TryGetBoolValue(OpenTelemetryProtocolExporterEventSource.Log, EmitLogEventEnvVar, out var emitLogEventAttributes))
         {
             this.EmitLogEventAttributes = emitLogEventAttributes;
         }
 
-        if (configuration.TryGetBoolValue(EnableInMemoryRetryEnvVar, out var enableInMemoryRetry))
+        if (configuration.TryGetBoolValue(OpenTelemetryProtocolExporterEventSource.Log, EnableInMemoryRetryEnvVar, out var enableInMemoryRetry))
         {
             this.EnableInMemoryRetry = enableInMemoryRetry;
         }
diff --git a/src/OpenTelemetry.Exporter.OpenTelemetryProtocol/Implementation/OpenTelemetryProtocolExporterEventSource.cs b/src/OpenTelemetry.Exporter.OpenTelemetryProtocol/Implementation/OpenTelemetryProtocolExporterEventSource.cs
@@ -2,12 +2,13 @@
 // SPDX-License-Identifier: Apache-2.0
 
 using System.Diagnostics.Tracing;
+using Microsoft.Extensions.Configuration;
 using OpenTelemetry.Internal;
 
 namespace OpenTelemetry.Exporter.OpenTelemetryProtocol.Implementation;
 
 [EventSource(Name = "OpenTelemetry-Exporter-OpenTelemetryProtocol")]
-internal sealed class OpenTelemetryProtocolExporterEventSource : EventSource
+internal sealed class OpenTelemetryProtocolExporterEventSource : EventSource, IConfigurationExtensionsLogger
 {
     public static readonly OpenTelemetryProtocolExporterEventSource Log = new();
 
@@ -81,8 +82,8 @@ public void UnsupportedAttributeType(string type, string key)
         this.WriteEvent(10, type.ToString(), key);
     }
 
-    [Event(11, Message = "{0} environment variable has an invalid value: '{1}'", Level = EventLevel.Warning)]
-    public void InvalidEnvironmentVariable(string key, string value)
+    [Event(11, Message = "Configuration key '{0}' has an invalid value: '{1}'", Level = EventLevel.Warning)]
+    public void InvalidConfigurationValue(string key, string value)
     {
         this.WriteEvent(11, key, value);
     }
@@ -92,4 +93,9 @@ public void TrySubmitRequestException(string ex)
     {
         this.WriteEvent(12, ex);
     }
+
+    void IConfigurationExtensionsLogger.LogInvalidConfigurationValue(string key, string value)
+    {
+        this.InvalidConfigurationValue(key, value);
+    }
 }
diff --git a/src/OpenTelemetry.Exporter.OpenTelemetryProtocol/Implementation/SdkLimitOptions.cs b/src/OpenTelemetry.Exporter.OpenTelemetryProtocol/Implementation/SdkLimitOptions.cs
@@ -163,7 +163,7 @@ public int? LogRecordAttributeCountLimit
 
     private static void SetIntConfigValue(IConfiguration configuration, string key, Action<int?> setter, int? defaultValue)
     {
-        if (configuration.TryGetIntValue(key, out var result))
+        if (configuration.TryGetIntValue(OpenTelemetryProtocolExporterEventSource.Log, key, out var result))
         {
             setter(result);
         }
diff --git a/src/OpenTelemetry.Exporter.OpenTelemetryProtocol/OtlpExporterOptions.cs b/src/OpenTelemetry.Exporter.OpenTelemetryProtocol/OtlpExporterOptions.cs
@@ -11,6 +11,7 @@
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Options;
+using OpenTelemetry.Exporter.OpenTelemetryProtocol.Implementation;
 using OpenTelemetry.Internal;
 using OpenTelemetry.Trace;
 
@@ -179,13 +180,14 @@ internal void ApplyConfigurationUsingSpecificationEnvVars(
         string headersEnvVarKey,
         string timeoutEnvVarKey)
     {
-        if (configuration.TryGetUriValue(endpointEnvVarKey, out var endpoint))
+        if (configuration.TryGetUriValue(OpenTelemetryProtocolExporterEventSource.Log, endpointEnvVarKey, out var endpoint))
         {
             this.endpoint = endpoint;
             this.AppendSignalPathToEndpoint = appendSignalPathToEndpoint;
         }
 
         if (configuration.TryGetValue<OtlpExportProtocol>(
+            OpenTelemetryProtocolExporterEventSource.Log,
             protocolEnvVarKey,
             OtlpExportProtocolParser.TryParse,
             out var protocol))
@@ -198,7 +200,7 @@ internal void ApplyConfigurationUsingSpecificationEnvVars(
             this.Headers = headers;
         }
 
-        if (configuration.TryGetIntValue(timeoutEnvVarKey, out var timeout))
+        if (configuration.TryGetIntValue(OpenTelemetryProtocolExporterEventSource.Log, timeoutEnvVarKey, out var timeout))
         {
             this.TimeoutMilliseconds = timeout;
         }
diff --git a/src/OpenTelemetry.Exporter.OpenTelemetryProtocol/OtlpLogExporter.cs b/src/OpenTelemetry.Exporter.OpenTelemetryProtocol/OtlpLogExporter.cs
@@ -4,7 +4,6 @@
 #nullable enable
 
 using System.Diagnostics;
-using Microsoft.Extensions.Configuration;
 using OpenTelemetry.Exporter.OpenTelemetryProtocol.Implementation;
 using OpenTelemetry.Exporter.OpenTelemetryProtocol.Implementation.Transmission;
 using OpenTelemetry.Logs;
@@ -36,7 +35,7 @@ public OtlpLogExporter(OtlpExporterOptions options)
     /// <summary>
     /// Initializes a new instance of the <see cref="OtlpLogExporter"/> class.
     /// </summary>
-    /// <param name="exporterOptions">Configuration options for the exporter.</param>
+    /// <param name="exporterOptions"><see cref="OtlpExporterOptions"/>.</param>
     /// <param name="sdkLimitOptions"><see cref="SdkLimitOptions"/>.</param>
     /// <param name="experimentalOptions"><see cref="ExperimentalOptions"/>.</param>
     /// <param name="transmissionHandler"><see cref="OtlpExporterTransmissionHandler{T}"/>.</param>
@@ -50,12 +49,6 @@ internal OtlpLogExporter(
         Debug.Assert(sdkLimitOptions != null, "sdkLimitOptions was null");
         Debug.Assert(experimentalOptions != null, "experimentalOptions was null");
 
-        // Each of the Otlp exporters: Traces, Metrics, and Logs set the same
-        // value for
-        // `OpenTelemetryConfigurationExtensions.LogInvalidEnvironmentVariable`
-        // so it should be fine even if these exporters are used together.
-        OpenTelemetryConfigurationExtensions.LogInvalidEnvironmentVariable = OpenTelemetryProtocolExporterEventSource.Log.InvalidEnvironmentVariable;
-
         this.transmissionHandler = transmissionHandler ?? exporterOptions.GetLogsExportTransmissionHandler(experimentalOptions!);
 
         this.otlpLogRecordTransformer = new OtlpLogRecordTransformer(sdkLimitOptions!, experimentalOptions!);
diff --git a/src/OpenTelemetry.Exporter.OpenTelemetryProtocol/OtlpMetricExporter.cs b/src/OpenTelemetry.Exporter.OpenTelemetryProtocol/OtlpMetricExporter.cs
@@ -1,7 +1,7 @@
 // Copyright The OpenTelemetry Authors
 // SPDX-License-Identifier: Apache-2.0
 
-using Microsoft.Extensions.Configuration;
+using System.Diagnostics;
 using OpenTelemetry.Exporter.OpenTelemetryProtocol.Implementation;
 using OpenTelemetry.Exporter.OpenTelemetryProtocol.Implementation.Transmission;
 using OpenTelemetry.Metrics;
@@ -32,21 +32,18 @@ public OtlpMetricExporter(OtlpExporterOptions options)
     /// <summary>
     /// Initializes a new instance of the <see cref="OtlpMetricExporter"/> class.
     /// </summary>
-    /// <param name="options">Configuration options for the export.</param>
+    /// <param name="exporterOptions"><see cref="OtlpExporterOptions"/>.</param>
     /// <param name="experimentalOptions"><see cref="ExperimentalOptions"/>.</param>
     /// <param name="transmissionHandler"><see cref="OtlpExporterTransmissionHandler{T}"/>.</param>
     internal OtlpMetricExporter(
-        OtlpExporterOptions options,
+        OtlpExporterOptions exporterOptions,
         ExperimentalOptions experimentalOptions,
         OtlpExporterTransmissionHandler<OtlpCollector.ExportMetricsServiceRequest> transmissionHandler = null)
     {
-        // Each of the Otlp exporters: Traces, Metrics, and Logs set the same
-        // value for
-        // `OpenTelemetryConfigurationExtensions.LogInvalidEnvironmentVariable`
-        // so it should be fine even if these exporters are used together.
-        OpenTelemetryConfigurationExtensions.LogInvalidEnvironmentVariable = OpenTelemetryProtocolExporterEventSource.Log.InvalidEnvironmentVariable;
+        Debug.Assert(exporterOptions != null, "exporterOptions was null");
+        Debug.Assert(experimentalOptions != null, "experimentalOptions was null");
 
-        this.transmissionHandler = transmissionHandler ?? options.GetMetricsExportTransmissionHandler(experimentalOptions);
+        this.transmissionHandler = transmissionHandler ?? exporterOptions.GetMetricsExportTransmissionHandler(experimentalOptions);
     }
 
     internal OtlpResource.Resource ProcessResource => this.processResource ??= this.ParentProvider.GetResource().ToOtlpResource();
diff --git a/src/OpenTelemetry.Exporter.OpenTelemetryProtocol/OtlpTraceExporter.cs b/src/OpenTelemetry.Exporter.OpenTelemetryProtocol/OtlpTraceExporter.cs
@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: Apache-2.0
 
 using System.Diagnostics;
-using Microsoft.Extensions.Configuration;
 using OpenTelemetry.Exporter.OpenTelemetryProtocol.Implementation;
 using OpenTelemetry.Exporter.OpenTelemetryProtocol.Implementation.Transmission;
 using OtlpCollector = OpenTelemetry.Proto.Collector.Trace.V1;
@@ -48,12 +47,6 @@ internal OtlpTraceExporter(
 
         this.sdkLimitOptions = sdkLimitOptions;
 
-        // Each of the Otlp exporters: Traces, Metrics, and Logs set the same
-        // value for
-        // `OpenTelemetryConfigurationExtensions.LogInvalidEnvironmentVariable`
-        // so it should be fine even if these exporters are used together.
-        OpenTelemetryConfigurationExtensions.LogInvalidEnvironmentVariable = OpenTelemetryProtocolExporterEventSource.Log.InvalidEnvironmentVariable;
-
         this.transmissionHandler = transmissionHandler ?? exporterOptions.GetTraceExportTransmissionHandler(experimentalOptions);
     }
 
diff --git a/src/OpenTelemetry.Exporter.Zipkin/Implementation/ZipkinExporterEventSource.cs b/src/OpenTelemetry.Exporter.Zipkin/Implementation/ZipkinExporterEventSource.cs
@@ -2,6 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 using System.Diagnostics.Tracing;
+using Microsoft.Extensions.Configuration;
 using OpenTelemetry.Internal;
 
 namespace OpenTelemetry.Exporter.Zipkin.Implementation;
@@ -10,7 +11,7 @@ namespace OpenTelemetry.Exporter.Zipkin.Implementation;
 /// EventSource events emitted from the project.
 /// </summary>
 [EventSource(Name = "OpenTelemetry-Exporter-Zipkin")]
-internal sealed class ZipkinExporterEventSource : EventSource
+internal sealed class ZipkinExporterEventSource : EventSource, IConfigurationExtensionsLogger
 {
     public static ZipkinExporterEventSource Log = new();
 
@@ -35,9 +36,14 @@ public void UnsupportedAttributeType(string type, string key)
         this.WriteEvent(2, type.ToString(), key);
     }
 
-    [Event(3, Message = "{0} environment variable has an invalid value: '{1}'", Level = EventLevel.Warning)]
-    public void InvalidEnvironmentVariable(string key, string value)
+    [Event(3, Message = "Configuration key '{0}' has an invalid value: '{1}'", Level = EventLevel.Warning)]
+    public void InvalidConfigurationValue(string key, string value)
     {
         this.WriteEvent(3, key, value);
     }
+
+    void IConfigurationExtensionsLogger.LogInvalidConfigurationValue(string key, string value)
+    {
+        this.InvalidConfigurationValue(key, value);
+    }
 }
diff --git a/src/OpenTelemetry.Exporter.Zipkin/ZipkinExporter.cs b/src/OpenTelemetry.Exporter.Zipkin/ZipkinExporter.cs
@@ -10,7 +10,6 @@
 using System.Net.Sockets;
 using System.Runtime.CompilerServices;
 using System.Text.Json;
-using Microsoft.Extensions.Configuration;
 using OpenTelemetry.Exporter.Zipkin.Implementation;
 using OpenTelemetry.Internal;
 using OpenTelemetry.Resources;
@@ -38,8 +37,6 @@ public ZipkinExporter(ZipkinExporterOptions options, HttpClient client = null)
         this.options = options;
         this.maxPayloadSizeInBytes = (!options.MaxPayloadSizeInBytes.HasValue || options.MaxPayloadSizeInBytes <= 0) ? ZipkinExporterOptions.DefaultMaxPayloadSizeInBytes : options.MaxPayloadSizeInBytes.Value;
         this.httpClient = client ?? options.HttpClientFactory?.Invoke() ?? throw new InvalidOperationException("ZipkinExporter was missing HttpClientFactory or it returned null.");
-
-        OpenTelemetryConfigurationExtensions.LogInvalidEnvironmentVariable = ZipkinExporterEventSource.Log.InvalidEnvironmentVariable;
     }
 
     internal ZipkinEndpoint LocalEndpoint { get; private set; }
diff --git a/src/OpenTelemetry.Exporter.Zipkin/ZipkinExporterOptions.cs b/src/OpenTelemetry.Exporter.Zipkin/ZipkinExporterOptions.cs
@@ -6,6 +6,7 @@
 using System.Net.Http;
 #endif
 using Microsoft.Extensions.Configuration;
+using OpenTelemetry.Exporter.Zipkin.Implementation;
 using OpenTelemetry.Trace;
 
 namespace OpenTelemetry.Exporter;
@@ -39,7 +40,7 @@ internal ZipkinExporterOptions(
         Debug.Assert(configuration != null, "configuration was null");
         Debug.Assert(defaultBatchOptions != null, "defaultBatchOptions was null");
 
-        if (configuration.TryGetUriValue(ZipkinEndpointEnvVar, out var endpoint))
+        if (configuration.TryGetUriValue(ZipkinExporterEventSource.Log, ZipkinEndpointEnvVar, out var endpoint))
         {
             this.Endpoint = endpoint;
         }
diff --git a/src/OpenTelemetry.Instrumentation.AspNetCore/AspNetCoreTraceInstrumentationOptions.cs b/src/OpenTelemetry.Instrumentation.AspNetCore/AspNetCoreTraceInstrumentationOptions.cs
@@ -4,6 +4,7 @@
 using System.Diagnostics;
 using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.Configuration;
+using OpenTelemetry.Instrumentation.AspNetCore.Implementation;
 
 namespace OpenTelemetry.Instrumentation.AspNetCore;
 
@@ -24,7 +25,10 @@ internal AspNetCoreTraceInstrumentationOptions(IConfiguration configuration)
     {
         Debug.Assert(configuration != null, "configuration was null");
 
-        if (configuration.TryGetBoolValue("OTEL_DOTNET_EXPERIMENTAL_ASPNETCORE_ENABLE_GRPC_INSTRUMENTATION", out var enableGrpcInstrumentation))
+        if (configuration.TryGetBoolValue(
+            AspNetCoreInstrumentationEventSource.Log,
+            "OTEL_DOTNET_EXPERIMENTAL_ASPNETCORE_ENABLE_GRPC_INSTRUMENTATION",
+            out var enableGrpcInstrumentation))
         {
             this.EnableGrpcAspNetCoreSupport = enableGrpcInstrumentation;
         }
diff --git a/src/OpenTelemetry.Instrumentation.AspNetCore/Implementation/AspNetCoreInstrumentationEventSource.cs b/src/OpenTelemetry.Instrumentation.AspNetCore/Implementation/AspNetCoreInstrumentationEventSource.cs
@@ -5,6 +5,7 @@
 using System.Diagnostics.CodeAnalysis;
 #endif
 using System.Diagnostics.Tracing;
+using Microsoft.Extensions.Configuration;
 using OpenTelemetry.Internal;
 
 namespace OpenTelemetry.Instrumentation.AspNetCore.Implementation;
@@ -13,7 +14,7 @@ namespace OpenTelemetry.Instrumentation.AspNetCore.Implementation;
 /// EventSource events emitted from the project.
 /// </summary>
 [EventSource(Name = "OpenTelemetry-Instrumentation-AspNetCore")]
-internal sealed class AspNetCoreInstrumentationEventSource : EventSource
+internal sealed class AspNetCoreInstrumentationEventSource : EventSource, IConfigurationExtensionsLogger
 {
     public static AspNetCoreInstrumentationEventSource Log = new();
 
@@ -79,4 +80,15 @@ public void UnknownErrorProcessingEvent(string handlerName, string eventName, st
     {
         this.WriteEvent(5, handlerName, eventName, ex);
     }
+
+    [Event(6, Message = "Configuration key '{0}' has an invalid value: '{1}'", Level = EventLevel.Warning)]
+    public void InvalidConfigurationValue(string key, string value)
+    {
+        this.WriteEvent(6, key, value);
+    }
+
+    void IConfigurationExtensionsLogger.LogInvalidConfigurationValue(string key, string value)
+    {
+        this.InvalidConfigurationValue(key, value);
+    }
 }
diff --git a/src/OpenTelemetry/Internal/OpenTelemetrySdkEventSource.cs b/src/OpenTelemetry/Internal/OpenTelemetrySdkEventSource.cs
@@ -6,14 +6,15 @@
 using System.Diagnostics.CodeAnalysis;
 #endif
 using System.Diagnostics.Tracing;
+using Microsoft.Extensions.Configuration;
 
 namespace OpenTelemetry.Internal;
 
 /// <summary>
 /// EventSource implementation for OpenTelemetry SDK implementation.
 /// </summary>
 [EventSource(Name = "OpenTelemetry-Sdk")]
-internal sealed class OpenTelemetrySdkEventSource : EventSource
+internal sealed class OpenTelemetrySdkEventSource : EventSource, IConfigurationExtensionsLogger
 {
     public static OpenTelemetrySdkEventSource Log = new();
 #if DEBUG
@@ -304,8 +305,8 @@ public void TracerProviderSdkEvent(string message)
         this.WriteEvent(46, message);
     }
 
-    [Event(47, Message = "{0} environment variable has an invalid value: '{1}'", Level = EventLevel.Warning)]
-    public void InvalidEnvironmentVariable(string key, string? value)
+    [Event(47, Message = "Configuration key '{0}' has an invalid value: '{1}'", Level = EventLevel.Warning)]
+    public void InvalidConfigurationValue(string key, string? value)
     {
         this.WriteEvent(47, key, value);
     }
@@ -358,6 +359,11 @@ public void TracesSamplerArgConfigInvalid(string configValue)
         this.WriteEvent(55, configValue);
     }
 
+    void IConfigurationExtensionsLogger.LogInvalidConfigurationValue(string key, string value)
+    {
+        this.InvalidConfigurationValue(key, value);
+    }
+
 #if DEBUG
     public class OpenTelemetryEventListener : EventListener
     {
diff --git a/src/OpenTelemetry/Logs/BatchExportLogRecordProcessorOptions.cs b/src/OpenTelemetry/Logs/BatchExportLogRecordProcessorOptions.cs
@@ -2,6 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 using Microsoft.Extensions.Configuration;
+using OpenTelemetry.Internal;
 
 namespace OpenTelemetry.Logs;
 
@@ -31,22 +32,22 @@ public BatchExportLogRecordProcessorOptions()
 
     internal BatchExportLogRecordProcessorOptions(IConfiguration configuration)
     {
-        if (configuration.TryGetIntValue(ExporterTimeoutEnvVarKey, out var value))
+        if (configuration.TryGetIntValue(OpenTelemetrySdkEventSource.Log, ExporterTimeoutEnvVarKey, out var value))
         {
             this.ExporterTimeoutMilliseconds = value;
         }
 
-        if (configuration.TryGetIntValue(MaxExportBatchSizeEnvVarKey, out value))
+        if (configuration.TryGetIntValue(OpenTelemetrySdkEventSource.Log, MaxExportBatchSizeEnvVarKey, out value))
         {
             this.MaxExportBatchSize = value;
         }
 
-        if (configuration.TryGetIntValue(MaxQueueSizeEnvVarKey, out value))
+        if (configuration.TryGetIntValue(OpenTelemetrySdkEventSource.Log, MaxQueueSizeEnvVarKey, out value))
         {
             this.MaxQueueSize = value;
         }
 
-        if (configuration.TryGetIntValue(ScheduledDelayEnvVarKey, out value))
+        if (configuration.TryGetIntValue(OpenTelemetrySdkEventSource.Log, ScheduledDelayEnvVarKey, out value))
         {
             this.ScheduledDelayMilliseconds = value;
         }
diff --git a/src/OpenTelemetry/Metrics/MeterProviderSdk.cs b/src/OpenTelemetry/Metrics/MeterProviderSdk.cs
@@ -480,12 +480,12 @@ protected override void Dispose(bool disposing)
 
     private void ApplySpecificationConfigurationKeys(IConfiguration configuration)
     {
-        if (configuration.TryGetBoolValue(EmitOverFlowAttributeConfigKey, out this.EmitOverflowAttribute))
+        if (configuration.TryGetBoolValue(OpenTelemetrySdkEventSource.Log, EmitOverFlowAttributeConfigKey, out this.EmitOverflowAttribute))
         {
             OpenTelemetrySdkEventSource.Log.MeterProviderSdkEvent("Overflow attribute feature enabled via configuration.");
         }
 
-        if (configuration.TryGetBoolValue(ReclaimUnusedMetricPointsConfigKey, out this.ReclaimUnusedMetricPoints))
+        if (configuration.TryGetBoolValue(OpenTelemetrySdkEventSource.Log, ReclaimUnusedMetricPointsConfigKey, out this.ReclaimUnusedMetricPoints))
         {
             OpenTelemetrySdkEventSource.Log.MeterProviderSdkEvent("Reclaim unused metric point feature enabled via configuration.");
         }
diff --git a/src/OpenTelemetry/Metrics/PeriodicExportingMetricReaderOptions.cs b/src/OpenTelemetry/Metrics/PeriodicExportingMetricReaderOptions.cs
diff --git a/src/OpenTelemetry/Sdk.cs b/src/OpenTelemetry/Sdk.cs
diff --git a/src/OpenTelemetry/Trace/BatchExportActivityProcessorOptions.cs b/src/OpenTelemetry/Trace/BatchExportActivityProcessorOptions.cs
diff --git a/src/Shared/Configuration/IConfigurationExtensionsLogger.cs b/src/Shared/Configuration/IConfigurationExtensionsLogger.cs
diff --git a/src/Shared/Configuration/OpenTelemetryConfigurationExtensions.cs b/src/Shared/Configuration/OpenTelemetryConfigurationExtensions.cs

Original file line number	Diff line number	Diff line change
`@@ -24,12 +24,12 @@ public ExperimentalOptions()`
`24`	`24`
`25`	`25`	`public ExperimentalOptions(IConfiguration configuration)`
`26`	`26`	`{`
`27`		`- if (configuration.TryGetBoolValue(EmitLogEventEnvVar, out var emitLogEventAttributes))`
	`27`	`+ if (configuration.TryGetBoolValue(OpenTelemetryProtocolExporterEventSource.Log, EmitLogEventEnvVar, out var emitLogEventAttributes))`
`28`	`28`	`{`
`29`	`29`	`this.EmitLogEventAttributes = emitLogEventAttributes;`
`30`	`30`	`}`
`31`	`31`
`32`		`- if (configuration.TryGetBoolValue(EnableInMemoryRetryEnvVar, out var enableInMemoryRetry))`
	`32`	`+ if (configuration.TryGetBoolValue(OpenTelemetryProtocolExporterEventSource.Log, EnableInMemoryRetryEnvVar, out var enableInMemoryRetry))`
`33`	`33`	`{`
`34`	`34`	`this.EnableInMemoryRetry = enableInMemoryRetry;`
`35`	`35`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,12 +2,13 @@`
`2`	`2`	`// SPDX-License-Identifier: Apache-2.0`
`3`	`3`
`4`	`4`	`using System.Diagnostics.Tracing;`
	`5`	`+using Microsoft.Extensions.Configuration;`
`5`	`6`	`using OpenTelemetry.Internal;`
`6`	`7`
`7`	`8`	`namespace OpenTelemetry.Exporter.OpenTelemetryProtocol.Implementation;`
`8`	`9`
`9`	`10`	`[EventSource(Name = "OpenTelemetry-Exporter-OpenTelemetryProtocol")]`
`10`		`-internal sealed class OpenTelemetryProtocolExporterEventSource : EventSource`
	`11`	`+internal sealed class OpenTelemetryProtocolExporterEventSource : EventSource, IConfigurationExtensionsLogger`
`11`	`12`	`{`
`12`	`13`	`public static readonly OpenTelemetryProtocolExporterEventSource Log = new();`
`13`	`14`
`@@ -81,8 +82,8 @@ public void UnsupportedAttributeType(string type, string key)`
`81`	`82`	`this.WriteEvent(10, type.ToString(), key);`
`82`	`83`	`}`
`83`	`84`
`84`		`- [Event(11, Message = "{0} environment variable has an invalid value: '{1}'", Level = EventLevel.Warning)]`
`85`		`- public void InvalidEnvironmentVariable(string key, string value)`
	`85`	`+ [Event(11, Message = "Configuration key '{0}' has an invalid value: '{1}'", Level = EventLevel.Warning)]`
	`86`	`+ public void InvalidConfigurationValue(string key, string value)`
`86`	`87`	`{`
`87`	`88`	`this.WriteEvent(11, key, value);`
`88`	`89`	`}`
`@@ -92,4 +93,9 @@ public void TrySubmitRequestException(string ex)`
`92`	`93`	`{`
`93`	`94`	`this.WriteEvent(12, ex);`
`94`	`95`	`}`
	`96`	`+`
	`97`	`+ void IConfigurationExtensionsLogger.LogInvalidConfigurationValue(string key, string value)`
	`98`	`+ {`
	`99`	`+ this.InvalidConfigurationValue(key, value);`
	`100`	`+ }`
`95`	`101`	`}`
Original file line number	Diff line number	Diff line change
`@@ -163,7 +163,7 @@ public int? LogRecordAttributeCountLimit`
`163`	`163`
`164`	`164`	`private static void SetIntConfigValue(IConfiguration configuration, string key, Action<int?> setter, int? defaultValue)`
`165`	`165`	`{`
`166`		`- if (configuration.TryGetIntValue(key, out var result))`
	`166`	`+ if (configuration.TryGetIntValue(OpenTelemetryProtocolExporterEventSource.Log, key, out var result))`
`167`	`167`	`{`
`168`	`168`	`setter(result);`
`169`	`169`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,7 @@`
`11`	`11`	`using Microsoft.Extensions.Configuration;`
`12`	`12`	`using Microsoft.Extensions.DependencyInjection;`
`13`	`13`	`using Microsoft.Extensions.Options;`
	`14`	`+using OpenTelemetry.Exporter.OpenTelemetryProtocol.Implementation;`
`14`	`15`	`using OpenTelemetry.Internal;`
`15`	`16`	`using OpenTelemetry.Trace;`
`16`	`17`
`@@ -179,13 +180,14 @@ internal void ApplyConfigurationUsingSpecificationEnvVars(`
`179`	`180`	`string headersEnvVarKey,`
`180`	`181`	`string timeoutEnvVarKey)`
`181`	`182`	`{`
`182`		`- if (configuration.TryGetUriValue(endpointEnvVarKey, out var endpoint))`
	`183`	`+ if (configuration.TryGetUriValue(OpenTelemetryProtocolExporterEventSource.Log, endpointEnvVarKey, out var endpoint))`
`183`	`184`	`{`
`184`	`185`	`this.endpoint = endpoint;`
`185`	`186`	`this.AppendSignalPathToEndpoint = appendSignalPathToEndpoint;`
`186`	`187`	`}`
`187`	`188`
`188`	`189`	`if (configuration.TryGetValue<OtlpExportProtocol>(`
	`190`	`+ OpenTelemetryProtocolExporterEventSource.Log,`
`189`	`191`	`protocolEnvVarKey,`
`190`	`192`	`OtlpExportProtocolParser.TryParse,`
`191`	`193`	`out var protocol))`
`@@ -198,7 +200,7 @@ internal void ApplyConfigurationUsingSpecificationEnvVars(`
`198`	`200`	`this.Headers = headers;`
`199`	`201`	`}`
`200`	`202`
`201`		`- if (configuration.TryGetIntValue(timeoutEnvVarKey, out var timeout))`
	`203`	`+ if (configuration.TryGetIntValue(OpenTelemetryProtocolExporterEventSource.Log, timeoutEnvVarKey, out var timeout))`
`202`	`204`	`{`
`203`	`205`	`this.TimeoutMilliseconds = timeout;`
`204`	`206`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,7 @@`
`2`	`2`	`// SPDX-License-Identifier: Apache-2.0`
`3`	`3`
`4`	`4`	`using System.Diagnostics.Tracing;`
	`5`	`+using Microsoft.Extensions.Configuration;`
`5`	`6`	`using OpenTelemetry.Internal;`
`6`	`7`
`7`	`8`	`namespace OpenTelemetry.Exporter.Zipkin.Implementation;`
`@@ -10,7 +11,7 @@ namespace OpenTelemetry.Exporter.Zipkin.Implementation;`
`10`	`11`	`/// EventSource events emitted from the project.`
`11`	`12`	`/// </summary>`
`12`	`13`	`[EventSource(Name = "OpenTelemetry-Exporter-Zipkin")]`
`13`		`-internal sealed class ZipkinExporterEventSource : EventSource`
	`14`	`+internal sealed class ZipkinExporterEventSource : EventSource, IConfigurationExtensionsLogger`
`14`	`15`	`{`
`15`	`16`	`public static ZipkinExporterEventSource Log = new();`
`16`	`17`
`@@ -35,9 +36,14 @@ public void UnsupportedAttributeType(string type, string key)`
`35`	`36`	`this.WriteEvent(2, type.ToString(), key);`
`36`	`37`	`}`
`37`	`38`
`38`		`- [Event(3, Message = "{0} environment variable has an invalid value: '{1}'", Level = EventLevel.Warning)]`
`39`		`- public void InvalidEnvironmentVariable(string key, string value)`
	`39`	`+ [Event(3, Message = "Configuration key '{0}' has an invalid value: '{1}'", Level = EventLevel.Warning)]`
	`40`	`+ public void InvalidConfigurationValue(string key, string value)`
`40`	`41`	`{`
`41`	`42`	`this.WriteEvent(3, key, value);`
`42`	`43`	`}`
	`44`	`+`
	`45`	`+ void IConfigurationExtensionsLogger.LogInvalidConfigurationValue(string key, string value)`
	`46`	`+ {`
	`47`	`+ this.InvalidConfigurationValue(key, value);`
	`48`	`+ }`
`43`	`49`	`}`