[hbase] branch branch-2.5 updated: HBASE-26520 Remove use of `db.hbase.namespance` tracing attribute (#4015)

[ndimiduk]

This is an automated email from the ASF dual-hosted git repository.

ndimiduk pushed a commit to branch branch-2.5
in repository https://gitbox.apache.org/repos/asf/hbase.git


The following commit(s) were added to refs/heads/branch-2.5 by this push:
     new 6d739de  HBASE-26520 Remove use of `db.hbase.namespance` tracing 
attribute (#4015)
6d739de is described below

commit 6d739de5bead242f85253e40cebd8ecef481a566
Author: Nick Dimiduk <ndimi...@apache.org>
AuthorDate: Mon Jan 10 17:02:50 2022 -0800

    HBASE-26520 Remove use of `db.hbase.namespance` tracing attribute (#4015)
    
    The HBase-specific attribute `db.hbase.namespace` has been deprecated in 
favor of the generic
    `db.name`. See also 
https://github.com/open-telemetry/opentelemetry-specification/issues/1760
    
    Signed-off-by: Duo Zhang <zhang...@apache.org>
    Signed-off-by: Tak Lon (Stephen) Wu <tak...@apache.org>
---
 .../java/org/apache/hadoop/hbase/client/trace/TableSpanBuilder.java     | 2 --
 .../src/test/java/org/apache/hadoop/hbase/client/TestTracingBase.java   | 2 +-
 .../org/apache/hadoop/hbase/client/trace/hamcrest/TraceTestUtil.java    | 1 -
 .../java/org/apache/hadoop/hbase/trace/HBaseSemanticAttributes.java     | 1 -
 4 files changed, 1 insertion(+), 5 deletions(-)

diff --git 
a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/trace/TableSpanBuilder.java
 
b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/trace/TableSpanBuilder.java
index 8973da6..437c70b 100644
--- 
a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/trace/TableSpanBuilder.java
+++ 
b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/trace/TableSpanBuilder.java
@@ -19,7 +19,6 @@
 package org.apache.hadoop.hbase.client.trace;
 
 import static org.apache.hadoop.hbase.trace.HBaseSemanticAttributes.DB_NAME;
-import static 
org.apache.hadoop.hbase.trace.HBaseSemanticAttributes.NAMESPACE_KEY;
 import static org.apache.hadoop.hbase.trace.HBaseSemanticAttributes.TABLE_KEY;
 import io.opentelemetry.api.common.AttributeKey;
 import io.opentelemetry.api.trace.Span;
@@ -92,7 +91,6 @@ public class TableSpanBuilder implements Supplier<Span> {
     final Map<AttributeKey<?>, Object> attributes,
     final TableName tableName
   ) {
-    attributes.put(NAMESPACE_KEY, tableName.getNamespaceAsString());
     attributes.put(DB_NAME, tableName.getNamespaceAsString());
     attributes.put(TABLE_KEY, tableName.getNameAsString());
   }
diff --git 
a/hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestTracingBase.java
 
b/hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestTracingBase.java
index c2067e7..3463348 100644
--- 
a/hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestTracingBase.java
+++ 
b/hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestTracingBase.java
@@ -89,7 +89,7 @@ public class TestTracingBase {
 
     if (tableName != null) {
       assertEquals(tableName.getNamespaceAsString(),
-        data.getAttributes().get(HBaseSemanticAttributes.NAMESPACE_KEY));
+        data.getAttributes().get(HBaseSemanticAttributes.DB_NAME));
       assertEquals(tableName.getNameAsString(),
         data.getAttributes().get(HBaseSemanticAttributes.TABLE_KEY));
     }
diff --git 
a/hbase-client/src/test/java/org/apache/hadoop/hbase/client/trace/hamcrest/TraceTestUtil.java
 
b/hbase-client/src/test/java/org/apache/hadoop/hbase/client/trace/hamcrest/TraceTestUtil.java
index 21d37e8..71aedbd 100644
--- 
a/hbase-client/src/test/java/org/apache/hadoop/hbase/client/trace/hamcrest/TraceTestUtil.java
+++ 
b/hbase-client/src/test/java/org/apache/hadoop/hbase/client/trace/hamcrest/TraceTestUtil.java
@@ -59,7 +59,6 @@ public final class TraceTestUtil {
   public static Matcher<SpanData> buildTableAttributesMatcher(TableName 
tableName) {
     return hasAttributes(allOf(
       containsEntry("db.name", tableName.getNamespaceAsString()),
-      containsEntry("db.hbase.namespace", tableName.getNamespaceAsString()),
       containsEntry("db.hbase.table", tableName.getNameAsString())));
   }
 }
diff --git 
a/hbase-common/src/main/java/org/apache/hadoop/hbase/trace/HBaseSemanticAttributes.java
 
b/hbase-common/src/main/java/org/apache/hadoop/hbase/trace/HBaseSemanticAttributes.java
index 59c372f..fd6ab85 100644
--- 
a/hbase-common/src/main/java/org/apache/hadoop/hbase/trace/HBaseSemanticAttributes.java
+++ 
b/hbase-common/src/main/java/org/apache/hadoop/hbase/trace/HBaseSemanticAttributes.java
@@ -34,7 +34,6 @@ public final class HBaseSemanticAttributes {
     SemanticAttributes.DB_CONNECTION_STRING;
   public static final AttributeKey<String> DB_USER = 
SemanticAttributes.DB_USER;
   public static final AttributeKey<String> DB_NAME = 
SemanticAttributes.DB_NAME;
-  public static final AttributeKey<String> NAMESPACE_KEY = 
SemanticAttributes.DB_HBASE_NAMESPACE;
   public static final AttributeKey<String> DB_OPERATION = 
SemanticAttributes.DB_OPERATION;
   public static final AttributeKey<String> TABLE_KEY = 
AttributeKey.stringKey("db.hbase.table");
   public static final AttributeKey<List<String>> REGION_NAMES_KEY =