Skip to content

Commit 3b16293

Browse files
committed
HBASE-29349 Upgrade to opentelemetry-semconv 1.32.0
1 parent dfd0bab commit 3b16293

File tree

4 files changed

+31
-18
lines changed

4 files changed

+31
-18
lines changed

hbase-common/pom.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,10 @@
106106
<groupId>io.opentelemetry.semconv</groupId>
107107
<artifactId>opentelemetry-semconv</artifactId>
108108
</dependency>
109+
<dependency>
110+
<groupId>io.opentelemetry.semconv</groupId>
111+
<artifactId>opentelemetry-semconv-incubating</artifactId>
112+
</dependency>
109113
<dependency>
110114
<groupId>org.apache.commons</groupId>
111115
<artifactId>commons-crypto</artifactId>

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

Lines changed: 19 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -18,25 +18,28 @@
1818
package org.apache.hadoop.hbase.trace;
1919

2020
import io.opentelemetry.api.common.AttributeKey;
21-
import io.opentelemetry.semconv.SemanticAttributes;
21+
import io.opentelemetry.semconv.ExceptionAttributes;
22+
import io.opentelemetry.semconv.incubating.DbIncubatingAttributes;
23+
import io.opentelemetry.semconv.incubating.RpcIncubatingAttributes;
24+
import io.opentelemetry.semconv.incubating.NetIncubatingAttributes;
2225
import java.nio.ByteBuffer;
2326
import java.util.List;
2427
import org.apache.yetus.audience.InterfaceAudience;
2528

