Skip to content

Commit 8d2a0ef

Browse files
authored
HBASE-25811 The client integration test is failing after HBASE-22120 merged (apache#3201)
move opentelemetry jars to client-facing-thirdparty add opentelemetry jars when init map reduce job dependencies Signed-off-by: Xin Sun <ddupgs@gmail.com>
1 parent a4d954e commit 8d2a0ef

File tree

3 files changed

+12
-1
lines changed

3 files changed

+12
-1
lines changed

hbase-assembly/src/main/assembly/client.xml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@
6363
<exclude>org.apache.yetus:audience-annotations</exclude>
6464
<exclude>org.slf4j:*</exclude>
6565
<exclude>org.apache.logging.log4j:*</exclude>
66+
<exclude>io.opentelemetry.javaagent:*</exclude>
6667
</excludes>
6768
</dependencySet>
6869
</dependencySets>
@@ -149,6 +150,13 @@
149150
<include>org.apache.yetus:audience-annotations</include>
150151
<include>org.slf4j:*</include>
151152
<include>org.apache.logging.log4j:*</include>
153+
<include>io.opentelemetry:*</include>
154+
</includes>
155+
</dependencySet>
156+
<dependencySet>
157+
<outputDirectory>lib/trace</outputDirectory>
158+
<includes>
159+
<include>io.opentelemetry.javaagent:*</include>
152160
</includes>
153161
</dependencySet>
154162
</dependencySets>

hbase-assembly/src/main/assembly/hadoop-three-compat.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -210,6 +210,7 @@
210210
<include>org.apache.yetus:audience-annotations</include>
211211
<include>org.slf4j:*</include>
212212
<include>org.apache.logging.log4j:*</include>
213+
<include>io.opentelemetry:*</include>
213214
</includes>
214215
</dependencySet>
215216
<dependencySet>

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -831,7 +831,9 @@ public static void addHBaseDependencyJars(Configuration conf) throws IOException
831831
org.apache.zookeeper.ZooKeeper.class, // zookeeper
832832
org.apache.htrace.core.Tracer.class, // htrace
833833
com.codahale.metrics.MetricRegistry.class, // metrics-core
834-
org.apache.commons.lang3.ArrayUtils.class); // commons-lang
834+
org.apache.commons.lang3.ArrayUtils.class, // commons-lang
835+
io.opentelemetry.api.trace.Span.class, // opentelemetry-api
836+
io.opentelemetry.semconv.trace.attributes.SemanticAttributes.class); // opentelemetry-semconv
835837
}
836838

837839
/**

0 commit comments

Comments
 (0)