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 12152fab4d9351c72afee23e899eb4362644fd3f Author: zhengyangyong <[email protected]> AuthorDate: Thu Dec 28 15:55:50 2017 +0800 SCB-85 move write file from example to extension Signed-off-by: zhengyangyong <[email protected]> --- .../metrics-write-file-config-log4j}/pom.xml | 9 +++- .../writefile/config/Log4JMetricsFileWriter.java} | 50 +++++++++------------- .../metrics-write-file-config-log4j2/pom.xml | 3 +- .../writefile/config/Log4J2MetricsFileWriter.java} | 8 ++-- .../metrics-write-file-config/pom.xml | 2 +- .../writefile/config/MetricsFileWriter.java} | 4 +- .../metrics-write-file/pom.xml | 2 +- .../extension}/writefile/FileContentConvertor.java | 2 +- .../extension}/writefile/FileContentFormatter.java | 2 +- .../writefile/SimpleFileContentConvertor.java | 2 +- .../writefile/SimpleFileContentFormatter.java | 2 +- .../extension}/writefile/WriteFileInitializer.java | 24 ++++++++--- .../{metrics-sample => metrics-extension}/pom.xml | 12 ++++-- .../metrics-performance-test/pom.xml | 17 -------- .../metrics/sample/writefile/FileWriter.java | 48 --------------------- metrics/metrics-sample/pom.xml | 23 ---------- metrics/pom.xml | 3 +- 17 files changed, 67 insertions(+), 146 deletions(-) diff --git a/metrics/metrics-sample/metrics-write-file/pom.xml b/metrics/metrics-extension/metrics-write-file-config-log4j/pom.xml similarity index 86% copy from metrics/metrics-sample/metrics-write-file/pom.xml copy to metrics/metrics-extension/metrics-write-file-config-log4j/pom.xml index 7769bb5..36c9091 100644 --- a/metrics/metrics-sample/metrics-write-file/pom.xml +++ b/metrics/metrics-extension/metrics-write-file-config-log4j/pom.xml @@ -20,19 +20,24 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> <parent> - <artifactId>metrics-sample</artifactId> + <artifactId>metrics-extension</artifactId> <groupId>io.servicecomb</groupId> <version>0.6.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> - <artifactId>metrics-write-file</artifactId> + <artifactId>metrics-write-file-config-log4j</artifactId> <dependencies> <dependency> <groupId>io.servicecomb</groupId> <artifactId>metrics-write-file-config</artifactId> </dependency> + + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + </dependency> </dependencies> </project> \ No newline at end of file diff --git a/metrics/metrics-sample/metrics-write-file-config-log4j2/src/main/java/io/servicecomb/metrics/sample/writefile/config/log4j2/Log4j2FileWriterManager.java b/metrics/metrics-extension/metrics-write-file-config-log4j/src/main/java/io/servicecomb/metrics/extension/writefile/config/Log4JMetricsFileWriter.java similarity index 55% copy from metrics/metrics-sample/metrics-write-file-config-log4j2/src/main/java/io/servicecomb/metrics/sample/writefile/config/log4j2/Log4j2FileWriterManager.java copy to metrics/metrics-extension/metrics-write-file-config-log4j/src/main/java/io/servicecomb/metrics/extension/writefile/config/Log4JMetricsFileWriter.java index 4c1eb07..7b263de 100644 --- a/metrics/metrics-sample/metrics-write-file-config-log4j2/src/main/java/io/servicecomb/metrics/sample/writefile/config/log4j2/Log4j2FileWriterManager.java +++ b/metrics/metrics-extension/metrics-write-file-config-log4j/src/main/java/io/servicecomb/metrics/extension/writefile/config/Log4JMetricsFileWriter.java @@ -15,38 +15,29 @@ * limitations under the License. */ -package io.servicecomb.metrics.sample.writefile.config.log4j2; +package io.servicecomb.metrics.extension.writefile.config; import java.nio.file.Paths; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.core.LoggerContext; -import org.apache.logging.log4j.core.appender.RollingFileAppender; -import org.apache.logging.log4j.core.appender.rolling.DefaultRolloverStrategy; -import org.apache.logging.log4j.core.appender.rolling.SizeBasedTriggeringPolicy; -import org.apache.logging.log4j.core.config.Configuration; -import org.apache.logging.log4j.core.impl.Log4jLogEvent; -import org.apache.logging.log4j.core.layout.PatternLayout; -import org.apache.logging.log4j.message.SimpleMessage; +import org.apache.log4j.Level; +import org.apache.log4j.Logger; +import org.apache.log4j.PatternLayout; +import org.apache.log4j.RollingFileAppender; +import org.apache.log4j.spi.LoggingEvent; import org.springframework.stereotype.Component; import com.netflix.config.DynamicPropertyFactory; -import io.servicecomb.metrics.sample.writefile.config.FileWriterManager; - @Component -public class Log4j2FileWriterManager implements FileWriterManager { +public class Log4JMetricsFileWriter implements MetricsFileWriter { private static final String METRICS_FILE_ROLLING_MAX_FILE_COUNT = "servicecomb.metrics.file.rolling.max_file_count"; private static final String METRICS_FILE_ROLLING_MAX_FILE_SIZE = "servicecomb.metrics.file.rolling.max_file_size"; private static final String METRICS_FILE_ROOT_PATH = "servicecomb.metrics.file.root_path"; - private final LoggerContext ctx = (LoggerContext) LogManager.getContext(false); - - private final Configuration config = ctx.getConfiguration(); private final Map<String, RollingFileAppender> fileAppenders = new ConcurrentHashMap<>(); @@ -56,7 +47,7 @@ public class Log4j2FileWriterManager implements FileWriterManager { private final String rootPath; - public Log4j2FileWriterManager() { + public Log4JMetricsFileWriter() { maxFileCount = DynamicPropertyFactory.getInstance().getIntProperty(METRICS_FILE_ROLLING_MAX_FILE_COUNT, 10).get(); maxFileSize = DynamicPropertyFactory.getInstance().getStringProperty(METRICS_FILE_ROLLING_MAX_FILE_SIZE, "10MB") .get(); @@ -66,22 +57,21 @@ public class Log4j2FileWriterManager implements FileWriterManager { @Override public void write(String loggerName, String filePrefix, String content) { RollingFileAppender logger = fileAppenders.computeIfAbsent(loggerName, f -> initLogger(loggerName, filePrefix)); - logger.append(Log4jLogEvent.newBuilder().setMessage(new SimpleMessage(content)).build()); + LoggingEvent event = new LoggingEvent(loggerName, Logger.getLogger(loggerName), Level.ALL, + content, null); + logger.append(event); } private RollingFileAppender initLogger(String loggerName, String filePrefix) { String fileName = Paths.get(rootPath, filePrefix + loggerName + ".dat").toString(); - String filePattern = Paths.get(rootPath, filePrefix + loggerName + "-%i.dat").toString(); - - PatternLayout layout = PatternLayout.newBuilder().withPattern(PatternLayout.DEFAULT_CONVERSION_PATTERN).build(); - SizeBasedTriggeringPolicy policy = SizeBasedTriggeringPolicy.createPolicy(maxFileSize); - DefaultRolloverStrategy strategy = DefaultRolloverStrategy.createStrategy(String.valueOf(maxFileCount), null, null, - null, null, false, config); - - //TODO:in version 2.8 + , log4j2 request use RollingFileAppender.newBuilder,but throw No such static method exception - RollingFileAppender appender = RollingFileAppender - .createAppender(fileName, filePattern, "true", loggerName, "true", null, - "true", policy, strategy, layout, null, null, null, null, config); - return appender; + RollingFileAppender fileAppender = new RollingFileAppender(); + fileAppender.setName(loggerName); + fileAppender.setFile(fileName); + fileAppender.setLayout(new PatternLayout("%m%n")); + fileAppender.setAppend(true); + fileAppender.setMaxFileSize(maxFileSize); + fileAppender.setMaxBackupIndex(maxFileCount); + fileAppender.activateOptions(); + return fileAppender; } } diff --git a/metrics/metrics-sample/metrics-write-file-config-log4j2/pom.xml b/metrics/metrics-extension/metrics-write-file-config-log4j2/pom.xml similarity index 96% rename from metrics/metrics-sample/metrics-write-file-config-log4j2/pom.xml rename to metrics/metrics-extension/metrics-write-file-config-log4j2/pom.xml index 6912de1..9a5583c 100644 --- a/metrics/metrics-sample/metrics-write-file-config-log4j2/pom.xml +++ b/metrics/metrics-extension/metrics-write-file-config-log4j2/pom.xml @@ -20,7 +20,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> <parent> - <artifactId>metrics-sample</artifactId> + <artifactId>metrics-extension</artifactId> <groupId>io.servicecomb</groupId> <version>0.6.0-SNAPSHOT</version> </parent> @@ -29,7 +29,6 @@ <artifactId>metrics-write-file-config-log4j2</artifactId> <dependencies> - <dependency> <groupId>io.servicecomb</groupId> <artifactId>metrics-write-file-config</artifactId> diff --git a/metrics/metrics-sample/metrics-write-file-config-log4j2/src/main/java/io/servicecomb/metrics/sample/writefile/config/log4j2/Log4j2FileWriterManager.java b/metrics/metrics-extension/metrics-write-file-config-log4j2/src/main/java/io/servicecomb/metrics/extension/writefile/config/Log4J2MetricsFileWriter.java similarity index 94% rename from metrics/metrics-sample/metrics-write-file-config-log4j2/src/main/java/io/servicecomb/metrics/sample/writefile/config/log4j2/Log4j2FileWriterManager.java rename to metrics/metrics-extension/metrics-write-file-config-log4j2/src/main/java/io/servicecomb/metrics/extension/writefile/config/Log4J2MetricsFileWriter.java index 4c1eb07..daaddad 100644 --- a/metrics/metrics-sample/metrics-write-file-config-log4j2/src/main/java/io/servicecomb/metrics/sample/writefile/config/log4j2/Log4j2FileWriterManager.java +++ b/metrics/metrics-extension/metrics-write-file-config-log4j2/src/main/java/io/servicecomb/metrics/extension/writefile/config/Log4J2MetricsFileWriter.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package io.servicecomb.metrics.sample.writefile.config.log4j2; +package io.servicecomb.metrics.extension.writefile.config; import java.nio.file.Paths; import java.util.Map; @@ -34,10 +34,8 @@ import org.springframework.stereotype.Component; import com.netflix.config.DynamicPropertyFactory; -import io.servicecomb.metrics.sample.writefile.config.FileWriterManager; - @Component -public class Log4j2FileWriterManager implements FileWriterManager { +public class Log4J2MetricsFileWriter implements MetricsFileWriter { private static final String METRICS_FILE_ROLLING_MAX_FILE_COUNT = "servicecomb.metrics.file.rolling.max_file_count"; private static final String METRICS_FILE_ROLLING_MAX_FILE_SIZE = "servicecomb.metrics.file.rolling.max_file_size"; @@ -56,7 +54,7 @@ public class Log4j2FileWriterManager implements FileWriterManager { private final String rootPath; - public Log4j2FileWriterManager() { + public Log4J2MetricsFileWriter() { maxFileCount = DynamicPropertyFactory.getInstance().getIntProperty(METRICS_FILE_ROLLING_MAX_FILE_COUNT, 10).get(); maxFileSize = DynamicPropertyFactory.getInstance().getStringProperty(METRICS_FILE_ROLLING_MAX_FILE_SIZE, "10MB") .get(); diff --git a/metrics/metrics-sample/metrics-write-file-config/pom.xml b/metrics/metrics-extension/metrics-write-file-config/pom.xml similarity index 95% rename from metrics/metrics-sample/metrics-write-file-config/pom.xml rename to metrics/metrics-extension/metrics-write-file-config/pom.xml index adf44c3..86b5ea3 100644 --- a/metrics/metrics-sample/metrics-write-file-config/pom.xml +++ b/metrics/metrics-extension/metrics-write-file-config/pom.xml @@ -20,7 +20,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> <parent> - <artifactId>metrics-sample</artifactId> + <artifactId>metrics-extension</artifactId> <groupId>io.servicecomb</groupId> <version>0.6.0-SNAPSHOT</version> </parent> diff --git a/metrics/metrics-sample/metrics-write-file-config/src/main/java/io/servicecomb/metrics/sample/writefile/config/FileWriterManager.java b/metrics/metrics-extension/metrics-write-file-config/src/main/java/io/servicecomb/metrics/extension/writefile/config/MetricsFileWriter.java similarity index 90% rename from metrics/metrics-sample/metrics-write-file-config/src/main/java/io/servicecomb/metrics/sample/writefile/config/FileWriterManager.java rename to metrics/metrics-extension/metrics-write-file-config/src/main/java/io/servicecomb/metrics/extension/writefile/config/MetricsFileWriter.java index 3fde5f9..3a82d11 100644 --- a/metrics/metrics-sample/metrics-write-file-config/src/main/java/io/servicecomb/metrics/sample/writefile/config/FileWriterManager.java +++ b/metrics/metrics-extension/metrics-write-file-config/src/main/java/io/servicecomb/metrics/extension/writefile/config/MetricsFileWriter.java @@ -15,8 +15,8 @@ * limitations under the License. */ -package io.servicecomb.metrics.sample.writefile.config; +package io.servicecomb.metrics.extension.writefile.config; -public interface FileWriterManager { +public interface MetricsFileWriter { void write(String loggerName, String filePrefix, String content); } diff --git a/metrics/metrics-sample/metrics-write-file/pom.xml b/metrics/metrics-extension/metrics-write-file/pom.xml similarity index 96% rename from metrics/metrics-sample/metrics-write-file/pom.xml rename to metrics/metrics-extension/metrics-write-file/pom.xml index 7769bb5..3930ea9 100644 --- a/metrics/metrics-sample/metrics-write-file/pom.xml +++ b/metrics/metrics-extension/metrics-write-file/pom.xml @@ -20,7 +20,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> <parent> - <artifactId>metrics-sample</artifactId> + <artifactId>metrics-extension</artifactId> <groupId>io.servicecomb</groupId> <version>0.6.0-SNAPSHOT</version> </parent> diff --git a/metrics/metrics-sample/metrics-write-file/src/main/java/io/servicecomb/metrics/sample/writefile/FileContentConvertor.java b/metrics/metrics-extension/metrics-write-file/src/main/java/io/servicecomb/metrics/extension/writefile/FileContentConvertor.java similarity index 95% rename from metrics/metrics-sample/metrics-write-file/src/main/java/io/servicecomb/metrics/sample/writefile/FileContentConvertor.java rename to metrics/metrics-extension/metrics-write-file/src/main/java/io/servicecomb/metrics/extension/writefile/FileContentConvertor.java index 6619327..2340ef3 100644 --- a/metrics/metrics-sample/metrics-write-file/src/main/java/io/servicecomb/metrics/sample/writefile/FileContentConvertor.java +++ b/metrics/metrics-extension/metrics-write-file/src/main/java/io/servicecomb/metrics/extension/writefile/FileContentConvertor.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package io.servicecomb.metrics.sample.writefile; +package io.servicecomb.metrics.extension.writefile; import java.util.Map; diff --git a/metrics/metrics-sample/metrics-write-file/src/main/java/io/servicecomb/metrics/sample/writefile/FileContentFormatter.java b/metrics/metrics-extension/metrics-write-file/src/main/java/io/servicecomb/metrics/extension/writefile/FileContentFormatter.java similarity index 94% rename from metrics/metrics-sample/metrics-write-file/src/main/java/io/servicecomb/metrics/sample/writefile/FileContentFormatter.java rename to metrics/metrics-extension/metrics-write-file/src/main/java/io/servicecomb/metrics/extension/writefile/FileContentFormatter.java index f06c3c8..22009a6 100644 --- a/metrics/metrics-sample/metrics-write-file/src/main/java/io/servicecomb/metrics/sample/writefile/FileContentFormatter.java +++ b/metrics/metrics-extension/metrics-write-file/src/main/java/io/servicecomb/metrics/extension/writefile/FileContentFormatter.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package io.servicecomb.metrics.sample.writefile; +package io.servicecomb.metrics.extension.writefile; import java.util.Map; diff --git a/metrics/metrics-sample/metrics-write-file/src/main/java/io/servicecomb/metrics/sample/writefile/SimpleFileContentConvertor.java b/metrics/metrics-extension/metrics-write-file/src/main/java/io/servicecomb/metrics/extension/writefile/SimpleFileContentConvertor.java similarity index 96% rename from metrics/metrics-sample/metrics-write-file/src/main/java/io/servicecomb/metrics/sample/writefile/SimpleFileContentConvertor.java rename to metrics/metrics-extension/metrics-write-file/src/main/java/io/servicecomb/metrics/extension/writefile/SimpleFileContentConvertor.java index b4eee11..1fbe822 100644 --- a/metrics/metrics-sample/metrics-write-file/src/main/java/io/servicecomb/metrics/sample/writefile/SimpleFileContentConvertor.java +++ b/metrics/metrics-extension/metrics-write-file/src/main/java/io/servicecomb/metrics/extension/writefile/SimpleFileContentConvertor.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package io.servicecomb.metrics.sample.writefile; +package io.servicecomb.metrics.extension.writefile; import java.util.HashMap; import java.util.Map; diff --git a/metrics/metrics-sample/metrics-write-file/src/main/java/io/servicecomb/metrics/sample/writefile/SimpleFileContentFormatter.java b/metrics/metrics-extension/metrics-write-file/src/main/java/io/servicecomb/metrics/extension/writefile/SimpleFileContentFormatter.java similarity index 98% rename from metrics/metrics-sample/metrics-write-file/src/main/java/io/servicecomb/metrics/sample/writefile/SimpleFileContentFormatter.java rename to metrics/metrics-extension/metrics-write-file/src/main/java/io/servicecomb/metrics/extension/writefile/SimpleFileContentFormatter.java index 809a2fb..23dbeca 100644 --- a/metrics/metrics-sample/metrics-write-file/src/main/java/io/servicecomb/metrics/sample/writefile/SimpleFileContentFormatter.java +++ b/metrics/metrics-extension/metrics-write-file/src/main/java/io/servicecomb/metrics/extension/writefile/SimpleFileContentFormatter.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package io.servicecomb.metrics.sample.writefile; +package io.servicecomb.metrics.extension.writefile; import java.util.HashMap; import java.util.Map; diff --git a/metrics/metrics-sample/metrics-write-file/src/main/java/io/servicecomb/metrics/sample/writefile/WriteFileInitializer.java b/metrics/metrics-extension/metrics-write-file/src/main/java/io/servicecomb/metrics/extension/writefile/WriteFileInitializer.java similarity index 74% rename from metrics/metrics-sample/metrics-write-file/src/main/java/io/servicecomb/metrics/sample/writefile/WriteFileInitializer.java rename to metrics/metrics-extension/metrics-write-file/src/main/java/io/servicecomb/metrics/extension/writefile/WriteFileInitializer.java index a01a5d5..ce61ff4 100644 --- a/metrics/metrics-sample/metrics-write-file/src/main/java/io/servicecomb/metrics/sample/writefile/WriteFileInitializer.java +++ b/metrics/metrics-extension/metrics-write-file/src/main/java/io/servicecomb/metrics/extension/writefile/WriteFileInitializer.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package io.servicecomb.metrics.sample.writefile; +package io.servicecomb.metrics.extension.writefile; import static java.util.concurrent.TimeUnit.MILLISECONDS; @@ -29,6 +29,9 @@ import com.netflix.config.DynamicPropertyFactory; import io.servicecomb.metrics.common.RegistryMetric; import io.servicecomb.metrics.core.publish.DataSource; +import io.servicecomb.metrics.extension.writefile.config.MetricsFileWriter; +import io.servicecomb.serviceregistry.RegistryUtils; +import io.servicecomb.serviceregistry.api.registry.Microservice; @Component public class WriteFileInitializer { @@ -37,22 +40,28 @@ public class WriteFileInitializer { private final int metricPoll; - private final FileWriter fileOutput; - private final FileContentConvertor convertor; private final FileContentFormatter formatter; private final DataSource dataSource; + private final MetricsFileWriter fileWriter; + + private final String filePrefix; + @Autowired - public WriteFileInitializer(FileWriter fileOutput, FileContentConvertor convertor, + public WriteFileInitializer(MetricsFileWriter fileWriter, FileContentConvertor convertor, FileContentFormatter formatter, DataSource dataSource) { metricPoll = DynamicPropertyFactory.getInstance().getIntProperty(METRICS_WINDOW_TIME, 5000).get(); - this.fileOutput = fileOutput; + this.fileWriter = fileWriter; this.convertor = convertor; this.formatter = formatter; this.dataSource = dataSource; + + Microservice microservice = RegistryUtils.getMicroservice(); + filePrefix = microservice.getAppId() + "." + microservice.getServiceName() + "."; + this.init(); } @@ -66,6 +75,9 @@ public class WriteFileInitializer { RegistryMetric registryMetric = dataSource.getRegistryMetric(0); Map<String, String> convertedMetrics = convertor.convert(registryMetric); Map<String, String> formattedMetrics = formatter.format(convertedMetrics); - fileOutput.output(formattedMetrics); + + for (String metricName : formattedMetrics.keySet()) { + fileWriter.write(metricName, filePrefix, formattedMetrics.get(metricName)); + } } } diff --git a/metrics/metrics-sample/pom.xml b/metrics/metrics-extension/pom.xml similarity index 88% copy from metrics/metrics-sample/pom.xml copy to metrics/metrics-extension/pom.xml index 845a570..14201cc 100644 --- a/metrics/metrics-sample/pom.xml +++ b/metrics/metrics-extension/pom.xml @@ -26,14 +26,14 @@ </parent> <modelVersion>4.0.0</modelVersion> - <artifactId>metrics-sample</artifactId> + <artifactId>metrics-extension</artifactId> <packaging>pom</packaging> <modules> - <module>metrics-performance-test</module> - <module>metrics-write-file</module> <module>metrics-write-file-config</module> + <module>metrics-write-file-config-log4j</module> <module>metrics-write-file-config-log4j2</module> + <module>metrics-write-file</module> </modules> <dependencyManagement> @@ -45,6 +45,11 @@ </dependency> <dependency> <groupId>io.servicecomb</groupId> + <artifactId>metrics-write-file-config-log4j</artifactId> + <version>0.6.0-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>io.servicecomb</groupId> <artifactId>metrics-write-file-config-log4j2</artifactId> <version>0.6.0-SNAPSHOT</version> </dependency> @@ -67,5 +72,4 @@ </dependency> </dependencies> - </project> \ No newline at end of file diff --git a/metrics/metrics-sample/metrics-performance-test/pom.xml b/metrics/metrics-sample/metrics-performance-test/pom.xml index e12b18c..faf1510 100644 --- a/metrics/metrics-sample/metrics-performance-test/pom.xml +++ b/metrics/metrics-sample/metrics-performance-test/pom.xml @@ -53,23 +53,6 @@ <groupId>org.hibernate</groupId> <artifactId>hibernate-validator</artifactId> </dependency> - - <dependency> - <groupId>io.servicecomb</groupId> - <artifactId>metrics-write-file-config</artifactId> - </dependency> - <dependency> - <groupId>io.servicecomb</groupId> - <artifactId>metrics-write-file-config-log4j2</artifactId> - </dependency> - <dependency> - <groupId>io.servicecomb</groupId> - <artifactId>metrics-core</artifactId> - </dependency> - <dependency> - <groupId>io.servicecomb</groupId> - <artifactId>metrics-write-file</artifactId> - </dependency> </dependencies> <build> diff --git a/metrics/metrics-sample/metrics-write-file/src/main/java/io/servicecomb/metrics/sample/writefile/FileWriter.java b/metrics/metrics-sample/metrics-write-file/src/main/java/io/servicecomb/metrics/sample/writefile/FileWriter.java deleted file mode 100644 index b3c47cd..0000000 --- a/metrics/metrics-sample/metrics-write-file/src/main/java/io/servicecomb/metrics/sample/writefile/FileWriter.java +++ /dev/null @@ -1,48 +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. - */ - -package io.servicecomb.metrics.sample.writefile; - -import java.util.Map; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Component; - -import io.servicecomb.metrics.sample.writefile.config.FileWriterManager; -import io.servicecomb.serviceregistry.RegistryUtils; -import io.servicecomb.serviceregistry.api.registry.Microservice; - -@Component -public class FileWriter { - - private final FileWriterManager fileWriterManager; - - private final String filePrefix; - - @Autowired - public FileWriter(FileWriterManager fileWriterManager) { - this.fileWriterManager = fileWriterManager; - Microservice microservice = RegistryUtils.getMicroservice(); - filePrefix = microservice.getAppId() + "." + microservice.getServiceName() + "."; - } - - public void output(Map<String, String> metrics) { - for (String metricName : metrics.keySet()) { - fileWriterManager.write(metricName, filePrefix, metrics.get(metricName)); - } - } -} diff --git a/metrics/metrics-sample/pom.xml b/metrics/metrics-sample/pom.xml index 845a570..8922ebe 100644 --- a/metrics/metrics-sample/pom.xml +++ b/metrics/metrics-sample/pom.xml @@ -31,31 +31,8 @@ <modules> <module>metrics-performance-test</module> - <module>metrics-write-file</module> - <module>metrics-write-file-config</module> - <module>metrics-write-file-config-log4j2</module> </modules> - <dependencyManagement> - <dependencies> - <dependency> - <groupId>io.servicecomb</groupId> - <artifactId>metrics-write-file-config</artifactId> - <version>0.6.0-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>io.servicecomb</groupId> - <artifactId>metrics-write-file-config-log4j2</artifactId> - <version>0.6.0-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>io.servicecomb</groupId> - <artifactId>metrics-write-file</artifactId> - <version>0.6.0-SNAPSHOT</version> - </dependency> - </dependencies> - </dependencyManagement> - <dependencies> <dependency> <groupId>io.servicecomb</groupId> diff --git a/metrics/pom.xml b/metrics/pom.xml index f3cc665..db8933f 100644 --- a/metrics/pom.xml +++ b/metrics/pom.xml @@ -31,8 +31,9 @@ <artifactId>metrics</artifactId> <modules> + <module>metrics-common</module> <module>metrics-core</module> + <module>metrics-extension</module> <module>metrics-sample</module> - <module>metrics-common</module> </modules> </project> \ No newline at end of file -- To stop receiving notification emails like this one, please contact "[email protected]" <[email protected]>.
