From 13e176b7db31218c74496d6e79b7a2852cea4e96 Mon Sep 17 00:00:00 2001
From: Cyrille Le Clerc <cyrille.leclerc@grafana.com>
Date: Tue, 19 Dec 2023 18:40:34 +0100
Subject: [PATCH 1/3] Bump Jenkins Core to 2.401 + Add support for
 OutputStreamTaskListener

Signed-off-by: Cyrille Le Clerc <cyrille.leclerc@grafana.com>
---
 pom.xml                                       |  6 +-
 .../job/log/OtelLogSenderBuildListener.java   | 17 ++++-
 .../opentelemetry/job/log/OtelLogStorage.java | 36 ++++++++---
 .../job/log/util/TeeBuildListener.java        | 10 +--
 .../job/log/util/TeeOutputStream.java         | 51 +++++++++++++++
 .../util/TeeOutputStreamBuildListener.java    | 60 ++++++++++++++++++
 .../log/util/TeeOutputStreamTaskListener.java | 62 +++++++++++++++++++
 .../job/log/util/TeePrintStream.java          |  6 +-
 .../job/log/util/TeeTaskListener.java         | 25 ++++----
 9 files changed, 235 insertions(+), 38 deletions(-)
 create mode 100644 src/main/java/io/jenkins/plugins/opentelemetry/job/log/util/TeeOutputStream.java
 create mode 100644 src/main/java/io/jenkins/plugins/opentelemetry/job/log/util/TeeOutputStreamBuildListener.java
 create mode 100644 src/main/java/io/jenkins/plugins/opentelemetry/job/log/util/TeeOutputStreamTaskListener.java

diff --git a/pom.xml b/pom.xml
index 9d6133b8f..e27313816 100644
--- a/pom.xml
+++ b/pom.xml
@@ -19,7 +19,7 @@
     <properties>
         <revision>2.19.1</revision>
         <changelist>-SNAPSHOT</changelist>
-        <jenkins.version>2.387.3</jenkins.version>
+        <jenkins.version>2.401.3</jenkins.version>
         <gitHubRepo>jenkinsci/${project.artifactId}-plugin</gitHubRepo>
         <opentelemetry.version>1.33.0</opentelemetry.version>
         <!--
@@ -44,8 +44,8 @@
         <dependencies>
             <dependency>
                 <groupId>io.jenkins.tools.bom</groupId>
-                <artifactId>bom-2.387.x</artifactId>
-                <version>2102.v854b_fec19c92</version>
+                <artifactId>bom-2.401.x</artifactId>
+                <version>2312.v91115fa_5b_2b_6</version>
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>
diff --git a/src/main/java/io/jenkins/plugins/opentelemetry/job/log/OtelLogSenderBuildListener.java b/src/main/java/io/jenkins/plugins/opentelemetry/job/log/OtelLogSenderBuildListener.java
index bafd35814..180425546 100644
--- a/src/main/java/io/jenkins/plugins/opentelemetry/job/log/OtelLogSenderBuildListener.java
+++ b/src/main/java/io/jenkins/plugins/opentelemetry/job/log/OtelLogSenderBuildListener.java
@@ -14,9 +14,11 @@
 import io.jenkins.plugins.opentelemetry.semconv.JenkinsOtelSemanticAttributes;
 import io.opentelemetry.sdk.common.Clock;
 import jenkins.util.JenkinsJVM;
+import org.jenkinsci.plugins.workflow.log.OutputStreamTaskListener;
 
 import java.io.IOException;
 import java.io.ObjectOutputStream;
+import java.io.OutputStream;
 import java.io.PrintStream;
 import java.nio.charset.StandardCharsets;
 import java.util.Map;
@@ -33,7 +35,7 @@
  * <p>
  * See https://github.com/jenkinsci/pipeline-cloudwatch-logs-plugin/blob/pipeline-cloudwatch-logs-0.2/src/main/java/io/jenkins/plugins/pipeline_cloudwatch_logs/CloudWatchSender.java
  */
