You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicecomb.apache.org by li...@apache.org on 2018/01/09 06:27:21 UTC
[incubator-servicecomb-java-chassis] 10/13: SCB-85 fix pr comment
This is an automated email from the ASF dual-hosted git repository.
liubao pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-servicecomb-java-chassis.git
commit ada5d28f6dfcfa4515c7769c669af3feb741084a
Author: zhengyangyong <ya...@huawei.com>
AuthorDate: Mon Jan 8 09:29:16 2018 +0800
SCB-85 fix pr comment
Signed-off-by: zhengyangyong <ya...@huawei.com>
---
.../foundation/metrics/MetricsServoRegistry.java | 3 +--
.../io/servicecomb/metrics/core/MetricsConfig.java | 22 +++++++++++++++++++
.../metrics/core/publish/DefaultDataSource.java | 6 +++---
.../metrics-extension/metrics-write-file/pom.xml | 5 +++++
.../writefile/SimpleFileContentConvertor.java | 3 +--
.../extension/writefile/WriteFileInitializer.java | 8 +++----
metrics/metrics-extension/pom.xml | 11 ----------
.../metrics-write-file-common/pom.xml | 6 +-----
samples/metrics-write-file-sample/pom.xml | 12 +++++------
.../springmvc/consumer/SpringmvcConsumerMain.java | 25 ----------------------
.../springmvc/provider/SpringmvcHelloImpl.java | 24 ---------------------
11 files changed, 41 insertions(+), 84 deletions(-)
diff --git a/foundations/foundation-metrics/src/main/java/io/servicecomb/foundation/metrics/MetricsServoRegistry.java b/foundations/foundation-metrics/src/main/java/io/servicecomb/foundation/metrics/MetricsServoRegistry.java
index 4d90bbd..b00ff32 100644
--- a/foundations/foundation-metrics/src/main/java/io/servicecomb/foundation/metrics/MetricsServoRegistry.java
+++ b/foundations/foundation-metrics/src/main/java/io/servicecomb/foundation/metrics/MetricsServoRegistry.java
@@ -566,8 +566,7 @@ public class MetricsServoRegistry implements InitializingBean {
if (!Double.isNaN(value)) {
BigDecimal decimal = new BigDecimal(value);
return decimal.setScale(places, RoundingMode.HALF_UP).doubleValue();
- } else {
- return 0;
}
+ return 0;
}
}
diff --git a/metrics/metrics-core/src/main/java/io/servicecomb/metrics/core/MetricsConfig.java b/metrics/metrics-core/src/main/java/io/servicecomb/metrics/core/MetricsConfig.java
new file mode 100644
index 0000000..1223b15
--- /dev/null
+++ b/metrics/metrics-core/src/main/java/io/servicecomb/metrics/core/MetricsConfig.java
@@ -0,0 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.servicecomb.metrics.core;
+
+public class MetricsConfig {
+ public static final String METRICS_POLLING_TIME = "servicecomb.metrics.window_time";
+}
diff --git a/metrics/metrics-core/src/main/java/io/servicecomb/metrics/core/publish/DefaultDataSource.java b/metrics/metrics-core/src/main/java/io/servicecomb/metrics/core/publish/DefaultDataSource.java
index 81c439b..402a333 100644
--- a/metrics/metrics-core/src/main/java/io/servicecomb/metrics/core/publish/DefaultDataSource.java
+++ b/metrics/metrics-core/src/main/java/io/servicecomb/metrics/core/publish/DefaultDataSource.java
@@ -34,20 +34,20 @@ import com.netflix.servo.util.Strings;
import io.servicecomb.foundation.common.exceptions.ServiceCombException;
import io.servicecomb.metrics.common.RegistryMetric;
+import io.servicecomb.metrics.core.MetricsConfig;
import io.servicecomb.metrics.core.monitor.RegistryMonitor;
import io.servicecomb.swagger.invocation.exception.InvocationException;
@Component
public class DefaultDataSource implements DataSource {
- private static final String METRICS_POLLING_TIME = "servicecomb.metrics.window_time";
-
private final RegistryMonitor registryMonitor;
private final Map<Long, Integer> appliedWindowTimes = new HashMap<>();
@Autowired
public DefaultDataSource(RegistryMonitor registryMonitor) {
- this(registryMonitor, DynamicPropertyFactory.getInstance().getStringProperty(METRICS_POLLING_TIME, "5000").get());
+ this(registryMonitor,
+ DynamicPropertyFactory.getInstance().getStringProperty(MetricsConfig.METRICS_POLLING_TIME, "5000").get());
}
public DefaultDataSource(RegistryMonitor registryMonitor, String pollingSettings) {
diff --git a/metrics/metrics-extension/metrics-write-file/pom.xml b/metrics/metrics-extension/metrics-write-file/pom.xml
index 3930ea9..df8c1c7 100644
--- a/metrics/metrics-extension/metrics-write-file/pom.xml
+++ b/metrics/metrics-extension/metrics-write-file/pom.xml
@@ -33,6 +33,11 @@
<groupId>io.servicecomb</groupId>
<artifactId>metrics-write-file-config</artifactId>
</dependency>
+
+ <dependency>
+ <groupId>io.servicecomb</groupId>
+ <artifactId>metrics-core</artifactId>
+ </dependency>
</dependencies>
</project>
\ No newline at end of file
diff --git a/metrics/metrics-extension/metrics-write-file/src/main/java/io/servicecomb/metrics/extension/writefile/SimpleFileContentConvertor.java b/metrics/metrics-extension/metrics-write-file/src/main/java/io/servicecomb/metrics/extension/writefile/SimpleFileContentConvertor.java
index aa75a25..83d4554 100644
--- a/metrics/metrics-extension/metrics-write-file/src/main/java/io/servicecomb/metrics/extension/writefile/SimpleFileContentConvertor.java
+++ b/metrics/metrics-extension/metrics-write-file/src/main/java/io/servicecomb/metrics/extension/writefile/SimpleFileContentConvertor.java
@@ -54,8 +54,7 @@ public class SimpleFileContentConvertor implements FileContentConvertor {
if (!Double.isNaN(value)) {
BigDecimal decimal = new BigDecimal(value);
return decimal.setScale(places, RoundingMode.HALF_UP).doubleValue();
- } else {
- return 0;
}
+ return 0;
}
}
diff --git a/metrics/metrics-extension/metrics-write-file/src/main/java/io/servicecomb/metrics/extension/writefile/WriteFileInitializer.java b/metrics/metrics-extension/metrics-write-file/src/main/java/io/servicecomb/metrics/extension/writefile/WriteFileInitializer.java
index d3d6732..1593ce9 100644
--- a/metrics/metrics-extension/metrics-write-file/src/main/java/io/servicecomb/metrics/extension/writefile/WriteFileInitializer.java
+++ b/metrics/metrics-extension/metrics-write-file/src/main/java/io/servicecomb/metrics/extension/writefile/WriteFileInitializer.java
@@ -30,6 +30,7 @@ import com.netflix.config.DynamicPropertyFactory;
import io.servicecomb.foundation.common.net.NetUtils;
import io.servicecomb.metrics.common.RegistryMetric;
+import io.servicecomb.metrics.core.MetricsConfig;
import io.servicecomb.metrics.core.publish.DataSource;
import io.servicecomb.metrics.extension.writefile.config.MetricsFileWriter;
import io.servicecomb.serviceregistry.RegistryUtils;
@@ -37,9 +38,6 @@ import io.servicecomb.serviceregistry.api.registry.Microservice;
@Component
public class WriteFileInitializer {
-
- private static final String METRICS_WINDOW_TIME = "servicecomb.metrics.window_time";
-
private final int metricPoll;
private FileContentConvertor convertor;
@@ -56,7 +54,7 @@ public class WriteFileInitializer {
@Autowired
public WriteFileInitializer(MetricsFileWriter fileWriter, DataSource dataSource) {
- metricPoll = DynamicPropertyFactory.getInstance().getIntProperty(METRICS_WINDOW_TIME, 5000).get();
+ metricPoll = DynamicPropertyFactory.getInstance().getIntProperty(MetricsConfig.METRICS_POLLING_TIME, 5000).get();
this.fileWriter = fileWriter;
this.dataSource = dataSource;
@@ -64,7 +62,7 @@ public class WriteFileInitializer {
}
public WriteFileInitializer(MetricsFileWriter fileWriter, DataSource dataSource, String hostName, String filePrefix) {
- metricPoll = DynamicPropertyFactory.getInstance().getIntProperty(METRICS_WINDOW_TIME, 5000).get();
+ metricPoll = DynamicPropertyFactory.getInstance().getIntProperty(MetricsConfig.METRICS_POLLING_TIME, 5000).get();
this.fileWriter = fileWriter;
this.dataSource = dataSource;
this.hostName = hostName;
diff --git a/metrics/metrics-extension/pom.xml b/metrics/metrics-extension/pom.xml
index 14201cc..f8abb4e 100644
--- a/metrics/metrics-extension/pom.xml
+++ b/metrics/metrics-extension/pom.xml
@@ -61,15 +61,4 @@
</dependencies>
</dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>io.servicecomb</groupId>
- <artifactId>metrics-common</artifactId>
- </dependency>
- <dependency>
- <groupId>io.servicecomb</groupId>
- <artifactId>metrics-core</artifactId>
- </dependency>
- </dependencies>
-
</project>
\ No newline at end of file
diff --git a/samples/metrics-write-file-sample/metrics-write-file-common/pom.xml b/samples/metrics-write-file-sample/metrics-write-file-common/pom.xml
index b08966e..def56c2 100644
--- a/samples/metrics-write-file-sample/metrics-write-file-common/pom.xml
+++ b/samples/metrics-write-file-sample/metrics-write-file-common/pom.xml
@@ -30,11 +30,7 @@
<dependencies>
<dependency>
<groupId>io.servicecomb</groupId>
- <artifactId>provider-rest-common</artifactId>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-web</artifactId>
+ <artifactId>provider-springmvc</artifactId>
</dependency>
</dependencies>
</project>
\ No newline at end of file
diff --git a/samples/metrics-write-file-sample/pom.xml b/samples/metrics-write-file-sample/pom.xml
index fd7767b..ca8e29f 100644
--- a/samples/metrics-write-file-sample/pom.xml
+++ b/samples/metrics-write-file-sample/pom.xml
@@ -39,6 +39,11 @@
<dependencyManagement>
<dependencies>
<dependency>
+ <groupId>io.servicecomb.samples</groupId>
+ <artifactId>metrics-write-file-common</artifactId>
+ <version>0.6.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
<groupId>io.servicecomb</groupId>
<artifactId>metrics-write-file-config</artifactId>
<version>0.6.0-SNAPSHOT</version>
@@ -58,14 +63,7 @@
<artifactId>metrics-write-file</artifactId>
<version>0.6.0-SNAPSHOT</version>
</dependency>
-
- <dependency>
- <groupId>io.servicecomb.samples</groupId>
- <artifactId>metrics-write-file-common</artifactId>
- <version>0.6.0-SNAPSHOT</version>
- </dependency>
</dependencies>
</dependencyManagement>
-
</project>
\ No newline at end of file
diff --git a/samples/springmvc-sample/springmvc-consumer/src/main/java/io/servicecomb/samples/springmvc/consumer/SpringmvcConsumerMain.java b/samples/springmvc-sample/springmvc-consumer/src/main/java/io/servicecomb/samples/springmvc/consumer/SpringmvcConsumerMain.java
index 35fcffe..9ad4875 100644
--- a/samples/springmvc-sample/springmvc-consumer/src/main/java/io/servicecomb/samples/springmvc/consumer/SpringmvcConsumerMain.java
+++ b/samples/springmvc-sample/springmvc-consumer/src/main/java/io/servicecomb/samples/springmvc/consumer/SpringmvcConsumerMain.java
@@ -16,15 +16,10 @@
*/
package io.servicecomb.samples.springmvc.consumer;
-import java.util.HashMap;
-import java.util.Map;
-
import org.springframework.stereotype.Component;
import org.springframework.web.client.RestTemplate;
-import io.servicecomb.foundation.common.exceptions.ServiceCombException;
import io.servicecomb.foundation.common.utils.BeanUtils;
-import io.servicecomb.foundation.common.utils.JsonUtils;
import io.servicecomb.foundation.common.utils.Log4jUtils;
import io.servicecomb.provider.pojo.RpcReference;
import io.servicecomb.provider.springmvc.reference.RestTemplateBuilder;
@@ -56,26 +51,6 @@ public class SpringmvcConsumerMain {
// POJO Consumer
System.out.println("POJO consumer sayhi services: " + hello.sayHi("Java Chassis"));
System.out.println("POJO consumer sayhi services: " + hello.sayHello(person));
-
- String metricsResult = restTemplate.getForObject("cse://springmvc/springmvchello/metricsForTest/", String.class);
-
- @SuppressWarnings("unchecked")
- Map<String, String> resultMap = JsonUtils.OBJ_MAPPER.readValue(metricsResult, HashMap.class);
-
- if (!resultMap.get("CPU and Memory").contains("heapUsed=")) {
- throw new ServiceCombException("check metrics error");
- }
-
- if (!resultMap.get("totalRequestProvider OPERATIONAL_LEVEL")
- .equals("{springmvc.springmvcHello.sayHi=2, springmvc.springmvcHello.sayHello=2, springmvc.springmvcHello.metricsForTest=1}")) {
- throw new ServiceCombException("check metrics error");
- }
-
- if (!resultMap.get("RequestQueueRelated").contains("springmvc.springmvcHello.sayHi") ||
- !resultMap.get("RequestQueueRelated").contains("springmvc.springmvcHello.sayHello")){
- throw new ServiceCombException("check metrics error");
- }
-
}
public static void init() throws Exception {
diff --git a/samples/springmvc-sample/springmvc-provider/src/main/java/io/servicecomb/samples/springmvc/provider/SpringmvcHelloImpl.java b/samples/springmvc-sample/springmvc-provider/src/main/java/io/servicecomb/samples/springmvc/provider/SpringmvcHelloImpl.java
index 8d9c978..328fd94 100644
--- a/samples/springmvc-sample/springmvc-provider/src/main/java/io/servicecomb/samples/springmvc/provider/SpringmvcHelloImpl.java
+++ b/samples/springmvc-sample/springmvc-provider/src/main/java/io/servicecomb/samples/springmvc/provider/SpringmvcHelloImpl.java
@@ -18,10 +18,6 @@
package io.servicecomb.samples.springmvc.provider;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
import javax.ws.rs.core.MediaType;
import org.springframework.beans.factory.annotation.Autowired;
@@ -30,11 +26,6 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.netflix.servo.monitor.Monitor;
-
-import io.servicecomb.foundation.common.exceptions.ServiceCombException;
-import io.servicecomb.foundation.common.utils.JsonUtils;
import io.servicecomb.foundation.metrics.MetricsServoRegistry;
import io.servicecomb.provider.rest.common.RestSchema;
import io.servicecomb.samples.common.schema.Hello;
@@ -62,19 +53,4 @@ public class SpringmvcHelloImpl implements Hello {
public String sayHello(@RequestBody Person person) {
return "Hello person " + person.getName();
}
-
- //metrics it test
- @RequestMapping(path = "/metricsForTest", method = RequestMethod.GET)
- public String metricsForTest() {
- List<Monitor<?>> monitors = registry.getMetricsMonitors();
- Map<String, String> values = new HashMap<>();
- for (Monitor<?> monitor : monitors) {
- values.put(monitor.getConfig().getName(), monitor.getValue().toString());
- }
- try {
- return JsonUtils.writeValueAsString(values);
- } catch (JsonProcessingException e) {
- throw new ServiceCombException("json error", e);
- }
- }
}
--
To stop receiving notification emails like this one, please contact
"commits@servicecomb.apache.org" <co...@servicecomb.apache.org>.