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

Bumping versions

Browse Source
This commit is contained in:
buildmaster
2020-09-17 05:29:17 +00:00
parent ff44daa2bd
commit 05461159eb
276 changed files with 2590 additions and 4452 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
tests/spring-cloud-sleuth-instrumentation-rxjava-tests/src/test/java/org/springframework/cloud/sleuth/instrument/rxjava/SleuthRxJavaSchedulersHookTests.java
View File

@@ -54,8 +54,8 @@ public class SleuthRxJavaSchedulersHookTests {
TestSpanHandler spans = new TestSpanHandler();
Tracing tracing = Tracing.newBuilder().currentTraceContext(this.currentTraceContext)
.addSpanHandler(this.spans).build();
Tracing tracing = Tracing.newBuilder().currentTraceContext(this.currentTraceContext).addSpanHandler(this.spans)
.build();
Tracer tracer = this.tracing.tracer();
@@ -76,13 +76,11 @@ public class SleuthRxJavaSchedulersHookTests {
@Test
public void should_not_override_existing_custom_hooks() {
RxJavaPlugins.getInstance().registerErrorHandler(new MyRxJavaErrorHandler());
RxJavaPlugins.getInstance()
.registerObservableExecutionHook(new MyRxJavaObservableExecutionHook());
RxJavaPlugins.getInstance().registerObservableExecutionHook(new MyRxJavaObservableExecutionHook());
new SleuthRxJavaSchedulersHook(this.tracer, this.threadsToIgnore);
then(RxJavaPlugins.getInstance().getErrorHandler())
.isExactlyInstanceOf(MyRxJavaErrorHandler.class);
then(RxJavaPlugins.getInstance().getErrorHandler()).isExactlyInstanceOf(MyRxJavaErrorHandler.class);
then(RxJavaPlugins.getInstance().getObservableExecutionHook())
.isExactlyInstanceOf(MyRxJavaObservableExecutionHook.class);
}
@@ -90,8 +88,7 @@ public class SleuthRxJavaSchedulersHookTests {
@Test
public void should_wrap_delegates_action_in_wrapped_action_when_delegate_is_present_on_schedule() {
RxJavaPlugins.getInstance().registerSchedulersHook(new MyRxJavaSchedulersHook());
SleuthRxJavaSchedulersHook schedulersHook = new SleuthRxJavaSchedulersHook(
this.tracer, this.threadsToIgnore);
SleuthRxJavaSchedulersHook schedulersHook = new SleuthRxJavaSchedulersHook(this.tracer, this.threadsToIgnore);
Action0 action = schedulersHook.onSchedule(() -> {
caller = new StringBuilder("hello");
});
@@ -109,8 +106,8 @@ public class SleuthRxJavaSchedulersHookTests {
throws ExecutionException, InterruptedException {
String threadNameToIgnore = "^MyCustomThread.*$";
RxJavaPlugins.getInstance().registerSchedulersHook(new MyRxJavaSchedulersHook());
SleuthRxJavaSchedulersHook schedulersHook = new SleuthRxJavaSchedulersHook(
this.tracer, Collections.singletonList(threadNameToIgnore));
SleuthRxJavaSchedulersHook schedulersHook = new SleuthRxJavaSchedulersHook(this.tracer,
Collections.singletonList(threadNameToIgnore));
Future<Void> hello = executorService().submit((Callable<Void>) () -> {
Action0 action = schedulersHook.onSchedule(() -> {
caller = new StringBuilder("hello");

13
tests/spring-cloud-sleuth-instrumentation-rxjava-tests/src/test/java/org/springframework/cloud/sleuth/instrument/rxjava/SleuthRxJavaTests.java
View File

@@ -66,11 +66,8 @@ public class SleuthRxJavaTests {
@Test
public void should_create_new_span_when_rx_java_action_is_executed_and_there_was_no_span() {
Observable
.defer(() -> Observable.just(
(Action0) () -> this.caller = new StringBuffer("actual_action")))
.subscribeOn(Schedulers.newThread()).toBlocking()
.subscribe(Action0::call);
Observable.defer(() -> Observable.just((Action0) () -> this.caller = new StringBuffer("actual_action")))
.subscribeOn(Schedulers.newThread()).toBlocking().subscribe(Action0::call);
then(this.caller.toString()).isEqualTo("actual_action");
then(this.tracer.currentSpan()).isNull();
@@ -84,10 +81,8 @@ public class SleuthRxJavaTests {
Span spanInCurrentThread = this.tracer.nextSpan().name("current_span");
try (Tracer.SpanInScope ws = this.tracer.withSpanInScope(spanInCurrentThread)) {
Observable.defer(() -> Observable.just(
(Action0) () -> this.caller = new StringBuffer("actual_action")))
.subscribeOn(Schedulers.newThread()).toBlocking()
.subscribe(Action0::call);
Observable.defer(() -> Observable.just((Action0) () -> this.caller = new StringBuffer("actual_action")))
.subscribeOn(Schedulers.newThread()).toBlocking().subscribe(Action0::call);
}
finally {
spanInCurrentThread.finish();