You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by zh...@apache.org on 2021/04/27 03:43:12 UTC
[hbase] branch master updated: HBASE-25811 The client integration
test is failing after HBASE-22120 merged (#3201)
This is an automated email from the ASF dual-hosted git repository.
zhangduo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hbase.git
The following commit(s) were added to refs/heads/master by this push:
new 8d2a0ef HBASE-25811 The client integration test is failing after HBASE-22120 merged (#3201)
8d2a0ef is described below
commit 8d2a0efb7a9c17e58892369b281b4af49a5f0d7e
Author: Duo Zhang <zh...@apache.org>
AuthorDate: Tue Apr 27 11:42:48 2021 +0800
HBASE-25811 The client integration test is failing after HBASE-22120 merged (#3201)
move opentelemetry jars to client-facing-thirdparty
add opentelemetry jars when init map reduce job dependencies
Signed-off-by: Xin Sun <dd...@gmail.com>
---
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 62828fa..aaaa6aa 100644
--- a/hbase-assembly/src/main/assembly/client.xml
+++ b/hbase-assembly/src/main/assembly/client.xml
@@ -63,6 +63,7 @@
<exclude>org.apache.yetus:audience-annotations</exclude>
<exclude>org.slf4j:*</exclude>
<exclude>org.apache.logging.log4j:*</exclude>
+ <exclude>io.opentelemetry.javaagent:*</exclude>
</excludes>
</dependencySet>
</dependencySets>
@@ -149,6 +150,13 @@
<include>org.apache.yetus:audience-annotations</include>
<include>org.slf4j:*</include>
<include>org.apache.logging.log4j:*</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 8d4eaf6..13d4dcc 100644
--- a/hbase-assembly/src/main/assembly/hadoop-three-compat.xml
+++ b/hbase-assembly/src/main/assembly/hadoop-three-compat.xml
@@ -210,6 +210,7 @@
<include>org.apache.yetus:audience-annotations</include>
<include>org.slf4j:*</include>
<include>org.apache.logging.log4j:*</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 5a6071e..9b8bec6 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
@@ -831,7 +831,9 @@ public class TableMapReduceUtil {
org.apache.zookeeper.ZooKeeper.class, // zookeeper
org.apache.htrace.core.Tracer.class, // htrace
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
}
/**