SpringCloud/spring-cloud-sleuth
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed benchmarks

Browse Source
This commit is contained in:
Marcin Grzejszczak
2021-12-14 13:19:53 +01:00
parent beabeffe76
commit 9a90127098
2 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
benchmarks/src/main/java/org/springframework/cloud/sleuth/benchmarks/app/stream/SleuthBenchmarkingStreamApplication.java
View File

@@ -134,7 +134,7 @@ public class SleuthBenchmarkingStreamApplication {
@Bean(name = "myFlux")
@ConditionalOnProperty(value = "spring.sleuth.function.type", havingValue = "DECORATE_ON_EACH",
matchIfMissing = true)
public Function<Flux<String>, Flux<String>> onEachFunction() {
public Function<Flux<Message<String>>, Flux<Message<String>>> onEachFunction() {
log.info("on each function");
return new SleuthFunction();
}
@@ -142,14 +142,14 @@ public class SleuthBenchmarkingStreamApplication {
@Bean(name = "myFlux")
@ConditionalOnProperty(value = "spring.sleuth.function.type", havingValue = "DECORATE_QUEUES",
matchIfMissing = true)
public Function<Flux<String>, Flux<String>> decorateQueuesFunction() {
public Function<Flux<Message<String>>, Flux<Message<String>>> decorateQueuesFunction() {
log.info("decorate queues function");
return new SleuthFunction();
}
@Bean(name = "myFlux")
@ConditionalOnProperty(value = "spring.sleuth.function.type", havingValue = "DECORATE_ON_LAST")
public Function<Flux<String>, Flux<String>> onLastFunction() {
public Function<Flux<Message<String>>, Flux<Message<String>>> onLastFunction() {
log.info("on last function");
return new SleuthFunction();
}
@@ -269,18 +269,18 @@ class SleuthNonReactiveFunction implements Function<String, String> {
}
class SleuthFunction implements Function<Flux<String>, Flux<String>> {
class SleuthFunction implements Function<Flux<Message<String>>, Flux<Message<String>>> {
private static final Logger log = LoggerFactory.getLogger(SleuthFunction.class);
static final Scheduler SCHEDULER = Schedulers.newParallel("sleuthFunction");
@Override
public Flux<String> apply(Flux<String> input) {
public Flux<Message<String>> apply(Flux<Message<String>> input) {
return input.doOnEach(signal -> log.info("Got a message"))
.flatMap(s -> Mono.delay(Duration.ofMillis(1), SCHEDULER).map(aLong -> {
log.info("Logging [{}] from flat map", s);
return s.toUpperCase();
return MessageBuilder.withPayload(s.getPayload().toUpperCase()).build();
}));
}

22
benchmarks/src/test/java/org/springframework/cloud/sleuth/benchmarks/jmh/stream/MicroBenchmarkStreamTests.java
View File

@@ -56,9 +56,9 @@ import org.springframework.messaging.support.MessageBuilder;
import static org.assertj.core.api.Assertions.assertThat;
@Measurement(iterations = 10, time = 1)
@Warmup(iterations = 10, time = 1)
@Fork(4)
@Measurement(iterations = 1, time = 1)
@Warmup(iterations = 1, time = 1)
@Fork(1)
@BenchmarkMode(Mode.SampleTime)
@OutputTimeUnit(TimeUnit.MILLISECONDS)
@Microbenchmark
@@ -156,14 +156,14 @@ public class MicroBenchmarkStreamTests {
public enum Instrumentation {
// @formatter:off
noSleuthSimple(Pair.noSleuth(), function("simple")),
sleuthSimpleOnQueues(function("simple"), Pair.onHook()),
sleuthSimpleManual(function("simple_manual"), Pair.manual(), functionDisabled(), integrationDisabled()),
sleuthSimpleNoFunctionInstrumentationManual(function("simple_manual"), Pair.manual(), functionDisabled(), integrationDisabled()),
sleuthSimpleOnEach(function("simple"), Pair.onEach()),
sleuthSimpleOnLast(function("simple"), Pair.onLast()),
sleuthSimpleWithAroundOnQueues(function("simple_function_with_around")),
noSleuthReactiveSimple(function("reactive_simple"), Pair.noSleuth()),
// noSleuthSimple(Pair.noSleuth(), function("simple")),
// sleuthSimpleOnQueues(function("simple"), Pair.onHook()),
// sleuthSimpleManual(function("simple_manual"), Pair.manual(), functionDisabled(), integrationDisabled()),
// sleuthSimpleNoFunctionInstrumentationManual(function("simple_manual"), Pair.manual(), functionDisabled(), integrationDisabled()),
// sleuthSimpleOnEach(function("simple"), Pair.onEach()),
// sleuthSimpleOnLast(function("simple"), Pair.onLast()),
// sleuthSimpleWithAroundOnQueues(function("simple_function_with_around")),
// noSleuthReactiveSimple(function("reactive_simple"), Pair.noSleuth()),
sleuthReactiveSimpleOnQueues(function("DECORATE_QUEUES"), Pair.decorateQueues()),
sleuthReactiveSimpleOnEach(function("DECORATE_ON_EACH"), Pair.onEach()),
sleuthReactiveSimpleManual(function("reactive_simple_manual"), Pair.manual()),