Pass through configured otlp headers for logs containing profiles. (#2236)

* pass through configured otlp headers for logs containing profiles.

* use upstream util to configure exporter.

Author: breedx-splk

profiler/src/main/java/com/splunk/opentelemetry/profiler/LogExporterBuilder.java

@@ -16,9 +16,12 @@
 
 package com.splunk.opentelemetry.profiler;
 
+import static io.opentelemetry.exporter.otlp.internal.OtlpConfigUtil.DATA_TYPE_LOGS;
+
 import com.google.common.annotations.VisibleForTesting;
 import io.opentelemetry.exporter.otlp.http.logs.OtlpHttpLogRecordExporter;
 import io.opentelemetry.exporter.otlp.http.logs.OtlpHttpLogRecordExporterBuilder;
+import io.opentelemetry.exporter.otlp.internal.OtlpConfigUtil;
 import io.opentelemetry.exporter.otlp.logs.OtlpGrpcLogRecordExporter;
 import io.opentelemetry.exporter.otlp.logs.OtlpGrpcLogRecordExporterBuilder;
 import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties;
@@ -56,6 +59,19 @@ static LogRecordExporter buildHttpExporter(
       ConfigProperties config, Supplier<OtlpHttpLogRecordExporterBuilder> makeBuilder) {
     OtlpHttpLogRecordExporterBuilder builder = makeBuilder.get();
     String ingestUrl = Configuration.getConfigUrl(config);
+
+    OtlpConfigUtil.configureOtlpExporterBuilder(
+        DATA_TYPE_LOGS,
+        config,
+        builder::setEndpoint,
+        builder::addHeader,
+        builder::setCompression,
+        builder::setTimeout,
+        builder::setTrustedCertificates,
+        builder::setClientTls,
+        builder::setRetryPolicy,
+        builder::setMemoryMode);
+
     if (ingestUrl != null) {
       builder.setEndpoint(ingestUrl);
     }

profiler/src/test/java/com/splunk/opentelemetry/profiler/LogExporterBuilderTest.java

@@ -32,6 +32,7 @@
 import io.opentelemetry.exporter.otlp.logs.OtlpGrpcLogRecordExporterBuilder;
 import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties;
 import io.opentelemetry.sdk.logs.export.LogRecordExporter;
+import java.util.Map;
 import org.junit.jupiter.api.Test;
 
 class LogExporterBuilderTest {
@@ -58,12 +59,53 @@ void testBuildSimpleHttp() {
 
     when(builder.addHeader(EXTRA_CONTENT_TYPE, STACKTRACES_HEADER_VALUE)).thenReturn(builder);
     when(builder.build()).thenReturn(expected);
+    when(config.getString("otel.exporter.otlp.protocol", "grpc")).thenReturn("http/protobuf");
 
     LogRecordExporter exporter = LogExporterBuilder.buildHttpExporter(config, () -> builder);
     assertSame(expected, exporter);
     verify(builder, never()).setEndpoint(anyString());
   }
 
+  @Test
+  void extraOtlpHeaders() {
+    ConfigProperties config = mock(ConfigProperties.class);
+    when(config.getMap("otel.exporter.otlp.headers"))
+        .thenReturn(Map.of("foo", "bar", "bar", "baz"));
+    when(config.getMap("otel.exporter.otlp.logs.headers")).thenReturn(Map.of("log", "lady"));
+    when(config.getString("otel.exporter.otlp.protocol", "grpc")).thenReturn("http/protobuf");
+
+    OtlpHttpLogRecordExporterBuilder builder = mock(OtlpHttpLogRecordExporterBuilder.class);
+    OtlpHttpLogRecordExporter expected = mock(OtlpHttpLogRecordExporter.class);
+
+    when(builder.addHeader(anyString(), anyString())).thenReturn(builder);
+    when(builder.build()).thenReturn(expected);
+
+    LogRecordExporter exporter = LogExporterBuilder.buildHttpExporter(config, () -> builder);
+    assertSame(expected, exporter);
+    verify(builder).addHeader(EXTRA_CONTENT_TYPE, STACKTRACES_HEADER_VALUE);
+    verify(builder).addHeader("log", "lady");
+    verify(builder, never()).addHeader("foo", "bar");
+    verify(builder, never()).addHeader("bar", "baz");
+  }
+
+  @Test
+  void extraOtlpLogSpecificHeaders() {
+    ConfigProperties config = mock(ConfigProperties.class);
+    when(config.getMap("otel.exporter.otlp.headers"))
+        .thenReturn(Map.of("foo", "bar", "bar", "baz"));
+    when(config.getString("otel.exporter.otlp.protocol", "grpc")).thenReturn("http/protobuf");
+
+    OtlpHttpLogRecordExporterBuilder builder = mock(OtlpHttpLogRecordExporterBuilder.class);
+    OtlpHttpLogRecordExporter expected = mock(OtlpHttpLogRecordExporter.class);
+
+    when(builder.addHeader(anyString(), anyString())).thenReturn(builder);
+    when(builder.build()).thenReturn(expected);
+
+    LogRecordExporter exporter = LogExporterBuilder.buildHttpExporter(config, () -> builder);
+    assertSame(expected, exporter);
+    verify(builder).addHeader(EXTRA_CONTENT_TYPE, STACKTRACES_HEADER_VALUE);
+  }
+
   @Test
   void testCustomEndpointGrpc() {
     String endpoint = "http://example.com:9122/";
@@ -105,6 +147,7 @@ void testCustomEndpointHttp() {
     when(config.getString(
             Configuration.CONFIG_KEY_INGEST_URL, "http://shadowed.example.com:9122/v1/logs"))
         .thenReturn(endpoint);
+    when(config.getString("otel.exporter.otlp.protocol", "grpc")).thenReturn("http/protobuf");
     LogRecordExporter exporter = LogExporterBuilder.buildHttpExporter(config, () -> builder);
 
     assertNotNull(exporter);