diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt
index 4c71ab232d..75cbd2f1cc 100644
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/hadoop-common-project/hadoop-common/CHANGES.txt
@@ -530,6 +530,9 @@ Release 2.7.0 - UNRELEASED
HADOOP-11442. hadoop-azure: Create test jar.
(Shashank Khandelwal via cnauroth)
+ HADOOP-11544. Remove unused configuration keys for tracing. (Masatake
+ Iwasaki via aajisaka)
+
OPTIMIZATIONS
HADOOP-11323. WritableComparator#compare keeps reference to byte array.
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/CommonConfigurationKeys.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/CommonConfigurationKeys.java
index 748c552805..442dc7de9a 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/CommonConfigurationKeys.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/CommonConfigurationKeys.java
@@ -286,7 +286,4 @@ public class CommonConfigurationKeys extends CommonConfigurationKeysPublic {
public static final String NFS_EXPORTS_ALLOWED_HOSTS_SEPARATOR = ";";
public static final String NFS_EXPORTS_ALLOWED_HOSTS_KEY = "nfs.exports.allowed.hosts";
public static final String NFS_EXPORTS_ALLOWED_HOSTS_KEY_DEFAULT = "* rw";
-
- public static final String HADOOP_TRACE_SAMPLER = "hadoop.htrace.sampler";
- public static final String HADOOP_TRACE_SAMPLER_DEFAULT = "NeverSampler";
}
diff --git a/hadoop-common-project/hadoop-common/src/main/resources/core-default.xml b/hadoop-common-project/hadoop-common/src/main/resources/core-default.xml
index 598ce6f233..f31db3154f 100644
--- a/hadoop-common-project/hadoop-common/src/main/resources/core-default.xml
+++ b/hadoop-common-project/hadoop-common/src/main/resources/core-default.xml
@@ -1653,18 +1653,6 @@ for ldap providers in the same way as above does.
-
- hadoop.htrace.sampler
- NeverSampler
-
- Configure the samplers for HTrace, the value can be NeverSampler,
- AlwaysSampler or ProbabilitySampler. NeverSampler: HTrace is OFF
- for all spans; AlwaysSampler: HTrace is ON for all spans;
- ProbabilitySampler: HTrace is ON for some percentage% of top-level
- spans.
-
-
-
hadoop.htrace.spanreceiver.classes