Skip to content

Commit fcbb916

Browse files
committed
Remove redundant null checks in rxjava2 instrumentation (current Context is never null)
1 parent 78dc511 commit fcbb916

5 files changed

Lines changed: 7 additions & 7 deletions

File tree

dd-java-agent/instrumentation/rxjava/rxjava-2.0/src/main/java/datadog/trace/instrumentation/rxjava2/CompletableInstrumentation.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ public static class CaptureParentSpanAdvice {
3939
@Advice.OnMethodExit(suppress = Throwable.class)
4040
public static void onConstruct(@Advice.This final Completable completable) {
4141
Context parentContext = currentContext();
42-
if (parentContext != null && parentContext != rootContext()) {
42+
if (parentContext != rootContext()) {
4343
InstrumentationContext.get(Completable.class, Context.class)
4444
.put(completable, parentContext);
4545
}

dd-java-agent/instrumentation/rxjava/rxjava-2.0/src/main/java/datadog/trace/instrumentation/rxjava2/FlowableInstrumentation.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ public static class CaptureParentSpanAdvice {
3939
@Advice.OnMethodExit(suppress = Throwable.class)
4040
public static void onConstruct(@Advice.This final Flowable<?> flowable) {
4141
Context parentContext = currentContext();
42-
if (parentContext != null && parentContext != rootContext()) {
42+
if (parentContext != rootContext()) {
4343
InstrumentationContext.get(Flowable.class, Context.class).put(flowable, parentContext);
4444
}
4545
}

dd-java-agent/instrumentation/rxjava/rxjava-2.0/src/main/java/datadog/trace/instrumentation/rxjava2/MaybeInstrumentation.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ public static class CaptureParentSpanAdvice {
3838
@Advice.OnMethodExit(suppress = Throwable.class)
3939
public static void onConstruct(@Advice.This final Maybe<?> maybe) {
4040
Context parentContext = currentContext();
41-
if (parentContext != null && parentContext != rootContext()) {
41+
if (parentContext != rootContext()) {
4242
InstrumentationContext.get(Maybe.class, Context.class).put(maybe, parentContext);
4343
}
4444
}

dd-java-agent/instrumentation/rxjava/rxjava-2.0/src/main/java/datadog/trace/instrumentation/rxjava2/ObservableInstrumentation.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ public static class CaptureParentSpanAdvice {
3838
@Advice.OnMethodExit(suppress = Throwable.class)
3939
public static void onConstruct(@Advice.This final Observable<?> observable) {
4040
Context parentContext = currentContext();
41-
if (parentContext != null) {
41+
if (parentContext != rootContext()) {
4242
InstrumentationContext.get(Observable.class, Context.class).put(observable, parentContext);
4343
}
4444
}
@@ -52,7 +52,7 @@ public static ContextScope onSubscribe(
5252
if (observer != null) {
5353
Context parentContext =
5454
InstrumentationContext.get(Observable.class, Context.class).get(observable);
55-
if (parentContext != null && parentContext != rootContext()) {
55+
if (parentContext != null) {
5656
// wrap the observer so spans from its events treat the captured span as their parent
5757
observer = new TracingObserver<>(observer, parentContext);
5858
// attach the context here in case additional observers are created during subscribe

dd-java-agent/instrumentation/rxjava/rxjava-2.0/src/main/java/datadog/trace/instrumentation/rxjava2/SingleInstrumentation.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ public static class CaptureParentSpanAdvice {
3939
@Advice.OnMethodExit(suppress = Throwable.class)
4040
public static void onConstruct(@Advice.This final Single<?> single) {
4141
Context parentContext = currentContext();
42-
if (parentContext != null) {
42+
if (parentContext != rootContext()) {
4343
InstrumentationContext.get(Single.class, Context.class).put(single, parentContext);
4444
}
4545
}
@@ -52,7 +52,7 @@ public static ContextScope onSubscribe(
5252
@Advice.Argument(value = 0, readOnly = false) SingleObserver<?> observer) {
5353
if (observer != null) {
5454
Context parentContext = InstrumentationContext.get(Single.class, Context.class).get(single);
55-
if (parentContext != null && parentContext != rootContext()) {
55+
if (parentContext != null) {
5656
// wrap the observer so spans from its events treat the captured span as their parent
5757
observer = new TracingSingleObserver<>(observer, parentContext);
5858
// attach the context here in case additional observers are created during subscribe

0 commit comments

Comments
 (0)