convert to standard test methods

Author: jaydeluca

instrumentation/ratpack/ratpack-1.7/library/src/test/java/io/opentelemetry/instrumentation/ratpack/v1_7/AbstractRatpackTest.java

@@ -5,52 +5,19 @@
 
 package io.opentelemetry.instrumentation.ratpack.v1_7.client;
 
-import io.opentelemetry.api.OpenTelemetry;
-import io.opentelemetry.api.trace.Span;
-import io.opentelemetry.api.trace.Tracer;
-import io.opentelemetry.context.Context;
-import io.opentelemetry.context.Scope;
-import java.net.URI;
-import java.util.concurrent.CountDownLatch;
+import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension;
 import ratpack.exec.Execution;
 import ratpack.exec.Operation;
-import ratpack.http.client.HttpClient;
-import ratpack.service.Service;
 import ratpack.service.StartEvent;
 
-public class BarForkService implements Service {
-  private final String url;
-  private final CountDownLatch latch;
-  private final Tracer tracer;
+public class BarForkService extends BarService {
 
-  public BarForkService(CountDownLatch latch, String url, OpenTelemetry openTelemetry) {
-    this.latch = latch;
-    this.url = url;
-    this.tracer = openTelemetry.getTracerProvider().tracerBuilder("testing").build();
+  public BarForkService(String url, InstrumentationExtension testing) {
+    super(url, testing);
   }
 
   @Override
   public void onStart(StartEvent event) {
-    Execution.fork()
-        .start(
-            Operation.of(
-                () -> {
-                  Context parentContext = Context.current();
-                  Span span = tracer.spanBuilder("a-span").setParent(parentContext).startSpan();
-
-                  Context otelContext = parentContext.with(span);
-                  try (Scope scope = otelContext.makeCurrent()) {
-                    Execution.current().add(Context.class, otelContext);
-                    HttpClient httpClient = event.getRegistry().get(HttpClient.class);
-                    httpClient
-                        .get(new URI(url))
-                        .flatMap(response -> httpClient.get(new URI(url)))
-                        .then(
-                            response -> {
-                              span.end();
-                              latch.countDown();
-                            });
-                  }
-                }));
+    Execution.fork().start(Operation.of(() -> generateSpan(event)));
   }
 }

instrumentation/ratpack/ratpack-1.7/library/src/test/java/io/opentelemetry/instrumentation/ratpack/v1_7/client/BarForkService.java

@@ -5,49 +5,54 @@
 
 package io.opentelemetry.instrumentation.ratpack.v1_7.client;
 
-import io.opentelemetry.api.OpenTelemetry;
 import io.opentelemetry.api.trace.Span;
-import io.opentelemetry.api.trace.Tracer;
 import io.opentelemetry.context.Context;
 import io.opentelemetry.context.Scope;
+import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension;
 import java.net.URI;
 import java.net.URISyntaxException;
-import java.util.concurrent.CountDownLatch;
 import ratpack.exec.Execution;
 import ratpack.http.client.HttpClient;
 import ratpack.service.Service;
 import ratpack.service.StartEvent;
 
 public class BarService implements Service {
   private final String url;
-  private final CountDownLatch latch;
-  private final Tracer tracer;
+  //  private final CountDownLatch latch;
+  private final InstrumentationExtension testing;
 
-  public BarService(CountDownLatch latch, String url, OpenTelemetry openTelemetry) {
-    this.latch = latch;
+  public BarService(String url, InstrumentationExtension testing) {
+    //    this.latch = latch;
     this.url = url;
-    this.tracer = openTelemetry.getTracerProvider().tracerBuilder("testing").build();
+    this.testing = testing;
   }
 
-  @Override
-  public void onStart(StartEvent event) {
+  protected void generateSpan(StartEvent event) {
     Context parentContext = Context.current();
-    Span span = tracer.spanBuilder("a-span").setParent(parentContext).startSpan();
+    testing.runWithSpan(
+        "a-span",
+        () -> {
+          Span span = Span.current();
+          Context otelContext = parentContext.with(span);
+          try (Scope scope = otelContext.makeCurrent()) {
+            Execution.current().add(Context.class, otelContext);
+            HttpClient httpClient = event.getRegistry().get(HttpClient.class);
+            httpClient
+                .get(new URI(url))
+                .flatMap(response -> httpClient.get(new URI(url)))
+                .then(
+                    response -> {
+                      span.end();
+                      //                  latch.countDown();
+                    });
+          } catch (URISyntaxException e) {
+            throw new RuntimeException(e);
+          }
+        });
+  }
 
-    Context otelContext = parentContext.with(span);
-    try (Scope scope = otelContext.makeCurrent()) {
-      Execution.current().add(Context.class, otelContext);
-      HttpClient httpClient = event.getRegistry().get(HttpClient.class);
-      httpClient
-          .get(new URI(url))
-          .flatMap(response -> httpClient.get(new URI(url)))
-          .then(
-              response -> {
-                span.end();
-                latch.countDown();
-              });
-    } catch (URISyntaxException e) {
-      throw new RuntimeException(e);
-    }
+  @Override
+  public void onStart(StartEvent event) {
+    generateSpan(event);
   }
 }