Skip to content

Commit 1a205cc

Browse files
smengclsmengcl
authored
HADOOP-17424. Replace HTrace with No-Op tracer (apache#2645)
1 parent 6fafdd7 commit 1a205cc

File tree

69 files changed

+433
-1779
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

69 files changed

+433
-1779
lines changed

‎hadoop-client-modules/hadoop-client-api/pom.xml‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -126,9 +126,7 @@
126126
<excludes>
127127
<exclude>org/apache/hadoop/*</exclude>
128128
<exclude>org/apache/hadoop/**/*</exclude>
129-
<!-- Our non-shaded htrace and logging libraries -->
130-
<exclude>org/apache/htrace/*</exclude>
131-
<exclude>org/apache/htrace/**/*</exclude>
129+
<!-- Our non-shaded logging libraries -->
132130
<exclude>org/slf4j/*</exclude>
133131
<exclude>org/slf4j/**/*</exclude>
134132
<exclude>org/apache/commons/logging/*</exclude>

‎hadoop-client-modules/hadoop-client-check-invariants/pom.xml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,8 +80,6 @@
8080
but enforcer still sees it.
8181
-->
8282
<exclude>org.apache.hadoop:hadoop-annotations</exclude>
83-
<!-- We leave HTrace as an unshaded dependnecy on purpose so that tracing within a JVM will work -->
84-
<exclude>org.apache.htrace:htrace-core4</exclude>
8583
<!-- Leave slf4j unshaded so downstream users can configure logging. -->
8684
<exclude>org.slf4j:slf4j-api</exclude>
8785
<!-- Leave commons-logging unshaded so downstream users can configure logging. -->

‎hadoop-client-modules/hadoop-client-check-test-invariants/pom.xml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,8 +84,6 @@
8484
but enforcer still sees it.
8585
-->
8686
<exclude>org.apache.hadoop:hadoop-annotations</exclude>
87-
<!-- We leave HTrace as an unshaded dependnecy on purpose so that tracing within a JVM will work -->
88-
<exclude>org.apache.htrace:htrace-core4</exclude>
8987
<!-- Leave slf4j unshaded so downstream users can configure logging. -->
9088
<exclude>org.slf4j:slf4j-api</exclude>
9189
<!-- Leave commons-logging unshaded so downstream users can configure logging. -->

‎hadoop-client-modules/hadoop-client-minicluster/pom.xml‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -672,7 +672,6 @@
672672
<exclude>org.apache.hadoop:hadoop-client-api</exclude>
673673
<exclude>org.apache.hadoop:hadoop-client-runtime</exclude>
674674
<!-- Fine to expose our purposefully not-shaded deps as dependencies -->
675-
<exclude>org.apache.htrace:htrace-core4</exclude>
676675
<exclude>org.slf4j:slf4j-api</exclude>
677676
<exclude>commons-logging:commons-logging</exclude>
678677
<exclude>junit:junit</exclude>
@@ -870,9 +869,7 @@
870869
<excludes>
871870
<exclude>org/apache/hadoop/*</exclude>
872871
<exclude>org/apache/hadoop/**/*</exclude>
873-
<!-- Our non-shaded htrace and logging libraries -->
874-
<exclude>org/apache/htrace/*</exclude>
875-
<exclude>org/apache/htrace/**/*</exclude>
872+
<!-- Our non-shaded logging libraries -->
876873
<exclude>org/slf4j/*</exclude>
877874
<exclude>org/slf4j/**/*</exclude>
878875
<exclude>org/apache/commons/logging/*</exclude>

‎hadoop-client-modules/hadoop-client-runtime/pom.xml‎

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -75,15 +75,9 @@
7575
</dependency>
7676
<!-- Since hadoop-client is listed as optional, we have to list transitive
7777
dependencies that we still want to show up.
78-
* HTrace
7978
* Slf4j API
8079
* commons-logging
8180
-->
82-
<dependency>
83-
<groupId>org.apache.htrace</groupId>
84-
<artifactId>htrace-core4</artifactId>
85-
<scope>runtime</scope>
86-
</dependency>
8781
<dependency>
8882
<groupId>org.slf4j</groupId>
8983
<artifactId>slf4j-api</artifactId>
@@ -146,8 +140,6 @@
146140
<excludes>
147141
<!-- We need a filter that matches just those things that aer included in the api jar -->
148142
<exclude>org.apache.hadoop:hadoop-client-api</exclude>
149-
<!-- Leave HTrace as an unshaded dependency on purpose, since a static class member is used to trace within a given JVM instance -->
150-
<exclude>org.apache.htrace:htrace-core4</exclude>
151143
<!-- Leave slf4j unshaded so downstream users can configure logging. -->
152144
<exclude>org.slf4j:slf4j-api</exclude>
153145
<!-- Leave commons-logging unshaded so downstream users can configure logging. -->
@@ -250,9 +242,7 @@
250242
<excludes>
251243
<exclude>org/apache/hadoop/*</exclude>
252244
<exclude>org/apache/hadoop/**/*</exclude>
253-
<!-- Our non-shaded htrace and logging libraries -->
254-
<exclude>org/apache/htrace/*</exclude>
255-
<exclude>org/apache/htrace/**/*</exclude>
245+
<!-- Our non-shaded logging libraries -->
256246
<exclude>org/slf4j/*</exclude>
257247
<exclude>org/slf4j/**/*</exclude>
258248
<exclude>org/apache/commons/logging/*</exclude>

‎hadoop-common-project/hadoop-common/pom.xml‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -286,10 +286,6 @@
286286
<scope>test</scope>
287287
</dependency>
288288

289-
<dependency>
290-
<groupId>org.apache.htrace</groupId>
291-
<artifactId>htrace-core4</artifactId>
292-
</dependency>
293289
<dependency>
294290
<groupId>org.apache.zookeeper</groupId>
295291
<artifactId>zookeeper</artifactId>

‎hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FSOutputSummer.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
import org.apache.hadoop.classification.InterfaceAudience;
2222
import org.apache.hadoop.classification.InterfaceStability;
2323
import org.apache.hadoop.util.DataChecksum;
24-
import org.apache.htrace.core.TraceScope;
24+
import org.apache.hadoop.tracing.TraceScope;
2525

2626
import java.io.IOException;
2727
import java.io.OutputStream;

‎hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileContext.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@
6767

6868
import org.apache.hadoop.thirdparty.com.google.common.base.Preconditions;
6969
import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
70-
import org.apache.htrace.core.Tracer;
70+
import org.apache.hadoop.tracing.Tracer;
7171
import org.slf4j.Logger;
7272
import org.slf4j.LoggerFactory;
7373

‎hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileSystem.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,8 +83,8 @@
8383
import org.apache.hadoop.util.ReflectionUtils;
8484
import org.apache.hadoop.util.ShutdownHookManager;
8585
import org.apache.hadoop.util.StringUtils;
86-
import org.apache.htrace.core.Tracer;
87-
import org.apache.htrace.core.TraceScope;
86+
import org.apache.hadoop.tracing.Tracer;
87+
import org.apache.hadoop.tracing.TraceScope;
8888

8989
import org.apache.hadoop.thirdparty.com.google.common.base.Preconditions;
9090
import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;

‎hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FsShell.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@
3535
import org.apache.hadoop.util.StringUtils;
3636
import org.apache.hadoop.util.Tool;
3737
import org.apache.hadoop.util.ToolRunner;
38-
import org.apache.htrace.core.TraceScope;
39-
import org.apache.htrace.core.Tracer;
38+
import org.apache.hadoop.tracing.TraceScope;
39+
import org.apache.hadoop.tracing.Tracer;
4040
import org.slf4j.Logger;
4141
import org.slf4j.LoggerFactory;
4242

0 commit comments

Comments
 (0)