From b3710e5c2da788aad362b52ae6c582e01d77aabe Mon Sep 17 00:00:00 2001 From: Marcin Grzejszczak Date: Fri, 13 Jul 2018 11:39:07 -0400 Subject: [PATCH] Fixing benchmarks? --- .../benchmarks/app/SleuthBenchmarkingSpringApp.java | 10 ++++++++++ .../jmh/benchmarks/RestTemplateBenchmark.java | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/benchmarks/src/main/java/org/springframework/cloud/sleuth/benchmarks/app/SleuthBenchmarkingSpringApp.java b/benchmarks/src/main/java/org/springframework/cloud/sleuth/benchmarks/app/SleuthBenchmarkingSpringApp.java index 713aef37c..b66cf1505 100644 --- a/benchmarks/src/main/java/org/springframework/cloud/sleuth/benchmarks/app/SleuthBenchmarkingSpringApp.java +++ b/benchmarks/src/main/java/org/springframework/cloud/sleuth/benchmarks/app/SleuthBenchmarkingSpringApp.java @@ -21,6 +21,7 @@ import java.util.concurrent.ExecutionException; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.concurrent.Future; +import java.util.regex.Pattern; import javax.annotation.PreDestroy; import brave.Span; @@ -38,6 +39,7 @@ import org.springframework.boot.web.servlet.server.ServletWebServerFactory; import org.springframework.cloud.sleuth.annotation.ContinueSpan; import org.springframework.cloud.sleuth.annotation.NewSpan; import org.springframework.cloud.sleuth.annotation.SpanTag; +import org.springframework.cloud.sleuth.instrument.web.SkipPatternProvider; import org.springframework.context.ApplicationListener; import org.springframework.context.annotation.Bean; import org.springframework.scheduling.annotation.Async; @@ -120,6 +122,14 @@ public class SleuthBenchmarkingSpringApp implements return new AClass(this.tracer, anotherClass()); } + @Bean SkipPatternProvider patternProvider() { + return new SkipPatternProvider() { + @Override public Pattern skipPattern() { + return null; + } + }; + } + public ExecutorService getPool() { return this.pool; } diff --git a/benchmarks/src/main/java/org/springframework/cloud/sleuth/benchmarks/jmh/benchmarks/RestTemplateBenchmark.java b/benchmarks/src/main/java/org/springframework/cloud/sleuth/benchmarks/jmh/benchmarks/RestTemplateBenchmark.java index 2ddd494ff..a9ceb6e41 100644 --- a/benchmarks/src/main/java/org/springframework/cloud/sleuth/benchmarks/jmh/benchmarks/RestTemplateBenchmark.java +++ b/benchmarks/src/main/java/org/springframework/cloud/sleuth/benchmarks/jmh/benchmarks/RestTemplateBenchmark.java @@ -63,7 +63,7 @@ public class RestTemplateBenchmark { volatile RestTemplate untracedTemplate; @Setup public void setup() { - this.withSleuth = new SpringApplication( + new SpringApplication( SleuthBenchmarkingSpringApp.class) .run("--spring.jmx.enabled=false", "--spring.application.name=withSleuth");