simplify test

Author: zeitlinger

instrumentation/methods/javaagent/src/declarativeConfigTest/java/io/opentelemetry/javaagent/instrumentation/methods/MethodTest.java

@@ -9,20 +9,11 @@
 import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.equalTo;
 import static io.opentelemetry.semconv.incubating.CodeIncubatingAttributes.CODE_FUNCTION;
 import static io.opentelemetry.semconv.incubating.CodeIncubatingAttributes.CODE_NAMESPACE;
-import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
-import io.opentelemetry.api.trace.Span;
 import io.opentelemetry.api.trace.SpanKind;
 import io.opentelemetry.instrumentation.testing.junit.AgentInstrumentationExtension;
 import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension;
 import java.util.concurrent.Callable;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicReference;
-import javax.naming.NoInitialContextException;
-import javax.naming.directory.InitialDirContext;
-import javax.naming.ldap.InitialLdapContext;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
 
@@ -41,88 +32,16 @@ void methodTraced() {
             trace.hasSpansSatisfyingExactly(
                 span ->
                     span.hasName("ConfigTracedCallable.call")
-                        .hasKind(SpanKind.INTERNAL)
+                        .hasKind(SpanKind.SERVER)
                         .hasAttributesSatisfyingExactly(
                             equalTo(CODE_NAMESPACE, ConfigTracedCallable.class.getName()),
                             equalTo(CODE_FUNCTION, "call"))));
   }
-
-  @Test
-  void bootLoaderMethodTraced() throws Exception {
-    InitialLdapContext context = new InitialLdapContext();
-    AtomicReference<Throwable> throwableReference = new AtomicReference<>();
-    assertThatThrownBy(
-            () -> {
-              try {
-                context.search("foo", null);
-              } catch (Throwable throwable) {
-                throwableReference.set(throwable);
-                throw throwable;
-              }
-            })
-        .isInstanceOf(NoInitialContextException.class);
-
-    testing.waitAndAssertTraces(
-        trace ->
-            trace.hasSpansSatisfyingExactly(
-                span ->
-                    span.hasName("InitialDirContext.search")
-                        .hasKind(SpanKind.CLIENT)
-                        .hasException(throwableReference.get())
-                        .hasAttributesSatisfyingExactly(
-                            equalTo(CODE_NAMESPACE, InitialDirContext.class.getName()),
-                            equalTo(CODE_FUNCTION, "search"))));
-  }
-
   static class ConfigTracedCallable implements Callable<String> {
 
     @Override
     public String call() {
       return "Hello!";
     }
   }
-
-  @Test
-  void methodTracedWithAsyncStop() throws Exception {
-    ConfigTracedCompletableFuture traced = new ConfigTracedCompletableFuture();
-    CompletableFuture<String> future = traced.getResult();
-
-    // span is ended when CompletableFuture is completed
-    // verify that span has not been ended yet
-    assertThat(traced.span).isNotNull().satisfies(span -> assertThat(span.isRecording()).isTrue());
-
-    traced.countDownLatch.countDown();
-    assertThat(future.get(10, TimeUnit.SECONDS)).isEqualTo("Hello!");
-
-    testing.waitAndAssertTraces(
-        trace ->
-            trace.hasSpansSatisfyingExactly(
-                span ->
-                    span.hasName("ConfigTracedCompletableFuture.getResult")
-                        .hasKind(SpanKind.SERVER)
-                        .hasAttributesSatisfyingExactly(
-                            equalTo(CODE_NAMESPACE, ConfigTracedCompletableFuture.class.getName()),
-                            equalTo(CODE_FUNCTION, "getResult"))));
-  }
-
-  static class ConfigTracedCompletableFuture {
-    final CountDownLatch countDownLatch = new CountDownLatch(1);
-    Span span;
-
-    CompletableFuture<String> getResult() {
-      CompletableFuture<String> completableFuture = new CompletableFuture<>();
-      span = Span.current();
-      new Thread(
-              () -> {
-                try {
-                  countDownLatch.await();
-                } catch (InterruptedException exception) {
-                  // ignore
-                }
-                completableFuture.complete("Hello!");
-              })
-          .start();
-      return completableFuture;
-    }
-  }
 }

instrumentation/methods/javaagent/src/declarativeConfigTest/resources/declarative-config.yaml

@@ -30,11 +30,4 @@ instrumentation/development:
         - class: io.opentelemetry.javaagent.instrumentation.methods.MethodTest$ConfigTracedCallable
           methods:
             - name: call
-        - class: io.opentelemetry.javaagent.instrumentation.methods.MethodTest$ConfigTracedCompletableFuture
-          methods:
-            - name: getResult
               span_kind: SERVER
-        - class: javax.naming.directory.InitialDirContext
-          methods:
-            - name: search
-              span_kind: CLIENT