header values are be expected to be W3C baggage encoded

micrometer-metrics · Jan 19, 2024 · 8a2196c · 8a2196c
1 parent 3e8fb92
commit 8a2196c
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/...ations/micrometer-registry-otlp/src/main/java/io/micrometer/registry/otlp/OtlpConfig.java b/...ations/micrometer-registry-otlp/src/main/java/io/micrometer/registry/otlp/OtlpConfig.java
@@ -18,7 +18,6 @@
 import io.micrometer.core.instrument.config.validate.Validated;
 import io.micrometer.core.instrument.push.PushRegistryConfig;
 
-import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
 import java.time.Duration;
 import java.util.Arrays;
@@ -167,8 +166,9 @@ default Map<String, String> headers() {
                 // headers are encoded as URL - see
                 // https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/protocol/exporter.md#specifying-headers-via-environment-variables
                 headersString = URLDecoder.decode(headersString, "UTF-8");
-            } catch (UnsupportedEncodingException e) {
-                throw new IllegalArgumentException("cannot decode header value: " + headersString, e);
+            }
+            catch (Exception e) {
+                throw new IllegalArgumentException("Cannot decode header value: " + headersString, e);
             }
         }
 

diff --git a/...ns/micrometer-registry-otlp/src/test/java/io/micrometer/registry/otlp/OtlpConfigTest.java b/...ns/micrometer-registry-otlp/src/test/java/io/micrometer/registry/otlp/OtlpConfigTest.java
@@ -25,6 +25,7 @@
 import java.util.stream.Stream;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static uk.org.webcompere.systemstubs.SystemStubs.withEnvironmentVariable;
 import static uk.org.webcompere.systemstubs.SystemStubs.withEnvironmentVariables;
 
@@ -104,6 +105,15 @@ void headersUseEnvVarWhenConfigNotSet() throws Exception {
             .execute(() -> assertThat(config.headers()).containsEntry("header2", "va lue").hasSize(1));
     }
 
+    @Test
+    void headersDecodingError() throws Exception {
+        OtlpConfig config = k -> null;
+        withEnvironmentVariable("OTEL_EXPORTER_OTLP_HEADERS", "header2=%-1").execute(() -> {
+            assertThatThrownBy(config::headers).isInstanceOf(IllegalArgumentException.class)
+                .hasMessage("Cannot decode header value: header2=%-1,");
+        });
+    }
+
     @Test
     void combineHeadersFromEnvVars() throws Exception {
         OtlpConfig config = k -> null;