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/26 13:19:26 UTC
[hbase] branch HBASE-25811 updated (f4af34e -> ab603ee)
This is an automated email from the ASF dual-hosted git repository.
zhangduo pushed a change to branch HBASE-25811
in repository https://gitbox.apache.org/repos/asf/hbase.git.
discard f4af34e add opentelemetry jar to client-facing-thirdparty
discard a58ebb1 add opentelemetry deps when running MR job
discard 427e70e HBASE-25811 disable checks other than integration in nightly builds
new ab603ee HBASE-25811 The client integration test is failing after HBASE-22120 merged
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (f4af34e)
\
N -- N -- N refs/heads/HBASE-25811 (ab603ee)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
dev-support/Jenkinsfile | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
[hbase] 01/01: HBASE-25811 The client integration test is failing
after HBASE-22120 merged
Posted by zh...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
zhangduo pushed a commit to branch HBASE-25811
in repository https://gitbox.apache.org/repos/asf/hbase.git
commit ab603ee3b84852de8546de500520c1672cc69c6e
Author: Duo Zhang <zh...@apache.org>
AuthorDate: Mon Apr 26 13:36:50 2021 +0800
HBASE-25811 The client integration test is failing after HBASE-22120 merged
move opentelemetry jars to client-facing-thirdparty
add opentelemetry jars when init map reduce job dependencies
---
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
}
/**