From 78c543f5f1c483d8d56e66376cf22d7277d8062c Mon Sep 17 00:00:00 2001 From: Marcin Grzejszczak Date: Wed, 16 Dec 2020 16:19:49 +0100 Subject: [PATCH] Fixed broken compilation --- .../benchmarks/jmh/mvc/StartupBenchmarkTests.java | 10 ++++------ .../jmh/webflux/MicroBenchmarkHttpTests.java | 2 +- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/benchmarks/src/test/java/org/springframework/cloud/sleuth/benchmarks/jmh/mvc/StartupBenchmarkTests.java b/benchmarks/src/test/java/org/springframework/cloud/sleuth/benchmarks/jmh/mvc/StartupBenchmarkTests.java index dfe8c4faa..63a6adc65 100644 --- a/benchmarks/src/test/java/org/springframework/cloud/sleuth/benchmarks/jmh/mvc/StartupBenchmarkTests.java +++ b/benchmarks/src/test/java/org/springframework/cloud/sleuth/benchmarks/jmh/mvc/StartupBenchmarkTests.java @@ -48,29 +48,27 @@ public class StartupBenchmarkTests { @Benchmark public void withoutAnnotations(ApplicationState state) throws Exception { - state.setExtraArgs("--spring.sleuth.annotation.enabled=false", state.tracerImplementation.property()); + state.setExtraArgs("--spring.sleuth.annotation.enabled=false"); state.run(); } @Benchmark public void withoutAsync(ApplicationState state) throws Exception { - state.setExtraArgs("--spring.sleuth.async.enabled=false", "--spring.sleuth.annotation.enabled=false", - state.tracerImplementation.property()); + state.setExtraArgs("--spring.sleuth.async.enabled=false", "--spring.sleuth.annotation.enabled=false"); state.run(); } @Benchmark public void withoutScheduled(ApplicationState state) throws Exception { state.setExtraArgs("--spring.sleuth.scheduled.enabled=false", "--spring.sleuth.async.enabled=false", - "--spring.sleuth.annotation.enabled=false", state.tracerImplementation.property()); + "--spring.sleuth.annotation.enabled=false"); state.run(); } @Benchmark public void withoutWeb(ApplicationState state) throws Exception { state.setExtraArgs("--spring.sleuth.web.enabled=false", "--spring.sleuth.scheduled.enabled=false", - "--spring.sleuth.async.enabled=false", "--spring.sleuth.annotation.enabled=false", - state.tracerImplementation.property()); + "--spring.sleuth.async.enabled=false", "--spring.sleuth.annotation.enabled=false"); state.run(); } diff --git a/benchmarks/src/test/java/org/springframework/cloud/sleuth/benchmarks/jmh/webflux/MicroBenchmarkHttpTests.java b/benchmarks/src/test/java/org/springframework/cloud/sleuth/benchmarks/jmh/webflux/MicroBenchmarkHttpTests.java index 9f985a9ba..89ed7c443 100644 --- a/benchmarks/src/test/java/org/springframework/cloud/sleuth/benchmarks/jmh/webflux/MicroBenchmarkHttpTests.java +++ b/benchmarks/src/test/java/org/springframework/cloud/sleuth/benchmarks/jmh/webflux/MicroBenchmarkHttpTests.java @@ -82,7 +82,7 @@ public class MicroBenchmarkHttpTests { } protected String[] runArgs() { - return new String[] { "--spring.jmx.enabled=false", tracerImplementation.property(), + return new String[] { "--spring.jmx.enabled=false", "--spring.application.name=defaultTraceContext" + instrumentation.name() + "_" + tracerImplementation.name(), "--" + instrumentation.key + "=" + instrumentation.value };