format code style

open-telemetry · Mar 5, 2023 · c8edf4d · c8edf4d
1 parent 5fec045
commit c8edf4d
Show file tree

Hide file tree

Showing 16 changed files with 124 additions and 30 deletions.
diff --git a/...va/io/opentelemetry/instrumentation/rxjava/v3/common/AbstractRxJava3SubscriptionTest.java b/...va/io/opentelemetry/instrumentation/rxjava/v3/common/AbstractRxJava3SubscriptionTest.java
@@ -1,3 +1,8 @@
+/*
+ * Copyright The OpenTelemetry Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
 package io.opentelemetry.instrumentation.rxjava.v3.common;
 
 import io.opentelemetry.api.GlobalOpenTelemetry;
@@ -6,9 +11,9 @@
 import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension;
 import io.reactivex.rxjava3.core.Single;
 import io.reactivex.rxjava3.disposables.Disposable;
-import org.junit.jupiter.api.Test;
 import java.util.Random;
 import java.util.concurrent.CountDownLatch;
+import org.junit.jupiter.api.Test;
 
 public abstract class AbstractRxJava3SubscriptionTest {
 

diff --git a/.../src/main/java/io/opentelemetry/instrumentation/rxjava/v3/common/AbstractRxJava3Test.java b/.../src/main/java/io/opentelemetry/instrumentation/rxjava/v3/common/AbstractRxJava3Test.java
@@ -1,15 +1,19 @@
+/*
+ * Copyright The OpenTelemetry Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
 package io.opentelemetry.instrumentation.rxjava.v3.common;
 
+import static io.opentelemetry.sdk.testing.assertj.LogAssertions.assertThat;
+import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.attributeEntry;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+
 import com.google.common.primitives.Ints;
 import io.opentelemetry.api.common.AttributeKey;
 import io.opentelemetry.api.trace.SpanKind;
 import io.opentelemetry.instrumentation.testing.InstrumentationTestRunner;
 import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension;
-
-import static io.opentelemetry.sdk.testing.assertj.LogAssertions.assertThat;
-import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.attributeEntry;
-import static org.assertj.core.api.Assertions.assertThatThrownBy;
-
 import io.opentelemetry.instrumentation.testing.util.ThrowingRunnable;
 import io.opentelemetry.instrumentation.testing.util.ThrowingSupplier;
 import io.opentelemetry.sdk.testing.assertj.TraceAssert;
@@ -21,19 +25,20 @@
 import io.reactivex.rxjava3.core.Scheduler;
 import io.reactivex.rxjava3.core.Single;
 import io.reactivex.rxjava3.internal.operators.flowable.FlowablePublish;
+import io.reactivex.rxjava3.internal.operators.observable.ObservablePublish;
 import io.reactivex.rxjava3.schedulers.Schedulers;
+import java.util.Comparator;
+import java.util.List;
+import java.util.concurrent.TimeUnit;
+import java.util.function.Consumer;
+import java.util.stream.Stream;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestInstance;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 import org.reactivestreams.Subscriber;
 import org.reactivestreams.Subscription;
-import java.util.Comparator;
-import java.util.List;
-import java.util.concurrent.TimeUnit;
-import java.util.function.Consumer;
-import java.util.stream.Stream;
 
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public abstract class AbstractRxJava3Test {
@@ -191,7 +196,7 @@ public void basicFlowable() {
   }
 
   @Test
-  public void towOperationsFlowable() {
+  public void twoOperationsFlowable() {
     List<Integer> result =
         createParentSpan(
             () ->
@@ -287,7 +292,7 @@ public void delayedTwiceFlowable() {
   }
 
   @Test
-  public void MaybeFromCallable() {
+  public void maybeFromCallable() {
     Integer result =
         createParentSpan(
             () -> Maybe.fromCallable(() -> addOne(10)).map(this::addOne).blockingGet());
@@ -360,6 +365,28 @@ public void connectableFlowable() {
                             .hasParent(trace.getSpan(0))));
   }
 
+  @Test
+  public void connectableObservable() {
+    List<Integer> result =
+        createParentSpan(
+            () ->
+                ObservablePublish.just(0)
+                    .delay(100, TimeUnit.MILLISECONDS)
+                    .map(this::addOne)
+                    .toList()
+                    .blockingGet());
+    assertThat(result).contains(1);
+    testing()
+        .waitAndAssertTraces(
+            trace ->
+                trace.hasSpansSatisfyingExactly(
+                    span -> span.hasName(PARENT).hasKind(SpanKind.INTERNAL).hasNoParent(),
+                    span ->
+                        span.hasName(ADD_ONE)
+                            .hasKind(SpanKind.INTERNAL)
+                            .hasParent(trace.getSpan(0))));
+  }
+
   @Test
   public void maybeError() {
     IllegalStateException error = new IllegalStateException(EXCEPTION_MESSAGE);
@@ -397,7 +424,7 @@ public void singleError() {
   }
 
   @Test
-  public void ObservableError() {
+  public void observableError() {
     IllegalStateException error = new IllegalStateException(EXCEPTION_MESSAGE);
     assertThatThrownBy(() -> createParentSpan(() -> Observable.error(error).toList().blockingGet()))
         .isEqualTo(error);
@@ -509,7 +536,7 @@ public void basicSingleCancel() {
   }
 
   @Test
-  public void basicCompletable() {
+  public void basicCompletableCancel() {
     createParentSpan(
         () ->
             Completable.fromCallable(() -> 1)
@@ -523,7 +550,7 @@ public void basicCompletable() {
   }
 
   @Test
-  public void observableCancel() {
+  public void basicObservableCancel() {
     createParentSpan(
         () ->
             Observable.just(1)
@@ -566,7 +593,7 @@ public void basicMaybeChain() {
   }
 
   @Test
-  public void basicFLowableChain() {
+  public void basicFlowableChain() {
     createParentSpan(
         () ->
             Flowable.fromIterable(Ints.asList(5, 6))
@@ -604,7 +631,7 @@ public void basicFLowableChain() {
 
   // Publisher chain spans have the correct parents from subscription time
   @Test
-  public void maybeParentSpan() {
+  public void maybeChainParentSpan() {
     testing()
         .runWithSpan(
             "trace-parent", () -> Maybe.just(42).map(this::addOne).map(this::addTwo).blockingGet());
@@ -724,7 +751,7 @@ public void singleChainHasAssemblyContext() {
   }
 
   @Test
-  public void observalbeChainHasAssemblyContext() {
+  public void observableChainHasAssemblyContext() {
     List<Integer> result =
         createParentSpan(
             () -> {

diff --git a/...n/java/io/opentelemetry/instrumentation/rxjava/v3/common/AbstractRxJava3WithSpanTest.java b/...n/java/io/opentelemetry/instrumentation/rxjava/v3/common/AbstractRxJava3WithSpanTest.java
@@ -1,10 +1,20 @@
+/*
+ * Copyright The OpenTelemetry Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
 package io.opentelemetry.instrumentation.rxjava.v3.common;
 
+import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.equalTo;
+import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.satisfies;
+import static io.opentelemetry.semconv.trace.attributes.SemanticAttributes.CODE_FUNCTION;
+import static io.opentelemetry.semconv.trace.attributes.SemanticAttributes.CODE_NAMESPACE;
+import static org.assertj.core.api.Assertions.assertThat;
+
 import io.opentelemetry.api.common.AttributeKey;
 import io.opentelemetry.api.trace.SpanKind;
 import io.opentelemetry.instrumentation.testing.InstrumentationTestRunner;
 import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension;
-
 import io.opentelemetry.sdk.trace.data.SpanData;
 import io.opentelemetry.sdk.trace.data.StatusData;
 import io.reactivex.rxjava3.core.Completable;
@@ -19,19 +29,12 @@
 import io.reactivex.rxjava3.subjects.SingleSubject;
 import io.reactivex.rxjava3.subjects.UnicastSubject;
 import io.reactivex.rxjava3.subscribers.TestSubscriber;
+import java.util.List;
 import org.junit.jupiter.api.Test;
 import org.reactivestreams.Publisher;
 import org.reactivestreams.Subscriber;
 import org.reactivestreams.Subscription;
 
-import java.util.List;
-
-import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.equalTo;
-import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.satisfies;
-import static io.opentelemetry.semconv.trace.attributes.SemanticAttributes.CODE_FUNCTION;
-import static io.opentelemetry.semconv.trace.attributes.SemanticAttributes.CODE_NAMESPACE;
-import static org.assertj.core.api.Assertions.assertThat;
-
 public abstract class AbstractRxJava3WithSpanTest {
   private static final AttributeKey<Boolean> RXJAVA_CANCELED =
       AttributeKey.booleanKey("rxjava.canceled");

diff --git a/.../java/io/opentelemetry/instrumentation/rxjava/v3/common/RxJava3ConcurrencyTestHelper.java b/.../java/io/opentelemetry/instrumentation/rxjava/v3/common/RxJava3ConcurrencyTestHelper.java
@@ -23,8 +23,7 @@
  * from different traces.
  */
 public class RxJava3ConcurrencyTestHelper {
-  private RxJava3ConcurrencyTestHelper() {
-  }
+  private RxJava3ConcurrencyTestHelper() {}
 
   public static void launchAndWait(
       Scheduler scheduler, int iterations, long timeoutMillis, InstrumentationTestRunner runner) {

diff --git a/instrumentation/rxjava/rxjava-3.0/javaagent/src/test/java/Rx3SubscriptionTest.java b/instrumentation/rxjava/rxjava-3.0/javaagent/src/test/java/Rx3SubscriptionTest.java
@@ -1,3 +1,8 @@
+/*
+ * Copyright The OpenTelemetry Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
 import io.opentelemetry.instrumentation.rxjava.v3.common.AbstractRxJava3SubscriptionTest;
 import io.opentelemetry.instrumentation.testing.junit.AgentInstrumentationExtension;
 import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension;

diff --git a/instrumentation/rxjava/rxjava-3.0/javaagent/src/test/java/RxJava3ExtensionWithSpanTest.java b/instrumentation/rxjava/rxjava-3.0/javaagent/src/test/java/RxJava3ExtensionWithSpanTest.java
@@ -1,3 +1,8 @@
+/*
+ * Copyright The OpenTelemetry Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
 import io.opentelemetry.instrumentation.rxjava.v3.common.AbstractRxJava3WithSpanTest;
 import io.opentelemetry.instrumentation.rxjava.v3.common.AbstractTracedWithSpan;
 import io.opentelemetry.instrumentation.rxjava.v3.common.extensionannotation.TracedWithSpan;

diff --git a/...ntation/rxjava/rxjava-3.0/javaagent/src/test/java/RxJava3InstrumentationWithSpanTest.java b/...ntation/rxjava/rxjava-3.0/javaagent/src/test/java/RxJava3InstrumentationWithSpanTest.java
@@ -1,3 +1,8 @@
+/*
+ * Copyright The OpenTelemetry Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
 import io.opentelemetry.instrumentation.rxjava.v3.common.AbstractRxJava3WithSpanTest;
 import io.opentelemetry.instrumentation.rxjava.v3.common.AbstractTracedWithSpan;
 import io.opentelemetry.instrumentation.rxjava.v3.common.extensionannotation.TracedWithSpan;

diff --git a/instrumentation/rxjava/rxjava-3.0/javaagent/src/test/java/RxJava3Test.java b/instrumentation/rxjava/rxjava-3.0/javaagent/src/test/java/RxJava3Test.java
@@ -1,3 +1,8 @@
+/*
+ * Copyright The OpenTelemetry Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
 import io.opentelemetry.instrumentation.rxjava.v3.common.AbstractRxJava3Test;
 import io.opentelemetry.instrumentation.testing.AgentTestRunner;
 import io.opentelemetry.instrumentation.testing.InstrumentationTestRunner;

diff --git a/instrumentation/rxjava/rxjava-3.0/library/src/test/java/Rx3SubscriptionTest.java b/instrumentation/rxjava/rxjava-3.0/library/src/test/java/Rx3SubscriptionTest.java
@@ -1,3 +1,8 @@
+/*
+ * Copyright The OpenTelemetry Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
 import io.opentelemetry.instrumentation.rxjava.v3.common.AbstractRxJava3SubscriptionTest;
 import io.opentelemetry.instrumentation.rxjava.v3_0.TracingAssembly;
 import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension;

diff --git a/instrumentation/rxjava/rxjava-3.0/library/src/test/java/RxJava3Test.java b/instrumentation/rxjava/rxjava-3.0/library/src/test/java/RxJava3Test.java
@@ -1,3 +1,8 @@
+/*
+ * Copyright The OpenTelemetry Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
 import io.opentelemetry.instrumentation.rxjava.v3.common.AbstractRxJava3Test;
 import io.opentelemetry.instrumentation.rxjava.v3_0.TracingAssembly;
 import io.opentelemetry.instrumentation.testing.InstrumentationTestRunner;

diff --git a/instrumentation/rxjava/rxjava-3.1.1/javaagent/src/test/java/Rx3SubscriptionTest.java b/instrumentation/rxjava/rxjava-3.1.1/javaagent/src/test/java/Rx3SubscriptionTest.java
@@ -1,3 +1,8 @@
+/*
+ * Copyright The OpenTelemetry Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
 import io.opentelemetry.instrumentation.rxjava.v3.common.AbstractRxJava3SubscriptionTest;
 import io.opentelemetry.instrumentation.testing.junit.AgentInstrumentationExtension;
 import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension;

diff --git a/...rumentation/rxjava/rxjava-3.1.1/javaagent/src/test/java/RxJava3ExtensionWithSpanTest.java b/...rumentation/rxjava/rxjava-3.1.1/javaagent/src/test/java/RxJava3ExtensionWithSpanTest.java
@@ -1,3 +1,8 @@
+/*
+ * Copyright The OpenTelemetry Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
 import io.opentelemetry.instrumentation.rxjava.v3.common.AbstractRxJava3WithSpanTest;
 import io.opentelemetry.instrumentation.rxjava.v3.common.AbstractTracedWithSpan;
 import io.opentelemetry.instrumentation.rxjava.v3.common.extensionannotation.TracedWithSpan;

diff --git a/...ation/rxjava/rxjava-3.1.1/javaagent/src/test/java/RxJava3InstrumentationWithSpanTest.java b/...ation/rxjava/rxjava-3.1.1/javaagent/src/test/java/RxJava3InstrumentationWithSpanTest.java
@@ -1,3 +1,8 @@
+/*
+ * Copyright The OpenTelemetry Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
 import io.opentelemetry.instrumentation.rxjava.v3.common.AbstractRxJava3WithSpanTest;
 import io.opentelemetry.instrumentation.rxjava.v3.common.AbstractTracedWithSpan;
 import io.opentelemetry.instrumentation.rxjava.v3.common.extensionannotation.TracedWithSpan;

diff --git a/instrumentation/rxjava/rxjava-3.1.1/javaagent/src/test/java/RxJava3Test.java b/instrumentation/rxjava/rxjava-3.1.1/javaagent/src/test/java/RxJava3Test.java
@@ -1,3 +1,8 @@
+/*
+ * Copyright The OpenTelemetry Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
 import io.opentelemetry.instrumentation.rxjava.v3.common.AbstractRxJava3Test;
 import io.opentelemetry.instrumentation.testing.AgentTestRunner;
 import io.opentelemetry.instrumentation.testing.InstrumentationTestRunner;

diff --git a/instrumentation/rxjava/rxjava-3.1.1/library/src/test/java/Rx3SubscriptionTest.java b/instrumentation/rxjava/rxjava-3.1.1/library/src/test/java/Rx3SubscriptionTest.java
@@ -1,3 +1,8 @@
+/*
+ * Copyright The OpenTelemetry Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
 import io.opentelemetry.instrumentation.rxjava.v3.common.AbstractRxJava3SubscriptionTest;
 import io.opentelemetry.instrumentation.rxjava.v3_1_1.TracingAssembly;
 import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension;

diff --git a/instrumentation/rxjava/rxjava-3.1.1/library/src/test/java/RxJava3Test.java b/instrumentation/rxjava/rxjava-3.1.1/library/src/test/java/RxJava3Test.java
@@ -1,3 +1,8 @@
+/*
+ * Copyright The OpenTelemetry Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
 import io.opentelemetry.instrumentation.rxjava.v3.common.AbstractRxJava3Test;
 import io.opentelemetry.instrumentation.rxjava.v3_1_1.TracingAssembly;
 import io.opentelemetry.instrumentation.testing.InstrumentationTestRunner;