Export OTEL_TRACES_EXPORTER to meet new requirements of the Otel Ma…

…ven Extension open-telemetry/opentelemetry-java-contrib#132
jenkinsci · Nov 26, 2021 · d3a89fd · d3a89fd
1 parent e656312
commit d3a89fd
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 0 deletions.
diff --git a/src/main/java/io/jenkins/plugins/opentelemetry/JenkinsOpenTelemetryPluginConfiguration.java b/src/main/java/io/jenkins/plugins/opentelemetry/JenkinsOpenTelemetryPluginConfiguration.java
@@ -231,7 +231,12 @@ public void setExportOtelConfigurationAsEnvironmentVariables(boolean exportOtelC
 
     @Nonnull
     public Map<String, String> getOtelConfigurationAsEnvironmentVariables() {
+        if (this.endpoint == null) {
+            return Collections.emptyMap();
+        }
+
         Map<String, String> environmentVariables = new HashMap<>();
+        environmentVariables.put(OTelEnvironmentVariablesConventions.OTEL_TRACES_EXPORTER, "otlp");
         environmentVariables.put(OTelEnvironmentVariablesConventions.OTEL_EXPORTER_OTLP_ENDPOINT, this.endpoint);
         String sanitizeOtlpEndpoint = sanitizeOtlpEndpoint(this.endpoint);
         if (sanitizeOtlpEndpoint != null && sanitizeOtlpEndpoint.startsWith("http://")) {

diff --git a/...in/java/io/jenkins/plugins/opentelemetry/semconv/OTelEnvironmentVariablesConventions.java b/...in/java/io/jenkins/plugins/opentelemetry/semconv/OTelEnvironmentVariablesConventions.java
@@ -16,6 +16,7 @@ public class OTelEnvironmentVariablesConventions {
     public static final String OTEL_EXPORTER_OTLP_ENDPOINT = "OTEL_EXPORTER_OTLP_ENDPOINT";
     public static final String OTEL_EXPORTER_OTLP_INSECURE = "OTEL_EXPORTER_OTLP_INSECURE";
     public static final String OTEL_EXPORTER_OTLP_TIMEOUT = "OTEL_EXPORTER_OTLP_TIMEOUT";
+    public static final String OTEL_TRACES_EXPORTER = "OTEL_TRACES_EXPORTER";
 
     public static final String SPAN_ID = "SPAN_ID";
     public static final String TRACE_ID = "TRACE_ID";

diff --git a/src/test/java/io/jenkins/plugins/opentelemetry/BaseIntegrationTest.java b/src/test/java/io/jenkins/plugins/opentelemetry/BaseIntegrationTest.java
@@ -175,6 +175,7 @@ protected void assertEnvironmentVariables(EnvVars environment) {
         MatcherAssert.assertThat(environment.get(OTelEnvironmentVariablesConventions.SPAN_ID), CoreMatchers.is(CoreMatchers.notNullValue()));
         MatcherAssert.assertThat(environment.get(OTelEnvironmentVariablesConventions.TRACE_ID), CoreMatchers.is(CoreMatchers.notNullValue()));
         // See src/test/resources/io/jenkins/plugins/opentelemetry/jcasc-elastic-backend.yml
+        MatcherAssert.assertThat(environment.get(OTelEnvironmentVariablesConventions.OTEL_TRACES_EXPORTER), CoreMatchers.is("otlp"));
         MatcherAssert.assertThat(environment.get(OTelEnvironmentVariablesConventions.OTEL_EXPORTER_OTLP_ENDPOINT), CoreMatchers.is("http://otel-collector-contrib:4317"));
         MatcherAssert.assertThat(environment.get(OTelEnvironmentVariablesConventions.OTEL_EXPORTER_OTLP_INSECURE), CoreMatchers.is("true"));
         MatcherAssert.assertThat(environment.get(OTelEnvironmentVariablesConventions.OTEL_EXPORTER_OTLP_TIMEOUT), CoreMatchers.is("3000"));