limit scope to Tracing utility class

add unit tests

extended-tracer/README.md

@@ -0,0 +1,11 @@
+# extended-tracer
+
+Utility methods to make it easier to use the OpenTelemetry tracer.
+
+---
+
+## Component owners
+
+- [Gregor Zeitlinger](https://github.com/zeitlinger), Grafana Labs
+
+Learn more about component owners in [component_owners.yml](../.github/component_owners.yml).

extended-tracer/build.gradle.kts

@@ -6,6 +6,18 @@ plugins {
 description = "Tracing Utilities"
 otelJava.moduleName.set("io.opentelemetry.contrib.extended-tracer")
 
+otelJava {
+  minJavaVersionSupported.set(JavaVersion.VERSION_1_8)
+}
+
+tasks {
+  compileTestJava {
+    options.release.set(17)
+  }
+}
+
 dependencies {
   api("io.opentelemetry:opentelemetry-api")
+  testImplementation("io.opentelemetry:opentelemetry-sdk-testing")
+  testImplementation("io.opentelemetry:opentelemetry-semconv")
 }

extended-tracer/src/main/java/io/opentelemetry/contrib/tracer/Tracing.java

@@ -3,10 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.contrib.tracer; /*
-                                          * Copyright The OpenTelemetry Authors
-                                          * SPDX-License-Identifier: Apache-2.0
-                                          */
+package io.opentelemetry.contrib.tracer;
 
 import static io.opentelemetry.api.trace.SpanKind.CONSUMER;
 import static io.opentelemetry.api.trace.SpanKind.SERVER;
@@ -18,6 +15,7 @@
 import io.opentelemetry.api.trace.SpanBuilder;
 import io.opentelemetry.api.trace.SpanKind;
 import io.opentelemetry.api.trace.StatusCode;
+import io.opentelemetry.api.trace.Tracer;
 import io.opentelemetry.context.Context;
 import io.opentelemetry.context.Scope;
 import io.opentelemetry.context.propagation.TextMapGetter;
@@ -50,7 +48,7 @@ public String get(@Nullable Map<String, String> carrier, String key) {
   private Tracing() {}
 
   public static void run(String spanName, Runnable runnable) {
-    serviceTracer().run(spanName, runnable);
+    run(serviceTracer().spanBuilder(spanName).startSpan(), runnable);
   }
 
   public static void run(Span span, Runnable runnable) {
@@ -68,7 +66,7 @@ public static void run(Span span, Runnable runnable) {
    * @param spanName name of the new span
    */
   public static <T> T call(String spanName, Callable<T> callable) {
-    return serviceTracer().call(spanName, callable);
+    return call(serviceTracer().spanBuilder(spanName).startSpan(), callable);
   }
 
   public static <T> T call(Span span, Callable<T> callable) {
@@ -95,8 +93,8 @@ public static <T> T call(
    *
    * @return the tracer to be used in a service
    */
-  public static ExtendedTracer serviceTracer() {
-    return ExtendedTracer.create(GlobalOpenTelemetry.getTracer("service"));
+  public static Tracer serviceTracer() {
+    return GlobalOpenTelemetry.getTracer("service");
   }
 
   /**
@@ -105,7 +103,7 @@ public static ExtendedTracer serviceTracer() {
    * @param spanName the span name
    * @return the span builder
    */
-  public static ExtendedSpanBuilder withSpan(String spanName) {
+  public static SpanBuilder withSpan(String spanName) {
     return Tracing.serviceTracer().spanBuilder(spanName);
   }