Minor fixes

Signed-off-by: Dmitry Aleksandrov <dmitry.aleksandrov@oracle.com>
dalexandrov · Oct 5, 2023 · 1ebb9b5 · 1ebb9b5
1 parent 8989d53
commit 1ebb9b5
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 10 deletions.
diff --git a/dbclient/tracing/src/main/java/io/helidon/dbclient/tracing/DbClientTracing.java b/dbclient/tracing/src/main/java/io/helidon/dbclient/tracing/DbClientTracing.java
@@ -35,6 +35,8 @@
  * 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);
     }
@@ -89,7 +91,8 @@ protected Single<DbClientServiceContext> apply(DbClientServiceContext serviceCon
         if (spanConfig.logEnabled("statement", true)) {
             Tag.DB_STATEMENT.create(serviceContext.statement()).apply(span);
         }
-        Tag.COMPONENT.create("dbclient").apply(span);
+
+        DBCLIENT_TAG.apply(span);
         Tag.DB_TYPE.create(serviceContext.dbType()).apply(span);
 
         serviceContext.statementFuture().thenAccept(nothing -> {
@@ -105,11 +108,7 @@ protected Single<DbClientServiceContext> apply(DbClientServiceContext serviceCon
             }
             span.end();
         }).exceptionally(throwable -> {
-            Tag.ERROR.create(Boolean.TRUE).apply(span);
-            span.addEvent("error", Map.of("error.kind", "Exception",
-                            "error.object", throwable,
-                            "message", throwable.getMessage()));
-            span.end();
+            span.end(throwable);
             return null;
         });
 

diff --git a/tracing/tracing/src/main/java/io/helidon/tracing/Tag.java b/tracing/tracing/src/main/java/io/helidon/tracing/Tag.java
@@ -54,10 +54,6 @@ public abstract class Tag<T> {
      */
     public static final TagSource<String> DB_STATEMENT = new StringTagSource("db.statement");
 
-    /**
-     * Tag marking an Error.
-     */
-    public static final TagSource<Boolean> ERROR = new BooleanTagSource("error");
     private final String key;
     private final T value;