Merge branch 'main' into log-exporter-test + move test mehod

# Conflicts: # src/main/java/io/jenkins/plugins/opentelemetry/api/ReconfigurableOpenTelemetry.java
jenkinsci · Aug 27, 2024 · 46cdc83 · 46cdc83
2 parents 43d70a9 + 85785bc
commit 46cdc83
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 22 deletions.
diff --git a/src/main/java/io/jenkins/plugins/opentelemetry/api/ReconfigurableOpenTelemetry.java b/src/main/java/io/jenkins/plugins/opentelemetry/api/ReconfigurableOpenTelemetry.java
@@ -116,7 +116,6 @@ public static ReconfigurableOpenTelemetry get() {
      * <p>
      * Initialize as NoOp.
      * </p>
-     *
      * @see #get()
      */
     public ReconfigurableOpenTelemetry() {
@@ -138,7 +137,6 @@ public ReconfigurableOpenTelemetry() {
 
     /**
      * Configure the OpenTelemetry SDK with the given properties and resource disabling the OTel SDK shutdown hook
-     *
      * @deprecated use {@link #configure(Map, Resource, boolean)} instead
      */
     @Deprecated
@@ -232,26 +230,6 @@ protected void setOpenTelemetryImpl(OpenTelemetry openTelemetryImpl) {
         this.eventLoggerProviderImpl.setDelegate(SdkEventLoggerProvider.create(openTelemetryImpl.getLogsBridge()));
     }
 
-    public String testLogRecordExporter() {
-        return testLogRecordExporter("Test log record");
-    }
-
-    public String testLogRecordExporter(String message) {
-        LogRecordData logRecordData = TestLogRecordData.builder()
-                .setTimestamp(Instant.now())
-                .setResource(resource)
-                .setSeverityText(Severity.INFO.name())
-                .setSeverity(Severity.INFO)
-                .setInstrumentationScopeInfo(InstrumentationScopeInfo.create("io.jenkins.opentelemetry.api"))
-                .setBody(message)
-                .build();
-        CompletableResultCode result = logRecordExporter.export(Collections.singleton(logRecordData));
-        result.join(1, TimeUnit.SECONDS);
-        String resultMessage = "testLogRecordExporter(): result(success: " + result.isSuccess() + "done: " + result.isDone() + "), " + logRecordExporter + ", " + logRecordData + " -";
-        logger.log(Level.INFO, resultMessage);
-        return resultMessage;
-    }
-
     @PreDestroy
     @Override
     public void close() {

diff --git a/src/main/java/io/jenkins/plugins/opentelemetry/api/util/OpenTelemetryUtils.java b/src/main/java/io/jenkins/plugins/opentelemetry/api/util/OpenTelemetryUtils.java
@@ -1,9 +1,23 @@
 package io.jenkins.plugins.opentelemetry.api.util;
 
+import io.jenkins.plugins.opentelemetry.api.ReconfigurableOpenTelemetry;
+import io.jenkins.plugins.opentelemetry.api.logs.TestLogRecordData;
+import io.opentelemetry.api.logs.Severity;
+import io.opentelemetry.sdk.common.CompletableResultCode;
+import io.opentelemetry.sdk.common.InstrumentationScopeInfo;
+import io.opentelemetry.sdk.logs.data.LogRecordData;
+
+import java.time.Instant;
+import java.util.Collections;
+import java.util.concurrent.TimeUnit;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
 /**
  * Utility methods for working with OpenTelemetry.
  */
 public class OpenTelemetryUtils {
+    private final static Logger logger = Logger.getLogger(OpenTelemetryUtils.class.getName());
 
     /**
      * <p>
@@ -44,6 +58,22 @@ static boolean getProperty(String propertyName, boolean defaultValue) {
         return defaultValue;
     }
 
+    static public String testLogRecordExporter() {
+        ReconfigurableOpenTelemetry openTelemetry = ReconfigurableOpenTelemetry.get();
+        LogRecordData logRecordData = TestLogRecordData.builder()
+                .setTimestamp(Instant.now())
+                .setResource(openTelemetry.getResource())
+                .setSeverityText(Severity.INFO.name())
+                .setSeverity(Severity.INFO)
+                .setInstrumentationScopeInfo(InstrumentationScopeInfo.create("io.jenkins.opentelemetry.api"))
+                .setBody("Test log record")
+                .build();
+        CompletableResultCode result = openTelemetry.getLogRecordExporter().export(Collections.singleton(logRecordData));
+        result.join(1, TimeUnit.SECONDS);
+        String resultMessage = "testLogRecordExporter(): result(success: " + result.isSuccess() + "done: " + result.isDone() + "), " + openTelemetry.getLogRecordExporter() + ", " + logRecordData + " -";
+        logger.log(Level.INFO, resultMessage);
+        return resultMessage;
+    }
 
     private OpenTelemetryUtils() {
     }