Chore: bean can now return null

wearefrank · Aug 28, 2024 · 0c1c384 · 0c1c384
1 parent 8bea223
commit 0c1c384
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 7 deletions.
diff --git a/src/main/java/nl/nn/testtool/Config.java b/src/main/java/nl/nn/testtool/Config.java
@@ -317,15 +317,13 @@ OpenTelemetry openTelemetry(@Qualifier("openTelemetryCollector") String openTele
 					.setResource(resource)
 					.build();
 		} else {
-			return OpenTelemetry.noop();
+			return null;
 		}
 
-		OpenTelemetry openTelemetry = OpenTelemetrySdk.builder()
+		return 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/TestTool.java b/src/main/java/nl/nn/testtool/TestTool.java
@@ -98,8 +98,7 @@ public class TestTool {
 	private @Setter @Getter @Inject @Autowired Views views;
 	private @Setter @Getter int reportsInProgressThreshold = 300000;
 	boolean devMode = false; // See testConcurrentLastEndpointAndFirstStartpointForSameCorrelationId()
-	private @Autowired String openTelemetryCollector;
-	private @Autowired OpenTelemetry openTelemetry;
+	private @Autowired(required = false) OpenTelemetry openTelemetry;
 	private transient Tracer tracer;
 
 	@PostConstruct
@@ -303,7 +302,7 @@ public void setCloseMessageCapturers(boolean closeMessageCapturers) {
 	@Transient
 	@JsonIgnore
 	public Tracer getOpenTelemetryTracer() {
-		if (openTelemetryCollector.contains("9411") || openTelemetryCollector.equals("jaeger")) {
+		if (this.openTelemetry != null) {
 			if (this.tracer == null) {
 				this.tracer = this.openTelemetry.getTracer(Report.class.getName(), "0.1.0");
 			}