cleanup

Author: zeitlinger

exporters/otlp/all/src/main/java/io/opentelemetry/exporter/otlp/internal/OtlpDeclarativeConfigUtil.java

@@ -24,9 +24,11 @@
 import java.time.Duration;
 import java.util.Collections;
 import java.util.List;
+import java.util.Map;
 import java.util.Set;
 import java.util.function.BiConsumer;
 import java.util.function.Consumer;
+import java.util.function.Supplier;
 
 /**
  * This class is internal and is hence not for public use. Its APIs are unstable and can change at
@@ -55,7 +57,7 @@ public static void configureOtlpExporterBuilder(
       Consumer<ComponentLoader> setComponentLoader,
       Consumer<String> setEndpoint,
       BiConsumer<String, String> addHeader,
-      Consumer<ExporterAuthenticator> setAuthenticator,
+      Consumer<Supplier<Map<String, String>>> setHeaders,
       Consumer<String> setCompression,
       Consumer<Duration> setTimeout,
       Consumer<byte[]> setTrustedCertificates,
@@ -87,7 +89,7 @@ public static void configureOtlpExporterBuilder(
           componentProviderLoader.loadComponent(
               ExporterAuthenticator.class, authenticatorName, authenticator);
 
-      setAuthenticator.accept(exporterAuthenticator);
+      setHeaders.accept(exporterAuthenticator::getAuthenticationHeaders);
     }
 
     String headerList = config.getString("headers_list");

exporters/otlp/all/src/main/java/io/opentelemetry/exporter/otlp/internal/OtlpGrpcLogRecordExporterComponentProvider.java

@@ -44,7 +44,7 @@ public LogRecordExporter create(DeclarativeConfigProperties config,
         builder::setComponentLoader,
         builder::setEndpoint,
         builder::addHeader,
-        auth -> builder.setHeaders(auth::getAuthenticationHeaders),
+        builder::setHeaders,
         builder::setCompression,
         builder::setTimeout,
         builder::setTrustedCertificates,

exporters/otlp/all/src/main/java/io/opentelemetry/exporter/otlp/internal/OtlpGrpcMetricExporterComponentProvider.java

@@ -43,7 +43,7 @@ public MetricExporter create(DeclarativeConfigProperties config, ComponentProvid
         builder::setComponentLoader,
         builder::setEndpoint,
         builder::addHeader,
-        auth -> builder.setHeaders(auth::getAuthenticationHeaders),
+        builder::setHeaders,
         builder::setCompression,
         builder::setTimeout,
         builder::setTrustedCertificates,

exporters/otlp/all/src/main/java/io/opentelemetry/exporter/otlp/internal/OtlpGrpcSpanExporterComponentProvider.java

@@ -42,7 +42,7 @@ public SpanExporter create(DeclarativeConfigProperties config, ComponentProvider
         builder::setComponentLoader,
         builder::setEndpoint,
         builder::addHeader,
-        auth -> builder.setHeaders(auth::getAuthenticationHeaders),
+        builder::setHeaders,
         builder::setCompression,
         builder::setTimeout,
         builder::setTrustedCertificates,

exporters/otlp/all/src/main/java/io/opentelemetry/exporter/otlp/internal/OtlpHttpLogRecordExporterComponentProvider.java

@@ -44,7 +44,7 @@ public LogRecordExporter create(DeclarativeConfigProperties config,
         builder::setComponentLoader,
         builder::setEndpoint,
         builder::addHeader,
-        auth -> builder.setHeaders(auth::getAuthenticationHeaders),
+        builder::setHeaders,
         builder::setCompression,
         builder::setTimeout,
         builder::setTrustedCertificates,

exporters/otlp/all/src/main/java/io/opentelemetry/exporter/otlp/internal/OtlpHttpMetricExporterComponentProvider.java

@@ -43,7 +43,7 @@ public MetricExporter create(DeclarativeConfigProperties config, ComponentProvid
         builder::setComponentLoader,
         builder::setEndpoint,
         builder::addHeader,
-        auth -> builder.setHeaders(auth::getAuthenticationHeaders),
+        builder::setHeaders,
         builder::setCompression,
         builder::setTimeout,
         builder::setTrustedCertificates,

exporters/otlp/all/src/main/java/io/opentelemetry/exporter/otlp/internal/OtlpHttpSpanExporterComponentProvider.java

@@ -42,7 +42,7 @@ public SpanExporter create(DeclarativeConfigProperties config, ComponentProvider
         builder::setComponentLoader,
         builder::setEndpoint,
         builder::addHeader,
-        auth -> builder.setHeaders(auth::getAuthenticationHeaders),
+        builder::setHeaders,
         builder::setCompression,
         builder::setTimeout,
         builder::setTrustedCertificates,