From 4fb3edcb1d8edc04a567263c83d26dd17f2fa7df Mon Sep 17 00:00:00 2001 From: Marcin Grzejszczak Date: Wed, 22 Jul 2020 12:42:35 +0200 Subject: [PATCH] Adding more logs, fixing rest template based benchmark --- .../app/stream/SleuthBenchmarkingStreamApplication.java | 2 -- benchmarks/src/main/resources/application.yml | 1 + .../sleuth/benchmarks/jmh/mvc/RestTemplateBenchmarkTests.java | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/benchmarks/src/main/java/org/springframework/cloud/sleuth/benchmarks/app/stream/SleuthBenchmarkingStreamApplication.java b/benchmarks/src/main/java/org/springframework/cloud/sleuth/benchmarks/app/stream/SleuthBenchmarkingStreamApplication.java index 163146f52..a304afcbd 100644 --- a/benchmarks/src/main/java/org/springframework/cloud/sleuth/benchmarks/app/stream/SleuthBenchmarkingStreamApplication.java +++ b/benchmarks/src/main/java/org/springframework/cloud/sleuth/benchmarks/app/stream/SleuthBenchmarkingStreamApplication.java @@ -63,8 +63,6 @@ public class SleuthBenchmarkingStreamApplication { System.setProperty("spring.sleuth.reactor.instrumentation-type", "MANUAL"); System.setProperty("spring.sleuth.function.type", "simple"); ConfigurableApplicationContext context = SpringApplication.run(SleuthBenchmarkingStreamApplication.class, args); - System.out.println("PRess any key to continue"); - System.in.read(); for (int i = 0; i < 1; i++) { InputDestination input = context.getBean(InputDestination.class); input.send(MessageBuilder.withPayload("hello".getBytes()) diff --git a/benchmarks/src/main/resources/application.yml b/benchmarks/src/main/resources/application.yml index 8eb7c1da3..8ffac9305 100644 --- a/benchmarks/src/main/resources/application.yml +++ b/benchmarks/src/main/resources/application.yml @@ -1,4 +1,5 @@ logging.level: org.springframework: ERROR org.springframework.sleuth: ERROR + org.springframework.sleuth.benchmarks: INFO brave: ERROR diff --git a/benchmarks/src/test/java/org/springframework/cloud/sleuth/benchmarks/jmh/mvc/RestTemplateBenchmarkTests.java b/benchmarks/src/test/java/org/springframework/cloud/sleuth/benchmarks/jmh/mvc/RestTemplateBenchmarkTests.java index e3411cf2f..8d091c6b8 100644 --- a/benchmarks/src/test/java/org/springframework/cloud/sleuth/benchmarks/jmh/mvc/RestTemplateBenchmarkTests.java +++ b/benchmarks/src/test/java/org/springframework/cloud/sleuth/benchmarks/jmh/mvc/RestTemplateBenchmarkTests.java @@ -86,7 +86,7 @@ public class RestTemplateBenchmarkTests { @Setup public void setup() { - new SpringApplication(SleuthBenchmarkingSpringApp.class).run("--spring.jmx.enabled=false", + this.withSleuth = new SpringApplication(SleuthBenchmarkingSpringApp.class).run("--spring.jmx.enabled=false", "--spring.application.name=withSleuth"); this.mockMvc = MockMvcBuilders.standaloneSetup(this.withSleuth.getBean(SleuthBenchmarkingSpringApp.class)) .build();