diff --git a/hbase-assembly/src/main/assembly/client.xml b/hbase-assembly/src/main/assembly/client.xml index bd65cb43f8e9..48940b75d5be 100644 --- a/hbase-assembly/src/main/assembly/client.xml +++ b/hbase-assembly/src/main/assembly/client.xml @@ -65,6 +65,7 @@ org.slf4j:jcl-over-slf4j org.slf4j:jul-to-slf4j org.slf4j:slf4j-log4j12 + io.opentelemetry.javaagent:* @@ -153,6 +154,13 @@ org.slf4j:jcl-over-slf4j org.slf4j:jul-to-slf4j org.slf4j:slf4j-log4j12 + io.opentelemetry:* + + + + lib/trace + + io.opentelemetry.javaagent:* diff --git a/hbase-assembly/src/main/assembly/hadoop-three-compat.xml b/hbase-assembly/src/main/assembly/hadoop-three-compat.xml index 9780444deca8..6c670a77f7e0 100644 --- a/hbase-assembly/src/main/assembly/hadoop-three-compat.xml +++ b/hbase-assembly/src/main/assembly/hadoop-three-compat.xml @@ -213,6 +213,7 @@ org.slf4j:jcl-over-slf4j org.slf4j:jul-to-slf4j org.slf4j:slf4j-log4j12 + io.opentelemetry:* diff --git a/hbase-mapreduce/src/main/java/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.java b/hbase-mapreduce/src/main/java/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.java index 7910a5f3fac0..d8bffb31ec5e 100644 --- a/hbase-mapreduce/src/main/java/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.java +++ b/hbase-mapreduce/src/main/java/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.java @@ -832,7 +832,9 @@ public static void addHBaseDependencyJars(Configuration conf) throws IOException org.apache.zookeeper.ZooKeeper.class, // zookeeper com.google.protobuf.Message.class, // protobuf com.codahale.metrics.MetricRegistry.class, // metrics-core - org.apache.commons.lang3.ArrayUtils.class); // commons-lang + org.apache.commons.lang3.ArrayUtils.class, // commons-lang + io.opentelemetry.api.trace.Span.class, // opentelemetry-api + io.opentelemetry.semconv.trace.attributes.SemanticAttributes.class); // opentelemetry-semconv } /**