subject:"kafka git commit\: MINOR\: Push JMX metric name mangling into the JmxReporter \(KIP\-190 follow up\)"

kafka git commit: MINOR: Push JMX metric name mangling into the JmxReporter (KIP-190 follow up)

2017-10-11 Thread rsivaram

Repository: kafka
Updated Branches:
  refs/heads/trunk 54ed3435b -> 7d6ca52a2


MINOR: Push JMX metric name mangling into the JmxReporter (KIP-190 follow up)

Author: Ewen Cheslack-Postava 

Reviewers: Rajini Sivaram , Ismael Juma 


Closes #3980 from ewencp/dont-mangle-names


Project: http://git-wip-us.apache.org/repos/asf/kafka/repo
Commit: http://git-wip-us.apache.org/repos/asf/kafka/commit/7d6ca52a
Tree: http://git-wip-us.apache.org/repos/asf/kafka/tree/7d6ca52a
Diff: http://git-wip-us.apache.org/repos/asf/kafka/diff/7d6ca52a

Branch: refs/heads/trunk
Commit: 7d6ca52a2751908c7fc6b752d70dfa9bbe8c
Parents: 54ed343
Author: Ewen Cheslack-Postava 
Authored: Wed Oct 11 17:32:40 2017 -0400
Committer: Rajini Sivaram 
Committed: Wed Oct 11 17:32:40 2017 -0400

--
 .../kafka/clients/admin/KafkaAdminClient.java   | 14 ++-
 .../kafka/clients/consumer/KafkaConsumer.java   |  8 +-
 .../kafka/clients/producer/KafkaProducer.java   |  8 +-
 .../kafka/common/metrics/JmxReporter.java   |  3 +-
 .../apache/kafka/common/metrics/Sanitizer.java  | 61 
 .../kafka/common/utils/AppInfoParser.java   |  3 +-
 .../apache/kafka/common/utils/Sanitizer.java| 61 
 .../kafka/common/metrics/JmxReporterTest.java   | 67 -
 .../kafka/common/metrics/SanitizerTest.java | 35 ---
 .../kafka/common/utils/SanitizerTest.java   | 35 +++
 .../kafka/connect/runtime/ConnectMetrics.java   | 45 +
 .../connect/runtime/ConnectMetricsTest.java | 24 -
 .../main/scala/kafka/admin/ConfigCommand.scala  |  5 +-
 .../scala/kafka/network/RequestChannel.scala|  3 +-
 .../scala/kafka/server/ClientQuotaManager.scala | 98 ++--
 .../server/ClientRequestQuotaManager.scala  |  4 +-
 .../main/scala/kafka/server/ConfigHandler.scala | 10 +-
 .../kafka/server/DynamicConfigManager.scala |  2 +-
 .../integration/kafka/api/BaseQuotaTest.scala   |  8 +-
 .../kafka/api/ClientIdQuotaTest.scala   |  6 +-
 .../kafka/api/UserClientIdQuotaTest.scala   |  6 +-
 .../integration/kafka/api/UserQuotaTest.scala   |  6 +-
 .../unit/kafka/admin/ConfigCommandTest.scala|  4 +-
 .../kafka/server/ClientQuotaManagerTest.scala   | 70 +++---
 .../kafka/server/DynamicConfigChangeTest.scala  |  1 +
 .../unit/kafka/server/RequestQuotaTest.scala|  3 +-
 26 files changed, 299 insertions(+), 291 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/kafka/blob/7d6ca52a/clients/src/main/java/org/apache/kafka/clients/admin/KafkaAdminClient.java
--
diff --git 
a/clients/src/main/java/org/apache/kafka/clients/admin/KafkaAdminClient.java 
b/clients/src/main/java/org/apache/kafka/clients/admin/KafkaAdminClient.java
index 1a66371..ece27ca 100644
--- a/clients/src/main/java/org/apache/kafka/clients/admin/KafkaAdminClient.java
+++ b/clients/src/main/java/org/apache/kafka/clients/admin/KafkaAdminClient.java
@@ -55,7 +55,6 @@ import org.apache.kafka.common.metrics.JmxReporter;
 import org.apache.kafka.common.metrics.MetricConfig;
 import org.apache.kafka.common.metrics.Metrics;
 import org.apache.kafka.common.metrics.MetricsReporter;
