Use names specified by OpenTelemetry for tags

See eclipse-vertx/vertx-tracing#69

Signed-off-by: Thomas Segismont <[email protected]>

Author: tsegismont

vertx-sql-client/src/main/java/io/vertx/sqlclient/impl/tracing/QueryReporter.java

@@ -1,15 +1,15 @@
 package io.vertx.sqlclient.impl.tracing;
 
 import io.vertx.core.AsyncResult;
+import io.vertx.core.internal.ContextInternal;
 import io.vertx.core.spi.metrics.ClientMetrics;
 import io.vertx.core.spi.tracing.SpanKind;
 import io.vertx.core.spi.tracing.TagExtractor;
 import io.vertx.core.spi.tracing.VertxTracer;
 import io.vertx.core.tracing.TracingPolicy;
-import io.vertx.core.internal.ContextInternal;
 import io.vertx.sqlclient.Tuple;
-import io.vertx.sqlclient.internal.Connection;
 import io.vertx.sqlclient.impl.QueryResultBuilder;
+import io.vertx.sqlclient.internal.Connection;
 import io.vertx.sqlclient.internal.command.ExtendedQueryCommand;
 import io.vertx.sqlclient.internal.command.QueryCommandBase;
 import io.vertx.sqlclient.internal.command.SimpleQueryCommand;
@@ -26,17 +26,16 @@ public class QueryReporter {
   enum RequestTags {
 
     // Generic
-    PEER_ADDRESS("peer.address", q -> q.tracer.address),
+    PEER_ADDRESS("network.peer.address", q -> q.tracer.address),
     SPAN_KIND("span.kind", q -> "client"),
 
     // DB
-    // See https://github.com/open-telemetry/opentelemetry-specification/blob/v1.18.0/specification/trace/semantic_conventions/database.md#connection-level-attributes
+    // See https://opentelemetry.io/docs/specs/semconv/database/
 
     DB_USER("db.user", q -> q.tracer.user),
-    DB_INSTANCE("db.instance", q -> q.tracer.database),
-    DB_STATEMENT("db.statement", QueryRequest::sql),
-    DB_TYPE("db.type", q -> "sql"),
-    DB_NAME("db.system", q -> q.tracer.system),
+    DB_NAMESPACE("db.namespace", q -> q.tracer.database),
+    DB_QUERY_TEXT("db.query.text", QueryRequest::sql),
+    DB_SYSTEM("db.system", q -> q.tracer.system),
     ;
 
     final String name;
@@ -48,18 +47,20 @@ enum RequestTags {
     }
   }
 
-  private static final TagExtractor<QueryRequest> REQUEST_TAG_EXTRACTOR = new TagExtractor<QueryRequest>() {
+  private static final TagExtractor<QueryRequest> REQUEST_TAG_EXTRACTOR = new TagExtractor<>() {
 
     private final RequestTags[] TAGS = RequestTags.values();
 
     @Override
     public int len(QueryRequest obj) {
       return TAGS.length;
     }
+
     @Override
     public String name(QueryRequest obj, int index) {
       return TAGS[index].name;
     }
+
     @Override
     public String value(QueryRequest obj, int index) {
       return TAGS[index].fn.apply(obj);

vertx-sql-client/src/test/java/io/vertx/sqlclient/tck/TracingTestBase.java

@@ -14,7 +14,6 @@
 import io.vertx.core.Context;
 import io.vertx.core.Future;
 import io.vertx.core.Vertx;
-import io.vertx.core.VertxOptions;
 import io.vertx.core.spi.tracing.SpanKind;
 import io.vertx.core.spi.tracing.TagExtractor;
 import io.vertx.core.spi.tracing.VertxTracer;
@@ -124,8 +123,7 @@ public <R> Object sendRequest(Context context, SpanKind kind, TracingPolicy trac
         ctx.assertEquals(expectedTuples, query.tuples());
         Map<String, String> tags = tagExtractor.extract(request);
         ctx.assertEquals("client", tags.get("span.kind"));
-        ctx.assertEquals("sql", tags.get("db.type"));
-        ctx.assertEquals(expectedSql, tags.get("db.statement"));
+        ctx.assertEquals(expectedSql, tags.get("db.query.text"));
         String dbSystem = tags.get("db.system");
         ctx.assertNotNull(dbSystem);
         ctx.assertTrue(isValidDbSystem(dbSystem));