Skip to content

Commit e292db6

Browse files
Revert "Add RxJava 3 instrumentation (#11506)" (#11761)
Revert "Add RxJava 3 instrumentation (#11506)" This reverts commit 35096e2. Co-authored-by: bruce.bujon <bruce.bujon@datadoghq.com>
1 parent ffb48ae commit e292db6

22 files changed

Lines changed: 0 additions & 2125 deletions

File tree

dd-java-agent/instrumentation/graal/graal-native-image-20.0/src/main/java/datadog/trace/instrumentation/graal/nativeimage/NativeImageGeneratorRunnerInstrumentation.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,6 @@ public static void onEnter(@Advice.Argument(value = 0, readOnly = false) String[
157157
+ "datadog.trace.instrumentation.reactivestreams.ReactiveStreamsAsyncResultExtension:build_time,"
158158
+ "datadog.trace.instrumentation.reactor.core.ReactorAsyncResultExtension:build_time,"
159159
+ "datadog.trace.instrumentation.rxjava2.RxJavaAsyncResultExtension:build_time,"
160-
+ "datadog.trace.instrumentation.rxjava3.RxJavaAsyncResultExtension:build_time,"
161160
+ "datadog.trace.logging.ddlogger.DDLogger:build_time,"
162161
+ "datadog.trace.logging.ddlogger.DDLoggerFactory:build_time,"
163162
+ "datadog.trace.logging.ddlogger.DDLoggerFactory$HelperWrapper:build_time,"

dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/main/java/datadog/trace/instrumentation/java/concurrent/AsyncPropagatingDisableInstrumentation.java

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -47,17 +47,6 @@ public AsyncPropagatingDisableInstrumentation() {
4747
namedOneOf("reactor.core.scheduler.SchedulerTask", "reactor.core.scheduler.WorkerTask");
4848
private static final ElementMatcher<TypeDescription> RXJAVA2_DISABLED_TYPE_INITIALIZERS =
4949
named("io.reactivex.internal.schedulers.AbstractDirectTask");
50-
51-
/**
52-
* RxJava 3's AbstractDirectTask creates FINISHED/DISPOSED sentinel FutureTask instances in its
53-
* static initializer. If that initializer runs while a trace is active (e.g. the first scheduled
54-
* delay/timeout under a span), the executor instrumentation captures a continuation on those
55-
* static singletons that is never cancelled, leaking the pending trace. Disable async propagation
56-
* while the type initializer runs.
57-
*/
58-
private static final ElementMatcher<TypeDescription> RXJAVA3_DISABLED_TYPE_INITIALIZERS =
59-
named("io.reactivex.rxjava3.internal.schedulers.AbstractDirectTask");
60-
6150
private static final ElementMatcher<TypeDescription> NETTY_GLOBAL_EVENT_EXECUTOR =
6251
namedOneOf(
6352
"io.netty.util.concurrent.GlobalEventExecutor",
@@ -101,7 +90,6 @@ public String[] knownMatchingTypes() {
10190
"org.apache.activemq.broker.TransactionBroker",
10291
"com.mongodb.internal.connection.DefaultConnectionPool$AsyncWorkManager",
10392
"io.reactivex.internal.schedulers.AbstractDirectTask",
104-
"io.reactivex.rxjava3.internal.schedulers.AbstractDirectTask",
10593
"jdk.internal.net.http.HttpClientImpl",
10694
LETTUCE_HANDSHAKE_HANDLER,
10795
"io.netty.util.concurrent.GlobalEventExecutor",
@@ -122,7 +110,6 @@ public ElementMatcher<TypeDescription> hierarchyMatcher() {
122110
.or(GRPC_MANAGED_CHANNEL)
123111
.or(REACTOR_DISABLED_TYPE_INITIALIZERS)
124112
.or(RXJAVA2_DISABLED_TYPE_INITIALIZERS)
125-
.or(RXJAVA3_DISABLED_TYPE_INITIALIZERS)
126113
.or(JAVA_HTTP_CLIENT);
127114
}
128115

@@ -209,8 +196,6 @@ public void methodAdvice(MethodTransformer transformer) {
209196
isTypeInitializer().and(isDeclaredBy(REACTOR_DISABLED_TYPE_INITIALIZERS)), advice);
210197
transformer.applyAdvice(
211198
isTypeInitializer().and(isDeclaredBy(RXJAVA2_DISABLED_TYPE_INITIALIZERS)), advice);
212-
transformer.applyAdvice(
213-
isTypeInitializer().and(isDeclaredBy(RXJAVA3_DISABLED_TYPE_INITIALIZERS)), advice);
214199
transformer.applyAdvice(
215200
isTypeInitializer().and(isDeclaredBy(NETTY_GLOBAL_EVENT_EXECUTOR)), advice);
216201
transformer.applyAdvice(namedOneOf("sendAsync").and(isDeclaredBy(JAVA_HTTP_CLIENT)), advice);

dd-java-agent/instrumentation/rxjava/rxjava-3.0/build.gradle

Lines changed: 0 additions & 36 deletions
This file was deleted.

dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/main/java/datadog/trace/instrumentation/rxjava3/CompletableInstrumentation.java

Lines changed: 0 additions & 73 deletions
This file was deleted.

dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/main/java/datadog/trace/instrumentation/rxjava3/FlowableInstrumentation.java

Lines changed: 0 additions & 72 deletions
This file was deleted.

dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/main/java/datadog/trace/instrumentation/rxjava3/MaybeInstrumentation.java

Lines changed: 0 additions & 70 deletions
This file was deleted.

dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/main/java/datadog/trace/instrumentation/rxjava3/ObservableInstrumentation.java

Lines changed: 0 additions & 71 deletions
This file was deleted.

0 commit comments

Comments
 (0)