Instrumentation for rxjava3.1.1 (#4954)

* Instrumentation for rxjava3.1.1 * Move common test classes * spotless * move rxjava 3.1.1 classes to separate package
open-telemetry · Jan 4, 2022 · 97f1104 · 97f1104
1 parent 26d2634
commit 97f1104
Show file tree

Hide file tree

Showing 35 changed files with 1,946 additions and 1,048 deletions.
diff --git a/instrumentation/rxjava/rxjava-3-common/library/build.gradle.kts b/instrumentation/rxjava/rxjava-3-common/library/build.gradle.kts
@@ -0,0 +1,8 @@
+plugins {
+  id("otel.library-instrumentation")
+}
+
+dependencies {
+  library("io.reactivex.rxjava3:rxjava:3.0.12")
+  implementation(project(":instrumentation-api-annotation-support"))
+}
diff --git a/...va3/RxJava3AsyncOperationEndStrategy.java → ...va3/RxJava3AsyncOperationEndStrategy.java b/...va3/RxJava3AsyncOperationEndStrategy.java → ...va3/RxJava3AsyncOperationEndStrategy.java
diff --git a/...ava3AsyncOperationEndStrategyBuilder.java → ...ava3AsyncOperationEndStrategyBuilder.java b/...ava3AsyncOperationEndStrategyBuilder.java → ...ava3AsyncOperationEndStrategyBuilder.java
diff --git a/...n/rxjava3/TracingCompletableObserver.java → ...n/rxjava3/TracingCompletableObserver.java b/...n/rxjava3/TracingCompletableObserver.java → ...n/rxjava3/TracingCompletableObserver.java
@@ -28,13 +28,13 @@
 import io.reactivex.rxjava3.disposables.Disposable;
 import io.reactivex.rxjava3.internal.disposables.DisposableHelper;
 
-class TracingCompletableObserver implements CompletableObserver, Disposable {
+public class TracingCompletableObserver implements CompletableObserver, Disposable {
 
   private final CompletableObserver actual;
   private final Context context;
   private Disposable disposable;
 
-  TracingCompletableObserver(CompletableObserver actual, Context context) {
+  public TracingCompletableObserver(CompletableObserver actual, Context context) {
     this.actual = actual;
     this.context = context;
   }

diff --git a/...ntation/rxjava3/TracingMaybeObserver.java → ...ntation/rxjava3/TracingMaybeObserver.java b/...ntation/rxjava3/TracingMaybeObserver.java → ...ntation/rxjava3/TracingMaybeObserver.java
@@ -28,13 +28,13 @@
 import io.reactivex.rxjava3.disposables.Disposable;
 import io.reactivex.rxjava3.internal.disposables.DisposableHelper;
 
-class TracingMaybeObserver<T> implements MaybeObserver<T>, Disposable {
+public class TracingMaybeObserver<T> implements MaybeObserver<T>, Disposable {
 
   private final MaybeObserver<T> actual;
   private final Context context;
   private Disposable disposable;
 
-  TracingMaybeObserver(MaybeObserver<T> actual, Context context) {
+  public TracingMaybeObserver(MaybeObserver<T> actual, Context context) {
     this.actual = actual;
     this.context = context;
   }

diff --git a/...tation/rxjava3/TracingSingleObserver.java → ...tation/rxjava3/TracingSingleObserver.java b/...tation/rxjava3/TracingSingleObserver.java → ...tation/rxjava3/TracingSingleObserver.java
@@ -28,13 +28,13 @@
 import io.reactivex.rxjava3.disposables.Disposable;
 import io.reactivex.rxjava3.internal.disposables.DisposableHelper;
 
-class TracingSingleObserver<T> implements SingleObserver<T>, Disposable {
+public class TracingSingleObserver<T> implements SingleObserver<T>, Disposable {
 
   private final SingleObserver<T> actual;
   private final Context context;
   private Disposable disposable;
 
-  TracingSingleObserver(SingleObserver<T> actual, Context context) {
+  public TracingSingleObserver(SingleObserver<T> actual, Context context) {
     this.actual = actual;
     this.context = context;
   }

diff --git a/...Java3AsyncOperationEndStrategyTest.groovy → ...Java3AsyncOperationEndStrategyTest.groovy b/...Java3AsyncOperationEndStrategyTest.groovy → ...Java3AsyncOperationEndStrategyTest.groovy
diff --git a/...xjava/rxjava-3.0/testing/build.gradle.kts → .../rxjava-3-common/testing/build.gradle.kts b/...xjava/rxjava-3.0/testing/build.gradle.kts → .../rxjava-3-common/testing/build.gradle.kts
@@ -7,8 +7,8 @@ dependencies {
 
   api("io.reactivex.rxjava3:rxjava:3.0.12")
 
+  implementation("io.opentelemetry:opentelemetry-extension-annotations")
   implementation("com.google.guava:guava")
-
   implementation("org.codehaus.groovy:groovy-all")
   implementation("io.opentelemetry:opentelemetry-api")
   implementation("org.spockframework:spock-core")

diff --git a/...a3/AbstractRxJava3SubscriptionTest.groovy → ...a3/AbstractRxJava3SubscriptionTest.groovy b/...a3/AbstractRxJava3SubscriptionTest.groovy → ...a3/AbstractRxJava3SubscriptionTest.groovy
diff --git a/...tation/rxjava3/AbstractRxJava3Test.groovy → ...tation/rxjava3/AbstractRxJava3Test.groovy b/...tation/rxjava3/AbstractRxJava3Test.groovy → ...tation/rxjava3/AbstractRxJava3Test.groovy