You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicecomb.apache.org by ni...@apache.org on 2018/01/24 01:21:45 UTC
[incubator-servicecomb-java-chassis] 08/10: SCB-150 update package
name and resolve conflicts
This is an automated email from the ASF dual-hosted git repository.
ningjiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-servicecomb-java-chassis.git
commit cbd7092a004eb54827f88792f3cd692e2279e5f7
Author: zhengyangyong <ya...@huawei.com>
AuthorDate: Mon Jan 15 09:22:02 2018 +0800
SCB-150 update package name and resolve conflicts
Signed-off-by: zhengyangyong <ya...@huawei.com>
---
.../demo/springmvc/client/SpringmvcClient.java | 3 +-
.../demo/perf/PerfMetricsFilePublisher.java | 1 +
metrics/metrics-common/pom.xml | 2 +-
.../metrics/common/DoubleMetricValue.java | 8 ++--
.../metrics/common/LongMetricValue.java | 8 ++--
.../servicecomb/metrics/common/MetricValue.java | 2 +-
.../metrics/common/MetricsDimension.java | 4 +-
.../event/InvocationFinishedEventListener.java | 18 ++++-----
.../core/event/InvocationStartedEventListener.java | 18 ++++-----
.../metrics/core/monitor/CallMonitor.java | 14 +++----
.../core/monitor/ConsumerInvocationMonitor.java | 8 ++--
.../core/monitor/ProducerInvocationMonitor.java | 10 ++---
.../metrics/core/monitor/TimerMonitor.java | 8 ++--
.../metrics/core/utils/MonitorUtils.java | 2 +-
.../metrics/core/TestEventAndRunner.java | 25 ++++++------
.../metrics/prometheus/MetricsCollector.java | 16 ++++----
.../servicecomb/samples/mwf/TestWriteFile.java | 45 +++++++++++-----------
17 files changed, 96 insertions(+), 96 deletions(-)
diff --git a/demo/demo-springmvc/springmvc-client/src/main/java/org/apache/servicecomb/demo/springmvc/client/SpringmvcClient.java b/demo/demo-springmvc/springmvc-client/src/main/java/org/apache/servicecomb/demo/springmvc/client/SpringmvcClient.java
index 7ee9c14..08eec9b 100644
--- a/demo/demo-springmvc/springmvc-client/src/main/java/org/apache/servicecomb/demo/springmvc/client/SpringmvcClient.java
+++ b/demo/demo-springmvc/springmvc-client/src/main/java/org/apache/servicecomb/demo/springmvc/client/SpringmvcClient.java
@@ -29,6 +29,7 @@ import org.apache.servicecomb.demo.controller.Person;
import org.apache.servicecomb.foundation.common.utils.BeanUtils;
import org.apache.servicecomb.foundation.common.utils.JsonUtils;
import org.apache.servicecomb.foundation.common.utils.Log4jUtils;
+import org.apache.servicecomb.metrics.common.MetricsDimension;
import org.apache.servicecomb.metrics.common.MetricsPublisher;
import org.apache.servicecomb.metrics.common.RegistryMetric;
import org.apache.servicecomb.provider.springmvc.reference.CseRestTemplate;
@@ -58,7 +59,7 @@ public class SpringmvcClient {
TestMgr.summary();
}
- public static void run() throws Exception {
+ public static void run() {
templateUrlWithServiceName.setRequestFactory(new UrlWithServiceNameClientHttpRequestFactory());
restTemplate = RestTemplateBuilder.create();
controller = BeanUtils.getBean("controller");
diff --git a/demo/perf/src/main/java/org/apache/servicecomb/demo/perf/PerfMetricsFilePublisher.java b/demo/perf/src/main/java/org/apache/servicecomb/demo/perf/PerfMetricsFilePublisher.java
index 8a490a0..f04fdcd 100644
--- a/demo/perf/src/main/java/org/apache/servicecomb/demo/perf/PerfMetricsFilePublisher.java
+++ b/demo/perf/src/main/java/org/apache/servicecomb/demo/perf/PerfMetricsFilePublisher.java
@@ -19,6 +19,7 @@ package org.apache.servicecomb.demo.perf;
import java.util.Map.Entry;
import org.apache.servicecomb.metrics.common.ConsumerInvocationMetric;
+import org.apache.servicecomb.metrics.common.MetricsDimension;
import org.apache.servicecomb.metrics.common.ProducerInvocationMetric;
import org.apache.servicecomb.metrics.common.RegistryMetric;
import org.apache.servicecomb.metrics.core.publish.DataSource;
diff --git a/metrics/metrics-common/pom.xml b/metrics/metrics-common/pom.xml
index 5987595..3ac7fae 100644
--- a/metrics/metrics-common/pom.xml
+++ b/metrics/metrics-common/pom.xml
@@ -31,7 +31,7 @@
<dependencies>
<dependency>
- <groupId>io.servicecomb</groupId>
+ <groupId>org.apache.servicecomb</groupId>
<artifactId>foundation-common</artifactId>
</dependency>
</dependencies>
diff --git a/metrics/metrics-common/src/main/java/io/servicecomb/metrics/common/DoubleMetricValue.java b/metrics/metrics-common/src/main/java/org/apache/servicecomb/metrics/common/DoubleMetricValue.java
similarity index 92%
rename from metrics/metrics-common/src/main/java/io/servicecomb/metrics/common/DoubleMetricValue.java
rename to metrics/metrics-common/src/main/java/org/apache/servicecomb/metrics/common/DoubleMetricValue.java
index 8b83191..30a7790 100644
--- a/metrics/metrics-common/src/main/java/io/servicecomb/metrics/common/DoubleMetricValue.java
+++ b/metrics/metrics-common/src/main/java/org/apache/servicecomb/metrics/common/DoubleMetricValue.java
@@ -15,16 +15,16 @@
* limitations under the License.
*/
-package io.servicecomb.metrics.common;
+package org.apache.servicecomb.metrics.common;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import com.fasterxml.jackson.annotation.JsonProperty;
+import org.apache.servicecomb.foundation.common.exceptions.ServiceCombException;
-import io.servicecomb.foundation.common.exceptions.ServiceCombException;
+import com.fasterxml.jackson.annotation.JsonProperty;
public class DoubleMetricValue extends MetricValue<Double> {
public DoubleMetricValue(Double value, Map<String, String> dimensions) {
@@ -37,7 +37,7 @@ public class DoubleMetricValue extends MetricValue<Double> {
super(key, value, dimensions);
}
- public DoubleMetricValue merge(DoubleMetricValue value) {
+ private DoubleMetricValue merge(DoubleMetricValue value) {
if (this.getKey().equals(value.getKey())) {
return new DoubleMetricValue(this.getKey(), this.getValue() + value.getValue(), this.getDimensions());
}
diff --git a/metrics/metrics-common/src/main/java/io/servicecomb/metrics/common/LongMetricValue.java b/metrics/metrics-common/src/main/java/org/apache/servicecomb/metrics/common/LongMetricValue.java
similarity index 92%
rename from metrics/metrics-common/src/main/java/io/servicecomb/metrics/common/LongMetricValue.java
rename to metrics/metrics-common/src/main/java/org/apache/servicecomb/metrics/common/LongMetricValue.java
index 6f7429c..84babff 100644
--- a/metrics/metrics-common/src/main/java/io/servicecomb/metrics/common/LongMetricValue.java
+++ b/metrics/metrics-common/src/main/java/org/apache/servicecomb/metrics/common/LongMetricValue.java
@@ -15,16 +15,16 @@
* limitations under the License.
*/
-package io.servicecomb.metrics.common;
+package org.apache.servicecomb.metrics.common;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import com.fasterxml.jackson.annotation.JsonProperty;
+import org.apache.servicecomb.foundation.common.exceptions.ServiceCombException;
-import io.servicecomb.foundation.common.exceptions.ServiceCombException;
+import com.fasterxml.jackson.annotation.JsonProperty;
public class LongMetricValue extends MetricValue<Long> {
public LongMetricValue(Long value, Map<String, String> dimensions) {
@@ -37,7 +37,7 @@ public class LongMetricValue extends MetricValue<Long> {
super(key, value, dimensions);
}
- public LongMetricValue merge(LongMetricValue value) {
+ private LongMetricValue merge(LongMetricValue value) {
if (this.getKey().equals(value.getKey())) {
return new LongMetricValue(this.getKey(), this.getValue() + value.getValue(), this.getDimensions());
}
diff --git a/metrics/metrics-common/src/main/java/io/servicecomb/metrics/common/MetricValue.java b/metrics/metrics-common/src/main/java/org/apache/servicecomb/metrics/common/MetricValue.java
similarity index 97%
rename from metrics/metrics-common/src/main/java/io/servicecomb/metrics/common/MetricValue.java
rename to metrics/metrics-common/src/main/java/org/apache/servicecomb/metrics/common/MetricValue.java
index f1f95e3..0a8d364 100644
--- a/metrics/metrics-common/src/main/java/io/servicecomb/metrics/common/MetricValue.java
+++ b/metrics/metrics-common/src/main/java/org/apache/servicecomb/metrics/common/MetricValue.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package io.servicecomb.metrics.common;
+package org.apache.servicecomb.metrics.common;
import java.util.Arrays;
import java.util.Map;
diff --git a/metrics/metrics-common/src/main/java/io/servicecomb/metrics/common/MetricsDimension.java b/metrics/metrics-common/src/main/java/org/apache/servicecomb/metrics/common/MetricsDimension.java
similarity index 91%
rename from metrics/metrics-common/src/main/java/io/servicecomb/metrics/common/MetricsDimension.java
rename to metrics/metrics-common/src/main/java/org/apache/servicecomb/metrics/common/MetricsDimension.java
index d8f661f..23f1f40 100644
--- a/metrics/metrics-common/src/main/java/io/servicecomb/metrics/common/MetricsDimension.java
+++ b/metrics/metrics-common/src/main/java/org/apache/servicecomb/metrics/common/MetricsDimension.java
@@ -15,9 +15,9 @@
* limitations under the License.
*/
-package io.servicecomb.metrics.common;
+package org.apache.servicecomb.metrics.common;
-import io.servicecomb.foundation.common.exceptions.ServiceCombException;
+import org.apache.servicecomb.foundation.common.exceptions.ServiceCombException;
public class MetricsDimension {
public static final String DIMENSION_STATUS = "Status";
diff --git a/metrics/metrics-core/src/main/java/org/apache/servicecomb/metrics/core/event/InvocationFinishedEventListener.java b/metrics/metrics-core/src/main/java/org/apache/servicecomb/metrics/core/event/InvocationFinishedEventListener.java
index a802a49..8d15eac 100644
--- a/metrics/metrics-core/src/main/java/org/apache/servicecomb/metrics/core/event/InvocationFinishedEventListener.java
+++ b/metrics/metrics-core/src/main/java/org/apache/servicecomb/metrics/core/event/InvocationFinishedEventListener.java
@@ -15,16 +15,16 @@
* limitations under the License.
*/
-package io.servicecomb.metrics.core.event;
+package org.apache.servicecomb.metrics.core.event;
-import io.servicecomb.core.metrics.InvocationFinishedEvent;
-import io.servicecomb.foundation.common.event.Event;
-import io.servicecomb.foundation.common.event.EventListener;
-import io.servicecomb.metrics.common.MetricsDimension;
-import io.servicecomb.metrics.core.monitor.ConsumerInvocationMonitor;
-import io.servicecomb.metrics.core.monitor.ProducerInvocationMonitor;
-import io.servicecomb.metrics.core.monitor.RegistryMonitor;
-import io.servicecomb.swagger.invocation.InvocationType;
+import org.apache.servicecomb.core.metrics.InvocationFinishedEvent;
+import org.apache.servicecomb.foundation.common.event.Event;
+import org.apache.servicecomb.foundation.common.event.EventListener;
+import org.apache.servicecomb.metrics.common.MetricsDimension;
+import org.apache.servicecomb.metrics.core.monitor.ConsumerInvocationMonitor;
+import org.apache.servicecomb.metrics.core.monitor.ProducerInvocationMonitor;
+import org.apache.servicecomb.metrics.core.monitor.RegistryMonitor;
+import org.apache.servicecomb.swagger.invocation.InvocationType;
public class InvocationFinishedEventListener implements EventListener {
diff --git a/metrics/metrics-core/src/main/java/org/apache/servicecomb/metrics/core/event/InvocationStartedEventListener.java b/metrics/metrics-core/src/main/java/org/apache/servicecomb/metrics/core/event/InvocationStartedEventListener.java
index 2ea0fee..c13d173 100644
--- a/metrics/metrics-core/src/main/java/org/apache/servicecomb/metrics/core/event/InvocationStartedEventListener.java
+++ b/metrics/metrics-core/src/main/java/org/apache/servicecomb/metrics/core/event/InvocationStartedEventListener.java
@@ -15,16 +15,16 @@
* limitations under the License.
*/
-package io.servicecomb.metrics.core.event;
+package org.apache.servicecomb.metrics.core.event;
-import io.servicecomb.core.metrics.InvocationStartedEvent;
-import io.servicecomb.foundation.common.event.Event;
-import io.servicecomb.foundation.common.event.EventListener;
-import io.servicecomb.metrics.common.MetricsDimension;
-import io.servicecomb.metrics.core.monitor.ConsumerInvocationMonitor;
-import io.servicecomb.metrics.core.monitor.ProducerInvocationMonitor;
-import io.servicecomb.metrics.core.monitor.RegistryMonitor;
-import io.servicecomb.swagger.invocation.InvocationType;
+import org.apache.servicecomb.core.metrics.InvocationStartedEvent;
+import org.apache.servicecomb.foundation.common.event.Event;
+import org.apache.servicecomb.foundation.common.event.EventListener;
+import org.apache.servicecomb.metrics.common.MetricsDimension;
+import org.apache.servicecomb.metrics.core.monitor.ConsumerInvocationMonitor;
+import org.apache.servicecomb.metrics.core.monitor.ProducerInvocationMonitor;
+import org.apache.servicecomb.metrics.core.monitor.RegistryMonitor;
+import org.apache.servicecomb.swagger.invocation.InvocationType;
public class InvocationStartedEventListener implements EventListener {
diff --git a/metrics/metrics-core/src/main/java/org/apache/servicecomb/metrics/core/monitor/CallMonitor.java b/metrics/metrics-core/src/main/java/org/apache/servicecomb/metrics/core/monitor/CallMonitor.java
index 986592d..068776e 100644
--- a/metrics/metrics-core/src/main/java/org/apache/servicecomb/metrics/core/monitor/CallMonitor.java
+++ b/metrics/metrics-core/src/main/java/org/apache/servicecomb/metrics/core/monitor/CallMonitor.java
@@ -17,21 +17,19 @@
package org.apache.servicecomb.metrics.core.monitor;
-import org.apache.servicecomb.metrics.common.CallMetric;
-
import java.util.ArrayList;
import java.util.List;
+import org.apache.servicecomb.metrics.common.CallMetric;
+import org.apache.servicecomb.metrics.common.DoubleMetricValue;
+import org.apache.servicecomb.metrics.common.LongMetricValue;
+import org.apache.servicecomb.metrics.common.MetricsDimension;
+import org.apache.servicecomb.metrics.core.utils.MonitorUtils;
+
import com.netflix.servo.monitor.BasicCounter;
import com.netflix.servo.monitor.MonitorConfig;
import com.netflix.servo.monitor.StepCounter;
-import io.servicecomb.metrics.common.CallMetric;
-import io.servicecomb.metrics.common.DoubleMetricValue;
-import io.servicecomb.metrics.common.LongMetricValue;
-import io.servicecomb.metrics.common.MetricsDimension;
-import io.servicecomb.metrics.core.utils.MonitorUtils;
-
public class CallMonitor {
private final String prefix;
diff --git a/metrics/metrics-core/src/main/java/org/apache/servicecomb/metrics/core/monitor/ConsumerInvocationMonitor.java b/metrics/metrics-core/src/main/java/org/apache/servicecomb/metrics/core/monitor/ConsumerInvocationMonitor.java
index 076ecd1..9a09551 100644
--- a/metrics/metrics-core/src/main/java/org/apache/servicecomb/metrics/core/monitor/ConsumerInvocationMonitor.java
+++ b/metrics/metrics-core/src/main/java/org/apache/servicecomb/metrics/core/monitor/ConsumerInvocationMonitor.java
@@ -15,12 +15,12 @@
* limitations under the License.
*/
-package io.servicecomb.metrics.core.monitor;
+package org.apache.servicecomb.metrics.core.monitor;
-import io.servicecomb.metrics.common.ConsumerInvocationMetric;
-import io.servicecomb.metrics.common.MetricsConst;
-import io.servicecomb.metrics.common.MetricsDimension;
+import org.apache.servicecomb.metrics.common.ConsumerInvocationMetric;
+import org.apache.servicecomb.metrics.common.MetricsConst;
+import org.apache.servicecomb.metrics.common.MetricsDimension;
public class ConsumerInvocationMonitor extends InvocationMonitor {
private final TimerMonitor consumerLatency;
diff --git a/metrics/metrics-core/src/main/java/org/apache/servicecomb/metrics/core/monitor/ProducerInvocationMonitor.java b/metrics/metrics-core/src/main/java/org/apache/servicecomb/metrics/core/monitor/ProducerInvocationMonitor.java
index 82d426f..50a508c 100644
--- a/metrics/metrics-core/src/main/java/org/apache/servicecomb/metrics/core/monitor/ProducerInvocationMonitor.java
+++ b/metrics/metrics-core/src/main/java/org/apache/servicecomb/metrics/core/monitor/ProducerInvocationMonitor.java
@@ -15,15 +15,15 @@
* limitations under the License.
*/
-package io.servicecomb.metrics.core.monitor;
+package org.apache.servicecomb.metrics.core.monitor;
+
+import org.apache.servicecomb.metrics.common.MetricsConst;
+import org.apache.servicecomb.metrics.common.MetricsDimension;
+import org.apache.servicecomb.metrics.common.ProducerInvocationMetric;
import com.netflix.servo.monitor.BasicCounter;
import com.netflix.servo.monitor.MonitorConfig;
-import io.servicecomb.metrics.common.MetricsConst;
-import io.servicecomb.metrics.common.MetricsDimension;
-import io.servicecomb.metrics.common.ProducerInvocationMetric;
-
public class ProducerInvocationMonitor extends InvocationMonitor {
private final BasicCounter waitInQueue;
diff --git a/metrics/metrics-core/src/main/java/org/apache/servicecomb/metrics/core/monitor/TimerMonitor.java b/metrics/metrics-core/src/main/java/org/apache/servicecomb/metrics/core/monitor/TimerMonitor.java
index 33ba8ab..a88a604 100644
--- a/metrics/metrics-core/src/main/java/org/apache/servicecomb/metrics/core/monitor/TimerMonitor.java
+++ b/metrics/metrics-core/src/main/java/org/apache/servicecomb/metrics/core/monitor/TimerMonitor.java
@@ -15,16 +15,16 @@
* limitations under the License.
*/
-package io.servicecomb.metrics.core.monitor;
+package org.apache.servicecomb.metrics.core.monitor;
+
+import org.apache.servicecomb.metrics.common.TimerMetric;
+import org.apache.servicecomb.metrics.core.utils.MonitorUtils;
import com.netflix.servo.monitor.MaxGauge;
import com.netflix.servo.monitor.MinGauge;
import com.netflix.servo.monitor.MonitorConfig;
import com.netflix.servo.monitor.StepCounter;
-import io.servicecomb.metrics.common.TimerMetric;
-import io.servicecomb.metrics.core.utils.MonitorUtils;
-
public class TimerMonitor {
private final String prefix;
diff --git a/metrics/metrics-core/src/main/java/io/servicecomb/metrics/core/utils/MonitorUtils.java b/metrics/metrics-core/src/main/java/org/apache/servicecomb/metrics/core/utils/MonitorUtils.java
similarity index 98%
rename from metrics/metrics-core/src/main/java/io/servicecomb/metrics/core/utils/MonitorUtils.java
rename to metrics/metrics-core/src/main/java/org/apache/servicecomb/metrics/core/utils/MonitorUtils.java
index 741cdd5..31be367 100644
--- a/metrics/metrics-core/src/main/java/io/servicecomb/metrics/core/utils/MonitorUtils.java
+++ b/metrics/metrics-core/src/main/java/org/apache/servicecomb/metrics/core/utils/MonitorUtils.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package io.servicecomb.metrics.core.utils;
+package org.apache.servicecomb.metrics.core.utils;
import java.util.HashMap;
import java.util.Map;
diff --git a/metrics/metrics-core/src/test/java/org/apache/servicecomb/metrics/core/TestEventAndRunner.java b/metrics/metrics-core/src/test/java/org/apache/servicecomb/metrics/core/TestEventAndRunner.java
index c897bf1..8e87439 100644
--- a/metrics/metrics-core/src/test/java/org/apache/servicecomb/metrics/core/TestEventAndRunner.java
+++ b/metrics/metrics-core/src/test/java/org/apache/servicecomb/metrics/core/TestEventAndRunner.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package io.servicecomb.metrics.core;
+package org.apache.servicecomb.metrics.core;
import static org.hamcrest.Matchers.containsInAnyOrder;
import static org.mockito.Mockito.when;
@@ -29,22 +29,21 @@ import java.util.List;
import java.util.Map;
import java.util.concurrent.TimeUnit;
+import org.apache.servicecomb.core.metrics.InvocationFinishedEvent;
+import org.apache.servicecomb.core.metrics.InvocationStartProcessingEvent;
+import org.apache.servicecomb.core.metrics.InvocationStartedEvent;
+import org.apache.servicecomb.foundation.common.utils.EventUtils;
+import org.apache.servicecomb.metrics.common.MetricsDimension;
+import org.apache.servicecomb.metrics.common.RegistryMetric;
+import org.apache.servicecomb.metrics.core.event.DefaultEventListenerManager;
+import org.apache.servicecomb.metrics.core.monitor.DefaultSystemMonitor;
+import org.apache.servicecomb.metrics.core.monitor.RegistryMonitor;
+import org.apache.servicecomb.metrics.core.publish.DefaultDataSource;
+import org.apache.servicecomb.swagger.invocation.InvocationType;
import org.junit.Assert;
import org.junit.Test;
import org.mockito.Mockito;
-import io.servicecomb.core.metrics.InvocationFinishedEvent;
-import io.servicecomb.core.metrics.InvocationStartProcessingEvent;
-import io.servicecomb.core.metrics.InvocationStartedEvent;
-import io.servicecomb.foundation.common.utils.EventUtils;
-import io.servicecomb.metrics.common.MetricsDimension;
-import io.servicecomb.metrics.common.RegistryMetric;
-import io.servicecomb.metrics.core.event.DefaultEventListenerManager;
-import io.servicecomb.metrics.core.monitor.DefaultSystemMonitor;
-import io.servicecomb.metrics.core.monitor.RegistryMonitor;
-import io.servicecomb.metrics.core.publish.DefaultDataSource;
-import io.servicecomb.swagger.invocation.InvocationType;
-
public class TestEventAndRunner {
@Test
diff --git a/metrics/metrics-integration/metrics-prometheus/src/main/java/org/apache/servicecomb/metrics/prometheus/MetricsCollector.java b/metrics/metrics-integration/metrics-prometheus/src/main/java/org/apache/servicecomb/metrics/prometheus/MetricsCollector.java
index f784722..290d383 100644
--- a/metrics/metrics-integration/metrics-prometheus/src/main/java/org/apache/servicecomb/metrics/prometheus/MetricsCollector.java
+++ b/metrics/metrics-integration/metrics-prometheus/src/main/java/org/apache/servicecomb/metrics/prometheus/MetricsCollector.java
@@ -15,25 +15,25 @@
* limitations under the License.
*/
-package io.servicecomb.metrics.prometheus;
+package org.apache.servicecomb.metrics.prometheus;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
+import org.apache.servicecomb.metrics.common.CallMetric;
+import org.apache.servicecomb.metrics.common.ConsumerInvocationMetric;
+import org.apache.servicecomb.metrics.common.DoubleMetricValue;
+import org.apache.servicecomb.metrics.common.LongMetricValue;
+import org.apache.servicecomb.metrics.common.ProducerInvocationMetric;
+import org.apache.servicecomb.metrics.common.RegistryMetric;
+import org.apache.servicecomb.metrics.core.publish.DataSource;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import io.prometheus.client.Collector;
import io.prometheus.client.Collector.MetricFamilySamples.Sample;
-import io.servicecomb.metrics.common.CallMetric;
-import io.servicecomb.metrics.common.ConsumerInvocationMetric;
-import io.servicecomb.metrics.common.DoubleMetricValue;
-import io.servicecomb.metrics.common.LongMetricValue;
-import io.servicecomb.metrics.common.ProducerInvocationMetric;
-import io.servicecomb.metrics.common.RegistryMetric;
-import io.servicecomb.metrics.core.publish.DataSource;
@Component
public class MetricsCollector extends Collector implements Collector.Describable {
diff --git a/samples/metrics-write-file-sample/metrics-write-file/src/test/java/org/apache/servicecomb/samples/mwf/TestWriteFile.java b/samples/metrics-write-file-sample/metrics-write-file/src/test/java/org/apache/servicecomb/samples/mwf/TestWriteFile.java
index d73d30d..d550f77 100644
--- a/samples/metrics-write-file-sample/metrics-write-file/src/test/java/org/apache/servicecomb/samples/mwf/TestWriteFile.java
+++ b/samples/metrics-write-file-sample/metrics-write-file/src/test/java/org/apache/servicecomb/samples/mwf/TestWriteFile.java
@@ -15,35 +15,36 @@
* limitations under the License.
*/
-package io.servicecomb.samples.mwf;
+package org.apache.servicecomb.samples.mwf;
import java.util.Arrays;
+import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Set;
+import org.apache.servicecomb.metrics.common.CallMetric;
+import org.apache.servicecomb.metrics.common.ConsumerInvocationMetric;
+import org.apache.servicecomb.metrics.common.DoubleMetricValue;
+import org.apache.servicecomb.metrics.common.LongMetricValue;
+import org.apache.servicecomb.metrics.common.RegistryMetric;
+import org.apache.servicecomb.metrics.common.SystemMetric;
+import org.apache.servicecomb.metrics.common.TimerMetric;
+import org.apache.servicecomb.metrics.core.publish.DataSource;
+import org.apache.servicecomb.serviceregistry.Features;
+import org.apache.servicecomb.serviceregistry.RegistryUtils;
+import org.apache.servicecomb.serviceregistry.ServiceRegistry;
+import org.apache.servicecomb.serviceregistry.api.registry.Microservice;
+import org.apache.servicecomb.serviceregistry.api.registry.MicroserviceInstance;
+import org.apache.servicecomb.serviceregistry.cache.InstanceCacheManager;
+import org.apache.servicecomb.serviceregistry.client.ServiceRegistryClient;
+import org.apache.servicecomb.serviceregistry.client.http.MicroserviceInstances;
+import org.apache.servicecomb.serviceregistry.consumer.AppManager;
import org.junit.Assert;
import org.junit.Test;
import org.mockito.Mockito;
-import io.servicecomb.metrics.common.CallMetric;
-import io.servicecomb.metrics.common.ConsumerInvocationMetric;
-import io.servicecomb.metrics.common.DoubleMetricValue;
-import io.servicecomb.metrics.common.LongMetricValue;
-import io.servicecomb.metrics.common.RegistryMetric;
-import io.servicecomb.metrics.common.SystemMetric;
-import io.servicecomb.metrics.common.TimerMetric;
-import io.servicecomb.metrics.core.publish.DataSource;
-import io.servicecomb.serviceregistry.Features;
-import io.servicecomb.serviceregistry.RegistryUtils;
-import io.servicecomb.serviceregistry.ServiceRegistry;
-import io.servicecomb.serviceregistry.api.registry.Microservice;
-import io.servicecomb.serviceregistry.api.registry.MicroserviceInstance;
-import io.servicecomb.serviceregistry.cache.InstanceCacheManager;
-import io.servicecomb.serviceregistry.client.ServiceRegistryClient;
-import io.servicecomb.serviceregistry.client.http.MicroserviceInstances;
-import io.servicecomb.serviceregistry.consumer.AppManager;
import mockit.Expectations;
public class TestWriteFile {
@@ -146,13 +147,13 @@ public class TestWriteFile {
Map<String, ConsumerInvocationMetric> consumerInvocationMetricMap = new HashMap<>();
consumerInvocationMetricMap.put("A", new ConsumerInvocationMetric("A", "A",
new TimerMetric("A1", 1, 2, 3, 4),
- new CallMetric("A2", Arrays.asList(new LongMetricValue("A2", 100L, new HashMap<>())),
- Arrays.asList(new DoubleMetricValue("A2", 999.44444, new HashMap<>())))));
+ new CallMetric("A2", Collections.singletonList(new LongMetricValue("A2", 100L, new HashMap<>())),
+ Collections.singletonList(new DoubleMetricValue("A2", 999.44444, new HashMap<>())))));
consumerInvocationMetricMap.put("B", new ConsumerInvocationMetric("B", "B",
new TimerMetric("B1", 1, 2, 3, 4),
- new CallMetric("B2", Arrays.asList(new LongMetricValue("B2", 100L, new HashMap<>())),
- Arrays.asList(new DoubleMetricValue("B2", 888.66666, new HashMap<>())))));
+ new CallMetric("B2", Collections.singletonList(new LongMetricValue("B2", 100L, new HashMap<>())),
+ Collections.singletonList(new DoubleMetricValue("B2", 888.66666, new HashMap<>())))));
RegistryMetric metric = new RegistryMetric(systemMetric, consumerInvocationMetricMap, new HashMap<>());
--
To stop receiving notification emails like this one, please contact
ningjiang@apache.org.