Add headers supplier for DC exporter (#67)

* Implement dynamic headers for exporter * Pick up the latest otel-dc-0.10.0.jar
instana · Nov 2, 2024 · 3caf966 · 3caf966
1 parent dd5acb5
commit 3caf966
Show file tree

Hide file tree

Showing 12 changed files with 40 additions and 13 deletions.
diff --git a/host/build.gradle b/host/build.gradle
@@ -21,7 +21,7 @@ dependencies {
     implementation("io.opentelemetry.semconv:opentelemetry-semconv:1.23.1-alpha")
     implementation("com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.16.0-rc1")
     implementation("org.snmp4j:snmp4j-agent:3.8.1")
-    implementation(files("libs/otel-dc-0.9.9.jar"))
+    implementation(files("libs/otel-dc-0.10.0.jar"))
     implementation(files("libs/simp-snmp-0.1.3.jar"))
 
     testImplementation("org.junit.jupiter:junit-jupiter-api:5.8.1")

diff --git a/host/libs/otel-dc-0.10.0.jar b/host/libs/otel-dc-0.10.0.jar
diff --git a/host/libs/otel-dc-0.9.9.jar b/host/libs/otel-dc-0.9.9.jar
diff --git a/internal/otel-dc/build.gradle b/internal/otel-dc/build.gradle
@@ -4,7 +4,7 @@ plugins {
 }
 
 group = "com.instana.dc"
-version = "0.9.9"
+version = "0.10.0"
 
 repositories {
     mavenCentral()

diff --git a/internal/otel-dc/src/main/java/com/instana/dc/AbstractDc.java b/internal/otel-dc/src/main/java/com/instana/dc/AbstractDc.java
@@ -1,5 +1,12 @@
 package com.instana.dc;
 
+import java.time.Duration;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.TimeUnit;
+
+import static com.instana.dc.DcUtil.getCert;
+
 import io.opentelemetry.api.OpenTelemetry;
 import io.opentelemetry.api.metrics.Meter;
 import io.opentelemetry.exporter.otlp.http.metrics.OtlpHttpMetricExporter;
@@ -10,13 +17,6 @@
 import io.opentelemetry.sdk.metrics.export.PeriodicMetricReader;
 import io.opentelemetry.sdk.resources.Resource;
 
-import java.time.Duration;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.TimeUnit;
-
-import static com.instana.dc.DcUtil.getCert;
-
 public abstract class AbstractDc implements IDc {
     private final Map<String, Meter> meters = new ConcurrentHashMap<>();
     private final Map<String, RawMetric> rawMetricsMap;
@@ -63,8 +63,10 @@ public static OtlpGrpcMetricExporter createOtlpGrpcMetricExporter(String otelBac
                 .setEndpoint(otelBackendUrl)
                 .setTimeout(timeout, TimeUnit.SECONDS);
 
+        HeadersSupplier supplier = HeadersSupplier.INSTANCE;
+        builder.setHeaders(supplier::getHeaders);
         if (headers != null) {
-            builder.setHeaders(() -> headers);
+            supplier.updateHeaders(headers);
         }
         if (cert != null) {
             builder.setTrustedCertificates(cert);
@@ -78,8 +80,10 @@ public static OtlpHttpMetricExporter createOtlpHttpMetricExporter(String otelBac
                 .setEndpoint(otelBackendUrl)
                 .setTimeout(timeout, TimeUnit.SECONDS);
 
+        HeadersSupplier supplier = HeadersSupplier.INSTANCE;
+        builder.setHeaders(supplier::getHeaders);
         if (headers != null) {
-            builder.setHeaders(() -> headers);
+            supplier.updateHeaders(headers);
         }
         if (cert != null) {
             builder.setTrustedCertificates(cert);

diff --git a/internal/otel-dc/src/main/java/com/instana/dc/HeadersSupplier.java b/internal/otel-dc/src/main/java/com/instana/dc/HeadersSupplier.java
@@ -0,0 +1,23 @@
+/*
+ * (c) Copyright IBM Corp. 2024
+ * (c) Copyright Instana Inc.
+ */
+package com.instana.dc;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public enum HeadersSupplier {
+    INSTANCE;
+
+    private final Map<String, String> headers = new HashMap<>();
+
+    public synchronized void updateHeaders(Map<String, String> newHeaders) {
+        headers.clear();
+        headers.putAll(newHeaders);
+    }
+
+    public Map<String, String> getHeaders() {
+        return new HashMap<>(headers);
+    }
+}
diff --git a/llm/build.gradle b/llm/build.gradle
@@ -27,7 +27,7 @@ dependencies {
     implementation("com.google.protobuf:protobuf-java-util:3.23.4")
     implementation("com.linecorp.armeria:armeria:1.27.3")
     implementation("com.linecorp.armeria:armeria-grpc:1.27.3")
-    implementation(files("libs/otel-dc-0.9.9.jar"))
+    implementation(files("libs/otel-dc-0.10.0.jar"))
 
     testImplementation("org.junit.jupiter:junit-jupiter-api:5.8.1")
     testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.8.1")

diff --git a/llm/libs/otel-dc-0.10.0.jar b/llm/libs/otel-dc-0.10.0.jar
diff --git a/llm/libs/otel-dc-0.9.9.jar b/llm/libs/otel-dc-0.9.9.jar
diff --git a/rdb/build.gradle b/rdb/build.gradle
@@ -20,7 +20,7 @@ dependencies {
     implementation("io.opentelemetry:opentelemetry-exporter-sender-okhttp:1.34.1")
     implementation("io.opentelemetry.semconv:opentelemetry-semconv:1.23.1-alpha")
     implementation("com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.16.0-rc1")
-    implementation(files("libs/otel-dc-0.9.9.jar"))
+    implementation(files("libs/otel-dc-0.10.0.jar"))
     implementation(files("libs/ngdbc-2.4.64.jar"))
     implementation("org.apache.commons:commons-dbcp2:2.11.0")
 

diff --git a/rdb/libs/otel-dc-0.10.0.jar b/rdb/libs/otel-dc-0.10.0.jar
diff --git a/rdb/libs/otel-dc-0.9.9.jar b/rdb/libs/otel-dc-0.9.9.jar