From 8d2a0efb7a9c17e58892369b281b4af49a5f0d7e Mon Sep 17 00:00:00 2001
From: Duo Zhang <zhangduo@apache.org>
Date: Tue, 27 Apr 2021 11:42:48 +0800
Subject: [PATCH] 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 <ddupgs@gmail.com>
---
 hbase-assembly/src/main/assembly/client.xml               | 8 ++++++++
 hbase-assembly/src/main/assembly/hadoop-three-compat.xml  | 1 +
 .../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 62828fa5afc9..aaaa6aa99a18 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 8d4eaf60de0c..13d4dcc3a912 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 5a6071e01867..9b8bec631420 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 static void addHBaseDependencyJars(Configuration conf) throws IOException
       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
   }
 
   /**