From fbe3a63c95b899fad8ab005a3e7dd641b8cd6fd3 Mon Sep 17 00:00:00 2001 From: zhengyangyong Date: Wed, 10 Jan 2018 09:44:13 +0800 Subject: [PATCH] SCB-85 simple metrics write file examples Signed-off-by: zhengyangyong --- .../metrics-write-file-common/pom.xml | 36 --------- .../metrics-write-file-config-log4j/pom.xml | 43 ----------- .../metrics-write-file-config-log4j2/pom.xml | 47 ------------ .../metrics-write-file-config/pom.xml | 32 -------- .../pom.xml | 8 +- .../samples/mwf/Log4JMetricsFileWriter.java | 0 .../samples/mwf/ServiceApplication.java | 13 ++-- .../samples/mwf/SimpleService.java | 0 .../metrics-write-file-log4j/pom.xml | 74 ------------------- .../META-INF/spring/pojo.provider.bean.xml | 26 ------- .../src/main/resources/microservice.yaml | 46 ------------ .../pom.xml | 13 ++-- .../samples/mwf/Log4J2MetricsFileWriter.java | 0 .../samples/mwf/SimpleService.java} | 20 +++-- .../metrics-write-file-log4j2/pom.xml | 74 ------------------- .../src/main/resources/microservice.yaml | 46 ------------ .../resources/spring/pojo.provider.bean.xml | 26 ------- .../metrics-write-file/pom.xml | 4 - .../samples/mwf/MetricsFileWriter.java | 0 .../samples/mwf/TestWriteFile.java | 7 ++ samples/metrics-write-file-sample/pom.xml | 31 -------- 21 files changed, 40 insertions(+), 506 deletions(-) delete mode 100644 samples/metrics-write-file-sample/metrics-write-file-common/pom.xml delete mode 100644 samples/metrics-write-file-sample/metrics-write-file-config-log4j/pom.xml delete mode 100644 samples/metrics-write-file-sample/metrics-write-file-config-log4j2/pom.xml delete mode 100644 samples/metrics-write-file-sample/metrics-write-file-config/pom.xml rename samples/metrics-write-file-sample/{metrics-write-file-config-log4j => metrics-write-file-log4j-springboot}/src/main/java/io/servicecomb/samples/mwf/Log4JMetricsFileWriter.java (100%) rename samples/metrics-write-file-sample/{metrics-write-file-log4j => metrics-write-file-log4j-springboot}/src/main/java/io/servicecomb/samples/mwf/ServiceApplication.java (72%) rename samples/metrics-write-file-sample/{metrics-write-file-common => metrics-write-file-log4j-springboot}/src/main/java/io/servicecomb/samples/mwf/SimpleService.java (100%) delete mode 100644 samples/metrics-write-file-sample/metrics-write-file-log4j/pom.xml delete mode 100644 samples/metrics-write-file-sample/metrics-write-file-log4j/src/main/resources/META-INF/spring/pojo.provider.bean.xml delete mode 100644 samples/metrics-write-file-sample/metrics-write-file-log4j/src/main/resources/microservice.yaml rename samples/metrics-write-file-sample/{metrics-write-file-config-log4j2 => metrics-write-file-log4j2-springboot}/src/main/java/io/servicecomb/samples/mwf/Log4J2MetricsFileWriter.java (100%) rename samples/metrics-write-file-sample/{metrics-write-file-log4j2/src/main/java/io/servicecomb/samples/mwf/ServiceApplication.java => metrics-write-file-log4j2-springboot/src/main/java/io/servicecomb/samples/mwf/SimpleService.java} (66%) delete mode 100644 samples/metrics-write-file-sample/metrics-write-file-log4j2/pom.xml delete mode 100644 samples/metrics-write-file-sample/metrics-write-file-log4j2/src/main/resources/microservice.yaml delete mode 100644 samples/metrics-write-file-sample/metrics-write-file-log4j2/src/main/resources/spring/pojo.provider.bean.xml rename samples/metrics-write-file-sample/{metrics-write-file-config => metrics-write-file}/src/main/java/io/servicecomb/samples/mwf/MetricsFileWriter.java (100%) 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 deleted file mode 100644 index def56c23731..00000000000 --- a/samples/metrics-write-file-sample/metrics-write-file-common/pom.xml +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - metrics-write-file-sample - io.servicecomb.samples - 0.6.0-SNAPSHOT - - 4.0.0 - - metrics-write-file-common - - - io.servicecomb - provider-springmvc - - - \ No newline at end of file diff --git a/samples/metrics-write-file-sample/metrics-write-file-config-log4j/pom.xml b/samples/metrics-write-file-sample/metrics-write-file-config-log4j/pom.xml deleted file mode 100644 index dc58bf8e5f5..00000000000 --- a/samples/metrics-write-file-sample/metrics-write-file-config-log4j/pom.xml +++ /dev/null @@ -1,43 +0,0 @@ - - - - - - metrics-write-file-sample - io.servicecomb.samples - 0.6.0-SNAPSHOT - - 4.0.0 - - metrics-write-file-config-log4j - - - - io.servicecomb.samples - metrics-write-file - - - - log4j - log4j - - - - \ No newline at end of file diff --git a/samples/metrics-write-file-sample/metrics-write-file-config-log4j2/pom.xml b/samples/metrics-write-file-sample/metrics-write-file-config-log4j2/pom.xml deleted file mode 100644 index 63a16895c23..00000000000 --- a/samples/metrics-write-file-sample/metrics-write-file-config-log4j2/pom.xml +++ /dev/null @@ -1,47 +0,0 @@ - - - - - - metrics-write-file-sample - io.servicecomb.samples - 0.6.0-SNAPSHOT - - 4.0.0 - - metrics-write-file-config-log4j2 - - - - io.servicecomb.samples - metrics-write-file - - - - org.apache.logging.log4j - log4j-api - - - org.apache.logging.log4j - log4j-core - - - - \ No newline at end of file diff --git a/samples/metrics-write-file-sample/metrics-write-file-config/pom.xml b/samples/metrics-write-file-sample/metrics-write-file-config/pom.xml deleted file mode 100644 index 001648d0af2..00000000000 --- a/samples/metrics-write-file-sample/metrics-write-file-config/pom.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - metrics-write-file-sample - io.servicecomb.samples - 0.6.0-SNAPSHOT - - 4.0.0 - - metrics-write-file-config - - - \ No newline at end of file diff --git a/samples/metrics-write-file-sample/metrics-write-file-log4j-springboot/pom.xml b/samples/metrics-write-file-sample/metrics-write-file-log4j-springboot/pom.xml index 447ad59c374..8d6ecc4f14c 100644 --- a/samples/metrics-write-file-sample/metrics-write-file-log4j-springboot/pom.xml +++ b/samples/metrics-write-file-sample/metrics-write-file-log4j-springboot/pom.xml @@ -67,14 +67,12 @@ - io.servicecomb.samples - metrics-write-file-common + log4j + log4j - - io.servicecomb.samples - metrics-write-file-config-log4j + metrics-write-file diff --git a/samples/metrics-write-file-sample/metrics-write-file-config-log4j/src/main/java/io/servicecomb/samples/mwf/Log4JMetricsFileWriter.java b/samples/metrics-write-file-sample/metrics-write-file-log4j-springboot/src/main/java/io/servicecomb/samples/mwf/Log4JMetricsFileWriter.java similarity index 100% rename from samples/metrics-write-file-sample/metrics-write-file-config-log4j/src/main/java/io/servicecomb/samples/mwf/Log4JMetricsFileWriter.java rename to samples/metrics-write-file-sample/metrics-write-file-log4j-springboot/src/main/java/io/servicecomb/samples/mwf/Log4JMetricsFileWriter.java diff --git a/samples/metrics-write-file-sample/metrics-write-file-log4j/src/main/java/io/servicecomb/samples/mwf/ServiceApplication.java b/samples/metrics-write-file-sample/metrics-write-file-log4j-springboot/src/main/java/io/servicecomb/samples/mwf/ServiceApplication.java similarity index 72% rename from samples/metrics-write-file-sample/metrics-write-file-log4j/src/main/java/io/servicecomb/samples/mwf/ServiceApplication.java rename to samples/metrics-write-file-sample/metrics-write-file-log4j-springboot/src/main/java/io/servicecomb/samples/mwf/ServiceApplication.java index b1a4930af8b..bfb4354db01 100644 --- a/samples/metrics-write-file-sample/metrics-write-file-log4j/src/main/java/io/servicecomb/samples/mwf/ServiceApplication.java +++ b/samples/metrics-write-file-sample/metrics-write-file-log4j-springboot/src/main/java/io/servicecomb/samples/mwf/ServiceApplication.java @@ -17,12 +17,15 @@ package io.servicecomb.samples.mwf; -import io.servicecomb.foundation.common.utils.BeanUtils; -import io.servicecomb.foundation.common.utils.Log4jUtils; +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import io.servicecomb.springboot.starter.provider.EnableServiceComb; + +@SpringBootApplication +@EnableServiceComb public class ServiceApplication { - public static void main(String[] args) throws Exception { - Log4jUtils.init(); - BeanUtils.init(); + public static void main(String[] args) { + SpringApplication.run(ServiceApplication.class, args); } } diff --git a/samples/metrics-write-file-sample/metrics-write-file-common/src/main/java/io/servicecomb/samples/mwf/SimpleService.java b/samples/metrics-write-file-sample/metrics-write-file-log4j-springboot/src/main/java/io/servicecomb/samples/mwf/SimpleService.java similarity index 100% rename from samples/metrics-write-file-sample/metrics-write-file-common/src/main/java/io/servicecomb/samples/mwf/SimpleService.java rename to samples/metrics-write-file-sample/metrics-write-file-log4j-springboot/src/main/java/io/servicecomb/samples/mwf/SimpleService.java diff --git a/samples/metrics-write-file-sample/metrics-write-file-log4j/pom.xml b/samples/metrics-write-file-sample/metrics-write-file-log4j/pom.xml deleted file mode 100644 index f84ef1f24b8..00000000000 --- a/samples/metrics-write-file-sample/metrics-write-file-log4j/pom.xml +++ /dev/null @@ -1,74 +0,0 @@ - - - - - - metrics-write-file-sample - io.servicecomb.samples - 0.6.0-SNAPSHOT - - 4.0.0 - - metrics-write-file-log4j - - - - io.servicecomb - handler-bizkeeper - - - io.servicecomb - handler-loadbalance - - - io.servicecomb - transport-highway - - - io.servicecomb - transport-rest-vertx - - - io.servicecomb - handler-flowcontrol-qps - - - io.servicecomb - provider-springmvc - - - org.slf4j - slf4j-log4j12 - - - - io.servicecomb.samples - metrics-write-file-common - - - - - io.servicecomb.samples - metrics-write-file-config-log4j - - - - - \ No newline at end of file diff --git a/samples/metrics-write-file-sample/metrics-write-file-log4j/src/main/resources/META-INF/spring/pojo.provider.bean.xml b/samples/metrics-write-file-sample/metrics-write-file-log4j/src/main/resources/META-INF/spring/pojo.provider.bean.xml deleted file mode 100644 index 55045d091bc..00000000000 --- a/samples/metrics-write-file-sample/metrics-write-file-log4j/src/main/resources/META-INF/spring/pojo.provider.bean.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - diff --git a/samples/metrics-write-file-sample/metrics-write-file-log4j/src/main/resources/microservice.yaml b/samples/metrics-write-file-sample/metrics-write-file-log4j/src/main/resources/microservice.yaml deleted file mode 100644 index 999300af2a5..00000000000 --- a/samples/metrics-write-file-sample/metrics-write-file-log4j/src/main/resources/microservice.yaml +++ /dev/null @@ -1,46 +0,0 @@ -## --------------------------------------------------------------------------- -## 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. -## --------------------------------------------------------------------------- - -APPLICATION_ID: mwf -service_description: - name: mwf-log4j - version: 0.0.1 -cse: - service: - registry: - address: http://127.0.0.1:30100 - rest: - address: 0.0.0.0:8080 - highway: - address: 0.0.0.0:7070 - handler: - chain: - Provider: - default: bizkeeper-provider - -servicecomb: - metrics: - #metrics double value round places,default value is 1 - round_places: 1 - file: - root_path: ./samples/metrics-write-file-sample/metrics-write-file-log4j/target/metric/ - rolling: - max_file_count: 10 - max_file_size : 10MB - - #output time,milliseconds - window_time: 5000 diff --git a/samples/metrics-write-file-sample/metrics-write-file-log4j2-springboot/pom.xml b/samples/metrics-write-file-sample/metrics-write-file-log4j2-springboot/pom.xml index 24612e3f706..ee7978261d1 100644 --- a/samples/metrics-write-file-sample/metrics-write-file-log4j2-springboot/pom.xml +++ b/samples/metrics-write-file-sample/metrics-write-file-log4j2-springboot/pom.xml @@ -57,15 +57,18 @@ - io.servicecomb.samples - metrics-write-file-common + org.apache.logging.log4j + log4j-api + + + org.apache.logging.log4j + log4j-core - - io.servicecomb.samples - metrics-write-file-config-log4j2 + metrics-write-file + diff --git a/samples/metrics-write-file-sample/metrics-write-file-config-log4j2/src/main/java/io/servicecomb/samples/mwf/Log4J2MetricsFileWriter.java b/samples/metrics-write-file-sample/metrics-write-file-log4j2-springboot/src/main/java/io/servicecomb/samples/mwf/Log4J2MetricsFileWriter.java similarity index 100% rename from samples/metrics-write-file-sample/metrics-write-file-config-log4j2/src/main/java/io/servicecomb/samples/mwf/Log4J2MetricsFileWriter.java rename to samples/metrics-write-file-sample/metrics-write-file-log4j2-springboot/src/main/java/io/servicecomb/samples/mwf/Log4J2MetricsFileWriter.java diff --git a/samples/metrics-write-file-sample/metrics-write-file-log4j2/src/main/java/io/servicecomb/samples/mwf/ServiceApplication.java b/samples/metrics-write-file-sample/metrics-write-file-log4j2-springboot/src/main/java/io/servicecomb/samples/mwf/SimpleService.java similarity index 66% rename from samples/metrics-write-file-sample/metrics-write-file-log4j2/src/main/java/io/servicecomb/samples/mwf/ServiceApplication.java rename to samples/metrics-write-file-sample/metrics-write-file-log4j2-springboot/src/main/java/io/servicecomb/samples/mwf/SimpleService.java index b1a4930af8b..fbfc01f3fbf 100644 --- a/samples/metrics-write-file-sample/metrics-write-file-log4j2/src/main/java/io/servicecomb/samples/mwf/ServiceApplication.java +++ b/samples/metrics-write-file-sample/metrics-write-file-log4j2-springboot/src/main/java/io/servicecomb/samples/mwf/SimpleService.java @@ -17,12 +17,20 @@ package io.servicecomb.samples.mwf; -import io.servicecomb.foundation.common.utils.BeanUtils; -import io.servicecomb.foundation.common.utils.Log4jUtils; +import java.util.UUID; -public class ServiceApplication { - public static void main(String[] args) throws Exception { - Log4jUtils.init(); - BeanUtils.init(); +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; + +import io.servicecomb.provider.rest.common.RestSchema; + +//simple service sim +@RestSchema(schemaId = "demoServiceEndpoint") +@RequestMapping(path = "/") +public class SimpleService { + + @GetMapping(path = "/f") + public String fun() { + return UUID.randomUUID().toString(); } } diff --git a/samples/metrics-write-file-sample/metrics-write-file-log4j2/pom.xml b/samples/metrics-write-file-sample/metrics-write-file-log4j2/pom.xml deleted file mode 100644 index 863c3799372..00000000000 --- a/samples/metrics-write-file-sample/metrics-write-file-log4j2/pom.xml +++ /dev/null @@ -1,74 +0,0 @@ - - - - - - metrics-write-file-sample - io.servicecomb.samples - 0.6.0-SNAPSHOT - - 4.0.0 - - metrics-write-file-log4j2 - - - - io.servicecomb - handler-bizkeeper - - - io.servicecomb - handler-loadbalance - - - io.servicecomb - transport-highway - - - io.servicecomb - transport-rest-vertx - - - io.servicecomb - handler-flowcontrol-qps - - - io.servicecomb - provider-springmvc - - - org.slf4j - slf4j-log4j12 - - - - io.servicecomb.samples - metrics-write-file-common - - - - - io.servicecomb.samples - metrics-write-file-config-log4j2 - - - - - \ No newline at end of file diff --git a/samples/metrics-write-file-sample/metrics-write-file-log4j2/src/main/resources/microservice.yaml b/samples/metrics-write-file-sample/metrics-write-file-log4j2/src/main/resources/microservice.yaml deleted file mode 100644 index 36522b64089..00000000000 --- a/samples/metrics-write-file-sample/metrics-write-file-log4j2/src/main/resources/microservice.yaml +++ /dev/null @@ -1,46 +0,0 @@ -## --------------------------------------------------------------------------- -## 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. -## --------------------------------------------------------------------------- - -APPLICATION_ID: mwf -service_description: - name: mwf-log4j2 - version: 0.0.1 -cse: - service: - registry: - address: http://127.0.0.1:30100 - rest: - address: 0.0.0.0:8080 - highway: - address: 0.0.0.0:7070 - handler: - chain: - Provider: - default: bizkeeper-provider - -servicecomb: - metrics: - #metrics double value round places,default value is 1 - round_places: 1 - file: - root_path: ./samples/metrics-write-file-sample/metrics-write-file-log4j2/target/metric/ - rolling: - max_file_count: 10 - max_file_size : 10MB - - #output time,milliseconds - window_time: 5000 diff --git a/samples/metrics-write-file-sample/metrics-write-file-log4j2/src/main/resources/spring/pojo.provider.bean.xml b/samples/metrics-write-file-sample/metrics-write-file-log4j2/src/main/resources/spring/pojo.provider.bean.xml deleted file mode 100644 index 55045d091bc..00000000000 --- a/samples/metrics-write-file-sample/metrics-write-file-log4j2/src/main/resources/spring/pojo.provider.bean.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - diff --git a/samples/metrics-write-file-sample/metrics-write-file/pom.xml b/samples/metrics-write-file-sample/metrics-write-file/pom.xml index acc3e2bacc2..cff145104db 100644 --- a/samples/metrics-write-file-sample/metrics-write-file/pom.xml +++ b/samples/metrics-write-file-sample/metrics-write-file/pom.xml @@ -29,10 +29,6 @@ metrics-write-file - - io.servicecomb.samples - metrics-write-file-config - io.servicecomb metrics-core diff --git a/samples/metrics-write-file-sample/metrics-write-file-config/src/main/java/io/servicecomb/samples/mwf/MetricsFileWriter.java b/samples/metrics-write-file-sample/metrics-write-file/src/main/java/io/servicecomb/samples/mwf/MetricsFileWriter.java similarity index 100% rename from samples/metrics-write-file-sample/metrics-write-file-config/src/main/java/io/servicecomb/samples/mwf/MetricsFileWriter.java rename to samples/metrics-write-file-sample/metrics-write-file/src/main/java/io/servicecomb/samples/mwf/MetricsFileWriter.java diff --git a/samples/metrics-write-file-sample/metrics-write-file/src/test/java/io/servicecomb/samples/mwf/TestWriteFile.java b/samples/metrics-write-file-sample/metrics-write-file/src/test/java/io/servicecomb/samples/mwf/TestWriteFile.java index f3b089b7a11..1caff577ebb 100644 --- a/samples/metrics-write-file-sample/metrics-write-file/src/test/java/io/servicecomb/samples/mwf/TestWriteFile.java +++ b/samples/metrics-write-file-sample/metrics-write-file/src/test/java/io/servicecomb/samples/mwf/TestWriteFile.java @@ -39,6 +39,7 @@ 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; @@ -102,6 +103,12 @@ public List findServiceInstance(String appId, String micro return null; } + @Override + public MicroserviceInstances findServiceInstances(String appId, String microserviceName, + String microserviceVersionRule, String revision) { + return null; + } + @Override public boolean updateMicroserviceProperties(Map properties) { return false; diff --git a/samples/metrics-write-file-sample/pom.xml b/samples/metrics-write-file-sample/pom.xml index 31f5b4bccec..f7dccde29ec 100644 --- a/samples/metrics-write-file-sample/pom.xml +++ b/samples/metrics-write-file-sample/pom.xml @@ -29,13 +29,7 @@ metrics-write-file-sample pom - metrics-write-file-config metrics-write-file - metrics-write-file-config-log4j - metrics-write-file-config-log4j2 - metrics-write-file-common - metrics-write-file-log4j - metrics-write-file-log4j2 metrics-write-file-log4j-springboot metrics-write-file-log4j2-springboot @@ -47,31 +41,6 @@ metrics-core 0.6.0-SNAPSHOT - - io.servicecomb.samples - metrics-write-file-config - 0.6.0-SNAPSHOT - - - io.servicecomb.samples - metrics-write-file - 0.6.0-SNAPSHOT - - - io.servicecomb.samples - metrics-write-file-common - 0.6.0-SNAPSHOT - - - io.servicecomb.samples - metrics-write-file-config-log4j - 0.6.0-SNAPSHOT - - - io.servicecomb.samples - metrics-write-file-config-log4j2 - 0.6.0-SNAPSHOT - io.servicecomb.samples metrics-write-file