Use otel.metric.export.interval instead of the no longer used `otel…

….imr.export.interval` + replace static config entries by the usage of the generic properties text field
jenkinsci · Jan 14, 2025 · bd4bbce · bd4bbce
1 parent 691bd25
commit bd4bbce
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 7 deletions.
diff --git a/src/test/java/io/jenkins/plugins/opentelemetry/BaseIntegrationTest.java b/src/test/java/io/jenkins/plugins/opentelemetry/BaseIntegrationTest.java
@@ -115,7 +115,6 @@ public static void beforeClass() throws Exception {
             OpenTelemetryConfiguration configuration = new OpenTelemetryConfiguration(
                 of("http://localhost:4317"), empty(),
                 empty(),
-                empty(), empty(),
                 empty(), empty(), empty(),
                 Collections.emptyMap());
 

diff --git a/src/test/java/io/jenkins/plugins/opentelemetry/JenkinsControllerOpenTelemetryTest.java b/src/test/java/io/jenkins/plugins/opentelemetry/JenkinsControllerOpenTelemetryTest.java
@@ -50,8 +50,7 @@ private void testDefaultConfigurationOverwrite(String serviceNameDefinedInConfig
         OpenTelemetryConfiguration openTelemetryConfiguration = new OpenTelemetryConfiguration(
             Optional.of("http://localhost:4317/"),
             Optional.empty(),
-            Optional.empty(),
-            Optional.empty(),
+
             Optional.empty(),
             Optional.ofNullable(serviceNameDefinedInConfig),
             Optional.ofNullable(serviceNamespaceDefinedInConfig),

diff --git a/src/test/java/io/jenkins/plugins/opentelemetry/OpenTelemetryConfigurationTest.java b/src/test/java/io/jenkins/plugins/opentelemetry/OpenTelemetryConfigurationTest.java
@@ -93,8 +93,6 @@ private static void testOpenTelemetryExportersConfiguration(String expectedTrace
             Optional.ofNullable(otlpEndpoint),
             Optional.empty(),
             Optional.empty(),
-            Optional.empty(),
-            Optional.empty(),
             Optional.of("my-jenkins"),
             Optional.empty(),
             Optional.empty(),

diff --git a/src/test/java/io/jenkins/plugins/opentelemetry/job/log/OtelLocaLogMirroringTest.java b/src/test/java/io/jenkins/plugins/opentelemetry/job/log/OtelLocaLogMirroringTest.java
@@ -59,7 +59,7 @@ public static void beforeClass() throws Exception {
 
         openTelemetry = ExtensionList.lookup(ReconfigurableOpenTelemetry.class).get(0);
         jenkinsControllerOpenTelemetry = jenkinsOpenTelemetries.get(0);
-        jenkinsControllerOpenTelemetry.initialize(new OpenTelemetryConfiguration(of("http://localhost:4317"), Optional.empty(), Optional.empty(), Optional.empty(), Optional.empty(), Optional.empty(), Optional.empty(), Optional.empty(), Collections.emptyMap()));
+        jenkinsControllerOpenTelemetry.initialize(new OpenTelemetryConfiguration(of("http://localhost:4317"), Optional.empty(), Optional.empty(), Optional.empty(), Optional.empty(), Optional.empty(), Collections.emptyMap()));
     }
     @AfterClass
     public static void afterClass() throws Exception {
@@ -99,7 +99,7 @@ private WorkflowRun runBuild() throws Exception {
     }
 
     private void reInitProvider(Map<String, String> configuration) {
-        jenkinsControllerOpenTelemetry.initialize(new OpenTelemetryConfiguration(of("http://localhost:4317"), Optional.empty(), Optional.empty(), Optional.empty(), Optional.empty(), Optional.empty(), Optional.empty(), Optional.empty(), configuration));
+        jenkinsControllerOpenTelemetry.initialize(new OpenTelemetryConfiguration(of("http://localhost:4317"), Optional.empty(), Optional.empty(), Optional.empty(), Optional.empty(), Optional.empty(), configuration));
     }