Merge ea1fa89 into 769dc9d

apache · Feb 3, 2018 · c01ecc7 · c01ecc7
2 parents 769dc9d + ea1fa89
commit c01ecc7
Show file tree

Hide file tree

Showing 20 changed files with 8 additions and 691 deletions.
diff --git a/...cs/metrics-common/src/main/java/org/apache/servicecomb/metrics/common/RegistryMetric.java b/...cs/metrics-common/src/main/java/org/apache/servicecomb/metrics/common/RegistryMetric.java
@@ -29,8 +29,6 @@ public class RegistryMetric {
 
   private final Map<String, ProducerInvocationMetric> producerMetrics;
 
-  private final Map<String, Double> customMetrics;
-
   public InstanceMetric getInstanceMetric() {
     return instanceMetric;
   }
@@ -43,27 +41,19 @@ public Map<String, ProducerInvocationMetric> getProducerMetrics() {
     return producerMetrics;
   }
 
-  public Map<String, Double> getCustomMetrics() {
-    return customMetrics;
-  }
-
   public RegistryMetric(@JsonProperty("instanceMetric") InstanceMetric instanceMetric,
       @JsonProperty("consumerMetrics") Map<String, ConsumerInvocationMetric> consumerMetrics,
-      @JsonProperty("producerMetrics") Map<String, ProducerInvocationMetric> producerMetrics,
-      @JsonProperty("customMetrics") Map<String, Double> customMetrics) {
+      @JsonProperty("producerMetrics") Map<String, ProducerInvocationMetric> producerMetrics) {
     this.consumerMetrics = consumerMetrics;
     this.producerMetrics = producerMetrics;
     this.instanceMetric = instanceMetric;
-    this.customMetrics = customMetrics;
   }
 
   public RegistryMetric(SystemMetric systemMetric,
       Map<String, ConsumerInvocationMetric> consumerMetrics,
-      Map<String, ProducerInvocationMetric> producerMetrics,
-      Map<String, Double> customMetrics) {
+      Map<String, ProducerInvocationMetric> producerMetrics) {
     this.consumerMetrics = consumerMetrics;
     this.producerMetrics = producerMetrics;
-    this.customMetrics = customMetrics;
 
     ConsumerInvocationMetric instanceConsumerInvocationMetric = new ConsumerInvocationMetric("instance",
         MetricsConst.INSTANCE_CONSUMER_PREFIX,

diff --git a/...metrics-core/src/main/java/org/apache/servicecomb/metrics/core/custom/CounterService.java b/...metrics-core/src/main/java/org/apache/servicecomb/metrics/core/custom/CounterService.java
diff --git a/...-core/src/main/java/org/apache/servicecomb/metrics/core/custom/DefaultCounterService.java b/...-core/src/main/java/org/apache/servicecomb/metrics/core/custom/DefaultCounterService.java
diff --git a/...cs-core/src/main/java/org/apache/servicecomb/metrics/core/custom/DefaultGaugeService.java b/...cs-core/src/main/java/org/apache/servicecomb/metrics/core/custom/DefaultGaugeService.java
diff --git a/...src/main/java/org/apache/servicecomb/metrics/core/custom/DefaultWindowCounterService.java b/...src/main/java/org/apache/servicecomb/metrics/core/custom/DefaultWindowCounterService.java
diff --git a/...s/metrics-core/src/main/java/org/apache/servicecomb/metrics/core/custom/GaugeService.java b/...s/metrics-core/src/main/java/org/apache/servicecomb/metrics/core/custom/GaugeService.java
diff --git a/.../metrics-core/src/main/java/org/apache/servicecomb/metrics/core/custom/WindowCounter.java b/.../metrics-core/src/main/java/org/apache/servicecomb/metrics/core/custom/WindowCounter.java
diff --git a/...s-core/src/main/java/org/apache/servicecomb/metrics/core/custom/WindowCounterService.java b/...s-core/src/main/java/org/apache/servicecomb/metrics/core/custom/WindowCounterService.java