[4.x] - Migrate opentracing to Helidon Tracing (helidon-io#7708)

* Migrate to Helidon tracing

---------

Signed-off-by: Dmitry Aleksandrov <dmitry.aleksandrov@oracle.com>

Author: dalexandrov

dbclient/tracing/pom.xml

@@ -39,12 +39,8 @@
             <artifactId>helidon-tracing-config</artifactId>
         </dependency>
         <dependency>
-            <groupId>io.opentracing</groupId>
-            <artifactId>opentracing-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>io.opentracing</groupId>
-            <artifactId>opentracing-util</artifactId>
+            <groupId>io.helidon.tracing</groupId>
+            <artifactId>helidon-tracing</artifactId>
         </dependency>
         <dependency>
             <groupId>io.helidon.common.features</groupId>

dbclient/tracing/src/main/java/io/helidon/dbclient/tracing/DbClientTracing.java

@@ -21,21 +21,22 @@
 import io.helidon.common.context.Context;
 import io.helidon.dbclient.DbClientServiceBase;
 import io.helidon.dbclient.DbClientServiceContext;
+import io.helidon.tracing.Span;
+import io.helidon.tracing.SpanContext;
+import io.helidon.tracing.Tag;
+import io.helidon.tracing.Tracer;
 import io.helidon.tracing.config.SpanTracingConfig;
 import io.helidon.tracing.config.TracingConfigUtil;
 
-import io.opentracing.Span;
-import io.opentracing.SpanContext;
-import io.opentracing.Tracer;
-import io.opentracing.tag.Tags;
-import io.opentracing.util.GlobalTracer;
 
 /**
  * Tracing interceptor.
  * This interceptor is added through Java Service loader.
  */
 public class DbClientTracing extends DbClientServiceBase {
 
+    private static final Tag<? super String> DBCLIENT_TAG = Tag.COMPONENT.create("dbclient");
+
     private DbClientTracing(Builder builder) {
         super(builder);
     }
@@ -76,42 +77,37 @@ protected DbClientServiceContext apply(DbClientServiceContext serviceContext) {
         }
 
         Context context = serviceContext.context();
-        @SuppressWarnings("resource") Tracer tracer = context.get(Tracer.class).orElseGet(GlobalTracer::get);
+        @SuppressWarnings("resource") Tracer tracer = context.get(Tracer.class).orElseGet(Tracer::global);
 
         // now if span context is missing, we build a span without a parent
-        Tracer.SpanBuilder spanBuilder = tracer.buildSpan(serviceContext.statementName());
+        Span.Builder<?> spanBuilder = tracer.spanBuilder(serviceContext.statementName());
 
         context.get(SpanContext.class)
-                .ifPresent(spanBuilder::asChildOf);
+                .ifPresent(spanBuilder::parent);
 
         Span span = spanBuilder.start();
 
-        span.setTag("db.operation", serviceContext.statementType().toString());
+        span.tag("db.operation", serviceContext.statementType().toString());
         if (spanConfig.logEnabled("statement", true)) {
-            Tags.DB_STATEMENT.set(span, serviceContext.statement());
+            Tag.DB_STATEMENT.create(serviceContext.statement()).apply(span);
         }
-        Tags.COMPONENT.set(span, "dbclient");
-        Tags.DB_TYPE.set(span, serviceContext.dbType());
+        DBCLIENT_TAG.apply(span);
+        Tag.DB_TYPE.create(serviceContext.dbType()).apply(span);
 
         serviceContext.statementFuture().thenAccept(nothing -> {
             if (spanConfig.logEnabled("statement-finish", true)) {
-                span.log(Map.of("type", "statement"));
+                span.addEvent("log", Map.of("type", "statement"));
             }
         });
 
         serviceContext.resultFuture().thenAccept(count -> {
             if (spanConfig.logEnabled("result-finish", true)) {
-                span.log(Map.of("type", "result",
+                span.addEvent("log", Map.of("type", "result",
                         "count", count));
             }
-            span.finish();
+            span.end();
         }).exceptionally(throwable -> {
-            Tags.ERROR.set(span, Boolean.TRUE);
-            span.log(Map.of("event", "error",
-                    "error.kind", "Exception",
-                    "error.object", throwable,
-                    "message", throwable.getMessage()));
-            span.finish();
+            span.end(throwable);
             return null;
         });
 

dbclient/tracing/src/main/java/module-info.java

@@ -28,13 +28,13 @@
 module io.helidon.dbclient.tracing {
 
     requires io.helidon.tracing.config;
-    requires io.opentracing.api;
-    requires io.opentracing.util;
+    requires io.helidon.tracing;
 
     requires static io.helidon.common.features.api;
 
     requires transitive io.helidon.dbclient;
 
+
     exports io.helidon.dbclient.tracing;
 
     provides io.helidon.dbclient.spi.DbClientServiceProvider with io.helidon.dbclient.tracing.DbClientTracingProvider;

tracing/tracing/src/main/java/io/helidon/tracing/Tag.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2022 Oracle and/or its affiliates.
+ * Copyright (c) 2018, 2023 Oracle and/or its affiliates.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -43,6 +43,17 @@ public abstract class Tag<T> {
      * Status code that was returned.
      */
     public static final TagSource<Integer> HTTP_STATUS = new NumberTagSource<>("http.status_code");
+
+    /**
+     * Tag marking a Database type.
+     */
+    public static final TagSource<String> DB_TYPE = new StringTagSource("db.type");
+
+    /**
+     * Tag marking a Database statement.
+     */
+    public static final TagSource<String> DB_STATEMENT = new StringTagSource("db.statement");
+
     private final String key;
     private final T value;