2629
/**
2730
* The constants in this class correspond with the guidance outlined by the OpenTelemetry <a href=
28-
* "https://github.com/open-telemetry/opentelemetry-specification/tree/main/specification/trace/semantic_conventions">Semantic
31+
* "https://github.com/open-telemetry/semantic-conventions/tree/main/docs#opentelemetry-semantic-conventions">Semantic
2932
* Conventions</a>.
3033
*/
3134
@InterfaceAudience.Private
3235
public final class HBaseSemanticAttributes {
33-
public static final AttributeKey<String> DB_SYSTEM = SemanticAttributes.DB_SYSTEM;
34-
public static final String DB_SYSTEM_VALUE = SemanticAttributes.DbSystemValues.HBASE;
36+
public static final AttributeKey<String> DB_SYSTEM = DbIncubatingAttributes.DB_SYSTEM;
37+
public static final String DB_SYSTEM_VALUE = DbIncubatingAttributes.DbSystemIncubatingValues.HBASE;
3538
public static final AttributeKey<String> DB_CONNECTION_STRING =
36-
SemanticAttributes.DB_CONNECTION_STRING;
37-
public static final AttributeKey<String> DB_USER = SemanticAttributes.DB_USER;
38-
public static final AttributeKey<String> DB_NAME = SemanticAttributes.DB_NAME;
39-
public static final AttributeKey<String> DB_OPERATION = SemanticAttributes.DB_OPERATION;
39+
DbIncubatingAttributes.DB_CONNECTION_STRING;
40+
public static final AttributeKey<String> DB_USER = DbIncubatingAttributes.DB_USER;
41+
public static final AttributeKey<String> DB_NAME = DbIncubatingAttributes.DB_NAME;
42+
public static final AttributeKey<String> DB_OPERATION = DbIncubatingAttributes.DB_OPERATION;
4043
public static final AttributeKey<String> TABLE_KEY = AttributeKey.stringKey("db.hbase.table");
4144
/**
4245
* For operations that themselves ship one or more operations, such as {@link Operation#BATCH} and
@@ -46,20 +49,20 @@ public final class HBaseSemanticAttributes {
4649
AttributeKey.stringArrayKey("db.hbase.container_operations");
4750
public static final AttributeKey<List<String>> REGION_NAMES_KEY =
4851
AttributeKey.stringArrayKey("db.hbase.regions");
49-
public static final AttributeKey<String> RPC_SYSTEM = SemanticAttributes.RPC_SYSTEM;
50-
public static final AttributeKey<String> RPC_SERVICE = SemanticAttributes.RPC_SERVICE;
51-
public static final AttributeKey<String> RPC_METHOD = SemanticAttributes.RPC_METHOD;
52+
public static final AttributeKey<String> RPC_SYSTEM = RpcIncubatingAttributes.RPC_SYSTEM;
53+
public static final AttributeKey<String> RPC_SERVICE = RpcIncubatingAttributes.RPC_SERVICE;
54+
public static final AttributeKey<String> RPC_METHOD = RpcIncubatingAttributes.RPC_METHOD;
5255
public static final AttributeKey<String> SERVER_NAME_KEY =
5356
AttributeKey.stringKey("db.hbase.server.name");
54-
public static final AttributeKey<String> NET_PEER_NAME = SemanticAttributes.NET_PEER_NAME;
55-
public static final AttributeKey<Long> NET_PEER_PORT = SemanticAttributes.NET_PEER_PORT;
57+
public static final AttributeKey<String> NET_PEER_NAME = NetIncubatingAttributes.NET_PEER_NAME;
58+
public static final AttributeKey<Long> NET_PEER_PORT = NetIncubatingAttributes.NET_PEER_PORT;
5659
public static final AttributeKey<Boolean> ROW_LOCK_READ_LOCK_KEY =
5760
AttributeKey.booleanKey("db.hbase.rowlock.readlock");
5861
public static final AttributeKey<String> WAL_IMPL = AttributeKey.stringKey("db.hbase.wal.impl");
5962

60-
public static final AttributeKey<String> EXCEPTION_TYPE = SemanticAttributes.EXCEPTION_TYPE;
61-
public static final AttributeKey<String> EXCEPTION_MESSAGE = SemanticAttributes.EXCEPTION_MESSAGE;
62-
public static final String EXCEPTION_EVENT_NAME = SemanticAttributes.EXCEPTION_EVENT_NAME;
63+
public static final AttributeKey<String> EXCEPTION_TYPE = ExceptionAttributes.EXCEPTION_TYPE;
64+
public static final AttributeKey<String> EXCEPTION_MESSAGE = ExceptionAttributes.EXCEPTION_MESSAGE;
65+
public static final String EXCEPTION_EVENT_NAME = "exception";
6366

6467
/**
6568
* Indicates the amount of data was read into a {@link ByteBuffer} of type

hbase-mapreduce/src/main/java/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -856,7 +856,8 @@ public static void addHBaseDependencyJars(Configuration conf) throws IOException
856856
com.codahale.metrics.MetricRegistry.class, // metrics-core
857857
org.apache.commons.lang3.ArrayUtils.class, // commons-lang
858858
io.opentelemetry.api.trace.Span.class, // opentelemetry-api
859-
io.opentelemetry.semconv.SemanticAttributes.class, // opentelemetry-semconv
859+
io.opentelemetry.semconv.ExceptionAttributes.class, // opentelemetry-semconv
860+
io.opentelemetry.semconv.incubating.DbIncubatingAttributes.class, // opentelemetry-semconv-incubating
860861
io.opentelemetry.context.Context.class); // opentelemetry-context
861862
}
862863

pom.xml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -870,7 +870,7 @@
870870
<junit.version>4.13.2</junit.version>
871871
<hamcrest.version>1.3</hamcrest.version>
872872
<opentelemetry.version>1.49.0</opentelemetry.version>
873-
<opentelemetry-semconv.version>1.29.0-alpha</opentelemetry-semconv.version>
873+
<opentelemetry-semconv.version>1.32.0</opentelemetry-semconv.version>
874874
<opentelemetry-javaagent.version>2.15.0</opentelemetry-javaagent.version>
875875
<log4j2.version>2.17.2</log4j2.version>
876876
<mockito.version>4.11.0</mockito.version>
@@ -1667,6 +1667,11 @@
16671667
<artifactId>opentelemetry-semconv</artifactId>
16681668
<version>${opentelemetry-semconv.version}</version>
16691669
</dependency>
1670+
<dependency>
1671+
<groupId>io.opentelemetry.semconv</groupId>
1672+
<artifactId>opentelemetry-semconv-incubating</artifactId>
1673+
<version>${opentelemetry-semconv.version}-alpha</version>
1674+
</dependency>
16701675
<dependency>
16711676
<groupId>io.opentelemetry.javaagent</groupId>
16721677
<artifactId>opentelemetry-javaagent</artifactId>

0 commit comments

Comments
 (0)