Chore: replaced bean to the end of the file & removed unused imports

wearefrank · Aug 28, 2024 · f1d4eb5 · f1d4eb5
1 parent 488db75
commit f1d4eb5
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 29 deletions.
diff --git a/src/main/java/nl/nn/testtool/Config.java b/src/main/java/nl/nn/testtool/Config.java
@@ -113,32 +113,6 @@
 @Lazy // Lazy init singleton beans (prototype beans are already loaded on demand)
 @Configuration
 public class Config {
-	@Bean
-	OpenTelemetry openTelemetry(@Qualifier("openTelemetryCollector") String openTelemetryCollector) {
-		Resource resource = Resource.getDefault().toBuilder().put(ServiceAttributes.SERVICE_NAME, "ladybug").put(ServiceAttributes.SERVICE_VERSION, "1.0.0").build();
-		SdkTracerProvider sdkTracerProvider;
-		if (openTelemetryCollector.contains("9411")) {
-			sdkTracerProvider = SdkTracerProvider.builder()
-					.addSpanProcessor(BatchSpanProcessor.builder(ZipkinSpanExporter.builder().setEndpoint(openTelemetryCollector).build()).build())
-					.setResource(resource)
-					.build();
-		} else if (openTelemetryCollector.equals("jaeger")) {
-			sdkTracerProvider = SdkTracerProvider.builder()
-					.addSpanProcessor(BatchSpanProcessor.builder(OtlpGrpcSpanExporter.builder().build()).build())
-					.setResource(resource)
-					.build();
-		} else {
-			return OpenTelemetry.noop();
-		}
-
-		OpenTelemetry openTelemetry = OpenTelemetrySdk.builder()
-				.setTracerProvider(sdkTracerProvider)
-				.setPropagators(ContextPropagators.create(TextMapPropagator.composite(W3CTraceContextPropagator.getInstance(), W3CBaggagePropagator.getInstance())))
-				.buildAndRegisterGlobal();
-
-		return openTelemetry;
-	}
-
 	@Bean
 	@Scope("prototype") // Echo2Application needs to be unique per user (not per JVM)
 	Echo2Application echo2Application() {
@@ -327,4 +301,30 @@ String openTelemetryCollector() {
 		return "";
 	}
 
+	@Bean
+	OpenTelemetry openTelemetry(@Qualifier("openTelemetryCollector") String openTelemetryCollector) {
+		Resource resource = Resource.getDefault().toBuilder().put(ServiceAttributes.SERVICE_NAME, "ladybug").put(ServiceAttributes.SERVICE_VERSION, "1.0.0").build();
+		SdkTracerProvider sdkTracerProvider;
+		if (openTelemetryCollector.contains("9411")) {
+			sdkTracerProvider = SdkTracerProvider.builder()
+					.addSpanProcessor(BatchSpanProcessor.builder(ZipkinSpanExporter.builder().setEndpoint(openTelemetryCollector).build()).build())
+					.setResource(resource)
+					.build();
+		} else if (openTelemetryCollector.equals("jaeger")) {
+			sdkTracerProvider = SdkTracerProvider.builder()
+					.addSpanProcessor(BatchSpanProcessor.builder(OtlpGrpcSpanExporter.builder().build()).build())
+					.setResource(resource)
+					.build();
+		} else {
+			return OpenTelemetry.noop();
+		}
+
+		OpenTelemetry openTelemetry = OpenTelemetrySdk.builder()
+				.setTracerProvider(sdkTracerProvider)
+				.setPropagators(ContextPropagators.create(TextMapPropagator.composite(W3CTraceContextPropagator.getInstance(), W3CBaggagePropagator.getInstance())))
+				.buildAndRegisterGlobal();
+
+		return openTelemetry;
+	}
+
 }
diff --git a/src/main/java/nl/nn/testtool/Report.java b/src/main/java/nl/nn/testtool/Report.java
@@ -30,10 +30,8 @@
 import java.util.Scanner;
 import java.util.Set;
 
-import io.opentelemetry.api.OpenTelemetry;
 import io.opentelemetry.api.trace.Span;
 import io.opentelemetry.api.trace.SpanBuilder;
-import io.opentelemetry.api.trace.Tracer;
 import io.opentelemetry.context.Context;
 import org.apache.commons.lang3.NotImplementedException;
 import org.apache.commons.lang3.StringUtils;
@@ -52,7 +50,6 @@
 import nl.nn.testtool.util.CsvUtil;
 import nl.nn.testtool.util.EscapeUtil;
 import nl.nn.testtool.util.XmlUtil;
-import org.springframework.beans.factory.annotation.Autowired;
 
 /**
  * @author Jaco de Groot