From f39a1057a714e20364726da05e3d5c5a15e497d9 Mon Sep 17 00:00:00 2001
From: "Tak Lon (Stephen) Wu" <taklwu@apache.org>
Date: Thu, 10 Mar 2022 07:52:53 -0800
Subject: [PATCH] HBASE-26804 Missing opentelemetry agent in
 hadoop-two-compat.xml (#4185)

Signed-off-by: Nick Dimiduk <ndimiduk@apache.org>
Signed-off-by: Duo Zhang <zhangduo@apache.org>
---
 hbase-assembly/src/main/assembly/hadoop-two-compat.xml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/hbase-assembly/src/main/assembly/hadoop-two-compat.xml b/hbase-assembly/src/main/assembly/hadoop-two-compat.xml
index 88aa9dc6cbb..1845e87c5ec 100644
--- a/hbase-assembly/src/main/assembly/hadoop-two-compat.xml
+++ b/hbase-assembly/src/main/assembly/hadoop-two-compat.xml
@@ -115,6 +115,7 @@
               <exclude>org.slf4j:slf4j-api</exclude>
               <exclude>org.slf4j:slf4j-log4j12</exclude>
               <exclude>org.slf4j:slf4j-reload4j</exclude>
+              <exclude>io.opentelemetry.javaagent:*</exclude>
             </excludes>
           </dependencySet>
         </dependencySets>
@@ -213,6 +214,7 @@
         <include>org.apache.yetus:audience-annotations</include>
         <include>org.slf4j:slf4j-api</include>
         <include>org.slf4j:slf4j-reload4j</include>
+        <include>io.opentelemetry:*</include>
       </includes>
     </dependencySet>
     <dependencySet>
@@ -221,6 +223,12 @@
         <include>jline:jline</include>
       </includes>
     </dependencySet>
+    <dependencySet>
+      <outputDirectory>lib/trace</outputDirectory>
+      <includes>
+        <include>io.opentelemetry.javaagent:*</include>
+      </includes>
+    </dependencySet>
     <dependencySet>
       <outputDirectory>lib/jdk11</outputDirectory>
       <useTransitiveDependencies>true</useTransitiveDependencies>