Update OtelLogStorageFactory to use last workflow-api changes

pom.xml

@@ -60,8 +60,8 @@
   <properties>
     <revision>3</revision>
     <changelist>999999-SNAPSHOT</changelist>
-    <jenkins.baseline>2.479</jenkins.baseline>
-    <jenkins.version>${jenkins.baseline}.3</jenkins.version>
+    <jenkins.baseline>2.504</jenkins.baseline>
+    <jenkins.version>${jenkins.baseline}.1</jenkins.version>
     <gitHubRepo>jenkinsci/${project.artifactId}-plugin</gitHubRepo>
     <opentelemetry.version>1.49.0</opentelemetry.version>
     <jenkins-opentelemetry.version>1.49.0.75.v66006f513b_1f</jenkins-opentelemetry.version>
@@ -149,6 +149,22 @@
         <artifactId>parsson</artifactId>
         <version>1.1.7</version>
       </dependency>
+      <dependency>
+        <!-- depends on https://github.com/jenkinsci/workflow-api-plugin/pull/417 -->
+        <!-- TODO remove when in bom -->
+        <groupId>org.jenkins-ci.plugins.workflow</groupId>
+        <artifactId>workflow-api</artifactId>
+        <version>1404.vb_1e6d0166a_33</version>
+      </dependency>
+      <dependency>
+        <!-- depends on https://github.com/jenkinsci/workflow-api-plugin/pull/417 -->
+        <!-- TODO remove when in bom -->
+        <groupId>org.jenkins-ci.plugins.workflow</groupId>
+        <artifactId>workflow-api</artifactId>
+        <version>1404.vb_1e6d0166a_33</version>
+        <scope>test</scope>
+        <classifier>tests</classifier>
+      </dependency>
     </dependencies>
   </dependencyManagement>
   <dependencies>
@@ -176,6 +192,16 @@
           <groupId>org.apache.httpcomponents.client5</groupId>
           <artifactId>httpclient5</artifactId>
         </exclusion>
+        <exclusion>
+          <!-- provided by org.jenkins-ci.plugins:jackson2-api -->
+          <groupId>com.fasterxml.jackson.core</groupId>
+          <artifactId>jackson-core</artifactId>
+        </exclusion>
+        <exclusion>
+          <!-- provided by org.jenkins-ci.plugins:jackson2-api -->
+          <groupId>com.fasterxml.jackson.core</groupId>
+          <artifactId>jackson-databind</artifactId>
+        </exclusion>
       </exclusions>
     </dependency>
     <dependency>
@@ -525,10 +551,6 @@
       <version>1.21.3</version>
       <scope>test</scope>
       <exclusions>
-        <exclusion>
-          <groupId>org.apache.commons</groupId>
-          <artifactId>commons-compress</artifactId>
-        </exclusion>
         <exclusion>
           <groupId>org.slf4j</groupId>
           <artifactId>slf4j-api</artifactId>

src/main/java/io/jenkins/plugins/opentelemetry/job/log/OtelLogStorageFactory.java

@@ -8,7 +8,6 @@
 import edu.umd.cs.findbugs.annotations.NonNull;
 import edu.umd.cs.findbugs.annotations.Nullable;
 import hudson.Extension;
-import hudson.ExtensionList;
 import hudson.model.Queue;
 import hudson.model.Run;
 import io.jenkins.plugins.opentelemetry.JenkinsControllerOpenTelemetry;
@@ -19,19 +18,19 @@
 import java.io.IOException;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import javax.annotation.PostConstruct;
-import javax.inject.Inject;
+import org.jenkinsci.Symbol;
 import org.jenkinsci.plugins.workflow.flow.FlowExecutionOwner;
 import org.jenkinsci.plugins.workflow.log.BrokenLogStorage;
 import org.jenkinsci.plugins.workflow.log.LogStorage;
 import org.jenkinsci.plugins.workflow.log.LogStorageFactory;
