You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by ta...@apache.org on 2021/09/01 22:30:03 UTC
[hbase] 18/18: HBASE-26168 Backport HBASE-25811 "The client
integration test is failing after HBASE-22120 merged" into branch-2 (#3634)
This is an automated email from the ASF dual-hosted git repository.
taklwu pushed a commit to branch branch-2
in repository https://gitbox.apache.org/repos/asf/hbase.git
commit 625093f907b97a7f51946862843edbd6a7c57e8d
Author: Tak Lon (Stephen) Wu <ta...@apache.org>
AuthorDate: Fri Aug 27 09:09:55 2021 -0700
HBASE-26168 Backport HBASE-25811 "The client integration test is failing after HBASE-22120 merged" into branch-2 (#3634)
move opentelemetry jars to client-facing-thirdparty
add opentelemetry jars when init map reduce job dependencies
original commit 8d2a0efb7a9c17e58892369b281b4af49a5f0d7e
Co-authored-by: Duo Zhang <zh...@apache.org>
Signed-off-by: Duo Zhang <zh...@apache.org>
Signed-off-by: Peter Somogyi <ps...@apache.org>
---
hbase-assembly/src/main/assembly/client.xml | 8 ++++++++
hbase-assembly/src/main/assembly/hadoop-three-compat.xml | 1 +
.../org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.java | 4 +++-
3 files changed, 12 insertions(+), 1 deletion(-)
diff --git a/hbase-assembly/src/main/assembly/client.xml b/hbase-assembly/src/main/assembly/client.xml
index bd65cb4..48940b7 100644
--- a/hbase-assembly/src/main/assembly/client.xml
+++ b/hbase-assembly/src/main/assembly/client.xml
@@ -65,6 +65,7 @@
<exclude>org.slf4j:jcl-over-slf4j</exclude>
<exclude>org.slf4j:jul-to-slf4j</exclude>
<exclude>org.slf4j:slf4j-log4j12</exclude>
+ <exclude>io.opentelemetry.javaagent:*</exclude>
</excludes>
</dependencySet>
</dependencySets>
@@ -153,6 +154,13 @@
<include>org.slf4j:jcl-over-slf4j</include>
<include>org.slf4j:jul-to-slf4j</include>
<include>org.slf4j:slf4j-log4j12</include>
+ <include>io.opentelemetry:*</include>
+ </includes>
+ </dependencySet>
+ <dependencySet>
+ <outputDirectory>lib/trace</outputDirectory>
+ <includes>
+ <include>io.opentelemetry.javaagent:*</include>
</includes>
</dependencySet>
</dependencySets>
diff --git a/hbase-assembly/src/main/assembly/hadoop-three-compat.xml b/hbase-assembly/src/main/assembly/hadoop-three-compat.xml
index 9780444..6c670a7 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 @@
<include>org.slf4j:jcl-over-slf4j</include>
<include>org.slf4j:jul-to-slf4j</include>
<include>org.slf4j:slf4j-log4j12</include>
+ <include>io.opentelemetry:*</include>
</includes>
</dependencySet>
<dependencySet>
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 d89c5b5..eaf1b40 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 class TableMapReduceUtil {
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
}
/**