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 <[email protected]>
apache · Apr 27, 2021 · 8d2a0ef · 8d2a0ef
1 parent a4d954e
commit 8d2a0ef
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 1 deletion.
diff --git 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
@@ -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
@@ -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
   }
 
   /**