+import org.jenkinsci.plugins.workflow.log.LogStorageFactoryDescriptor;
+import org.kohsuke.stapler.DataBoundConstructor;
 
 /**
  * Binds Otel Logs to Pipeline logs.
  * <p>
  * See <a href="https://github.com/jenkinsci/pipeline-cloudwatch-logs-plugin/blob/pipeline-cloudwatch-logs-0.2/src/main/java/io/jenkins/plugins/pipeline_cloudwatch_logs/PipelineBridge.java">Pipeline Cloudwatch Logs - PipelineBridge</a>
  */
-@Extension
 public final class OtelLogStorageFactory implements LogStorageFactory, OpenTelemetryLifecycleListener {
 
     private static final Logger logger = Logger.getLogger(OtelLogStorageFactory.class.getName());
@@ -41,16 +40,17 @@ public final class OtelLogStorageFactory implements LogStorageFactory, OpenTelem
         System.setProperty("org.jenkinsci.plugins.workflow.steps.durable_task.DurableTaskStep.USE_WATCHING", "true");
     }
 
-    @Inject
-    JenkinsControllerOpenTelemetry jenkinsControllerOpenTelemetry;
+    private final JenkinsControllerOpenTelemetry jenkinsControllerOpenTelemetry;
 
-    @Nullable
-    private OtelTraceService otelTraceService;
+    private final OtelTraceService otelTraceService;
 
-    private Tracer tracer;
+    private final Tracer tracer;
 
-    static OtelLogStorageFactory get() {
-        return ExtensionList.lookupSingleton(OtelLogStorageFactory.class);
+    @DataBoundConstructor
+    public OtelLogStorageFactory() {
+        jenkinsControllerOpenTelemetry = JenkinsControllerOpenTelemetry.get();
+        otelTraceService = OtelTraceService.get();
+        tracer = jenkinsControllerOpenTelemetry.getDefaultTracer();
     }
 
     /**
@@ -62,7 +62,7 @@ static OtelLogStorageFactory get() {
     @Override
     public LogStorage forBuild(@NonNull final FlowExecutionOwner owner) {
         LogStorage ret = null;
-        if (!getJenkinsControllerOpenTelemetry().isLogsEnabled()) {
+        if (!jenkinsControllerOpenTelemetry.isLogsEnabled()) {
             logger.log(Level.FINE, () -> "OTel Logs disabled");
             return ret;
         }
@@ -86,35 +86,23 @@ private LogStorage forExec(@NonNull Queue.Executable exec) {
         if (exec instanceof Run<?, ?> run && run.getAction(MonitoringAction.class) != null) {
             // it's a pipeline with monitoring data
             logger.log(Level.FINEST, () -> "forExec(" + run + ")");
-            ret = new OtelLogStorage(run, getOtelTraceService(), tracer);
+            ret = new OtelLogStorage(run, otelTraceService, tracer);
         }
         return ret;
     }
 
-    /**
-     * Workaround dependency injection problem. @Inject doesn't work here
-     */
-    @NonNull
-    private JenkinsControllerOpenTelemetry getJenkinsControllerOpenTelemetry() {
-        if (jenkinsControllerOpenTelemetry == null) {
-            jenkinsControllerOpenTelemetry = JenkinsControllerOpenTelemetry.get();
+    @Extension()
+    @Symbol("opentelemetry")
+    public static final class DescriptorImpl extends LogStorageFactoryDescriptor<OtelLogStorageFactory> {
+        @NonNull
+        @Override
+        public String getDisplayName() {
+            return "Open Telemetry";
         }
-        return jenkinsControllerOpenTelemetry;
-    }
 
-    /**
-     * Workaround dependency injection problem. @Inject doesn't work here
-     */
-    @NonNull
-    private OtelTraceService getOtelTraceService() {
-        if (otelTraceService == null) {
-            otelTraceService = OtelTraceService.get();
+        @Override
+        public LogStorageFactory getDefaultInstance() {
+            return new OtelLogStorageFactory();
         }
-        return otelTraceService;
-    }
-
-    @PostConstruct
-    public void postConstruct() {
-        this.tracer = jenkinsControllerOpenTelemetry.getDefaultTracer();
     }
 }