Make sure tracing interceptor is applied first

Author: Quinn-With-Two-Ns

temporal-spring-boot-autoconfigure/src/main/java/io/temporal/spring/boot/autoconfigure/template/WorkerFactoryOptionsTemplate.java

@@ -8,7 +8,6 @@
 import io.temporal.spring.boot.autoconfigure.properties.NamespaceProperties;
 import io.temporal.worker.WorkerFactoryOptions;
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
 import java.util.Optional;
 import javax.annotation.Nonnull;
@@ -45,14 +44,16 @@ public WorkerFactoryOptions createWorkerFactoryOptions() {
           .ifPresent(options::setUsingVirtualWorkflowThreads);
     }
 
-    List<WorkerInterceptor> interceptors =
-        new ArrayList<>(workerInterceptors != null ? workerInterceptors : Collections.EMPTY_LIST);
+    List<WorkerInterceptor> interceptors = new ArrayList<>();
     if (tracer != null) {
       OpenTracingWorkerInterceptor openTracingClientInterceptor =
           new OpenTracingWorkerInterceptor(
               OpenTracingOptions.newBuilder().setTracer(tracer).build());
       interceptors.add(openTracingClientInterceptor);
     }
+    if (workerInterceptors != null) {
+      interceptors.addAll(workerInterceptors);
+    }
     options.setWorkerInterceptors(interceptors.stream().toArray(WorkerInterceptor[]::new));
 
     if (customizer != null) {

temporal-spring-boot-autoconfigure/src/main/java/io/temporal/spring/boot/autoconfigure/template/WorkflowClientOptionsTemplate.java

@@ -10,7 +10,6 @@
 import io.temporal.opentracing.OpenTracingOptions;
 import io.temporal.spring.boot.TemporalOptionsCustomizer;
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
 import java.util.Optional;
 import javax.annotation.Nonnull;
@@ -48,17 +47,16 @@ public WorkflowClientOptions createWorkflowClientOptions() {
     options.setNamespace(namespace);
     Optional.ofNullable(dataConverter).ifPresent(options::setDataConverter);
 
-    List<WorkflowClientInterceptor> interceptors =
-        new ArrayList<>(
-            workflowClientInterceptors != null
-                ? workflowClientInterceptors
-                : Collections.EMPTY_LIST);
+    List<WorkflowClientInterceptor> interceptors = new ArrayList<>();
     if (tracer != null) {
       OpenTracingClientInterceptor openTracingClientInterceptor =
           new OpenTracingClientInterceptor(
               OpenTracingOptions.newBuilder().setTracer(tracer).build());
       interceptors.add(openTracingClientInterceptor);
     }
+    if (workflowClientInterceptors != null) {
+      interceptors.addAll(workflowClientInterceptors);
+    }
 
     options.setInterceptors(interceptors.stream().toArray(WorkflowClientInterceptor[]::new));
 

temporal-spring-boot-autoconfigure/src/test/java/io/temporal/spring/boot/autoconfigure/InterceptorsTest.java

@@ -1,23 +1,3 @@
-/*
- * Copyright (C) 2022 Temporal Technologies, Inc. All Rights Reserved.
- *
- * Copyright (C) 2012-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- *
- * Modifications copyright (C) 2017 Uber Technologies, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this material except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
 package io.temporal.spring.boot.autoconfigure;
 
 import static org.mockito.ArgumentMatchers.any;