-import org.apache.kafka.common.metrics.Sanitizer;
 import org.apache.kafka.common.metrics.Sensor;
 import org.apache.kafka.common.network.ChannelBuilder;
 import org.apache.kafka.common.network.Selector;
@@ -290,7 +289,6 @@ public class KafkaAdminClient extends AdminClient {
 NetworkClient networkClient = null;
 Time time = Time.SYSTEM;
 String clientId = generateClientId(config);
-String sanitizedClientId = Sanitizer.sanitize(clientId);
 ChannelBuilder channelBuilder = null;
 Selector selector = null;
 ApiVersions apiVersions = new ApiVersions();
@@ -303,7 +301,7 @@ public class KafkaAdminClient extends AdminClient {
 config.getLong(AdminClientConfig.METADATA_MAX_AGE_CONFIG), 
true);
 List reporters = 
config.getConfiguredInstances(AdminClientConfig.METRIC_REPORTER_CLASSES_CONFIG,
 MetricsReporter.class);
-Map metricTags = 
Collections.singletonMap("client-id", sanitizedClientId);
+Map metricTags = 
Collections.singletonMap("client-id", clientId);
 MetricConfig metricConfig = new 
MetricConfig().samples(config.getInt(AdminClientConfig.METRICS_NUM_SAMPLES_CONFIG))
 
.timeWindow(config.getLong(AdminClientConfig.METRICS_SAMPLE_WINDOW_MS_CONFIG), 
TimeUnit.MILLISECONDS)
 
.recordLevel(Sensor.RecordingLevel.forName(config.getString(AdminClientConfig.METRICS_RECORDING_LEVEL_CONFIG)))
@@ -328,7 +326,7 @@ public class KafkaAdminClient

kafka git commit: MINOR: Push JMX metric name mangling into the JmxReporter (KIP-190 follow up)

2017-10-11 Thread rsivaram

Repository: kafka
Updated Branches:
  refs/heads/1.0 2cf059f33 -> 531dfd726


MINOR: Push JMX metric name mangling into the JmxReporter (KIP-190 follow up)

Author: Ewen Cheslack-Postava 

Reviewers: Rajini Sivaram , Ismael Juma 


Closes #3980 from ewencp/dont-mangle-names

(cherry picked from commit 7d6ca52a2751908c7fc6b752d70dfa9bbe8c)
Signed-off-by: Rajini Sivaram 


Project: http://git-wip-us.apache.org/repos/asf/kafka/repo
Commit: http://git-wip-us.apache.org/repos/asf/kafka/commit/531dfd72
Tree: http://git-wip-us.apache.org/repos/asf/kafka/tree/531dfd72
Diff: http://git-wip-us.apache.org/repos/asf/kafka/diff/531dfd72

Branch: refs/heads/1.0
Commit: 531dfd7268a5642f97e2bf79453b43ba307b9c0f
Parents: 2cf059f
Author: Ewen Cheslack-Postava 
Authored: Wed Oct 11 17:32:40 2017 -0400
Committer: Rajini Sivaram 
Committed: Wed Oct 11 17:33:16 2017 -0400

--
 .../kafka/clients/admin/KafkaAdminClient.java   | 14 ++-
 .../kafka/clients/consumer/KafkaConsumer.java   |  8 +-
 .../kafka/clients/producer/KafkaProducer.java   |  8 +-
 .../kafka/common/metrics/JmxReporter.java   |  3 +-
 .../apache/kafka/common/metrics/Sanitizer.java  | 61 
 .../kafka/common/utils/AppInfoParser.java   |  3 +-
 .../apache/kafka/common/utils/Sanitizer.java| 61 
 .../kafka/common/metrics/JmxReporterTest.java   | 67 -
 .../kafka/common/metrics/SanitizerTest.java | 35 ---
 .../kafka/common/utils/SanitizerTest.java   | 35 +++
 .../kafka/connect/runtime/ConnectMetrics.java   | 45 +
 .../connect/runtime/ConnectMetricsTest.java | 24 -
 .../main/scala/kafka/admin/ConfigCommand.scala  |  5 +-
 .../scala/kafka/network/RequestChannel.scala|  3 +-
 .../scala/kafka/server/ClientQuotaManager.scala | 98 ++--
 .../server/ClientRequestQuotaManager.scala  |  4 +-
 .../main/scala/kafka/server/ConfigHandler.scala | 10 +-
 .../kafka/server/DynamicConfigManager.scala |  2 +-
 .../integration/kafka/api/BaseQuotaTest.scala   |  8 +-
 .../kafka/api/ClientIdQuotaTest.scala   |  6 +-
 .../kafka/api/UserClientIdQuotaTest.scala   |  6 +-
 .../integration/kafka/api/UserQuotaTest.scala   |  6 +-
 .../unit/kafka/admin/ConfigCommandTest.scala|  4 +-
 .../kafka/server/ClientQuotaManagerTest.scala   | 70 +++---
 .../kafka/server/DynamicConfigChangeTest.scala  |  1 +
 .../unit/kafka/server/RequestQuotaTest.scala|  3 +-
 26 files changed, 299 insertions(+), 291 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/kafka/blob/531dfd72/clients/src/main/java/org/apache/kafka/clients/admin/KafkaAdminClient.java
--
diff --git 
a/clients/src/main/java/org/apache/kafka/clients/admin/KafkaAdminClient.java 
b/clients/src/main/java/org/apache/kafka/clients/admin/KafkaAdminClient.java
index 1a66371..ece27ca 100644
--- a/clients/src/main/java/org/apache/kafka/clients/admin/KafkaAdminClient.java
+++ b/clients/src/main/java/org/apache/kafka/clients/admin/KafkaAdminClient.java
@@ -55,7 +55,6 @@ import org.apache.kafka.common.metrics.JmxReporter;
 import org.apache.kafka.common.metrics.MetricConfig;
 import org.apache.kafka.common.metrics.Metrics;
 import org.apache.kafka.common.metrics.MetricsReporter;
-import org.apache.kafka.common.metrics.Sanitizer;
 import org.apache.kafka.common.metrics.Sensor;
 import org.apache.kafka.common.network.ChannelBuilder;
 import org.apache.kafka.common.network.Selector;
@@ -290,7 +289,6 @@ public class KafkaAdminClient extends AdminClient {
 NetworkClient networkClient = null;
 Time time = Time.SYSTEM;
 String clientId = generateClientId(config);
-String sanitizedClientId = Sanitizer.sanitize(clientId);
 ChannelBuilder channelBuilder = null;
 Selector selector = null;
 ApiVersions apiVersions = new ApiVersions();
@@ -303,7 +301,7 @@ public class KafkaAdminClient extends AdminClient {
 config.getLong(AdminClientConfig.METADATA_MAX_AGE_CONFIG), 
true);
 List reporters = 
config.getConfiguredInstances(AdminClientConfig.METRIC_REPORTER_CLASSES_CONFIG,
 MetricsReporter.class);
-Map metricTags = 
Collections.singletonMap("client-id", sanitizedClientId);
+Map metricTags = 
Collections.singletonMap("client-id", clientId);
 MetricConfig metricConfig = new 
MetricConfig().samples(config.getInt(AdminClientConfig.METRICS_NUM_SAMPLES_CONFIG))
 
.timeWindow(config.getLong(AdminClientConfig.METRICS_SAMPLE_WINDOW_MS_CONFIG), 
TimeUnit.MILLISECONDS)

kafka git commit: MINOR: Push JMX metric name mangling into the JmxReporter (KIP-190 follow up)

kafka git commit: MINOR: Push JMX metric name mangling into the JmxReporter (KIP-190 follow up)

2 matches

Site Navigation

Mail list logo

Footer information