Skip to content

Commit b7d0890

Browse files
committed
undo
1 parent 76e6387 commit b7d0890

File tree

2 files changed

+60
-99
lines changed

2 files changed

+60
-99
lines changed

instrumentation/rxjava/rxjava-2.0/library/src/main/java/io/opentelemetry/instrumentation/rxjava/v2_0/TracingAssembly.java

Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -62,11 +62,6 @@ public final class TracingAssembly {
6262
private static BiFunction<? super Observable, ? super Observer, ? extends Observer>
6363
oldOnObservableSubscribe;
6464

65-
@SuppressWarnings("rawtypes")
66-
@GuardedBy("TracingAssembly.class")
67-
@Nullable
68-
static volatile Function<? super Observable, ? extends Observable> oldOnObservableAssembly;
69-
7065
@SuppressWarnings("rawtypes")
7166
@GuardedBy("TracingAssembly.class")
7267
@Nullable
@@ -123,8 +118,6 @@ public void enable() {
123118

124119
enableObservable();
125120

126-
enableObservableAssembly();
127-
128121
enableCompletable();
129122

130123
enableSingle();
@@ -149,8 +142,6 @@ public void disable() {
149142

150143
disableObservable();
151144

152-
disableObservableAssembly();
153-
154145
disableCompletable();
155146

156147
disableSingle();
@@ -228,18 +219,6 @@ private static void enableObservable() {
228219
}
229220
}
230221

231-
@GuardedBy("TracingAssembly.class")
232-
@SuppressWarnings({"rawtypes", "unchecked"})
233-
private static void enableObservableAssembly() {
234-
if (TracingObserver.canEnable()) {
235-
oldOnObservableAssembly = RxJavaPlugins.getOnObservableAssembly();
236-
RxJavaPlugins.setOnObservableAssembly(
237-
compose(
238-
oldOnObservableAssembly,
239-
observable -> new TracingObservable(observable, Context.current())));
240-
}
241-
}
242-
243222
@GuardedBy("TracingAssembly.class")
244223
@SuppressWarnings({"rawtypes", "unchecked"})
245224
private static void enableSingle() {
@@ -295,12 +274,6 @@ private static void disableObservable() {
295274
oldOnObservableSubscribe = null;
296275
}
297276

298-
@GuardedBy("TracingAssembly.class")
299-
private static void disableObservableAssembly() {
300-
RxJavaPlugins.setOnObservableAssembly(oldOnObservableAssembly);
301-
oldOnObservableAssembly = null;
302-
}
303-
304277
@GuardedBy("TracingAssembly.class")
305278
private static void disableCompletable() {
306279
RxJavaPlugins.setOnCompletableSubscribe(oldOnCompletableSubscribe);

0 commit comments

Comments
 (0)