-abstract class OtelLogSenderBuildListener implements BuildListener {
+abstract class OtelLogSenderBuildListener implements BuildListener, OutputStreamTaskListener {
 
     protected final static Logger LOGGER = Logger.getLogger(OtelLogSenderBuildListener.class.getName());
     final RunTraceContext runTraceContext;
@@ -47,8 +49,10 @@ abstract class OtelLogSenderBuildListener implements BuildListener {
     transient Clock clock;
 
     @CheckForNull
-    transient PrintStream logger;
+    transient OutputStream outputStream;
 
+    @CheckForNull
+    transient PrintStream logger;
 
     public OtelLogSenderBuildListener(@NonNull RunTraceContext runTraceContext, @NonNull Map<String, String> otelConfigProperties, @NonNull Map<String, String> otelResourceAttributes) {
         this.runTraceContext = runTraceContext;
@@ -60,6 +64,15 @@ public OtelLogSenderBuildListener(@NonNull RunTraceContext runTraceContext, @Non
         JenkinsJVM.checkJenkinsJVM();
     }
 
+    @NonNull
+    @Override
+    public synchronized final OutputStream getOutputStream() {
+        if (outputStream == null) {
+            outputStream = new OtelLogOutputStream(runTraceContext, getOtelLogger(), clock);
+        }
+        return outputStream;
+    }
+
     @NonNull
     @Override
     public synchronized final PrintStream getLogger() {
diff --git a/src/main/java/io/jenkins/plugins/opentelemetry/job/log/OtelLogStorage.java b/src/main/java/io/jenkins/plugins/opentelemetry/job/log/OtelLogStorage.java
index 545965de6..3a5c5ee9a 100644
--- a/src/main/java/io/jenkins/plugins/opentelemetry/job/log/OtelLogStorage.java
+++ b/src/main/java/io/jenkins/plugins/opentelemetry/job/log/OtelLogStorage.java
@@ -1,5 +1,6 @@
 package io.jenkins.plugins.opentelemetry.job.log;
 
+import edu.umd.cs.findbugs.annotations.NonNull;
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import hudson.console.AnnotatedLargeText;
 import hudson.model.BuildListener;
@@ -11,6 +12,8 @@
 import io.jenkins.plugins.opentelemetry.job.MonitoringAction;
 import io.jenkins.plugins.opentelemetry.job.OtelTraceService;
 import io.jenkins.plugins.opentelemetry.job.log.util.TeeBuildListener;
+import io.jenkins.plugins.opentelemetry.job.log.util.TeeOutputStreamBuildListener;
+import io.jenkins.plugins.opentelemetry.job.log.util.TeeOutputStreamTaskListener;
 import io.jenkins.plugins.opentelemetry.job.log.util.TeeTaskListener;
 import io.jenkins.plugins.opentelemetry.semconv.JenkinsOtelSemanticAttributes;
 import io.opentelemetry.api.trace.Span;
@@ -21,8 +24,7 @@
 import org.jenkinsci.plugins.workflow.log.BrokenLogStorage;
 import org.jenkinsci.plugins.workflow.log.FileLogStorage;
 import org.jenkinsci.plugins.workflow.log.LogStorage;
-
-import edu.umd.cs.findbugs.annotations.NonNull;
+import org.jenkinsci.plugins.workflow.log.OutputStreamTaskListener;
 
 import java.io.File;
 import java.io.FileOutputStream;
@@ -76,15 +78,23 @@ public BuildListener overallListener() throws IOException {
         Map<String, String> otelResourceAttributes = new HashMap<>();
         otelConfiguration.toOpenTelemetryResource().getAttributes().asMap().forEach((k, v) -> otelResourceAttributes.put(k.getKey(), v.toString()));
 
-        BuildListener result = new OtelLogSenderBuildListener.OtelLogSenderBuildListenerOnController(runTraceContext, otelConfigurationProperties, otelResourceAttributes);
+        BuildListener otelStorageBuildListener = new OtelLogSenderBuildListener.OtelLogSenderBuildListenerOnController(runTraceContext, otelConfigurationProperties, otelResourceAttributes);
 
+        BuildListener result;
         if (OpenTelemetrySdkProvider.get().isOtelLogsMirrorToDisk()) {
             try {
               File logFile = new File(runFolderPath, "log");
-                result = new TeeBuildListener(result, FileLogStorage.forFile(logFile).overallListener());
+                BuildListener fileStorageBuildListener = FileLogStorage.forFile(logFile).overallListener();
+                if (fileStorageBuildListener instanceof OutputStreamTaskListener) {
+                    result = new TeeOutputStreamBuildListener(otelStorageBuildListener, fileStorageBuildListener);
+                } else {
+                    result = new TeeBuildListener(otelStorageBuildListener, fileStorageBuildListener);
+                }
               } catch (IOException|InterruptedException e) {
                 throw new IOException("Failure creating the mirror logs.", e);
               }
+        } else {
+            result = otelStorageBuildListener;
         }
         return result;
     }
@@ -99,15 +109,23 @@ public TaskListener nodeListener(@NonNull FlowNode flowNode) throws IOException
 
         Span span = otelTraceService.getSpan(run, flowNode);
         FlowNodeTraceContext flowNodeTraceContext = FlowNodeTraceContext.newFlowNodeTraceContext(run, flowNode, span);
-        TaskListener result = new OtelLogSenderBuildListener.OtelLogSenderBuildListenerOnController(flowNodeTraceContext, otelConfigurationProperties, otelResourceAttributes);
+        OutputStreamTaskListener otelStorageTaskListener = new OtelLogSenderBuildListener.OtelLogSenderBuildListenerOnController(flowNodeTraceContext, otelConfigurationProperties, otelResourceAttributes);
 
+        TaskListener result;
         if (OpenTelemetrySdkProvider.get().isOtelLogsMirrorToDisk()) {
             try {
-              File logFile = new File(runFolderPath, "log");
-              result = new TeeTaskListener(result, FileLogStorage.forFile(logFile).nodeListener(flowNode));
-             } catch (IOException|InterruptedException e) {
+                File logFile = new File(runFolderPath, "log");
+                TaskListener fileStorageTaskListener = FileLogStorage.forFile(logFile).nodeListener(flowNode);
+                if (fileStorageTaskListener instanceof OutputStreamTaskListener) {
+                    result = new TeeOutputStreamTaskListener(otelStorageTaskListener, (OutputStreamTaskListener) fileStorageTaskListener);
+                } else {
+                    result = new TeeTaskListener(otelStorageTaskListener, fileStorageTaskListener);
+                }
+            } catch (IOException | InterruptedException e) {
                 throw new IOException("Failure creating the mirror logs.", e);
-              }
+            }
+        } else {
+            result = otelStorageTaskListener;
         }
         return result;
     }
diff --git a/src/main/java/io/jenkins/plugins/opentelemetry/job/log/util/TeeBuildListener.java b/src/main/java/io/jenkins/plugins/opentelemetry/job/log/util/TeeBuildListener.java
index dcb15982a..67688198d 100644
--- a/src/main/java/io/jenkins/plugins/opentelemetry/job/log/util/TeeBuildListener.java
+++ b/src/main/java/io/jenkins/plugins/opentelemetry/job/log/util/TeeBuildListener.java
@@ -5,9 +5,9 @@
 
 package io.jenkins.plugins.opentelemetry.job.log.util;
 
+import edu.umd.cs.findbugs.annotations.NonNull;
 import hudson.model.BuildListener;
 import hudson.model.TaskListener;
-import edu.umd.cs.findbugs.annotations.NonNull;
 
 import java.io.Closeable;
 import java.io.IOException;
@@ -15,7 +15,7 @@
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-public final class TeeBuildListener implements BuildListener, Closeable {
+public final class TeeBuildListener implements BuildListener, AutoCloseable {
 
     private final static Logger logger = Logger.getLogger(TeeBuildListener.class.getName());
 
@@ -30,11 +30,7 @@ public TeeBuildListener(TaskListener main, TaskListener secondary) {
     @NonNull
     @Override
     public PrintStream getLogger() {
-        try {
-            return new TeePrintStream(main.getLogger(), secondary.getLogger());
-        } catch (IOException e) {
-            throw new RuntimeException(e);
-        }
+        return new TeePrintStream(main.getLogger(), secondary.getLogger());
     }
 
     @Override
diff --git a/src/main/java/io/jenkins/plugins/opentelemetry/job/log/util/TeeOutputStream.java b/src/main/java/io/jenkins/plugins/opentelemetry/job/log/util/TeeOutputStream.java
new file mode 100644
index 000000000..d2d104e1b
--- /dev/null
+++ b/src/main/java/io/jenkins/plugins/opentelemetry/job/log/util/TeeOutputStream.java
@@ -0,0 +1,51 @@
+/*
+ * Copyright The Original Author or Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package io.jenkins.plugins.opentelemetry.job.log.util;
+
+import javax.annotation.Nonnull;
+import java.io.IOException;
+import java.io.OutputStream;
+
+public class TeeOutputStream extends OutputStream {
+
+    final OutputStream primary;
+    final OutputStream secondary;
+
+    public TeeOutputStream(OutputStream primary, OutputStream secondary) {
+        this.primary = primary;
+        this.secondary = secondary;
+    }
+
+    @Override
+    public void write(int b) throws IOException {
+        primary.write(b);
+        secondary.write(b);
+    }
+
+    @Override
+    public void write(@Nonnull byte[] b) throws IOException {
+        primary.write(b);
+        secondary.write(b);
+    }
+
+    @Override
+    public void write(@Nonnull byte[] b, int off, int len) throws IOException {
+        primary.write(b, off, len);
+        secondary.write(b, off, len);
+    }
+
+    @Override
+    public void flush() throws IOException {
+        primary.flush();
+        secondary.flush();
+    }
+
+    @Override
+    public void close() throws IOException {
+        primary.close();
+        secondary.close();
+    }
+}
diff --git a/src/main/java/io/jenkins/plugins/opentelemetry/job/log/util/TeeOutputStreamBuildListener.java b/src/main/java/io/jenkins/plugins/opentelemetry/job/log/util/TeeOutputStreamBuildListener.java
new file mode 100644
index 000000000..ef1491ee6
--- /dev/null
+++ b/src/main/java/io/jenkins/plugins/opentelemetry/job/log/util/TeeOutputStreamBuildListener.java
@@ -0,0 +1,60 @@
+/*
+ * Copyright The Original Author or Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package io.jenkins.plugins.opentelemetry.job.log.util;
+
+import hudson.model.BuildListener;
+import org.jenkinsci.plugins.workflow.log.OutputStreamTaskListener;
+
+import javax.annotation.Nonnull;
+import java.io.OutputStream;
+import java.io.PrintStream;
+
+public class TeeOutputStreamBuildListener implements BuildListener, OutputStreamTaskListener, AutoCloseable {
+
+    final BuildListener primary;
+
+    final BuildListener secondary;
+
+    final OutputStream outputStream;
+
+    final PrintStream printStream;
+
+    public TeeOutputStreamBuildListener(BuildListener primary, BuildListener secondary) {
+        if (!(primary instanceof OutputStreamTaskListener)) {
+            throw new ClassCastException("Primary is not an instance of OutputStreamTaskListener: " + primary);
+        }
+        if (!(secondary instanceof OutputStreamTaskListener)) {
+            throw new ClassCastException("Secondary is not an instance of OutputStreamTaskListener: " + primary);
+        }
+        this.primary = primary;
+        this.secondary = secondary;
+
+        this.outputStream = new TeeOutputStream(((OutputStreamTaskListener) primary).getOutputStream(), ((OutputStreamTaskListener) secondary).getOutputStream());
+        this.printStream = new TeePrintStream(primary.getLogger(), secondary.getLogger());
+    }
+
+    @Nonnull
+    @Override
+    public OutputStream getOutputStream() {
+        return outputStream;
+    }
+
+    @Nonnull
+    @Override
+    public PrintStream getLogger() {
+        return printStream;
+    }
+
+    @Override
+    public void close() throws Exception {
+        if (primary instanceof AutoCloseable) {
+            ((AutoCloseable) primary).close();
+        }
+        if (secondary instanceof AutoCloseable) {
+            ((AutoCloseable) secondary).close();
+        }
+    }
+}
diff --git a/src/main/java/io/jenkins/plugins/opentelemetry/job/log/util/TeeOutputStreamTaskListener.java b/src/main/java/io/jenkins/plugins/opentelemetry/job/log/util/TeeOutputStreamTaskListener.java
new file mode 100644
index 000000000..a19771780
--- /dev/null
+++ b/src/main/java/io/jenkins/plugins/opentelemetry/job/log/util/TeeOutputStreamTaskListener.java
@@ -0,0 +1,62 @@
+/*
+ * Copyright The Original Author or Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package io.jenkins.plugins.opentelemetry.job.log.util;
+
+import edu.umd.cs.findbugs.annotations.NonNull;
+import org.jenkinsci.plugins.workflow.log.OutputStreamTaskListener;
+
+import java.io.OutputStream;
+import java.io.PrintStream;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+public class TeeOutputStreamTaskListener implements OutputStreamTaskListener, AutoCloseable {
+    private final static Logger logger = Logger.getLogger(TeeOutputStreamTaskListener.class.getName());
+
+    final OutputStreamTaskListener primary;
+    final OutputStreamTaskListener secondary;
+
+    final OutputStream outputStream;
+
+    final PrintStream printStream;
+
+    public TeeOutputStreamTaskListener(OutputStreamTaskListener primary, OutputStreamTaskListener secondary) {
+        this.primary = primary;
+        this.secondary = secondary;
+
+        OutputStream primaryOutputStream = primary.getOutputStream();
+        OutputStream secondaryOutputStream = secondary.getOutputStream();
+        if (primaryOutputStream instanceof PrintStream && secondaryOutputStream instanceof PrintStream) {
+            this.outputStream = new TeePrintStream((PrintStream) primaryOutputStream, (PrintStream) secondaryOutputStream);
+        } else {
+            this.outputStream = new TeeOutputStream(primaryOutputStream, secondaryOutputStream);
+        }
+        this.printStream = new TeePrintStream(primary.getLogger(), secondary.getLogger());
+    }
+
+    @NonNull
+    @Override
+    public OutputStream getOutputStream() {
+        return outputStream;
+    }
+
+    @NonNull
+    @Override
+    public PrintStream getLogger() {
+        return printStream;
+    }
+
+    @Override
+    public void close() throws Exception {
+        logger.log(Level.FINEST, "close()");
+        if (primary instanceof AutoCloseable) {
+            ((AutoCloseable) primary).close();
+        }
+        if (secondary instanceof AutoCloseable) {
+            ((AutoCloseable) secondary).close();
+        }
+    }
+}
diff --git a/src/main/java/io/jenkins/plugins/opentelemetry/job/log/util/TeePrintStream.java b/src/main/java/io/jenkins/plugins/opentelemetry/job/log/util/TeePrintStream.java
index 97203de9f..74409ba45 100644
--- a/src/main/java/io/jenkins/plugins/opentelemetry/job/log/util/TeePrintStream.java
+++ b/src/main/java/io/jenkins/plugins/opentelemetry/job/log/util/TeePrintStream.java
@@ -7,15 +7,15 @@
 
 import edu.umd.cs.findbugs.annotations.NonNull;
 
-import java.io.IOException;
 import java.io.PrintStream;
+import java.nio.charset.StandardCharsets;
 
 public class TeePrintStream extends PrintStream {
 
     final PrintStream secondary;
 
-    public TeePrintStream(@NonNull PrintStream primary, @NonNull PrintStream secondary) throws IOException {
-        super(primary, false, "UTF-8");
+    public TeePrintStream(@NonNull PrintStream primary, @NonNull PrintStream secondary) {
+        super(primary, false, StandardCharsets.UTF_8);
         this.secondary = secondary;
     }
 
diff --git a/src/main/java/io/jenkins/plugins/opentelemetry/job/log/util/TeeTaskListener.java b/src/main/java/io/jenkins/plugins/opentelemetry/job/log/util/TeeTaskListener.java
index dfe343ad9..be81db7d7 100644
--- a/src/main/java/io/jenkins/plugins/opentelemetry/job/log/util/TeeTaskListener.java
+++ b/src/main/java/io/jenkins/plugins/opentelemetry/job/log/util/TeeTaskListener.java
@@ -5,46 +5,43 @@
 
 package io.jenkins.plugins.opentelemetry.job.log.util;
 
-import hudson.model.TaskListener;
 import edu.umd.cs.findbugs.annotations.NonNull;
+import hudson.model.TaskListener;
 
-import java.io.Closeable;
-import java.io.IOException;
 import java.io.PrintStream;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-public class TeeTaskListener implements TaskListener, Closeable {
+public class TeeTaskListener implements TaskListener, AutoCloseable {
 
     private final static Logger logger = Logger.getLogger(TeeTaskListener.class.getName());
 
     final TaskListener main;
     final TaskListener secondary;
 
+    final PrintStream printStream;
+
     public TeeTaskListener(TaskListener main, TaskListener secondary) {
         this.main = main;
         this.secondary = secondary;
+        this.printStream = new TeePrintStream(main.getLogger(), secondary.getLogger());
     }
 
     @NonNull
     @Override
     public PrintStream getLogger() {
-        try {
-            return new TeePrintStream(main.getLogger(), secondary.getLogger());
-        } catch (IOException e) {
-            throw new RuntimeException(e);
-        }
+        return printStream;
     }
 
     @Override
-    public void close() throws IOException {
+    public void close() throws Exception {
         logger.log(Level.FINEST, "close()");
 
-        if (main instanceof Closeable) {
-            ((Closeable) main).close();
+        if (main instanceof AutoCloseable) {
+            ((AutoCloseable) main).close();
         }
-        if (secondary instanceof Closeable) {
-            ((Closeable) secondary).close();
+        if (secondary instanceof AutoCloseable) {
+            ((AutoCloseable) secondary).close();
         }
     }
 

From a8a44b5a81e987aabc8c6251db2141aa73090cc0 Mon Sep 17 00:00:00 2001
From: Cyrille Le Clerc <cyrille.leclerc@grafana.com>
Date: Thu, 21 Dec 2023 15:21:31 +0100
Subject: [PATCH 2/3] Fix SpotsBug issues

Signed-off-by: Cyrille Le Clerc <cyrille.leclerc@grafana.com>
---
 .../job/log/OtelLogSenderBuildListener.java   | 39 ++++++++++---------
 .../util/TeeOutputStreamBuildListener.java    | 29 ++++++++------
 .../log/util/TeeOutputStreamTaskListener.java | 33 +++++++++-------
 .../job/log/util/TeeTaskListener.java         | 16 +++++---
 4 files changed, 67 insertions(+), 50 deletions(-)

diff --git a/src/main/java/io/jenkins/plugins/opentelemetry/job/log/OtelLogSenderBuildListener.java b/src/main/java/io/jenkins/plugins/opentelemetry/job/log/OtelLogSenderBuildListener.java
index 180425546..5d28b3ffa 100644
--- a/src/main/java/io/jenkins/plugins/opentelemetry/job/log/OtelLogSenderBuildListener.java
+++ b/src/main/java/io/jenkins/plugins/opentelemetry/job/log/OtelLogSenderBuildListener.java
@@ -7,6 +7,7 @@
 
 import edu.umd.cs.findbugs.annotations.CheckForNull;
 import edu.umd.cs.findbugs.annotations.NonNull;
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import hudson.model.BuildListener;
 import io.jenkins.plugins.opentelemetry.OpenTelemetrySdkProvider;
 import io.jenkins.plugins.opentelemetry.opentelemetry.GlobalOpenTelemetrySdk;
@@ -46,6 +47,7 @@ abstract class OtelLogSenderBuildListener implements BuildListener, OutputStream
      * Timestamps of the logs emitted by the Jenkins Agents must be chronologically ordered with the timestamps of
      * the logs & traces emitted on the Jenkins controller even if the system clock are not perfectly synchronized
      */
+    @SuppressFBWarnings("IS2_INCONSISTENT_SYNC")
     transient Clock clock;
 
     @CheckForNull
@@ -163,37 +165,38 @@ private void writeObject(ObjectOutputStream stream) throws IOException {
 
 
         private Object readResolve() {
-            adjustClock();
-            GlobalOpenTelemetrySdk.configure(
-                otelConfigProperties,
-                otelResourceAttributes,
-                /* the JVM shutdown hook is too late to flush the Otel signals as the OTel classes have been unloaded */
-                false );
-            // TODO find the right lifecycle event to shutdown the Otel SDK on agent shutdown
-            // hudson.remoting.EngineListener doesn't seem to be the right event
-            return this;
-        }
-
-        /**
-         * Timestamps of the logs emitted by the Jenkins Agents must be chronologically ordered with the timestamps of
-         * the logs & traces emitted on the Jenkins controller even if the system clock are not perfectly synchronized
-         */
-        private void adjustClock() {
             JenkinsJVM.checkNotJenkinsJVM();
+
+            /*
+             * Timestamps of the logs emitted by the Jenkins Agents must be chronologically ordered with the timestamps of
+             * the logs & traces emitted on the Jenkins controller even if the system clock are not perfectly synchronized
+             */
             if (instantInNanosOnJenkinsControllerBeforeSerialization == 0) {
-                logger.log(Level.INFO, () -> "adjustClock(): unexpected timeBeforeSerialization of 0ns, don't adjust the clock");
+                logger.log(Level.INFO, () -> "adjustClock: unexpected timeBeforeSerialization of 0ns, don't adjust the clock");
                 this.clock = Clock.getDefault();
             } else {
                 long instantInNanosOnJenkinsAgentAtDeserialization = Clock.getDefault().now();
                 long offsetInNanosOnJenkinsAgent = instantInNanosOnJenkinsControllerBeforeSerialization - instantInNanosOnJenkinsAgentAtDeserialization;
                 logger.log(Level.FINE, () ->
-                    "adjustClock(): " +
+                    "adjustClock: " +
                         "offsetInNanos: " + TimeUnit.MILLISECONDS.convert(offsetInNanosOnJenkinsAgent, TimeUnit.NANOSECONDS) + "ms / " + offsetInNanosOnJenkinsAgent + "ns. "+
                         "A negative offset of few milliseconds is expected due to the latency of the communication from the Jenkins Controller to the Jenkins Agent. " +
                         "Higher offsets indicate a synchronization gap of the system clocks between the Jenkins Controller that will be work arounded by the clock adjustment."
                 );
                 this.clock = OffsetClock.offsetClock(offsetInNanosOnJenkinsAgent);
             }
+
+            // Setup OTel
+            GlobalOpenTelemetrySdk.configure(
+                otelConfigProperties,
+                otelResourceAttributes,
+                /* the JVM shutdown hook is too late to flush the Otel signals as the OTel classes have been unloaded */
+                false );
+            // TODO find the right lifecycle event to shutdown the Otel SDK on agent shutdown
+            // hudson.remoting.EngineListener doesn't seem to be the right event
+            return this;
         }
+
+
     }
 }
diff --git a/src/main/java/io/jenkins/plugins/opentelemetry/job/log/util/TeeOutputStreamBuildListener.java b/src/main/java/io/jenkins/plugins/opentelemetry/job/log/util/TeeOutputStreamBuildListener.java
index ef1491ee6..25aa8d857 100644
--- a/src/main/java/io/jenkins/plugins/opentelemetry/job/log/util/TeeOutputStreamBuildListener.java
+++ b/src/main/java/io/jenkins/plugins/opentelemetry/job/log/util/TeeOutputStreamBuildListener.java
@@ -5,22 +5,24 @@
 
 package io.jenkins.plugins.opentelemetry.job.log.util;
 
+import edu.umd.cs.findbugs.annotations.NonNull;
 import hudson.model.BuildListener;
 import org.jenkinsci.plugins.workflow.log.OutputStreamTaskListener;
 
-import javax.annotation.Nonnull;
 import java.io.OutputStream;
 import java.io.PrintStream;
 
 public class TeeOutputStreamBuildListener implements BuildListener, OutputStreamTaskListener, AutoCloseable {
 
-    final BuildListener primary;
+    private static final long serialVersionUID = 1L;
 
-    final BuildListener secondary;
+    private final BuildListener primary;
 
-    final OutputStream outputStream;
+    private final BuildListener secondary;
 
-    final PrintStream printStream;
+    private transient OutputStream outputStream;
+
+    private transient PrintStream printStream;
 
     public TeeOutputStreamBuildListener(BuildListener primary, BuildListener secondary) {
         if (!(primary instanceof OutputStreamTaskListener)) {
@@ -31,20 +33,23 @@ public TeeOutputStreamBuildListener(BuildListener primary, BuildListener seconda
         }
         this.primary = primary;
         this.secondary = secondary;
-
-        this.outputStream = new TeeOutputStream(((OutputStreamTaskListener) primary).getOutputStream(), ((OutputStreamTaskListener) secondary).getOutputStream());
-        this.printStream = new TeePrintStream(primary.getLogger(), secondary.getLogger());
     }
 
-    @Nonnull
+    @NonNull
     @Override
-    public OutputStream getOutputStream() {
+    public synchronized OutputStream getOutputStream() {
+        if (outputStream == null) {
+            outputStream = new TeeOutputStream(((OutputStreamTaskListener) primary).getOutputStream(), ((OutputStreamTaskListener) secondary).getOutputStream());
+        }
         return outputStream;
     }
 
-    @Nonnull
+    @NonNull
     @Override
-    public PrintStream getLogger() {
+    public synchronized PrintStream getLogger() {
+        if (printStream == null) {
+            printStream = new TeePrintStream(primary.getLogger(), secondary.getLogger());
+        }
         return printStream;
     }
 
diff --git a/src/main/java/io/jenkins/plugins/opentelemetry/job/log/util/TeeOutputStreamTaskListener.java b/src/main/java/io/jenkins/plugins/opentelemetry/job/log/util/TeeOutputStreamTaskListener.java
index a19771780..af13f1886 100644
--- a/src/main/java/io/jenkins/plugins/opentelemetry/job/log/util/TeeOutputStreamTaskListener.java
+++ b/src/main/java/io/jenkins/plugins/opentelemetry/job/log/util/TeeOutputStreamTaskListener.java
@@ -5,6 +5,7 @@
 
 package io.jenkins.plugins.opentelemetry.job.log.util;
 
+import edu.umd.cs.findbugs.annotations.CheckForNull;
 import edu.umd.cs.findbugs.annotations.NonNull;
 import org.jenkinsci.plugins.workflow.log.OutputStreamTaskListener;
 
@@ -14,38 +15,40 @@
 import java.util.logging.Logger;
 
 public class TeeOutputStreamTaskListener implements OutputStreamTaskListener, AutoCloseable {
+
+    private static final long serialVersionUID = 1L;
+
     private final static Logger logger = Logger.getLogger(TeeOutputStreamTaskListener.class.getName());
 
-    final OutputStreamTaskListener primary;
-    final OutputStreamTaskListener secondary;
+    private final OutputStreamTaskListener primary;
+    private final OutputStreamTaskListener secondary;
 
-    final OutputStream outputStream;
+    @CheckForNull
+    private transient OutputStream outputStream;
 
-    final PrintStream printStream;
+    @CheckForNull
+    private transient PrintStream printStream;
 
     public TeeOutputStreamTaskListener(OutputStreamTaskListener primary, OutputStreamTaskListener secondary) {
         this.primary = primary;
         this.secondary = secondary;
-
-        OutputStream primaryOutputStream = primary.getOutputStream();
-        OutputStream secondaryOutputStream = secondary.getOutputStream();
-        if (primaryOutputStream instanceof PrintStream && secondaryOutputStream instanceof PrintStream) {
-            this.outputStream = new TeePrintStream((PrintStream) primaryOutputStream, (PrintStream) secondaryOutputStream);
-        } else {
-            this.outputStream = new TeeOutputStream(primaryOutputStream, secondaryOutputStream);
-        }
-        this.printStream = new TeePrintStream(primary.getLogger(), secondary.getLogger());
     }
 
     @NonNull
     @Override
-    public OutputStream getOutputStream() {
+    public synchronized OutputStream getOutputStream() {
+        if (outputStream == null) {
+            outputStream = new TeeOutputStream(primary.getOutputStream(), secondary.getOutputStream());
+        }
         return outputStream;
     }
 
     @NonNull
     @Override
-    public PrintStream getLogger() {
+    public synchronized PrintStream getLogger() {
+        if (printStream == null) {
+            printStream = new TeePrintStream(primary.getLogger(), secondary.getLogger());
+        }
         return printStream;
     }
 
diff --git a/src/main/java/io/jenkins/plugins/opentelemetry/job/log/util/TeeTaskListener.java b/src/main/java/io/jenkins/plugins/opentelemetry/job/log/util/TeeTaskListener.java
index be81db7d7..aaab271d0 100644
--- a/src/main/java/io/jenkins/plugins/opentelemetry/job/log/util/TeeTaskListener.java
+++ b/src/main/java/io/jenkins/plugins/opentelemetry/job/log/util/TeeTaskListener.java
@@ -5,6 +5,7 @@
 
 package io.jenkins.plugins.opentelemetry.job.log.util;
 
+import edu.umd.cs.findbugs.annotations.CheckForNull;
 import edu.umd.cs.findbugs.annotations.NonNull;
 import hudson.model.TaskListener;
 
@@ -14,22 +15,27 @@
 
 public class TeeTaskListener implements TaskListener, AutoCloseable {
 
+    private static final long serialVersionUID = 1L;
+
     private final static Logger logger = Logger.getLogger(TeeTaskListener.class.getName());
 
-    final TaskListener main;
-    final TaskListener secondary;
+    private final TaskListener main;
+    private final TaskListener secondary;
 
-    final PrintStream printStream;
+    @CheckForNull
+    private transient PrintStream printStream;
 
     public TeeTaskListener(TaskListener main, TaskListener secondary) {
         this.main = main;
         this.secondary = secondary;
-        this.printStream = new TeePrintStream(main.getLogger(), secondary.getLogger());
     }
 
     @NonNull
     @Override
-    public PrintStream getLogger() {
+    public synchronized PrintStream getLogger() {
+        if (printStream == null) {
+            printStream = new TeePrintStream(main.getLogger(), secondary.getLogger());
+        }
         return printStream;
     }
 

From eeee19870fe359ce5ca88b6b9ae1fcfbb9d55832 Mon Sep 17 00:00:00 2001
From: Cyrille Le Clerc <cyrille.leclerc@grafana.com>
Date: Fri, 22 Dec 2023 10:45:53 +0100
Subject: [PATCH 3/3] Fix unexpected wrapping of TaskListener

Signed-off-by: Cyrille Le Clerc <cyrille.leclerc@grafana.com>
---
 .../opentelemetry/job/log/OtelLogStorage.java | 45 ++++++++-----
 .../log/util/TeeOutputStreamTaskListener.java | 65 -------------------
 .../job/log/util/TeeTaskListener.java         | 58 -----------------
 3 files changed, 28 insertions(+), 140 deletions(-)
 delete mode 100644 src/main/java/io/jenkins/plugins/opentelemetry/job/log/util/TeeOutputStreamTaskListener.java
 delete mode 100644 src/main/java/io/jenkins/plugins/opentelemetry/job/log/util/TeeTaskListener.java

diff --git a/src/main/java/io/jenkins/plugins/opentelemetry/job/log/OtelLogStorage.java b/src/main/java/io/jenkins/plugins/opentelemetry/job/log/OtelLogStorage.java
index 3a5c5ee9a..7d869daeb 100644
--- a/src/main/java/io/jenkins/plugins/opentelemetry/job/log/OtelLogStorage.java
+++ b/src/main/java/io/jenkins/plugins/opentelemetry/job/log/OtelLogStorage.java
@@ -13,12 +13,11 @@
 import io.jenkins.plugins.opentelemetry.job.OtelTraceService;
 import io.jenkins.plugins.opentelemetry.job.log.util.TeeBuildListener;
 import io.jenkins.plugins.opentelemetry.job.log.util.TeeOutputStreamBuildListener;
-import io.jenkins.plugins.opentelemetry.job.log.util.TeeOutputStreamTaskListener;
-import io.jenkins.plugins.opentelemetry.job.log.util.TeeTaskListener;
 import io.jenkins.plugins.opentelemetry.semconv.JenkinsOtelSemanticAttributes;
 import io.opentelemetry.api.trace.Span;
 import io.opentelemetry.api.trace.Tracer;
 import io.opentelemetry.context.Scope;
+import jenkins.util.BuildListenerAdapter;
 import org.jenkinsci.plugins.workflow.flow.FlowExecutionOwner;
 import org.jenkinsci.plugins.workflow.graph.FlowNode;
 import org.jenkinsci.plugins.workflow.log.BrokenLogStorage;
@@ -78,30 +77,39 @@ public BuildListener overallListener() throws IOException {
         Map<String, String> otelResourceAttributes = new HashMap<>();
         otelConfiguration.toOpenTelemetryResource().getAttributes().asMap().forEach((k, v) -> otelResourceAttributes.put(k.getKey(), v.toString()));
 
-        BuildListener otelStorageBuildListener = new OtelLogSenderBuildListener.OtelLogSenderBuildListenerOnController(runTraceContext, otelConfigurationProperties, otelResourceAttributes);
+        OtelLogSenderBuildListener otelLogSenderBuildListener = new OtelLogSenderBuildListener.OtelLogSenderBuildListenerOnController(runTraceContext, otelConfigurationProperties, otelResourceAttributes);
 
         BuildListener result;
         if (OpenTelemetrySdkProvider.get().isOtelLogsMirrorToDisk()) {
             try {
-              File logFile = new File(runFolderPath, "log");
+                File logFile = new File(runFolderPath, "log");
                 BuildListener fileStorageBuildListener = FileLogStorage.forFile(logFile).overallListener();
                 if (fileStorageBuildListener instanceof OutputStreamTaskListener) {
-                    result = new TeeOutputStreamBuildListener(otelStorageBuildListener, fileStorageBuildListener);
+                    result = new TeeOutputStreamBuildListener(otelLogSenderBuildListener, fileStorageBuildListener);
                 } else {
-                    result = new TeeBuildListener(otelStorageBuildListener, fileStorageBuildListener);
+                    logger.log(Level.INFO, () -> "overallListener(): FileLogStorage's TaskListener is not a OutputStreamTaskListener, use TeeBuildListener for " + fileStorageBuildListener);
+                    result = new TeeBuildListener(otelLogSenderBuildListener, fileStorageBuildListener);
                 }
-              } catch (IOException|InterruptedException e) {
+            } catch (IOException | InterruptedException e) {
                 throw new IOException("Failure creating the mirror logs.", e);
-              }
+            }
         } else {
-            result = otelStorageBuildListener;
+            result = otelLogSenderBuildListener;
         }
+
         return result;
     }
 
+    /**
+     * @param flowNode a running node
+     * @return a {@link BuildListener} rather than a {@link hudson.model.TaskListener} because the caller of
+     * {@link LogStorage#nodeListener(FlowNode)} will wrap any {@link hudson.model.TaskListener} into a {@link BuildListener}
+     * causing problems in {@link OutputStreamTaskListener#getOutputStream(TaskListener)}
+     * @throws IOException
+     */
     @NonNull
     @Override
-    public TaskListener nodeListener(@NonNull FlowNode flowNode) throws IOException {
+    public BuildListener nodeListener(@NonNull FlowNode flowNode) throws IOException {
         OpenTelemetryConfiguration otelConfiguration = JenkinsOpenTelemetryPluginConfiguration.get().toOpenTelemetryConfiguration();
         Map<String, String> otelConfigurationProperties = otelConfiguration.toOpenTelemetryProperties();
         Map<String, String> otelResourceAttributes = new HashMap<>();
@@ -109,24 +117,26 @@ public TaskListener nodeListener(@NonNull FlowNode flowNode) throws IOException
 
         Span span = otelTraceService.getSpan(run, flowNode);
         FlowNodeTraceContext flowNodeTraceContext = FlowNodeTraceContext.newFlowNodeTraceContext(run, flowNode, span);
-        OutputStreamTaskListener otelStorageTaskListener = new OtelLogSenderBuildListener.OtelLogSenderBuildListenerOnController(flowNodeTraceContext, otelConfigurationProperties, otelResourceAttributes);
+        OtelLogSenderBuildListener otelLogSenderBuildListener = new OtelLogSenderBuildListener.OtelLogSenderBuildListenerOnController(flowNodeTraceContext, otelConfigurationProperties, otelResourceAttributes);
 
-        TaskListener result;
+        BuildListener result;
         if (OpenTelemetrySdkProvider.get().isOtelLogsMirrorToDisk()) {
             try {
                 File logFile = new File(runFolderPath, "log");
-                TaskListener fileStorageTaskListener = FileLogStorage.forFile(logFile).nodeListener(flowNode);
-                if (fileStorageTaskListener instanceof OutputStreamTaskListener) {
-                    result = new TeeOutputStreamTaskListener(otelStorageTaskListener, (OutputStreamTaskListener) fileStorageTaskListener);
+                BuildListener fileStorageBuildListener = BuildListenerAdapter.wrap(FileLogStorage.forFile(logFile).nodeListener(flowNode));
+                if (fileStorageBuildListener instanceof OutputStreamTaskListener) {
+                    result = new TeeOutputStreamBuildListener(otelLogSenderBuildListener, fileStorageBuildListener);
                 } else {
-                    result = new TeeTaskListener(otelStorageTaskListener, fileStorageTaskListener);
+                    logger.log(Level.INFO, () -> "nodeListener(): FileLogStorage's TaskListener is not a OutputStreamTaskListener, use TeeBuildListener for " + fileStorageBuildListener);
+                    result = new TeeBuildListener(otelLogSenderBuildListener, fileStorageBuildListener);
                 }
             } catch (IOException | InterruptedException e) {
                 throw new IOException("Failure creating the mirror logs.", e);
             }
         } else {
-            result = otelStorageTaskListener;
+            result = otelLogSenderBuildListener;
         }
+
         return result;
     }
 
@@ -202,6 +212,7 @@ public AnnotatedLargeText<FlowNode> stepLog(@NonNull FlowNode flowNode, boolean
             span.end();
         }
     }
+
     @SuppressFBWarnings(value = "BC_UNCONFIRMED_CAST", justification = "forBuild only accepts Run")
     @Deprecated
     @Override
diff --git a/src/main/java/io/jenkins/plugins/opentelemetry/job/log/util/TeeOutputStreamTaskListener.java b/src/main/java/io/jenkins/plugins/opentelemetry/job/log/util/TeeOutputStreamTaskListener.java
deleted file mode 100644
index af13f1886..000000000
--- a/src/main/java/io/jenkins/plugins/opentelemetry/job/log/util/TeeOutputStreamTaskListener.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Copyright The Original Author or Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-package io.jenkins.plugins.opentelemetry.job.log.util;
-
-import edu.umd.cs.findbugs.annotations.CheckForNull;
-import edu.umd.cs.findbugs.annotations.NonNull;
-import org.jenkinsci.plugins.workflow.log.OutputStreamTaskListener;
-
-import java.io.OutputStream;
-import java.io.PrintStream;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-public class TeeOutputStreamTaskListener implements OutputStreamTaskListener, AutoCloseable {
-
-    private static final long serialVersionUID = 1L;
-
-    private final static Logger logger = Logger.getLogger(TeeOutputStreamTaskListener.class.getName());
-
-    private final OutputStreamTaskListener primary;
-    private final OutputStreamTaskListener secondary;
-
-    @CheckForNull
-    private transient OutputStream outputStream;
-
-    @CheckForNull
-    private transient PrintStream printStream;
-
-    public TeeOutputStreamTaskListener(OutputStreamTaskListener primary, OutputStreamTaskListener secondary) {
-        this.primary = primary;
-        this.secondary = secondary;
-    }
-
-    @NonNull
-    @Override
-    public synchronized OutputStream getOutputStream() {
-        if (outputStream == null) {
-            outputStream = new TeeOutputStream(primary.getOutputStream(), secondary.getOutputStream());
-        }
-        return outputStream;
-    }
-
-    @NonNull
-    @Override
-    public synchronized PrintStream getLogger() {
-        if (printStream == null) {
-            printStream = new TeePrintStream(primary.getLogger(), secondary.getLogger());
-        }
-        return printStream;
-    }
-
-    @Override
-    public void close() throws Exception {
-        logger.log(Level.FINEST, "close()");
-        if (primary instanceof AutoCloseable) {
-            ((AutoCloseable) primary).close();
-        }
-        if (secondary instanceof AutoCloseable) {
-            ((AutoCloseable) secondary).close();
-        }
-    }
-}
diff --git a/src/main/java/io/jenkins/plugins/opentelemetry/job/log/util/TeeTaskListener.java b/src/main/java/io/jenkins/plugins/opentelemetry/job/log/util/TeeTaskListener.java
deleted file mode 100644
index aaab271d0..000000000
--- a/src/main/java/io/jenkins/plugins/opentelemetry/job/log/util/TeeTaskListener.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Copyright The Original Author or Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-package io.jenkins.plugins.opentelemetry.job.log.util;
-
-import edu.umd.cs.findbugs.annotations.CheckForNull;
-import edu.umd.cs.findbugs.annotations.NonNull;
-import hudson.model.TaskListener;
-
-import java.io.PrintStream;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-public class TeeTaskListener implements TaskListener, AutoCloseable {
-
-    private static final long serialVersionUID = 1L;
-
-    private final static Logger logger = Logger.getLogger(TeeTaskListener.class.getName());
-
-    private final TaskListener main;
-    private final TaskListener secondary;
-
-    @CheckForNull
-    private transient PrintStream printStream;
-
-    public TeeTaskListener(TaskListener main, TaskListener secondary) {
-        this.main = main;
-        this.secondary = secondary;
-    }
-
-    @NonNull
-    @Override
-    public synchronized PrintStream getLogger() {
-        if (printStream == null) {
-            printStream = new TeePrintStream(main.getLogger(), secondary.getLogger());
-        }
-        return printStream;
-    }
-
-    @Override
-    public void close() throws Exception {
-        logger.log(Level.FINEST, "close()");
-
-        if (main instanceof AutoCloseable) {
-            ((AutoCloseable) main).close();
-        }
-        if (secondary instanceof AutoCloseable) {
-            ((AutoCloseable) secondary).close();
-        }
-    }
-
-    @Override
-    public String toString() {
-        return "TeeTaskListener[" + main + "," + secondary + "]";
-    }
-}