Skip to content

Commit 6d739de

Browse files
committed
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 open-telemetry/opentelemetry-specification#1760 Signed-off-by: Duo Zhang <[email protected]> Signed-off-by: Tak Lon (Stephen) Wu <[email protected]>
1 parent 2c82cf3 commit 6d739de

File tree

4 files changed

+1
-5
lines changed

4 files changed

+1
-5
lines changed

hbase-client/src/main/java/org/apache/hadoop/hbase/client/trace/TableSpanBuilder.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
package org.apache.hadoop.hbase.client.trace;
2020

2121
import static org.apache.hadoop.hbase.trace.HBaseSemanticAttributes.DB_NAME;
22-
import static org.apache.hadoop.hbase.trace.HBaseSemanticAttributes.NAMESPACE_KEY;
2322
import static org.apache.hadoop.hbase.trace.HBaseSemanticAttributes.TABLE_KEY;
2423
import io.opentelemetry.api.common.AttributeKey;
2524
import io.opentelemetry.api.trace.Span;
@@ -92,7 +91,6 @@ static void populateTableNameAttributes(
9291
final Map<AttributeKey<?>, Object> attributes,
9392
final TableName tableName
9493
) {
95-
attributes.put(NAMESPACE_KEY, tableName.getNamespaceAsString());
9694
attributes.put(DB_NAME, tableName.getNamespaceAsString());
9795
attributes.put(TABLE_KEY, tableName.getNameAsString());
9896
}

hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestTracingBase.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ protected void assertTrace(String className, String methodName, ServerName serve
8989

9090
if (tableName != null) {
9191
assertEquals(tableName.getNamespaceAsString(),
92-
data.getAttributes().get(HBaseSemanticAttributes.NAMESPACE_KEY));
92+
data.getAttributes().get(HBaseSemanticAttributes.DB_NAME));
9393
assertEquals(tableName.getNameAsString(),
9494
data.getAttributes().get(HBaseSemanticAttributes.TABLE_KEY));
9595
}

hbase-client/src/test/java/org/apache/hadoop/hbase/client/trace/hamcrest/TraceTestUtil.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,6 @@ public static Matcher<SpanData> buildConnectionAttributesMatcher(ConnectionImple
5959
public static Matcher<SpanData> buildTableAttributesMatcher(TableName tableName) {
6060
return hasAttributes(allOf(
6161
containsEntry("db.name", tableName.getNamespaceAsString()),
62-
containsEntry("db.hbase.namespace", tableName.getNamespaceAsString()),
6362
containsEntry("db.hbase.table", tableName.getNameAsString())));
6463
}
6564
}

hbase-common/src/main/java/org/apache/hadoop/hbase/trace/HBaseSemanticAttributes.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ public final class HBaseSemanticAttributes {
3434
SemanticAttributes.DB_CONNECTION_STRING;
3535
public static final AttributeKey<String> DB_USER = SemanticAttributes.DB_USER;
3636
public static final AttributeKey<String> DB_NAME = SemanticAttributes.DB_NAME;
37-
public static final AttributeKey<String> NAMESPACE_KEY = SemanticAttributes.DB_HBASE_NAMESPACE;
3837
public static final AttributeKey<String> DB_OPERATION = SemanticAttributes.DB_OPERATION;
3938
public static final AttributeKey<String> TABLE_KEY = AttributeKey.stringKey("db.hbase.table");
4039
public static final AttributeKey<List<String>> REGION_NAMES_KEY =

0 commit comments

Comments
 (0)