From ced19c228915edbdb31ed482ea05be1efee87f83 Mon Sep 17 00:00:00 2001 From: pengys5 <8082209@qq.com> Date: Sun, 9 Apr 2017 20:06:03 +0800 Subject: [PATCH] use provider to initialize config --- .../eye/skywalking/collector/AkkaSystem.java | 44 ++++++++++ .../skywalking/collector/CollectorSystem.java | 23 ++--- .../collector/cluster/ClusterConfig.java | 4 +- .../cluster/ClusterConfigInitializer.java | 61 ------------- .../cluster/ClusterConfigProvider.java | 31 +++++++ .../collector/config/ConfigInitializer.java | 40 +++++++++ .../collector/config/ConfigProvider.java | 10 +++ .../config/ConfigInitializerTestCase.java | 45 ++++++++++ ...skywalking.collector.config.ConfigProvider | 1 + .../src/test/resources/collector.config | 14 ++- .../worker/CollectorBootStartUp.java | 3 - .../collector/worker/MergeAnalysisMember.java | 3 +- .../worker/MergePersistenceMember.java | 3 +- .../worker/MetricAnalysisMember.java | 3 +- .../worker/MetricPersistenceMember.java | 3 +- .../worker/RecordAnalysisMember.java | 10 +-- .../worker/RecordPersistenceMember.java | 3 +- .../worker/config/CacheSizeConfig.java | 17 ++++ .../config/CacheSizeConfigProvider.java | 18 ++++ .../collector/worker/config/EsConfig.java | 28 ++++++ .../worker/config/EsConfigProvider.java | 35 ++++++++ .../collector/worker/config/HttpConfig.java | 13 +++ .../worker/config/HttpConfigProvider.java | 28 ++++++ .../worker/{ => config}/WorkerConfig.java | 42 +++------ .../worker/config/WorkerConfigProvider.java | 18 ++++ .../analysis/GlobalTraceAnalysis.java | 2 +- .../persistence/GlobalTraceAgg.java | 2 +- .../persistence/GlobalTraceSave.java | 2 +- .../httpserver/AbstractHttpServlet.java | 2 +- .../worker/httpserver/AbstractPost.java | 9 +- .../worker/httpserver/HttpServer.java | 8 +- .../node/analysis/NodeCompAnalysis.java | 2 +- .../node/analysis/NodeMappingDayAnalysis.java | 2 +- .../analysis/NodeMappingHourAnalysis.java | 2 +- .../analysis/NodeMappingMinuteAnalysis.java | 2 +- .../worker/node/persistence/NodeCompAgg.java | 2 +- .../worker/node/persistence/NodeCompSave.java | 2 +- .../node/persistence/NodeMappingDayAgg.java | 2 +- .../node/persistence/NodeMappingDaySave.java | 2 +- .../node/persistence/NodeMappingHourAgg.java | 2 +- .../node/persistence/NodeMappingHourSave.java | 2 +- .../persistence/NodeMappingMinuteAgg.java | 2 +- .../persistence/NodeMappingMinuteSave.java | 2 +- .../noderef/analysis/NodeRefDayAnalysis.java | 4 +- .../noderef/analysis/NodeRefHourAnalysis.java | 4 +- .../analysis/NodeRefMinuteAnalysis.java | 4 +- .../analysis/NodeRefResSumDayAnalysis.java | 2 +- .../analysis/NodeRefResSumHourAnalysis.java | 2 +- .../analysis/NodeRefResSumMinuteAnalysis.java | 2 +- .../noderef/persistence/NodeRefDayAgg.java | 2 +- .../noderef/persistence/NodeRefDaySave.java | 2 +- .../noderef/persistence/NodeRefHourAgg.java | 2 +- .../noderef/persistence/NodeRefHourSave.java | 2 +- .../noderef/persistence/NodeRefMinuteAgg.java | 2 +- .../persistence/NodeRefMinuteSave.java | 2 +- .../persistence/NodeRefResSumDayAgg.java | 2 +- .../persistence/NodeRefResSumDaySave.java | 2 +- .../persistence/NodeRefResSumHourAgg.java | 2 +- .../persistence/NodeRefResSumHourSave.java | 2 +- .../persistence/NodeRefResSumMinuteAgg.java | 2 +- .../persistence/NodeRefResSumMinuteSave.java | 2 +- .../collector/worker/segment/SegmentPost.java | 2 +- .../segment/persistence/SegmentCostSave.java | 2 +- .../persistence/SegmentExceptionSave.java | 2 +- .../segment/persistence/SegmentSave.java | 2 +- .../worker/storage/AbstractIndex.java | 5 +- .../collector/worker/storage/EsClient.java | 42 +++++++-- ...skywalking.collector.config.ConfigProvider | 5 ++ ...ctor.worker.httpserver.AbstractGetProvider | 2 - .../src/main/resources/collector.config | 64 +++++++++++++- .../worker/MergeAnalysisMemberTestCase.java | 5 +- .../collector/worker/StartUpTestCase.java | 69 --------------- .../analysis/GlobalTraceAnalysisTestCase.java | 2 +- .../persistence/GlobalTraceAggTestCase.java | 2 +- .../persistence/GlobalTraceSaveTestCase.java | 2 +- .../AbstractGetProviderTestCase.java | 22 +++++ .../httpserver/AbstractGetTestCase.java | 44 ++++++++++ .../AbstractPostProviderTestCase.java | 22 +++++ .../httpserver/AbstractPostTestCase.java | 46 ++++++++++ .../GetWithHttpServletTestCase.java | 44 ++++++++++ .../PostWithHttpServletTestCase.java | 88 +++++++++++++++++++ .../worker/httpserver/TestAbstractGet.java | 63 +++++++++++++ .../httpserver/TestAbstractGetProvider.java | 25 ++++++ .../worker/httpserver/TestAbstractPost.java | 65 ++++++++++++++ .../httpserver/TestAbstractPostProvider.java | 30 +++++++ .../analysis/NodeCompAnalysisTestCase.java | 2 +- .../NodeMappingDayAnalysisTestCase.java | 2 +- .../NodeMappingHourAnalysisTestCase.java | 2 +- .../NodeMappingMinuteAnalysisTestCase.java | 2 +- .../node/persistence/NodeCompAggTestCase.java | 4 +- .../persistence/NodeCompSaveTestCase.java | 3 +- .../NodeMappingDayAggTestCase.java | 2 +- .../NodeMappingDaySaveTestCase.java | 2 +- .../NodeMappingHourAggTestCase.java | 2 +- .../NodeMappingHourSaveTestCase.java | 2 +- .../NodeMappingMinuteAggTestCase.java | 2 +- .../NodeMappingMinuteSaveTestCase.java | 2 +- .../analysis/NodeRefDayAnalysisTestCase.java | 4 +- .../analysis/NodeRefHourAnalysisTestCase.java | 4 +- .../NodeRefMinuteAnalysisTestCase.java | 4 +- .../NodeRefResSumDayAnalysisTestCase.java | 2 +- .../NodeRefResSumHourAnalysisTestCase.java | 2 +- .../NodeRefResSumMinuteAnalysisTestCase.java | 2 +- .../persistence/NodeRefDayAggTestCase.java | 2 +- .../persistence/NodeRefDaySaveTestCase.java | 2 +- .../persistence/NodeRefHourAggTestCase.java | 2 +- .../persistence/NodeRefHourSaveTestCase.java | 2 +- .../persistence/NodeRefMinuteAggTestCase.java | 2 +- .../NodeRefMinuteSaveTestCase.java | 2 +- .../NodeRefResSumDayAggTestCase.java | 2 +- .../NodeRefResSumDaySaveTestCase.java | 2 +- .../NodeRefResSumHourAggTestCase.java | 2 +- .../NodeRefResSumHourSaveTestCase.java | 2 +- .../NodeRefResSumMinuteAggTestCase.java | 2 +- .../NodeRefResSumMinuteSaveTestCase.java | 3 +- .../worker/segment/SegmentPostTestCase.java | 2 +- .../persistence/SegmentCostSaveTestCase.java | 13 +-- .../SegmentExceptionSaveTestCase.java | 7 +- .../persistence/SegmentSaveTestCase.java | 6 +- .../worker/storage/AbstractIndexTestCase.java | 2 +- ...ctor.worker.httpserver.AbstractGetProvider | 1 + ...tor.worker.httpserver.AbstractPostProvider | 1 + 122 files changed, 1032 insertions(+), 316 deletions(-) create mode 100644 skywalking-collector/skywalking-collector-cluster/src/main/java/com/a/eye/skywalking/collector/AkkaSystem.java delete mode 100644 skywalking-collector/skywalking-collector-cluster/src/main/java/com/a/eye/skywalking/collector/cluster/ClusterConfigInitializer.java create mode 100644 skywalking-collector/skywalking-collector-cluster/src/main/java/com/a/eye/skywalking/collector/cluster/ClusterConfigProvider.java create mode 100644 skywalking-collector/skywalking-collector-cluster/src/main/java/com/a/eye/skywalking/collector/config/ConfigInitializer.java create mode 100644 skywalking-collector/skywalking-collector-cluster/src/main/java/com/a/eye/skywalking/collector/config/ConfigProvider.java create mode 100644 skywalking-collector/skywalking-collector-cluster/src/test/java/com/a/eye/skywalking/collector/config/ConfigInitializerTestCase.java create mode 100644 skywalking-collector/skywalking-collector-cluster/src/test/resources/META-INF/services/com.a.eye.skywalking.collector.config.ConfigProvider create mode 100644 skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/config/CacheSizeConfig.java create mode 100644 skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/config/CacheSizeConfigProvider.java create mode 100644 skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/config/EsConfig.java create mode 100644 skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/config/EsConfigProvider.java create mode 100644 skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/config/HttpConfig.java create mode 100644 skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/config/HttpConfigProvider.java rename skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/{ => config}/WorkerConfig.java (91%) create mode 100644 skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/config/WorkerConfigProvider.java create mode 100644 skywalking-collector/skywalking-collector-worker/src/main/resources/META-INF/services/com.a.eye.skywalking.collector.config.ConfigProvider delete mode 100644 skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/StartUpTestCase.java create mode 100644 skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/httpserver/AbstractGetProviderTestCase.java create mode 100644 skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/httpserver/AbstractGetTestCase.java create mode 100644 skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/httpserver/AbstractPostProviderTestCase.java create mode 100644 skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/httpserver/AbstractPostTestCase.java create mode 100644 skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/httpserver/GetWithHttpServletTestCase.java create mode 100644 skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/httpserver/PostWithHttpServletTestCase.java create mode 100644 skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/httpserver/TestAbstractGet.java create mode 100644 skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/httpserver/TestAbstractGetProvider.java create mode 100644 skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/httpserver/TestAbstractPost.java create mode 100644 skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/httpserver/TestAbstractPostProvider.java create mode 100644 skywalking-collector/skywalking-collector-worker/src/test/resources/META-INF/services/com.a.eye.skywalking.collector.worker.httpserver.AbstractGetProvider create mode 100644 skywalking-collector/skywalking-collector-worker/src/test/resources/META-INF/services/com.a.eye.skywalking.collector.worker.httpserver.AbstractPostProvider diff --git a/skywalking-collector/skywalking-collector-cluster/src/main/java/com/a/eye/skywalking/collector/AkkaSystem.java b/skywalking-collector/skywalking-collector-cluster/src/main/java/com/a/eye/skywalking/collector/AkkaSystem.java new file mode 100644 index 000000000..2c1c625d2 --- /dev/null +++ b/skywalking-collector/skywalking-collector-cluster/src/main/java/com/a/eye/skywalking/collector/AkkaSystem.java @@ -0,0 +1,44 @@ +package com.a.eye.skywalking.collector; + +import akka.actor.ActorSystem; +import com.a.eye.skywalking.api.util.StringUtil; +import com.a.eye.skywalking.collector.cluster.ClusterConfig; +import com.a.eye.skywalking.collector.cluster.Const; +import com.typesafe.config.Config; +import com.typesafe.config.ConfigFactory; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; + +/** + * @author pengys5 + */ +public enum AkkaSystem { + INSTANCE; + private Logger logger = LogManager.getFormatterLogger(AkkaSystem.class); + + public ActorSystem create() { + final Config config = ConfigFactory.parseString("akka.remote.netty.tcp.hostname=" + ClusterConfig.Cluster.Current.hostname). + withFallback(ConfigFactory.parseString("akka.remote.netty.tcp.port=" + ClusterConfig.Cluster.Current.port)). + withFallback(ConfigFactory.load("application.conf")); + if (!StringUtil.isEmpty(ClusterConfig.Cluster.seed_nodes)) { + config.withFallback(ConfigFactory.parseString("akka.cluster.seed-nodes=" + generateSeedNodes())); + } + return ActorSystem.create(Const.SystemName, config); + } + + private String generateSeedNodes() { + String[] seedNodes = ClusterConfig.Cluster.seed_nodes.split(","); + + String akkaSeedNodes = ""; + for (int i = 0; i < seedNodes.length; i++) { + String akkaNodeName = "\"akka.tcp://" + Const.SystemName + "@" + seedNodes[i] + "\""; + if (i > 0) { + akkaSeedNodes += ","; + } + akkaSeedNodes += akkaNodeName; + } + akkaSeedNodes = "[" + akkaSeedNodes + "]"; + logger.info("config seedNodes: %s, generate seedNodes: %s", ClusterConfig.Cluster.seed_nodes, akkaSeedNodes); + return akkaSeedNodes; + } +} diff --git a/skywalking-collector/skywalking-collector-cluster/src/main/java/com/a/eye/skywalking/collector/CollectorSystem.java b/skywalking-collector/skywalking-collector-cluster/src/main/java/com/a/eye/skywalking/collector/CollectorSystem.java index 83b0d2334..7053ab438 100644 --- a/skywalking-collector/skywalking-collector-cluster/src/main/java/com/a/eye/skywalking/collector/CollectorSystem.java +++ b/skywalking-collector/skywalking-collector-cluster/src/main/java/com/a/eye/skywalking/collector/CollectorSystem.java @@ -2,16 +2,13 @@ package com.a.eye.skywalking.collector; import akka.actor.ActorSystem; import akka.actor.Props; -import com.a.eye.skywalking.api.util.StringUtil; import com.a.eye.skywalking.collector.actor.*; -import com.a.eye.skywalking.collector.cluster.ClusterConfig; -import com.a.eye.skywalking.collector.cluster.Const; import com.a.eye.skywalking.collector.cluster.WorkersListener; -import com.typesafe.config.Config; -import com.typesafe.config.ConfigFactory; +import com.a.eye.skywalking.collector.config.ConfigInitializer; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import java.io.IOException; import java.util.ServiceLoader; /** @@ -26,26 +23,16 @@ public class CollectorSystem { return clusterContext; } - public void boot() throws UsedRoleNameException, ProviderNotFoundException { + public void boot() throws UsedRoleNameException, ProviderNotFoundException, IOException, IllegalAccessException { + ConfigInitializer.INSTANCE.initialize(); createAkkaSystem(); createListener(); loadLocalProviders(); createClusterWorkers(); } - public void terminate() { - clusterContext.getAkkaSystem().terminate(); - } - private void createAkkaSystem() { - final Config config = ConfigFactory.parseString("akka.remote.netty.tcp.hostname=" + ClusterConfig.Cluster.Current.hostname). - withFallback(ConfigFactory.parseString("akka.remote.netty.tcp.port=" + ClusterConfig.Cluster.Current.port)). - withFallback(ConfigFactory.load("application.conf")); - if (!StringUtil.isEmpty(ClusterConfig.Cluster.seed_nodes)) { - config.withFallback(ConfigFactory.parseString("akka.cluster.seed-nodes=" + ClusterConfig.Cluster.seed_nodes)); - } - ActorSystem akkaSystem = ActorSystem.create(Const.SystemName, config); - + ActorSystem akkaSystem = AkkaSystem.INSTANCE.create(); clusterContext = new ClusterWorkerContext(akkaSystem); } diff --git a/skywalking-collector/skywalking-collector-cluster/src/main/java/com/a/eye/skywalking/collector/cluster/ClusterConfig.java b/skywalking-collector/skywalking-collector-cluster/src/main/java/com/a/eye/skywalking/collector/cluster/ClusterConfig.java index 56cc5b2ce..a6afc09c3 100644 --- a/skywalking-collector/skywalking-collector-cluster/src/main/java/com/a/eye/skywalking/collector/cluster/ClusterConfig.java +++ b/skywalking-collector/skywalking-collector-cluster/src/main/java/com/a/eye/skywalking/collector/cluster/ClusterConfig.java @@ -14,8 +14,8 @@ public class ClusterConfig { public static class Cluster { public static class Current { - public static String hostname = "127.0.0.1"; - public static String port = "2551"; + public static String hostname = ""; + public static String port = ""; public static String roles = ""; } diff --git a/skywalking-collector/skywalking-collector-cluster/src/main/java/com/a/eye/skywalking/collector/cluster/ClusterConfigInitializer.java b/skywalking-collector/skywalking-collector-cluster/src/main/java/com/a/eye/skywalking/collector/cluster/ClusterConfigInitializer.java deleted file mode 100644 index edd55fc16..000000000 --- a/skywalking-collector/skywalking-collector-cluster/src/main/java/com/a/eye/skywalking/collector/cluster/ClusterConfigInitializer.java +++ /dev/null @@ -1,61 +0,0 @@ -package com.a.eye.skywalking.collector.cluster; - -import com.a.eye.skywalking.api.util.ConfigInitializer; -import com.a.eye.skywalking.api.util.StringUtil; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; - -import java.io.InputStream; -import java.util.Properties; - -/** - * ClusterConfigInitializer Contains static methods for setting - * {@link ClusterConfig} attributes value. - * - *

- * The priority of value setting is - * system property -> collector.config -> {@link ClusterConfig} default value - *

- * - * @author pengys5 - */ -public class ClusterConfigInitializer { - - private static Logger logger = LogManager.getFormatterLogger(ClusterConfigInitializer.class); - - public static final String ConfigFileName = "collector.config"; - - /** - * Read config file to setting {@link ClusterConfig} then get system property to overwrite it. - * - * @param configFileName is the config file name, the file format is key-value pairs - */ - public static void initialize(String configFileName) { - InputStream configFileStream = ClusterConfigInitializer.class.getResourceAsStream("/" + configFileName); - - if (configFileStream == null) { - logger.info("Not provide sky-walking certification documents, sky-walking api run in default config."); - } else { - try { - Properties properties = new Properties(); - properties.load(configFileStream); - ConfigInitializer.initialize(properties, ClusterConfig.class); - } catch (Exception e) { - logger.error("Failed to read the config file, sky-walking api run in default config.", e); - } - } - - if (!StringUtil.isEmpty(System.getProperty("cluster.current.hostname"))) { - ClusterConfig.Cluster.Current.hostname = System.getProperty("cluster.current.hostname"); - } - if (!StringUtil.isEmpty(System.getProperty("cluster.current.port"))) { - ClusterConfig.Cluster.Current.port = System.getProperty("cluster.current.port"); - } - if (!StringUtil.isEmpty(System.getProperty("cluster.current.roles"))) { - ClusterConfig.Cluster.Current.roles = System.getProperty("cluster.current.roles"); - } - if (!StringUtil.isEmpty(System.getProperty("cluster.seed_nodes"))) { - ClusterConfig.Cluster.seed_nodes = System.getProperty("cluster.seed_nodes"); - } - } -} diff --git a/skywalking-collector/skywalking-collector-cluster/src/main/java/com/a/eye/skywalking/collector/cluster/ClusterConfigProvider.java b/skywalking-collector/skywalking-collector-cluster/src/main/java/com/a/eye/skywalking/collector/cluster/ClusterConfigProvider.java new file mode 100644 index 000000000..97d509fc8 --- /dev/null +++ b/skywalking-collector/skywalking-collector-cluster/src/main/java/com/a/eye/skywalking/collector/cluster/ClusterConfigProvider.java @@ -0,0 +1,31 @@ +package com.a.eye.skywalking.collector.cluster; + +import com.a.eye.skywalking.api.util.StringUtil; +import com.a.eye.skywalking.collector.config.ConfigProvider; + +/** + * @author pengys5 + */ +public class ClusterConfigProvider implements ConfigProvider { + + @Override + public Class configClass() { + return ClusterConfig.class; + } + + @Override + public void cliArgs() { + if (!StringUtil.isEmpty(System.getProperty("cluster.current.hostname"))) { + ClusterConfig.Cluster.Current.hostname = System.getProperty("cluster.current.hostname"); + } + if (!StringUtil.isEmpty(System.getProperty("cluster.current.port"))) { + ClusterConfig.Cluster.Current.port = System.getProperty("cluster.current.port"); + } + if (!StringUtil.isEmpty(System.getProperty("cluster.current.roles"))) { + ClusterConfig.Cluster.Current.roles = System.getProperty("cluster.current.roles"); + } + if (!StringUtil.isEmpty(System.getProperty("cluster.seed_nodes"))) { + ClusterConfig.Cluster.seed_nodes = System.getProperty("cluster.seed_nodes"); + } + } +} diff --git a/skywalking-collector/skywalking-collector-cluster/src/main/java/com/a/eye/skywalking/collector/config/ConfigInitializer.java b/skywalking-collector/skywalking-collector-cluster/src/main/java/com/a/eye/skywalking/collector/config/ConfigInitializer.java new file mode 100644 index 000000000..779b21c67 --- /dev/null +++ b/skywalking-collector/skywalking-collector-cluster/src/main/java/com/a/eye/skywalking/collector/config/ConfigInitializer.java @@ -0,0 +1,40 @@ +package com.a.eye.skywalking.collector.config; + +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; + +import java.io.IOException; +import java.io.InputStream; +import java.util.Properties; +import java.util.ServiceLoader; + +/** + * @author pengys5 + */ +public enum ConfigInitializer { + INSTANCE; + + private Logger logger = LogManager.getFormatterLogger(ConfigInitializer.class); + + public void initialize() throws IOException, IllegalAccessException { + InputStream configFileStream = ConfigInitializer.class.getResourceAsStream("/collector.config"); + initializeConfigFile(configFileStream); + + ServiceLoader configProviders = ServiceLoader.load(ConfigProvider.class); + for (ConfigProvider provider : configProviders) { + provider.cliArgs(); + } + } + + private void initializeConfigFile(InputStream configFileStream) throws IOException, IllegalAccessException { + ServiceLoader configProviders = ServiceLoader.load(ConfigProvider.class); + Properties properties = new Properties(); + properties.load(configFileStream); + + for (ConfigProvider provider : configProviders) { + logger.info("configProvider provider name: %s", provider.getClass().getName()); + Class configClass = provider.configClass(); + com.a.eye.skywalking.api.util.ConfigInitializer.initialize(properties, configClass); + } + } +} diff --git a/skywalking-collector/skywalking-collector-cluster/src/main/java/com/a/eye/skywalking/collector/config/ConfigProvider.java b/skywalking-collector/skywalking-collector-cluster/src/main/java/com/a/eye/skywalking/collector/config/ConfigProvider.java new file mode 100644 index 000000000..a353f3a14 --- /dev/null +++ b/skywalking-collector/skywalking-collector-cluster/src/main/java/com/a/eye/skywalking/collector/config/ConfigProvider.java @@ -0,0 +1,10 @@ +package com.a.eye.skywalking.collector.config; + +/** + * @author pengys5 + */ +public interface ConfigProvider { + Class configClass(); + + void cliArgs(); +} diff --git a/skywalking-collector/skywalking-collector-cluster/src/test/java/com/a/eye/skywalking/collector/config/ConfigInitializerTestCase.java b/skywalking-collector/skywalking-collector-cluster/src/test/java/com/a/eye/skywalking/collector/config/ConfigInitializerTestCase.java new file mode 100644 index 000000000..35fd75205 --- /dev/null +++ b/skywalking-collector/skywalking-collector-cluster/src/test/java/com/a/eye/skywalking/collector/config/ConfigInitializerTestCase.java @@ -0,0 +1,45 @@ +package com.a.eye.skywalking.collector.config; + +import com.a.eye.skywalking.collector.cluster.ClusterConfig; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; + +/** + * @author pengys5 + */ +public class ConfigInitializerTestCase { + + @Before + public void clear() { + System.clearProperty("cluster.current.hostname"); + System.clearProperty("cluster.current.port"); + System.clearProperty("cluster.current.roles"); + System.clearProperty("cluster.seed_nodes"); + } + + @Test + public void testInitialize() throws Exception { + ConfigInitializer.INSTANCE.initialize(); + + Assert.assertEquals("127.0.0.1", ClusterConfig.Cluster.Current.hostname); + Assert.assertEquals("1000", ClusterConfig.Cluster.Current.port); + Assert.assertEquals("Test, Test1", ClusterConfig.Cluster.Current.roles); + Assert.assertEquals("127.0.0.1:1000", ClusterConfig.Cluster.seed_nodes); + } + + @Test + public void testInitializeWithCli() throws Exception { + System.setProperty("cluster.current.hostname", "127.0.0.2"); + System.setProperty("cluster.current.port", "1001"); + System.setProperty("cluster.current.roles", "Test1, Test2"); + System.setProperty("cluster.seed_nodes", "127.0.0.1:1000, 127.0.0.1:1001"); + + ConfigInitializer.INSTANCE.initialize(); + + Assert.assertEquals("127.0.0.2", ClusterConfig.Cluster.Current.hostname); + Assert.assertEquals("1001", ClusterConfig.Cluster.Current.port); + Assert.assertEquals("Test1, Test2", ClusterConfig.Cluster.Current.roles); + Assert.assertEquals("127.0.0.1:1000, 127.0.0.1:1001", ClusterConfig.Cluster.seed_nodes); + } +} diff --git a/skywalking-collector/skywalking-collector-cluster/src/test/resources/META-INF/services/com.a.eye.skywalking.collector.config.ConfigProvider b/skywalking-collector/skywalking-collector-cluster/src/test/resources/META-INF/services/com.a.eye.skywalking.collector.config.ConfigProvider new file mode 100644 index 000000000..2d6af0903 --- /dev/null +++ b/skywalking-collector/skywalking-collector-cluster/src/test/resources/META-INF/services/com.a.eye.skywalking.collector.config.ConfigProvider @@ -0,0 +1 @@ +com.a.eye.skywalking.collector.cluster.ClusterConfigProvider \ No newline at end of file diff --git a/skywalking-collector/skywalking-collector-cluster/src/test/resources/collector.config b/skywalking-collector/skywalking-collector-cluster/src/test/resources/collector.config index 590688c07..9f0ea3fbd 100644 --- a/skywalking-collector/skywalking-collector-cluster/src/test/resources/collector.config +++ b/skywalking-collector/skywalking-collector-cluster/src/test/resources/collector.config @@ -1,5 +1,11 @@ -cluster.current.hostname = 127.0.0.1 -cluster.current.port = 1000 -cluster.current.roles = [Test, Test1] +cluster.current.hostname=127.0.0.1 +cluster.current.port=1000 +cluster.current.roles=WorkersListener +cluster.seed_nodes=127.0.0.1:1000 -cluster.nodes=["akka.tcp://CollectorSystem@127.0.0.1:1000", "akka.tcp://CollectorSystem@127.0.0.1:1001", "akka.tcp://CollectorSystem@127.0.0.1:1002"] \ No newline at end of file +es.cluster.name=CollectorDBCluster +es.cluster.nodes=127.0.0.1:9300 +es.cluster.transport.sniffer=true + +es.index.shards.number=2 +es.index.replicas.number=0 \ No newline at end of file diff --git a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/CollectorBootStartUp.java b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/CollectorBootStartUp.java index 373603a33..49a22937b 100644 --- a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/CollectorBootStartUp.java +++ b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/CollectorBootStartUp.java @@ -2,7 +2,6 @@ package com.a.eye.skywalking.collector.worker; import com.a.eye.skywalking.collector.CollectorSystem; import com.a.eye.skywalking.collector.actor.ClusterWorkerContext; -import com.a.eye.skywalking.collector.cluster.ClusterConfigInitializer; import com.a.eye.skywalking.collector.worker.httpserver.HttpServer; import com.a.eye.skywalking.collector.worker.storage.EsClient; import com.a.eye.skywalking.collector.worker.storage.IndexCreator; @@ -18,8 +17,6 @@ public class CollectorBootStartUp { public static void main(String[] args) throws Exception { logger.info("collector system starting...."); - ClusterConfigInitializer.initialize("collector.config"); - CollectorSystem collectorSystem = new CollectorSystem(); collectorSystem.boot(); EsClient.INSTANCE.boot(); diff --git a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/MergeAnalysisMember.java b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/MergeAnalysisMember.java index a2e4df59b..146d7991c 100644 --- a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/MergeAnalysisMember.java +++ b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/MergeAnalysisMember.java @@ -3,6 +3,7 @@ package com.a.eye.skywalking.collector.worker; import com.a.eye.skywalking.collector.actor.ClusterWorkerContext; import com.a.eye.skywalking.collector.actor.LocalWorkerContext; import com.a.eye.skywalking.collector.actor.Role; +import com.a.eye.skywalking.collector.worker.config.CacheSizeConfig; import com.a.eye.skywalking.collector.worker.storage.MergeData; import com.a.eye.skywalking.collector.worker.storage.MergePersistenceData; @@ -24,7 +25,7 @@ public abstract class MergeAnalysisMember extends AnalysisMember { final protected void setMergeData(String id, String column, String value) throws Exception { getPersistenceData().getElseCreate(id).setMergeData(column, value); - if (getPersistenceData().size() >= WorkerConfig.Persistence.Data.size) { + if (getPersistenceData().size() >= CacheSizeConfig.Cache.Analysis.size) { aggregation(); } } diff --git a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/MergePersistenceMember.java b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/MergePersistenceMember.java index c77178470..866712e63 100644 --- a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/MergePersistenceMember.java +++ b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/MergePersistenceMember.java @@ -3,6 +3,7 @@ package com.a.eye.skywalking.collector.worker; import com.a.eye.skywalking.collector.actor.ClusterWorkerContext; import com.a.eye.skywalking.collector.actor.LocalWorkerContext; import com.a.eye.skywalking.collector.actor.Role; +import com.a.eye.skywalking.collector.worker.config.CacheSizeConfig; import com.a.eye.skywalking.collector.worker.storage.EsClient; import com.a.eye.skywalking.collector.worker.storage.MergeData; import com.a.eye.skywalking.collector.worker.storage.MergePersistenceData; @@ -42,7 +43,7 @@ public abstract class MergePersistenceMember extends PersistenceMember { if (message instanceof MergeData) { MergeData mergeData = (MergeData) message; getPersistenceData().getElseCreate(mergeData.getId()).merge(mergeData); - if (getPersistenceData().size() >= WorkerConfig.Persistence.Data.size) { + if (getPersistenceData().size() >= CacheSizeConfig.Cache.Persistence.size) { persistence(); } } else { diff --git a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/MetricAnalysisMember.java b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/MetricAnalysisMember.java index 701c907e0..5c28bbb14 100644 --- a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/MetricAnalysisMember.java +++ b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/MetricAnalysisMember.java @@ -3,6 +3,7 @@ package com.a.eye.skywalking.collector.worker; import com.a.eye.skywalking.collector.actor.ClusterWorkerContext; import com.a.eye.skywalking.collector.actor.LocalWorkerContext; import com.a.eye.skywalking.collector.actor.Role; +import com.a.eye.skywalking.collector.worker.config.CacheSizeConfig; import com.a.eye.skywalking.collector.worker.storage.MetricData; import com.a.eye.skywalking.collector.worker.storage.MetricPersistenceData; @@ -19,7 +20,7 @@ public abstract class MetricAnalysisMember extends AnalysisMember { final protected void setMetric(String id, String column, Long value) throws Exception { persistenceData.getElseCreate(id).setMetric(column, value); - if (persistenceData.size() >= WorkerConfig.Persistence.Data.size) { + if (persistenceData.size() >= CacheSizeConfig.Cache.Persistence.size) { aggregation(); } } diff --git a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/MetricPersistenceMember.java b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/MetricPersistenceMember.java index 08e4b1130..a1bb1c4df 100644 --- a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/MetricPersistenceMember.java +++ b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/MetricPersistenceMember.java @@ -3,6 +3,7 @@ package com.a.eye.skywalking.collector.worker; import com.a.eye.skywalking.collector.actor.ClusterWorkerContext; import com.a.eye.skywalking.collector.actor.LocalWorkerContext; import com.a.eye.skywalking.collector.actor.Role; +import com.a.eye.skywalking.collector.worker.config.CacheSizeConfig; import com.a.eye.skywalking.collector.worker.storage.EsClient; import com.a.eye.skywalking.collector.worker.storage.MetricData; import com.a.eye.skywalking.collector.worker.storage.MetricPersistenceData; @@ -37,7 +38,7 @@ public abstract class MetricPersistenceMember extends PersistenceMember { if (message instanceof MetricData) { MetricData metricData = (MetricData) message; persistenceData.getElseCreate(metricData.getId()).merge(metricData); - if (persistenceData.size() >= WorkerConfig.Persistence.Data.size) { + if (persistenceData.size() >= CacheSizeConfig.Cache.Persistence.size) { persistence(); } } else { diff --git a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/RecordAnalysisMember.java b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/RecordAnalysisMember.java index 2ea6a20bb..c87074b7a 100644 --- a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/RecordAnalysisMember.java +++ b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/RecordAnalysisMember.java @@ -1,24 +1,18 @@ package com.a.eye.skywalking.collector.worker; -import akka.actor.ActorRef; import com.a.eye.skywalking.collector.actor.ClusterWorkerContext; import com.a.eye.skywalking.collector.actor.LocalWorkerContext; import com.a.eye.skywalking.collector.actor.Role; -import com.a.eye.skywalking.collector.queue.MessageHolder; +import com.a.eye.skywalking.collector.worker.config.CacheSizeConfig; import com.a.eye.skywalking.collector.worker.storage.RecordData; import com.a.eye.skywalking.collector.worker.storage.RecordPersistenceData; import com.google.gson.JsonObject; -import com.lmax.disruptor.RingBuffer; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; /** * @author pengys5 */ public abstract class RecordAnalysisMember extends AnalysisMember { - private Logger logger = LogManager.getFormatterLogger(RecordAnalysisMember.class); - private RecordPersistenceData persistenceData = new RecordPersistenceData(); public RecordAnalysisMember(Role role, ClusterWorkerContext clusterContext, LocalWorkerContext selfContext) { @@ -27,7 +21,7 @@ public abstract class RecordAnalysisMember extends AnalysisMember { final public void setRecord(String id, JsonObject record) throws Exception { persistenceData.getElseCreate(id).setRecord(record); - if (persistenceData.size() >= WorkerConfig.Analysis.Data.size) { + if (persistenceData.size() >= CacheSizeConfig.Cache.Analysis.size) { aggregation(); } } diff --git a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/RecordPersistenceMember.java b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/RecordPersistenceMember.java index fdd75b6b3..891a24f07 100644 --- a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/RecordPersistenceMember.java +++ b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/RecordPersistenceMember.java @@ -3,6 +3,7 @@ package com.a.eye.skywalking.collector.worker; import com.a.eye.skywalking.collector.actor.ClusterWorkerContext; import com.a.eye.skywalking.collector.actor.LocalWorkerContext; import com.a.eye.skywalking.collector.actor.Role; +import com.a.eye.skywalking.collector.worker.config.CacheSizeConfig; import com.a.eye.skywalking.collector.worker.storage.EsClient; import com.a.eye.skywalking.collector.worker.storage.RecordData; import com.a.eye.skywalking.collector.worker.storage.RecordPersistenceData; @@ -39,7 +40,7 @@ public abstract class RecordPersistenceMember extends PersistenceMember { RecordData recordData = (RecordData) message; logger.debug("setRecord: id: %s, data: %s", recordData.getId(), recordData.getRecord()); getPersistenceData().getElseCreate(recordData.getId()).setRecord(recordData.getRecord()); - if (getPersistenceData().size() >= WorkerConfig.Persistence.Data.size) { + if (getPersistenceData().size() >= CacheSizeConfig.Cache.Persistence.size) { persistence(); } } else { diff --git a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/config/CacheSizeConfig.java b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/config/CacheSizeConfig.java new file mode 100644 index 000000000..457660277 --- /dev/null +++ b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/config/CacheSizeConfig.java @@ -0,0 +1,17 @@ +package com.a.eye.skywalking.collector.worker.config; + +/** + * @author pengys5 + */ +public class CacheSizeConfig { + + public static class Cache { + public static class Analysis { + public static int size = 1000; + } + + public static class Persistence { + public static int size = 1000; + } + } +} diff --git a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/config/CacheSizeConfigProvider.java b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/config/CacheSizeConfigProvider.java new file mode 100644 index 000000000..f6239ce4b --- /dev/null +++ b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/config/CacheSizeConfigProvider.java @@ -0,0 +1,18 @@ +package com.a.eye.skywalking.collector.worker.config; + +import com.a.eye.skywalking.collector.config.ConfigProvider; + +/** + * @author pengys5 + */ +public class CacheSizeConfigProvider implements ConfigProvider { + + @Override + public Class configClass() { + return CacheSizeConfig.class; + } + + @Override + public void cliArgs() { + } +} diff --git a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/config/EsConfig.java b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/config/EsConfig.java new file mode 100644 index 000000000..426307850 --- /dev/null +++ b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/config/EsConfig.java @@ -0,0 +1,28 @@ +package com.a.eye.skywalking.collector.worker.config; + +/** + * @author pengys5 + */ +public class EsConfig { + + public static class Es { + public static class Cluster { + public static String name = ""; + public static String nodes = ""; + + public static class Transport { + public static String sniffer = ""; + } + } + + public static class Index { + public static class Shards { + public static String number; + } + + public static class Replicas{ + public static String number; + } + } + } +} diff --git a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/config/EsConfigProvider.java b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/config/EsConfigProvider.java new file mode 100644 index 000000000..5c0173782 --- /dev/null +++ b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/config/EsConfigProvider.java @@ -0,0 +1,35 @@ +package com.a.eye.skywalking.collector.worker.config; + +import com.a.eye.skywalking.api.util.StringUtil; +import com.a.eye.skywalking.collector.config.ConfigProvider; + +/** + * @author pengys5 + */ +public class EsConfigProvider implements ConfigProvider { + + @Override + public Class configClass() { + return EsConfig.class; + } + + @Override + public void cliArgs() { + if (!StringUtil.isEmpty(System.getProperty("es.cluster.name"))) { + EsConfig.Es.Cluster.name = System.getProperty("es.cluster.name"); + } + if (!StringUtil.isEmpty(System.getProperty("es.cluster.nodes"))) { + EsConfig.Es.Cluster.nodes = System.getProperty("es.cluster.nodes"); + } + if (!StringUtil.isEmpty(System.getProperty("es.cluster.transport.sniffer"))) { + EsConfig.Es.Cluster.Transport.sniffer = System.getProperty("es.cluster.transport.sniffer"); + } + + if (!StringUtil.isEmpty(System.getProperty("es.index.shards.number"))) { + EsConfig.Es.Index.Shards.number = System.getProperty("es.index.shards.number"); + } + if (!StringUtil.isEmpty(System.getProperty("es.index.replicas.number"))) { + EsConfig.Es.Index.Replicas.number = System.getProperty("es.index.replicas.number"); + } + } +} diff --git a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/config/HttpConfig.java b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/config/HttpConfig.java new file mode 100644 index 000000000..0704c3889 --- /dev/null +++ b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/config/HttpConfig.java @@ -0,0 +1,13 @@ +package com.a.eye.skywalking.collector.worker.config; + +/** + * @author pengys5 + */ +public class HttpConfig { + + public static class Http { + public static String hostname = ""; + public static String port = ""; + public static String contextPath = ""; + } +} diff --git a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/config/HttpConfigProvider.java b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/config/HttpConfigProvider.java new file mode 100644 index 000000000..8439fc096 --- /dev/null +++ b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/config/HttpConfigProvider.java @@ -0,0 +1,28 @@ +package com.a.eye.skywalking.collector.worker.config; + +import com.a.eye.skywalking.api.util.StringUtil; +import com.a.eye.skywalking.collector.config.ConfigProvider; + +/** + * @author pengys5 + */ +public class HttpConfigProvider implements ConfigProvider { + + @Override + public Class configClass() { + return HttpConfig.class; + } + + @Override + public void cliArgs() { + if (!StringUtil.isEmpty(System.getProperty("http.hostname"))) { + HttpConfig.Http.hostname = System.getProperty("http.hostname"); + } + if (!StringUtil.isEmpty(System.getProperty("http.port"))) { + HttpConfig.Http.port = System.getProperty("http.port"); + } + if (!StringUtil.isEmpty(System.getProperty("http.contextPath"))) { + HttpConfig.Http.contextPath = System.getProperty("http.contextPath"); + } + } +} diff --git a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/WorkerConfig.java b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/config/WorkerConfig.java similarity index 91% rename from skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/WorkerConfig.java rename to skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/config/WorkerConfig.java index 0abc1b3fa..3e7f398e1 100644 --- a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/WorkerConfig.java +++ b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/config/WorkerConfig.java @@ -1,23 +1,9 @@ -package com.a.eye.skywalking.collector.worker; - -import com.a.eye.skywalking.collector.cluster.ClusterConfig; +package com.a.eye.skywalking.collector.worker.config; /** * @author pengys5 */ -public class WorkerConfig extends ClusterConfig { - - public static class Analysis { - public static class Data { - public static int size = 1000; - } - } - - public static class Persistence { - public static class Data { - public static int size = 1000; - } - } +public class WorkerConfig { public static class WorkerNum { public static class Node { @@ -105,18 +91,6 @@ public class WorkerConfig extends ClusterConfig { public static int Size = 1024; } - public static class NodeRefDayAnalysis { - public static int Size = 1024; - } - - public static class NodeRefHourAnalysis { - public static int Size = 1024; - } - - public static class NodeRefMinuteAnalysis { - public static int Size = 1024; - } - public static class NodeMappingDayAnalysis { public static int Size = 1024; } @@ -147,6 +121,18 @@ public class WorkerConfig extends ClusterConfig { } public static class NodeRef { + public static class NodeRefDayAnalysis { + public static int Size = 1024; + } + + public static class NodeRefHourAnalysis { + public static int Size = 1024; + } + + public static class NodeRefMinuteAnalysis { + public static int Size = 1024; + } + public static class NodeRefDaySave { public static int Size = 1024; } diff --git a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/config/WorkerConfigProvider.java b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/config/WorkerConfigProvider.java new file mode 100644 index 000000000..928b1015b --- /dev/null +++ b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/config/WorkerConfigProvider.java @@ -0,0 +1,18 @@ +package com.a.eye.skywalking.collector.worker.config; + +import com.a.eye.skywalking.collector.config.ConfigProvider; + +/** + * @author pengys5 + */ +public class WorkerConfigProvider implements ConfigProvider { + + @Override + public Class configClass() { + return WorkerConfig.class; + } + + @Override + public void cliArgs() { + } +} diff --git a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/globaltrace/analysis/GlobalTraceAnalysis.java b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/globaltrace/analysis/GlobalTraceAnalysis.java index d87f77d35..f657ad921 100644 --- a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/globaltrace/analysis/GlobalTraceAnalysis.java +++ b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/globaltrace/analysis/GlobalTraceAnalysis.java @@ -6,7 +6,7 @@ import com.a.eye.skywalking.collector.actor.LocalWorkerContext; import com.a.eye.skywalking.collector.actor.selector.RollingSelector; import com.a.eye.skywalking.collector.actor.selector.WorkerSelector; import com.a.eye.skywalking.collector.worker.MergeAnalysisMember; -import com.a.eye.skywalking.collector.worker.WorkerConfig; +import com.a.eye.skywalking.collector.worker.config.WorkerConfig; import com.a.eye.skywalking.collector.worker.globaltrace.GlobalTraceIndex; import com.a.eye.skywalking.collector.worker.globaltrace.persistence.GlobalTraceAgg; import com.a.eye.skywalking.collector.worker.segment.SegmentPost; diff --git a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/globaltrace/persistence/GlobalTraceAgg.java b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/globaltrace/persistence/GlobalTraceAgg.java index 5e246aa7a..3e0312364 100644 --- a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/globaltrace/persistence/GlobalTraceAgg.java +++ b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/globaltrace/persistence/GlobalTraceAgg.java @@ -3,7 +3,7 @@ package com.a.eye.skywalking.collector.worker.globaltrace.persistence; import com.a.eye.skywalking.collector.actor.*; import com.a.eye.skywalking.collector.actor.selector.HashCodeSelector; import com.a.eye.skywalking.collector.actor.selector.WorkerSelector; -import com.a.eye.skywalking.collector.worker.WorkerConfig; +import com.a.eye.skywalking.collector.worker.config.WorkerConfig; import com.a.eye.skywalking.collector.worker.storage.MergeData; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/globaltrace/persistence/GlobalTraceSave.java b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/globaltrace/persistence/GlobalTraceSave.java index 3c1f12199..76fc66244 100644 --- a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/globaltrace/persistence/GlobalTraceSave.java +++ b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/globaltrace/persistence/GlobalTraceSave.java @@ -7,7 +7,7 @@ import com.a.eye.skywalking.collector.actor.LocalWorkerContext; import com.a.eye.skywalking.collector.actor.selector.HashCodeSelector; import com.a.eye.skywalking.collector.actor.selector.WorkerSelector; import com.a.eye.skywalking.collector.worker.MergePersistenceMember; -import com.a.eye.skywalking.collector.worker.WorkerConfig; +import com.a.eye.skywalking.collector.worker.config.WorkerConfig; import com.a.eye.skywalking.collector.worker.globaltrace.GlobalTraceIndex; /** diff --git a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/httpserver/AbstractHttpServlet.java b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/httpserver/AbstractHttpServlet.java index f5c4e30a4..5edb5bc25 100644 --- a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/httpserver/AbstractHttpServlet.java +++ b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/httpserver/AbstractHttpServlet.java @@ -15,7 +15,7 @@ public abstract class AbstractHttpServlet extends HttpServlet { final public void reply(HttpServletResponse response, JsonObject resJson, int status) throws IOException { response.setContentType("text/json"); response.setCharacterEncoding("utf-8"); - response.setStatus(HttpServletResponse.SC_OK); + response.setStatus(status); PrintWriter out = response.getWriter(); out.print(resJson); diff --git a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/httpserver/AbstractPost.java b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/httpserver/AbstractPost.java index 2e915ff6b..fa45a1123 100644 --- a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/httpserver/AbstractPost.java +++ b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/httpserver/AbstractPost.java @@ -1,7 +1,6 @@ package com.a.eye.skywalking.collector.worker.httpserver; import com.a.eye.skywalking.collector.actor.*; -import com.a.eye.skywalking.collector.queue.EndOfBatchCommand; import com.google.gson.JsonObject; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -15,6 +14,7 @@ import java.io.IOException; /** * @author pengys5 */ + public abstract class AbstractPost extends AbstractLocalAsyncWorker { private Logger logger = LogManager.getFormatterLogger(AbstractPost.class); @@ -27,10 +27,9 @@ public abstract class AbstractPost extends AbstractLocalAsyncWorker { final public void onWork(Object request) throws Exception { if (request instanceof String) { onReceive((String) request); - } else if (request instanceof EndOfBatchCommand) { - } else { logger.error("unhandled request, request instance must String, but is %s", request.getClass().toString()); + saveException(new IllegalArgumentException("request instance must String")); } } @@ -40,7 +39,7 @@ public abstract class AbstractPost extends AbstractLocalAsyncWorker { private final LocalAsyncWorkerRef ownerWorkerRef; - protected PostWithHttpServlet(LocalAsyncWorkerRef ownerWorkerRef) { + PostWithHttpServlet(LocalAsyncWorkerRef ownerWorkerRef) { this.ownerWorkerRef = ownerWorkerRef; } @@ -49,7 +48,7 @@ public abstract class AbstractPost extends AbstractLocalAsyncWorker { JsonObject resJson = new JsonObject(); try { BufferedReader bufferedReader = request.getReader(); - StringBuffer dataStr = new StringBuffer(); + StringBuilder dataStr = new StringBuilder(); String tmpStr; while ((tmpStr = bufferedReader.readLine()) != null) { dataStr.append(tmpStr); diff --git a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/httpserver/HttpServer.java b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/httpserver/HttpServer.java index 144a9ab69..192aecd44 100644 --- a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/httpserver/HttpServer.java +++ b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/httpserver/HttpServer.java @@ -1,12 +1,14 @@ package com.a.eye.skywalking.collector.worker.httpserver; import com.a.eye.skywalking.collector.actor.ClusterWorkerContext; +import com.a.eye.skywalking.collector.worker.config.HttpConfig; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.eclipse.jetty.server.Server; -import org.eclipse.jetty.server.ServerConnector; import org.eclipse.jetty.servlet.ServletContextHandler; +import java.net.InetSocketAddress; + /** * @author pengys5 */ @@ -16,9 +18,9 @@ public enum HttpServer { private Logger logger = LogManager.getFormatterLogger(HttpServer.class); public void boot(ClusterWorkerContext clusterContext) throws Exception { - Server server = new Server(7001); + Server server = new Server(new InetSocketAddress(HttpConfig.Http.hostname, Integer.valueOf(HttpConfig.Http.port))); - String contextPath = "/"; + String contextPath = HttpConfig.Http.contextPath; ServletContextHandler servletContextHandler = new ServletContextHandler(ServletContextHandler.NO_SESSIONS); servletContextHandler.setContextPath(contextPath); logger.info("http server root context path: %s", contextPath); diff --git a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/node/analysis/NodeCompAnalysis.java b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/node/analysis/NodeCompAnalysis.java index 8d2a92802..75702cf3a 100644 --- a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/node/analysis/NodeCompAnalysis.java +++ b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/node/analysis/NodeCompAnalysis.java @@ -5,7 +5,7 @@ import com.a.eye.skywalking.collector.actor.ClusterWorkerContext; import com.a.eye.skywalking.collector.actor.LocalWorkerContext; import com.a.eye.skywalking.collector.actor.selector.RollingSelector; import com.a.eye.skywalking.collector.actor.selector.WorkerSelector; -import com.a.eye.skywalking.collector.worker.WorkerConfig; +import com.a.eye.skywalking.collector.worker.config.WorkerConfig; import com.a.eye.skywalking.collector.worker.node.persistence.NodeCompAgg; import com.a.eye.skywalking.collector.worker.segment.SegmentPost; import com.a.eye.skywalking.collector.worker.storage.RecordData; diff --git a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/node/analysis/NodeMappingDayAnalysis.java b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/node/analysis/NodeMappingDayAnalysis.java index 4b83c8db9..c006fbc15 100644 --- a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/node/analysis/NodeMappingDayAnalysis.java +++ b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/node/analysis/NodeMappingDayAnalysis.java @@ -5,7 +5,7 @@ import com.a.eye.skywalking.collector.actor.ClusterWorkerContext; import com.a.eye.skywalking.collector.actor.LocalWorkerContext; import com.a.eye.skywalking.collector.actor.selector.RollingSelector; import com.a.eye.skywalking.collector.actor.selector.WorkerSelector; -import com.a.eye.skywalking.collector.worker.WorkerConfig; +import com.a.eye.skywalking.collector.worker.config.WorkerConfig; import com.a.eye.skywalking.collector.worker.node.persistence.NodeMappingDayAgg; import com.a.eye.skywalking.collector.worker.segment.SegmentPost; import com.a.eye.skywalking.collector.worker.storage.RecordData; diff --git a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/node/analysis/NodeMappingHourAnalysis.java b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/node/analysis/NodeMappingHourAnalysis.java index a8a5d5893..66aedbcf0 100644 --- a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/node/analysis/NodeMappingHourAnalysis.java +++ b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/node/analysis/NodeMappingHourAnalysis.java @@ -5,7 +5,7 @@ import com.a.eye.skywalking.collector.actor.ClusterWorkerContext; import com.a.eye.skywalking.collector.actor.LocalWorkerContext; import com.a.eye.skywalking.collector.actor.selector.RollingSelector; import com.a.eye.skywalking.collector.actor.selector.WorkerSelector; -import com.a.eye.skywalking.collector.worker.WorkerConfig; +import com.a.eye.skywalking.collector.worker.config.WorkerConfig; import com.a.eye.skywalking.collector.worker.node.persistence.NodeMappingHourAgg; import com.a.eye.skywalking.collector.worker.segment.SegmentPost; import com.a.eye.skywalking.collector.worker.storage.RecordData; diff --git a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/node/analysis/NodeMappingMinuteAnalysis.java b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/node/analysis/NodeMappingMinuteAnalysis.java index 1c719fa4d..a3895d94c 100644 --- a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/node/analysis/NodeMappingMinuteAnalysis.java +++ b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/node/analysis/NodeMappingMinuteAnalysis.java @@ -5,7 +5,7 @@ import com.a.eye.skywalking.collector.actor.ClusterWorkerContext; import com.a.eye.skywalking.collector.actor.LocalWorkerContext; import com.a.eye.skywalking.collector.actor.selector.RollingSelector; import com.a.eye.skywalking.collector.actor.selector.WorkerSelector; -import com.a.eye.skywalking.collector.worker.WorkerConfig; +import com.a.eye.skywalking.collector.worker.config.WorkerConfig; import com.a.eye.skywalking.collector.worker.node.persistence.NodeMappingMinuteAgg; import com.a.eye.skywalking.collector.worker.segment.SegmentPost; import com.a.eye.skywalking.collector.worker.storage.RecordData; diff --git a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/node/persistence/NodeCompAgg.java b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/node/persistence/NodeCompAgg.java index 2149a2931..9a3f2bb6b 100644 --- a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/node/persistence/NodeCompAgg.java +++ b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/node/persistence/NodeCompAgg.java @@ -3,7 +3,7 @@ package com.a.eye.skywalking.collector.worker.node.persistence; import com.a.eye.skywalking.collector.actor.*; import com.a.eye.skywalking.collector.actor.selector.HashCodeSelector; import com.a.eye.skywalking.collector.actor.selector.WorkerSelector; -import com.a.eye.skywalking.collector.worker.WorkerConfig; +import com.a.eye.skywalking.collector.worker.config.WorkerConfig; import com.a.eye.skywalking.collector.worker.storage.RecordData; /** diff --git a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/node/persistence/NodeCompSave.java b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/node/persistence/NodeCompSave.java index bcae0e729..1590b42c2 100644 --- a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/node/persistence/NodeCompSave.java +++ b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/node/persistence/NodeCompSave.java @@ -6,7 +6,7 @@ import com.a.eye.skywalking.collector.actor.LocalWorkerContext; import com.a.eye.skywalking.collector.actor.selector.HashCodeSelector; import com.a.eye.skywalking.collector.actor.selector.WorkerSelector; import com.a.eye.skywalking.collector.worker.RecordPersistenceMember; -import com.a.eye.skywalking.collector.worker.WorkerConfig; +import com.a.eye.skywalking.collector.worker.config.WorkerConfig; import com.a.eye.skywalking.collector.worker.node.NodeCompIndex; /** diff --git a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/node/persistence/NodeMappingDayAgg.java b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/node/persistence/NodeMappingDayAgg.java index 25d6869b3..3d56b0b76 100644 --- a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/node/persistence/NodeMappingDayAgg.java +++ b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/node/persistence/NodeMappingDayAgg.java @@ -3,7 +3,7 @@ package com.a.eye.skywalking.collector.worker.node.persistence; import com.a.eye.skywalking.collector.actor.*; import com.a.eye.skywalking.collector.actor.selector.HashCodeSelector; import com.a.eye.skywalking.collector.actor.selector.WorkerSelector; -import com.a.eye.skywalking.collector.worker.WorkerConfig; +import com.a.eye.skywalking.collector.worker.config.WorkerConfig; import com.a.eye.skywalking.collector.worker.storage.RecordData; /** diff --git a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/node/persistence/NodeMappingDaySave.java b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/node/persistence/NodeMappingDaySave.java index b883a7f06..c0f588293 100644 --- a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/node/persistence/NodeMappingDaySave.java +++ b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/node/persistence/NodeMappingDaySave.java @@ -6,7 +6,7 @@ import com.a.eye.skywalking.collector.actor.LocalWorkerContext; import com.a.eye.skywalking.collector.actor.selector.HashCodeSelector; import com.a.eye.skywalking.collector.actor.selector.WorkerSelector; import com.a.eye.skywalking.collector.worker.RecordPersistenceMember; -import com.a.eye.skywalking.collector.worker.WorkerConfig; +import com.a.eye.skywalking.collector.worker.config.WorkerConfig; import com.a.eye.skywalking.collector.worker.node.NodeMappingIndex; /** diff --git a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/node/persistence/NodeMappingHourAgg.java b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/node/persistence/NodeMappingHourAgg.java index 2e614266b..79a1d6b54 100644 --- a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/node/persistence/NodeMappingHourAgg.java +++ b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/node/persistence/NodeMappingHourAgg.java @@ -3,7 +3,7 @@ package com.a.eye.skywalking.collector.worker.node.persistence; import com.a.eye.skywalking.collector.actor.*; import com.a.eye.skywalking.collector.actor.selector.HashCodeSelector; import com.a.eye.skywalking.collector.actor.selector.WorkerSelector; -import com.a.eye.skywalking.collector.worker.WorkerConfig; +import com.a.eye.skywalking.collector.worker.config.WorkerConfig; import com.a.eye.skywalking.collector.worker.storage.RecordData; /** diff --git a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/node/persistence/NodeMappingHourSave.java b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/node/persistence/NodeMappingHourSave.java index 58d776ffb..e6de9d3e9 100644 --- a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/node/persistence/NodeMappingHourSave.java +++ b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/node/persistence/NodeMappingHourSave.java @@ -6,7 +6,7 @@ import com.a.eye.skywalking.collector.actor.LocalWorkerContext; import com.a.eye.skywalking.collector.actor.selector.HashCodeSelector; import com.a.eye.skywalking.collector.actor.selector.WorkerSelector; import com.a.eye.skywalking.collector.worker.RecordPersistenceMember; -import com.a.eye.skywalking.collector.worker.WorkerConfig; +import com.a.eye.skywalking.collector.worker.config.WorkerConfig; import com.a.eye.skywalking.collector.worker.node.NodeMappingIndex; /** diff --git a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/node/persistence/NodeMappingMinuteAgg.java b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/node/persistence/NodeMappingMinuteAgg.java index d21ec9098..cba6a69da 100644 --- a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/node/persistence/NodeMappingMinuteAgg.java +++ b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/node/persistence/NodeMappingMinuteAgg.java @@ -3,7 +3,7 @@ package com.a.eye.skywalking.collector.worker.node.persistence; import com.a.eye.skywalking.collector.actor.*; import com.a.eye.skywalking.collector.actor.selector.HashCodeSelector; import com.a.eye.skywalking.collector.actor.selector.WorkerSelector; -import com.a.eye.skywalking.collector.worker.WorkerConfig; +import com.a.eye.skywalking.collector.worker.config.WorkerConfig; import com.a.eye.skywalking.collector.worker.storage.RecordData; /** diff --git a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/node/persistence/NodeMappingMinuteSave.java b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/node/persistence/NodeMappingMinuteSave.java index 29b398b80..663976d51 100644 --- a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/node/persistence/NodeMappingMinuteSave.java +++ b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/node/persistence/NodeMappingMinuteSave.java @@ -6,7 +6,7 @@ import com.a.eye.skywalking.collector.actor.LocalWorkerContext; import com.a.eye.skywalking.collector.actor.selector.HashCodeSelector; import com.a.eye.skywalking.collector.actor.selector.WorkerSelector; import com.a.eye.skywalking.collector.worker.RecordPersistenceMember; -import com.a.eye.skywalking.collector.worker.WorkerConfig; +import com.a.eye.skywalking.collector.worker.config.WorkerConfig; import com.a.eye.skywalking.collector.worker.node.NodeMappingIndex; /** diff --git a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/noderef/analysis/NodeRefDayAnalysis.java b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/noderef/analysis/NodeRefDayAnalysis.java index 1f1658375..d73f5d0ce 100644 --- a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/noderef/analysis/NodeRefDayAnalysis.java +++ b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/noderef/analysis/NodeRefDayAnalysis.java @@ -6,7 +6,7 @@ import com.a.eye.skywalking.collector.actor.LocalWorkerContext; import com.a.eye.skywalking.collector.actor.ProviderNotFoundException; import com.a.eye.skywalking.collector.actor.selector.RollingSelector; import com.a.eye.skywalking.collector.actor.selector.WorkerSelector; -import com.a.eye.skywalking.collector.worker.WorkerConfig; +import com.a.eye.skywalking.collector.worker.config.WorkerConfig; import com.a.eye.skywalking.collector.worker.noderef.persistence.NodeRefDayAgg; import com.a.eye.skywalking.collector.worker.segment.SegmentPost; import com.a.eye.skywalking.collector.worker.storage.RecordData; @@ -70,7 +70,7 @@ public class NodeRefDayAnalysis extends AbstractNodeRefAnalysis { @Override public int queueSize() { - return WorkerConfig.Queue.Node.NodeRefDayAnalysis.Size; + return WorkerConfig.Queue.NodeRef.NodeRefDayAnalysis.Size; } } diff --git a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/noderef/analysis/NodeRefHourAnalysis.java b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/noderef/analysis/NodeRefHourAnalysis.java index 02d27ff30..915347ee7 100644 --- a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/noderef/analysis/NodeRefHourAnalysis.java +++ b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/noderef/analysis/NodeRefHourAnalysis.java @@ -6,7 +6,7 @@ import com.a.eye.skywalking.collector.actor.LocalWorkerContext; import com.a.eye.skywalking.collector.actor.ProviderNotFoundException; import com.a.eye.skywalking.collector.actor.selector.RollingSelector; import com.a.eye.skywalking.collector.actor.selector.WorkerSelector; -import com.a.eye.skywalking.collector.worker.WorkerConfig; +import com.a.eye.skywalking.collector.worker.config.WorkerConfig; import com.a.eye.skywalking.collector.worker.noderef.persistence.NodeRefHourAgg; import com.a.eye.skywalking.collector.worker.segment.SegmentPost; import com.a.eye.skywalking.collector.worker.storage.RecordData; @@ -70,7 +70,7 @@ public class NodeRefHourAnalysis extends AbstractNodeRefAnalysis { @Override public int queueSize() { - return WorkerConfig.Queue.Node.NodeRefHourAnalysis.Size; + return WorkerConfig.Queue.NodeRef.NodeRefHourAnalysis.Size; } } diff --git a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/noderef/analysis/NodeRefMinuteAnalysis.java b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/noderef/analysis/NodeRefMinuteAnalysis.java index c913d58f6..dfebc4d94 100644 --- a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/noderef/analysis/NodeRefMinuteAnalysis.java +++ b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/noderef/analysis/NodeRefMinuteAnalysis.java @@ -6,7 +6,7 @@ import com.a.eye.skywalking.collector.actor.LocalWorkerContext; import com.a.eye.skywalking.collector.actor.ProviderNotFoundException; import com.a.eye.skywalking.collector.actor.selector.RollingSelector; import com.a.eye.skywalking.collector.actor.selector.WorkerSelector; -import com.a.eye.skywalking.collector.worker.WorkerConfig; +import com.a.eye.skywalking.collector.worker.config.WorkerConfig; import com.a.eye.skywalking.collector.worker.noderef.persistence.NodeRefMinuteAgg; import com.a.eye.skywalking.collector.worker.segment.SegmentPost; import com.a.eye.skywalking.collector.worker.storage.RecordData; @@ -70,7 +70,7 @@ public class NodeRefMinuteAnalysis extends AbstractNodeRefAnalysis { @Override public int queueSize() { - return WorkerConfig.Queue.Node.NodeRefMinuteAnalysis.Size; + return WorkerConfig.Queue.NodeRef.NodeRefMinuteAnalysis.Size; } } diff --git a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/noderef/analysis/NodeRefResSumDayAnalysis.java b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/noderef/analysis/NodeRefResSumDayAnalysis.java index 55c85e05d..3dfb34e30 100644 --- a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/noderef/analysis/NodeRefResSumDayAnalysis.java +++ b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/noderef/analysis/NodeRefResSumDayAnalysis.java @@ -5,7 +5,7 @@ import com.a.eye.skywalking.collector.actor.ClusterWorkerContext; import com.a.eye.skywalking.collector.actor.LocalWorkerContext; import com.a.eye.skywalking.collector.actor.selector.RollingSelector; import com.a.eye.skywalking.collector.actor.selector.WorkerSelector; -import com.a.eye.skywalking.collector.worker.WorkerConfig; +import com.a.eye.skywalking.collector.worker.config.WorkerConfig; import com.a.eye.skywalking.collector.worker.noderef.persistence.NodeRefResSumDayAgg; import com.a.eye.skywalking.collector.worker.storage.MetricData; diff --git a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/noderef/analysis/NodeRefResSumHourAnalysis.java b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/noderef/analysis/NodeRefResSumHourAnalysis.java index 363e6ded4..9614bae93 100644 --- a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/noderef/analysis/NodeRefResSumHourAnalysis.java +++ b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/noderef/analysis/NodeRefResSumHourAnalysis.java @@ -5,7 +5,7 @@ import com.a.eye.skywalking.collector.actor.ClusterWorkerContext; import com.a.eye.skywalking.collector.actor.LocalWorkerContext; import com.a.eye.skywalking.collector.actor.selector.RollingSelector; import com.a.eye.skywalking.collector.actor.selector.WorkerSelector; -import com.a.eye.skywalking.collector.worker.WorkerConfig; +import com.a.eye.skywalking.collector.worker.config.WorkerConfig; import com.a.eye.skywalking.collector.worker.noderef.persistence.NodeRefResSumHourAgg; import com.a.eye.skywalking.collector.worker.storage.MetricData; diff --git a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/noderef/analysis/NodeRefResSumMinuteAnalysis.java b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/noderef/analysis/NodeRefResSumMinuteAnalysis.java index 66e3a5547..b5bb56747 100644 --- a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/noderef/analysis/NodeRefResSumMinuteAnalysis.java +++ b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/noderef/analysis/NodeRefResSumMinuteAnalysis.java @@ -5,7 +5,7 @@ import com.a.eye.skywalking.collector.actor.ClusterWorkerContext; import com.a.eye.skywalking.collector.actor.LocalWorkerContext; import com.a.eye.skywalking.collector.actor.selector.RollingSelector; import com.a.eye.skywalking.collector.actor.selector.WorkerSelector; -import com.a.eye.skywalking.collector.worker.WorkerConfig; +import com.a.eye.skywalking.collector.worker.config.WorkerConfig; import com.a.eye.skywalking.collector.worker.noderef.persistence.NodeRefResSumMinuteAgg; import com.a.eye.skywalking.collector.worker.storage.MetricData; diff --git a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefDayAgg.java b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefDayAgg.java index e045565ac..89af04b61 100644 --- a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefDayAgg.java +++ b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefDayAgg.java @@ -3,7 +3,7 @@ package com.a.eye.skywalking.collector.worker.noderef.persistence; import com.a.eye.skywalking.collector.actor.*; import com.a.eye.skywalking.collector.actor.selector.HashCodeSelector; import com.a.eye.skywalking.collector.actor.selector.WorkerSelector; -import com.a.eye.skywalking.collector.worker.WorkerConfig; +import com.a.eye.skywalking.collector.worker.config.WorkerConfig; import com.a.eye.skywalking.collector.worker.storage.RecordData; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefDaySave.java b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefDaySave.java index 946eda3a1..f027b605e 100644 --- a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefDaySave.java +++ b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefDaySave.java @@ -6,7 +6,7 @@ import com.a.eye.skywalking.collector.actor.LocalWorkerContext; import com.a.eye.skywalking.collector.actor.selector.HashCodeSelector; import com.a.eye.skywalking.collector.actor.selector.WorkerSelector; import com.a.eye.skywalking.collector.worker.RecordPersistenceMember; -import com.a.eye.skywalking.collector.worker.WorkerConfig; +import com.a.eye.skywalking.collector.worker.config.WorkerConfig; import com.a.eye.skywalking.collector.worker.noderef.NodeRefIndex; /** diff --git a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefHourAgg.java b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefHourAgg.java index 78974e82b..f86097155 100644 --- a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefHourAgg.java +++ b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefHourAgg.java @@ -3,7 +3,7 @@ package com.a.eye.skywalking.collector.worker.noderef.persistence; import com.a.eye.skywalking.collector.actor.*; import com.a.eye.skywalking.collector.actor.selector.HashCodeSelector; import com.a.eye.skywalking.collector.actor.selector.WorkerSelector; -import com.a.eye.skywalking.collector.worker.WorkerConfig; +import com.a.eye.skywalking.collector.worker.config.WorkerConfig; import com.a.eye.skywalking.collector.worker.storage.RecordData; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefHourSave.java b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefHourSave.java index 8ec5b1476..1096127e8 100644 --- a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefHourSave.java +++ b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefHourSave.java @@ -6,7 +6,7 @@ import com.a.eye.skywalking.collector.actor.LocalWorkerContext; import com.a.eye.skywalking.collector.actor.selector.HashCodeSelector; import com.a.eye.skywalking.collector.actor.selector.WorkerSelector; import com.a.eye.skywalking.collector.worker.RecordPersistenceMember; -import com.a.eye.skywalking.collector.worker.WorkerConfig; +import com.a.eye.skywalking.collector.worker.config.WorkerConfig; import com.a.eye.skywalking.collector.worker.noderef.NodeRefIndex; /** diff --git a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefMinuteAgg.java b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefMinuteAgg.java index b961e2ce7..04a4c69ec 100644 --- a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefMinuteAgg.java +++ b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefMinuteAgg.java @@ -3,7 +3,7 @@ package com.a.eye.skywalking.collector.worker.noderef.persistence; import com.a.eye.skywalking.collector.actor.*; import com.a.eye.skywalking.collector.actor.selector.HashCodeSelector; import com.a.eye.skywalking.collector.actor.selector.WorkerSelector; -import com.a.eye.skywalking.collector.worker.WorkerConfig; +import com.a.eye.skywalking.collector.worker.config.WorkerConfig; import com.a.eye.skywalking.collector.worker.storage.RecordData; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefMinuteSave.java b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefMinuteSave.java index d77cd3c37..723b39953 100644 --- a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefMinuteSave.java +++ b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefMinuteSave.java @@ -6,7 +6,7 @@ import com.a.eye.skywalking.collector.actor.LocalWorkerContext; import com.a.eye.skywalking.collector.actor.selector.HashCodeSelector; import com.a.eye.skywalking.collector.actor.selector.WorkerSelector; import com.a.eye.skywalking.collector.worker.RecordPersistenceMember; -import com.a.eye.skywalking.collector.worker.WorkerConfig; +import com.a.eye.skywalking.collector.worker.config.WorkerConfig; import com.a.eye.skywalking.collector.worker.noderef.NodeRefIndex; /** diff --git a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefResSumDayAgg.java b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefResSumDayAgg.java index 61fa1ad5c..f95e00236 100644 --- a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefResSumDayAgg.java +++ b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefResSumDayAgg.java @@ -3,7 +3,7 @@ package com.a.eye.skywalking.collector.worker.noderef.persistence; import com.a.eye.skywalking.collector.actor.*; import com.a.eye.skywalking.collector.actor.selector.HashCodeSelector; import com.a.eye.skywalking.collector.actor.selector.WorkerSelector; -import com.a.eye.skywalking.collector.worker.WorkerConfig; +import com.a.eye.skywalking.collector.worker.config.WorkerConfig; import com.a.eye.skywalking.collector.worker.storage.MetricData; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefResSumDaySave.java b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefResSumDaySave.java index b2afec7e7..c08f018ef 100644 --- a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefResSumDaySave.java +++ b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefResSumDaySave.java @@ -6,7 +6,7 @@ import com.a.eye.skywalking.collector.actor.LocalWorkerContext; import com.a.eye.skywalking.collector.actor.selector.HashCodeSelector; import com.a.eye.skywalking.collector.actor.selector.WorkerSelector; import com.a.eye.skywalking.collector.worker.MetricPersistenceMember; -import com.a.eye.skywalking.collector.worker.WorkerConfig; +import com.a.eye.skywalking.collector.worker.config.WorkerConfig; import com.a.eye.skywalking.collector.worker.noderef.NodeRefResSumIndex; /** diff --git a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefResSumHourAgg.java b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefResSumHourAgg.java index 39435bbd5..1bf10dc7b 100644 --- a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefResSumHourAgg.java +++ b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefResSumHourAgg.java @@ -3,7 +3,7 @@ package com.a.eye.skywalking.collector.worker.noderef.persistence; import com.a.eye.skywalking.collector.actor.*; import com.a.eye.skywalking.collector.actor.selector.HashCodeSelector; import com.a.eye.skywalking.collector.actor.selector.WorkerSelector; -import com.a.eye.skywalking.collector.worker.WorkerConfig; +import com.a.eye.skywalking.collector.worker.config.WorkerConfig; import com.a.eye.skywalking.collector.worker.storage.MetricData; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefResSumHourSave.java b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefResSumHourSave.java index f4da5b507..c2e94a246 100644 --- a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefResSumHourSave.java +++ b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefResSumHourSave.java @@ -6,7 +6,7 @@ import com.a.eye.skywalking.collector.actor.LocalWorkerContext; import com.a.eye.skywalking.collector.actor.selector.HashCodeSelector; import com.a.eye.skywalking.collector.actor.selector.WorkerSelector; import com.a.eye.skywalking.collector.worker.MetricPersistenceMember; -import com.a.eye.skywalking.collector.worker.WorkerConfig; +import com.a.eye.skywalking.collector.worker.config.WorkerConfig; import com.a.eye.skywalking.collector.worker.noderef.NodeRefResSumIndex; /** diff --git a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefResSumMinuteAgg.java b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefResSumMinuteAgg.java index 7afb59d8b..c4a83124c 100644 --- a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefResSumMinuteAgg.java +++ b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefResSumMinuteAgg.java @@ -3,7 +3,7 @@ package com.a.eye.skywalking.collector.worker.noderef.persistence; import com.a.eye.skywalking.collector.actor.*; import com.a.eye.skywalking.collector.actor.selector.HashCodeSelector; import com.a.eye.skywalking.collector.actor.selector.WorkerSelector; -import com.a.eye.skywalking.collector.worker.WorkerConfig; +import com.a.eye.skywalking.collector.worker.config.WorkerConfig; import com.a.eye.skywalking.collector.worker.storage.MetricData; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefResSumMinuteSave.java b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefResSumMinuteSave.java index d2ae9fae7..70fb5c6b1 100644 --- a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefResSumMinuteSave.java +++ b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefResSumMinuteSave.java @@ -6,7 +6,7 @@ import com.a.eye.skywalking.collector.actor.LocalWorkerContext; import com.a.eye.skywalking.collector.actor.selector.HashCodeSelector; import com.a.eye.skywalking.collector.actor.selector.WorkerSelector; import com.a.eye.skywalking.collector.worker.MetricPersistenceMember; -import com.a.eye.skywalking.collector.worker.WorkerConfig; +import com.a.eye.skywalking.collector.worker.config.WorkerConfig; import com.a.eye.skywalking.collector.worker.noderef.NodeRefResSumIndex; /** diff --git a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/segment/SegmentPost.java b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/segment/SegmentPost.java index 2eb187ed5..5992716c7 100644 --- a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/segment/SegmentPost.java +++ b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/segment/SegmentPost.java @@ -7,7 +7,7 @@ import com.a.eye.skywalking.collector.actor.ProviderNotFoundException; import com.a.eye.skywalking.collector.actor.Role; import com.a.eye.skywalking.collector.actor.selector.RollingSelector; import com.a.eye.skywalking.collector.actor.selector.WorkerSelector; -import com.a.eye.skywalking.collector.worker.WorkerConfig; +import com.a.eye.skywalking.collector.worker.config.WorkerConfig; import com.a.eye.skywalking.collector.worker.globaltrace.analysis.GlobalTraceAnalysis; import com.a.eye.skywalking.collector.worker.httpserver.AbstractPost; import com.a.eye.skywalking.collector.worker.httpserver.AbstractPostProvider; diff --git a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/segment/persistence/SegmentCostSave.java b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/segment/persistence/SegmentCostSave.java index 9fe2cc6c4..c02e74356 100644 --- a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/segment/persistence/SegmentCostSave.java +++ b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/segment/persistence/SegmentCostSave.java @@ -7,7 +7,7 @@ import com.a.eye.skywalking.collector.actor.LocalWorkerContext; import com.a.eye.skywalking.collector.actor.selector.RollingSelector; import com.a.eye.skywalking.collector.actor.selector.WorkerSelector; import com.a.eye.skywalking.collector.worker.RecordPersistenceMember; -import com.a.eye.skywalking.collector.worker.WorkerConfig; +import com.a.eye.skywalking.collector.worker.config.WorkerConfig; import com.a.eye.skywalking.collector.worker.segment.SegmentCostIndex; import com.a.eye.skywalking.collector.worker.segment.SegmentPost; import com.a.eye.skywalking.collector.worker.storage.RecordData; diff --git a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/segment/persistence/SegmentExceptionSave.java b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/segment/persistence/SegmentExceptionSave.java index 6caccfa10..227cf61ad 100644 --- a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/segment/persistence/SegmentExceptionSave.java +++ b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/segment/persistence/SegmentExceptionSave.java @@ -7,7 +7,7 @@ import com.a.eye.skywalking.collector.actor.LocalWorkerContext; import com.a.eye.skywalking.collector.actor.selector.RollingSelector; import com.a.eye.skywalking.collector.actor.selector.WorkerSelector; import com.a.eye.skywalking.collector.worker.RecordPersistenceMember; -import com.a.eye.skywalking.collector.worker.WorkerConfig; +import com.a.eye.skywalking.collector.worker.config.WorkerConfig; import com.a.eye.skywalking.collector.worker.segment.SegmentExceptionIndex; import com.a.eye.skywalking.collector.worker.segment.SegmentPost; import com.a.eye.skywalking.collector.worker.storage.AbstractIndex; diff --git a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/segment/persistence/SegmentSave.java b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/segment/persistence/SegmentSave.java index 0875545ae..0d8ba306e 100644 --- a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/segment/persistence/SegmentSave.java +++ b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/segment/persistence/SegmentSave.java @@ -7,7 +7,7 @@ import com.a.eye.skywalking.collector.actor.LocalWorkerContext; import com.a.eye.skywalking.collector.actor.selector.RollingSelector; import com.a.eye.skywalking.collector.actor.selector.WorkerSelector; import com.a.eye.skywalking.collector.worker.RecordPersistenceMember; -import com.a.eye.skywalking.collector.worker.WorkerConfig; +import com.a.eye.skywalking.collector.worker.config.WorkerConfig; import com.a.eye.skywalking.collector.worker.segment.SegmentIndex; import com.a.eye.skywalking.collector.worker.storage.AbstractIndex; import com.a.eye.skywalking.collector.worker.storage.RecordData; diff --git a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/storage/AbstractIndex.java b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/storage/AbstractIndex.java index bb27a34e9..1aef5a01d 100644 --- a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/storage/AbstractIndex.java +++ b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/storage/AbstractIndex.java @@ -1,5 +1,6 @@ package com.a.eye.skywalking.collector.worker.storage; +import com.a.eye.skywalking.collector.worker.config.EsConfig; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.elasticsearch.action.admin.indices.create.CreateIndexResponse; @@ -32,8 +33,8 @@ public abstract class AbstractIndex { final XContentBuilder createSettingBuilder() throws IOException { return XContentFactory.jsonBuilder() .startObject() - .field("index.number_of_shards", 2) - .field("index.number_of_replicas", 0) + .field("index.number_of_shards", EsConfig.Es.Index.Shards.number) + .field("index.number_of_replicas", EsConfig.Es.Index.Replicas.number) .endObject(); } diff --git a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/storage/EsClient.java b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/storage/EsClient.java index 01355af82..b4985ce24 100644 --- a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/storage/EsClient.java +++ b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/storage/EsClient.java @@ -1,5 +1,6 @@ package com.a.eye.skywalking.collector.worker.storage; +import com.a.eye.skywalking.collector.worker.config.EsConfig; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.elasticsearch.action.admin.indices.refresh.RefreshRequest; @@ -11,6 +12,8 @@ import org.elasticsearch.transport.client.PreBuiltTransportClient; import java.net.InetAddress; import java.net.UnknownHostException; +import java.util.ArrayList; +import java.util.List; /** * @author pengys5 @@ -18,16 +21,22 @@ import java.net.UnknownHostException; public enum EsClient { INSTANCE; + private Logger logger = LogManager.getFormatterLogger(EsClient.class); + private Client client; public void boot() throws UnknownHostException { Settings settings = Settings.builder() - .put("cluster.name", "CollectorCluster") - .put("client.transport.sniff", true) + .put("cluster.name", EsConfig.Es.Cluster.name) + .put("client.transport.sniff", EsConfig.Es.Cluster.Transport.sniffer) .build(); - client = new PreBuiltTransportClient(settings) - .addTransportAddress(new InetSocketTransportAddress(InetAddress.getByName("localhost"), 9300)); + client = new PreBuiltTransportClient(settings); + + List pairsList = parseClusterNodes(EsConfig.Es.Cluster.nodes); + for (AddressPairs pairs : pairsList) { + ((PreBuiltTransportClient) client).addTransportAddress(new InetSocketTransportAddress(InetAddress.getByName(pairs.ip), pairs.port)); + } } public Client getClient() { @@ -35,7 +44,6 @@ public enum EsClient { } public void indexRefresh(String... indexName) { - Logger logger = LogManager.getFormatterLogger(EsClient.class); RefreshResponse response = client.admin().indices().refresh(new RefreshRequest(indexName)).actionGet(); if (response.getShardFailures().length == response.getTotalShards()) { logger.error("All elasticsearch shard index refresh failure, reason: %s", response.getShardFailures()); @@ -44,4 +52,28 @@ public enum EsClient { } logger.info("elasticsearch index refresh success"); } + + private List parseClusterNodes(String nodes) { + List pairsList = new ArrayList<>(); + logger.info("es nodes: %s", nodes); + String[] nodesSplit = nodes.split(","); + for (int i = 0; i < nodesSplit.length; i++) { + String node = nodesSplit[i]; + String ip = node.split(":")[0]; + String port = node.split(":")[1]; + pairsList.add(new AddressPairs(ip, Integer.valueOf(port))); + } + + return pairsList; + } + + class AddressPairs { + private String ip; + private Integer port; + + public AddressPairs(String ip, Integer port) { + this.ip = ip; + this.port = port; + } + } } diff --git a/skywalking-collector/skywalking-collector-worker/src/main/resources/META-INF/services/com.a.eye.skywalking.collector.config.ConfigProvider b/skywalking-collector/skywalking-collector-worker/src/main/resources/META-INF/services/com.a.eye.skywalking.collector.config.ConfigProvider new file mode 100644 index 000000000..30547ebfd --- /dev/null +++ b/skywalking-collector/skywalking-collector-worker/src/main/resources/META-INF/services/com.a.eye.skywalking.collector.config.ConfigProvider @@ -0,0 +1,5 @@ +com.a.eye.skywalking.collector.cluster.ClusterConfigProvider +com.a.eye.skywalking.collector.worker.config.EsConfigProvider +com.a.eye.skywalking.collector.worker.config.HttpConfigProvider +com.a.eye.skywalking.collector.worker.config.CacheSizeConfigProvider +com.a.eye.skywalking.collector.worker.config.WorkerConfigProvider \ No newline at end of file diff --git a/skywalking-collector/skywalking-collector-worker/src/main/resources/META-INF/services/com.a.eye.skywalking.collector.worker.httpserver.AbstractGetProvider b/skywalking-collector/skywalking-collector-worker/src/main/resources/META-INF/services/com.a.eye.skywalking.collector.worker.httpserver.AbstractGetProvider index ea63a29ac..a6e01f5ca 100644 --- a/skywalking-collector/skywalking-collector-worker/src/main/resources/META-INF/services/com.a.eye.skywalking.collector.worker.httpserver.AbstractGetProvider +++ b/skywalking-collector/skywalking-collector-worker/src/main/resources/META-INF/services/com.a.eye.skywalking.collector.worker.httpserver.AbstractGetProvider @@ -1,5 +1,3 @@ -com.a.eye.skywalking.collector.worker.noderef.NodeRefGetWithTimeSlice$Factory -com.a.eye.skywalking.collector.worker.noderef.NodeRefResSumGetWithTimeSlice$Factory com.a.eye.skywalking.collector.worker.noderef.NodeRefResSumGetGroupWithTimeSlice$Factory com.a.eye.skywalking.collector.worker.segment.SegmentTopGetWithTimeSlice$Factory com.a.eye.skywalking.collector.worker.globaltrace.GlobalTraceGetWithGlobalId$Factory diff --git a/skywalking-collector/skywalking-collector-worker/src/main/resources/collector.config b/skywalking-collector/skywalking-collector-worker/src/main/resources/collector.config index 159b51eee..077279ade 100644 --- a/skywalking-collector/skywalking-collector-worker/src/main/resources/collector.config +++ b/skywalking-collector/skywalking-collector-worker/src/main/resources/collector.config @@ -1,7 +1,63 @@ cluster.current.hostname=127.0.0.1 cluster.current.port=1000 -cluster.current.roles=[WorkersListener] -#cluster.seed_nodes=["akka.tcp://CollectorSystem@127.0.0.1:1000"] +cluster.current.roles=WorkersListener +cluster.seed_nodes=127.0.0.1:1000,127.0.0.1:1001 + +es.cluster.name=CollectorDBCluster +es.cluster.nodes=127.0.0.1:9300 +es.cluster.transport.sniffer=true + +es.index.shards.number=2 +es.index.replicas.number=0 + +http.hostname=127.0.0.1 +http.port=7001 +http.contextPath=/ + +cache.analysis.size=1024 +cache.persistence.size=1024 + +WorkerNum.Node.NodeCompAgg.Value=10 +WorkerNum.Node.NodeMappingDayAgg.Value=10 +WorkerNum.Node.NodeMappingHourAgg.Value=10 +WorkerNum.Node.NodeMappingMinuteAgg.Value=10 + +WorkerNum.NodeRef.NodeRefDayAgg.Value=10 +WorkerNum.NodeRef.NodeRefHourAgg.Value=10 +WorkerNum.NodeRef.NodeRefMinuteAgg.Value=10 +WorkerNum.NodeRef.NodeRefResSumDayAgg.Value=10 +WorkerNum.NodeRef.NodeRefResSumHourAgg.Value=10 +WorkerNum.NodeRef.NodeRefResSumMinuteAgg.Value=10 + +WorkerNum.GlobalTrace.GlobalTraceAgg.Value=10 + +Queue.GlobalTrace.GlobalTraceSave.Size=1024 +Queue.GlobalTrace.GlobalTraceAnalysis.Size=1024 + +Queue.Segment.SegmentPost.Size=1024 +Queue.Segment.SegmentCostSave.Size=1024 +Queue.Segment.SegmentSave.Size=1024 +Queue.Segment.SegmentExceptionSave.Size=1024 + +Queue.Node.NodeCompAnalysis.Size=1024 +Queue.Node.NodeMappingDayAnalysis.Size=1024 +Queue.Node.NodeMappingHourAnalysis.Size=1024 +Queue.Node.NodeMappingMinuteAnalysis.Size=1024 +Queue.Node.NodeCompSave.Size=1024 +Queue.Node.NodeMappingDaySave.Size=1024 +Queue.Node.NodeMappingHourSave.Size=1024 +Queue.Node.NodeMappingMinuteSave.Size=1024 + +Queue.NodeRef.NodeRefDayAnalysis.Size=1024 +Queue.NodeRef.NodeRefHourAnalysis.Size=1024 +Queue.NodeRef.NodeRefMinuteAnalysis.Size=1024 +Queue.NodeRef.NodeRefDaySave.Size=1024 +Queue.NodeRef.NodeRefHourSave.Size=1024 +Queue.NodeRef.NodeRefMinuteSave.Size=1024 +Queue.NodeRef.NodeRefResSumDaySave.Size=1024 +Queue.NodeRef.NodeRefResSumHourSave.Size=1024 +Queue.NodeRef.NodeRefResSumMinuteSave.Size=1024 +Queue.NodeRef.NodeRefResSumDayAnalysis.Size=1024 +Queue.NodeRef.NodeRefResSumHourAnalysis.Size=1024 +Queue.NodeRef.NodeRefResSumMinuteAnalysis.Size=1024 -es.cluster.name= -es.cluster.nodes= diff --git a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/MergeAnalysisMemberTestCase.java b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/MergeAnalysisMemberTestCase.java index 29a89eb2a..f35118cde 100644 --- a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/MergeAnalysisMemberTestCase.java +++ b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/MergeAnalysisMemberTestCase.java @@ -2,6 +2,7 @@ package com.a.eye.skywalking.collector.worker; import com.a.eye.skywalking.collector.actor.ClusterWorkerContext; import com.a.eye.skywalking.collector.actor.LocalWorkerContext; +import com.a.eye.skywalking.collector.worker.config.CacheSizeConfig; import com.a.eye.skywalking.collector.worker.storage.MergeData; import com.a.eye.skywalking.collector.worker.storage.MergePersistenceData; import org.junit.Assert; @@ -44,7 +45,7 @@ public class MergeAnalysisMemberTestCase { @Test public void testSetMergeDataNotFull() throws Exception { - when(persistenceData.size()).thenReturn(WorkerConfig.Persistence.Data.size - 1); + when(persistenceData.size()).thenReturn(CacheSizeConfig.Cache.Analysis.size - 1); mergeAnalysisMember.setMergeData("segment_1", "column", "value"); Mockito.verify(mergeAnalysisMember, Mockito.never()).aggregation(); @@ -52,7 +53,7 @@ public class MergeAnalysisMemberTestCase { @Test public void testSetMergeDataFull() throws Exception { - when(persistenceData.size()).thenReturn(WorkerConfig.Persistence.Data.size); + when(persistenceData.size()).thenReturn(CacheSizeConfig.Cache.Analysis.size); mergeAnalysisMember.setMergeData("segment_1", "column", "value"); Mockito.verify(mergeAnalysisMember, Mockito.times(1)).aggregation(); diff --git a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/StartUpTestCase.java b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/StartUpTestCase.java deleted file mode 100644 index 0d66c9cd9..000000000 --- a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/StartUpTestCase.java +++ /dev/null @@ -1,69 +0,0 @@ -package com.a.eye.skywalking.collector.worker; - -import akka.actor.ActorRef; -import akka.actor.ActorSelection; -import akka.actor.ActorSystem; -import com.a.eye.skywalking.collector.cluster.ClusterConfig; -import com.a.eye.skywalking.collector.cluster.ClusterConfigInitializer; -import com.a.eye.skywalking.collector.worker.segment.SegmentPost; -import com.a.eye.skywalking.collector.worker.storage.EsClient; -import com.a.eye.skywalking.sniffer.mock.trace.TraceSegmentBuilderFactory; -import com.a.eye.skywalking.trace.TraceSegment; -import com.typesafe.config.Config; -import com.typesafe.config.ConfigFactory; - -/** - * @author pengys5 - */ -public class StartUpTestCase { - - public void test() throws Exception { - System.out.println(SegmentPost.class.getSimpleName()); - ClusterConfigInitializer.initialize("collector.config"); - System.out.println(ClusterConfig.Cluster.Current.roles); - - final Config config = ConfigFactory.parseString("akka.remote.netty.tcp.hostname=" + ClusterConfig.Cluster.Current.hostname). - withFallback(ConfigFactory.parseString("akka.remote.netty.tcp.port=" + ClusterConfig.Cluster.Current.port)). - withFallback(ConfigFactory.parseString("akka.cluster.roles=" + ClusterConfig.Cluster.Current.roles)). - withFallback(ConfigFactory.parseString("akka.cluster.seed-nodes=" + ClusterConfig.Cluster.seed_nodes)). - withFallback(ConfigFactory.load("application.conf")); - ActorSystem system = ActorSystem.create("CollectorSystem", config); - - EsClient.INSTANCE.boot(); - - TraceSegment dubboClientData = TraceSegmentBuilderFactory.INSTANCE.traceOf_Tomcat_DubboClient(); - -// SegmentMessage.Builder clientBuilder = dubboClientData.serialize().toBuilder(); -// clientBuilder.setApplicationCode("Tomcat_DubboClient"); -// -// dubboClientData = new TraceSegment(clientBuilder.build()); -// -// TraceSegment dubboServerData = TraceSegmentBuilderFactory.INSTANCE.traceOf_DubboServer_MySQL(); -// -// SegmentMessage serializeServer = dubboServerData.serialize(); -// SegmentMessage.Builder builder = serializeServer.toBuilder(); -// -// SegmentRefMessage.Builder builderRef = builder.getRefs(0).toBuilder(); -// builderRef.setApplicationCode(dubboClientData.getApplicationCode()); -// -// -// builderRef.setPeerHost(Tags.PEER_HOST.get(dubboClientData.getSpans().get(1))); -// -// builder.setApplicationCode("DubboServer_MySQL"); -// builder.addRefs(builderRef); -// dubboServerData = new TraceSegment(builder.build()); - - Thread.sleep(5000); - - ActorSelection selection = system.actorSelection("/user/TraceSegmentReceiver_1"); - - for (int i = 0; i < 100; i++) { - selection.tell(dubboClientData, ActorRef.noSender()); -// selection.tell(dubboServerData, ActorRef.noSender()); - - Thread.sleep(200); - } - - Thread.sleep(1000000); - } -} diff --git a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/globaltrace/analysis/GlobalTraceAnalysisTestCase.java b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/globaltrace/analysis/GlobalTraceAnalysisTestCase.java index e6d1168a9..a7d034e1c 100644 --- a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/globaltrace/analysis/GlobalTraceAnalysisTestCase.java +++ b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/globaltrace/analysis/GlobalTraceAnalysisTestCase.java @@ -4,7 +4,7 @@ import com.a.eye.skywalking.collector.actor.ClusterWorkerContext; import com.a.eye.skywalking.collector.actor.LocalWorkerContext; import com.a.eye.skywalking.collector.actor.WorkerRefs; import com.a.eye.skywalking.collector.actor.selector.RollingSelector; -import com.a.eye.skywalking.collector.worker.WorkerConfig; +import com.a.eye.skywalking.collector.worker.config.WorkerConfig; import com.a.eye.skywalking.collector.worker.globaltrace.persistence.GlobalTraceAgg; import com.a.eye.skywalking.collector.worker.mock.MergeDataAnswer; import com.a.eye.skywalking.collector.worker.segment.mock.SegmentMock; diff --git a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/globaltrace/persistence/GlobalTraceAggTestCase.java b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/globaltrace/persistence/GlobalTraceAggTestCase.java index ac1d4413f..92623ed55 100644 --- a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/globaltrace/persistence/GlobalTraceAggTestCase.java +++ b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/globaltrace/persistence/GlobalTraceAggTestCase.java @@ -5,7 +5,7 @@ import com.a.eye.skywalking.collector.actor.LocalWorkerContext; import com.a.eye.skywalking.collector.actor.ProviderNotFoundException; import com.a.eye.skywalking.collector.actor.WorkerRefs; import com.a.eye.skywalking.collector.actor.selector.HashCodeSelector; -import com.a.eye.skywalking.collector.worker.WorkerConfig; +import com.a.eye.skywalking.collector.worker.config.WorkerConfig; import com.a.eye.skywalking.collector.worker.mock.MergeDataAnswer; import com.a.eye.skywalking.collector.worker.storage.RecordData; import com.a.eye.skywalking.collector.worker.tools.MergeDataAggTools; diff --git a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/globaltrace/persistence/GlobalTraceSaveTestCase.java b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/globaltrace/persistence/GlobalTraceSaveTestCase.java index 6b5021208..a1049eee4 100644 --- a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/globaltrace/persistence/GlobalTraceSaveTestCase.java +++ b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/globaltrace/persistence/GlobalTraceSaveTestCase.java @@ -3,7 +3,7 @@ package com.a.eye.skywalking.collector.worker.globaltrace.persistence; import com.a.eye.skywalking.collector.actor.ClusterWorkerContext; import com.a.eye.skywalking.collector.actor.LocalWorkerContext; import com.a.eye.skywalking.collector.actor.selector.HashCodeSelector; -import com.a.eye.skywalking.collector.worker.WorkerConfig; +import com.a.eye.skywalking.collector.worker.config.WorkerConfig; import com.a.eye.skywalking.collector.worker.globaltrace.GlobalTraceIndex; import org.junit.Assert; import org.junit.Before; diff --git a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/httpserver/AbstractGetProviderTestCase.java b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/httpserver/AbstractGetProviderTestCase.java new file mode 100644 index 000000000..28c6364ef --- /dev/null +++ b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/httpserver/AbstractGetProviderTestCase.java @@ -0,0 +1,22 @@ +package com.a.eye.skywalking.collector.worker.httpserver; + +import com.a.eye.skywalking.collector.actor.ProviderNotFoundException; +import org.eclipse.jetty.servlet.ServletContextHandler; +import org.eclipse.jetty.servlet.ServletHolder; +import org.junit.Test; +import org.mockito.Mockito; + +/** + * @author pengys5 + */ +public class AbstractGetProviderTestCase { + + @Test + public void testCreate() throws IllegalArgumentException, ProviderNotFoundException { + ServletContextHandler handler = Mockito.mock(ServletContextHandler.class); + + TestAbstractGetProvider provider = new TestAbstractGetProvider(); + provider.create(handler); + Mockito.verify(handler).addServlet(Mockito.any(ServletHolder.class), Mockito.eq("servletPath")); + } +} diff --git a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/httpserver/AbstractGetTestCase.java b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/httpserver/AbstractGetTestCase.java new file mode 100644 index 000000000..4a30f8b07 --- /dev/null +++ b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/httpserver/AbstractGetTestCase.java @@ -0,0 +1,44 @@ +package com.a.eye.skywalking.collector.worker.httpserver; + +import com.google.gson.JsonObject; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; + +import java.util.HashMap; +import java.util.Map; + +import static org.mockito.Mockito.*; + +/** + * @author pengys5 + */ +public class AbstractGetTestCase { + + private TestAbstractGet get; + + @Before + public void init() { + get = mock(TestAbstractGet.class); + } + + @Test + public void testOnWork() throws Exception { + Map parameterMap = new HashMap<>(); + JsonObject response = new JsonObject(); + get.onWork(parameterMap, response); + verify(get).onSearch(any(Map.class), any(JsonObject.class)); + } + + @Test + public void testOnWorkError() throws Exception { + Map parameterMap = new HashMap<>(); + JsonObject response = new JsonObject(); + + doThrow(new Exception("testOnWorkError")).when(get).onSearch(any(Map.class), any(JsonObject.class)); + get.onWork(parameterMap, response); + + Assert.assertEquals(false, response.get("isSuccess").getAsBoolean()); + Assert.assertEquals("testOnWorkError", response.get("reason").getAsString()); + } +} diff --git a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/httpserver/AbstractPostProviderTestCase.java b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/httpserver/AbstractPostProviderTestCase.java new file mode 100644 index 000000000..fa50ef37e --- /dev/null +++ b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/httpserver/AbstractPostProviderTestCase.java @@ -0,0 +1,22 @@ +package com.a.eye.skywalking.collector.worker.httpserver; + +import com.a.eye.skywalking.collector.actor.ProviderNotFoundException; +import org.eclipse.jetty.servlet.ServletContextHandler; +import org.eclipse.jetty.servlet.ServletHolder; +import org.junit.Test; +import org.mockito.Mockito; + +/** + * @author pengys5 + */ +public class AbstractPostProviderTestCase { + + @Test + public void testCreate() throws IllegalArgumentException, ProviderNotFoundException { + ServletContextHandler handler = Mockito.mock(ServletContextHandler.class); + + TestAbstractPostProvider provider = new TestAbstractPostProvider(); + provider.create(handler); + Mockito.verify(handler).addServlet(Mockito.any(ServletHolder.class), Mockito.eq("testPost")); + } +} diff --git a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/httpserver/AbstractPostTestCase.java b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/httpserver/AbstractPostTestCase.java new file mode 100644 index 000000000..3c0bf7af8 --- /dev/null +++ b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/httpserver/AbstractPostTestCase.java @@ -0,0 +1,46 @@ +package com.a.eye.skywalking.collector.worker.httpserver; + +import com.a.eye.skywalking.collector.actor.ClusterWorkerContext; +import com.a.eye.skywalking.collector.actor.LocalWorkerContext; +import com.google.gson.JsonObject; +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.powermock.api.mockito.PowerMockito; +import org.powermock.core.classloader.annotations.PowerMockIgnore; +import org.powermock.core.classloader.annotations.PrepareForTest; +import org.powermock.modules.junit4.PowerMockRunner; + +import static org.mockito.Matchers.anyString; +import static org.mockito.Mockito.*; + +/** + * @author pengys5 + */ +@RunWith(PowerMockRunner.class) +@PrepareForTest({TestAbstractPost.class}) +@PowerMockIgnore({"javax.management.*"}) +public class AbstractPostTestCase { + + private TestAbstractPost post; + + @Before + public void init() { + ClusterWorkerContext clusterWorkerContext = mock(ClusterWorkerContext.class); + LocalWorkerContext localWorkerContext = mock(LocalWorkerContext.class); + post = spy(new TestAbstractPost(TestAbstractPost.WorkerRole.INSTANCE, clusterWorkerContext, localWorkerContext)); + } + + @Test + public void testOnWork() throws Exception { + String request = "testOnWork"; + post.onWork(request); + verify(post).onReceive(anyString()); + } + + @Test + public void testOnWorkError() throws Exception { + post.onWork(new JsonObject()); + PowerMockito.verifyPrivate(post).invoke("saveException", any(IllegalArgumentException.class)); + } +} diff --git a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/httpserver/GetWithHttpServletTestCase.java b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/httpserver/GetWithHttpServletTestCase.java new file mode 100644 index 000000000..5dc728456 --- /dev/null +++ b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/httpserver/GetWithHttpServletTestCase.java @@ -0,0 +1,44 @@ +package com.a.eye.skywalking.collector.worker.httpserver; + +import com.a.eye.skywalking.collector.actor.LocalSyncWorkerRef; +import org.junit.Assert; +import org.junit.Test; +import org.mockito.invocation.InvocationOnMock; +import org.mockito.stubbing.Answer; + +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.io.PrintWriter; + +import static org.mockito.Mockito.*; + +/** + * @author pengys5 + */ +public class GetWithHttpServletTestCase { + + @Test + public void testDoGet() throws IOException, ServletException { + LocalSyncWorkerRef workerRef = mock(LocalSyncWorkerRef.class); + AbstractGet.GetWithHttpServlet servlet = new AbstractGet.GetWithHttpServlet(workerRef); + + HttpServletRequest request = mock(HttpServletRequest.class); + HttpServletResponse response = mock(HttpServletResponse.class); + doAnswer(new Answer() { + @Override + public Object answer(InvocationOnMock invocation) throws Throwable { + Integer status = (Integer) invocation.getArguments()[0]; + System.out.println(status); + Assert.assertEquals(new Integer(200), status); + return null; + } + }).when(response).setStatus(anyInt()); + + PrintWriter writer = mock(PrintWriter.class); + when(response.getWriter()).thenReturn(writer); + + servlet.doGet(request, response); + } +} diff --git a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/httpserver/PostWithHttpServletTestCase.java b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/httpserver/PostWithHttpServletTestCase.java new file mode 100644 index 000000000..7764b52cc --- /dev/null +++ b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/httpserver/PostWithHttpServletTestCase.java @@ -0,0 +1,88 @@ +package com.a.eye.skywalking.collector.worker.httpserver; + +import com.a.eye.skywalking.collector.actor.LocalAsyncWorkerRef; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; +import org.mockito.invocation.InvocationOnMock; +import org.mockito.stubbing.Answer; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.io.BufferedReader; +import java.io.PrintWriter; + +import static org.mockito.Matchers.anyInt; +import static org.mockito.Mockito.*; + +/** + * @author pengys5 + */ +public class PostWithHttpServletTestCase { + + private LocalAsyncWorkerRef workerRef; + private AbstractPost.PostWithHttpServlet servlet; + private HttpServletRequest request; + private HttpServletResponse response; + private PrintWriter writer; + + @Before + public void init() throws Exception { + workerRef = mock(LocalAsyncWorkerRef.class); + servlet = new AbstractPost.PostWithHttpServlet(workerRef); + + request = mock(HttpServletRequest.class); + response = mock(HttpServletResponse.class); + + writer = mock(PrintWriter.class); + when(response.getWriter()).thenReturn(writer); + } + + @Test + public void testDoPost() throws Exception { + + doAnswer(new Answer() { + @Override + public Object answer(InvocationOnMock invocation) throws Throwable { + Integer status = (Integer) invocation.getArguments()[0]; + System.out.println(status); + Assert.assertEquals(new Integer(200), status); + return null; + } + }).when(response).setStatus(anyInt()); + + doAnswer(new Answer() { + @Override + public Object answer(InvocationOnMock invocation) throws Throwable { + String reqStr = (String) invocation.getArguments()[0]; + System.out.println(reqStr); + Assert.assertEquals("TestTest2", reqStr); + return null; + } + }).when(workerRef).tell(anyString()); + + + BufferedReader bufferedReader = mock(BufferedReader.class); + when(bufferedReader.readLine()).thenReturn("Test").thenReturn("Test2").thenReturn(null); + + when(request.getReader()).thenReturn(bufferedReader); + + + servlet.doPost(request, response); + } + + @Test + public void testDoPostError() throws Exception { + doAnswer(new Answer() { + @Override + public Object answer(InvocationOnMock invocation) throws Throwable { + Integer status = (Integer) invocation.getArguments()[0]; + System.out.println(status); + Assert.assertEquals(new Integer(500), status); + return null; + } + }).when(response).setStatus(anyInt()); + doThrow(new Exception()).when(workerRef).tell(anyString()); + servlet.doPost(request, response); + } +} diff --git a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/httpserver/TestAbstractGet.java b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/httpserver/TestAbstractGet.java new file mode 100644 index 000000000..d1a1df0a2 --- /dev/null +++ b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/httpserver/TestAbstractGet.java @@ -0,0 +1,63 @@ +package com.a.eye.skywalking.collector.worker.httpserver; + +import com.a.eye.skywalking.collector.actor.ClusterWorkerContext; +import com.a.eye.skywalking.collector.actor.LocalWorkerContext; +import com.a.eye.skywalking.collector.actor.ProviderNotFoundException; +import com.a.eye.skywalking.collector.actor.Role; +import com.a.eye.skywalking.collector.actor.selector.RollingSelector; +import com.a.eye.skywalking.collector.actor.selector.WorkerSelector; +import com.google.gson.JsonObject; + +import java.util.Map; + +/** + * @author pengys5 + */ +public class TestAbstractGet extends AbstractGet { + protected TestAbstractGet(Role role, ClusterWorkerContext clusterContext, LocalWorkerContext selfContext) { + super(role, clusterContext, selfContext); + } + + @Override + public void preStart() throws ProviderNotFoundException { + super.preStart(); + } + + @Override + protected void onSearch(Map request, JsonObject response) throws Exception { + + } + + public static class Factory extends AbstractGetProvider { + public static Factory INSTANCE = new Factory(); + + @Override + public Role role() { + return TestAbstractGet.WorkerRole.INSTANCE; + } + + @Override + public TestAbstractGet workerInstance(ClusterWorkerContext clusterContext) { + return new TestAbstractGet(role(), clusterContext, new LocalWorkerContext()); + } + + @Override + public String servletPath() { + return "/TestAbstractGet"; + } + } + + public enum WorkerRole implements Role { + INSTANCE; + + @Override + public String roleName() { + return TestAbstractGet.class.getSimpleName(); + } + + @Override + public WorkerSelector workerSelector() { + return new RollingSelector(); + } + } +} diff --git a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/httpserver/TestAbstractGetProvider.java b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/httpserver/TestAbstractGetProvider.java new file mode 100644 index 000000000..82ddc918c --- /dev/null +++ b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/httpserver/TestAbstractGetProvider.java @@ -0,0 +1,25 @@ +package com.a.eye.skywalking.collector.worker.httpserver; + +import com.a.eye.skywalking.collector.actor.AbstractWorker; +import com.a.eye.skywalking.collector.actor.ClusterWorkerContext; +import com.a.eye.skywalking.collector.actor.Role; + +/** + * @author pengys5 + */ +public class TestAbstractGetProvider extends AbstractGetProvider { + @Override + public String servletPath() { + return "servletPath"; + } + + @Override + public Role role() { + return null; + } + + @Override + public AbstractWorker workerInstance(ClusterWorkerContext clusterContext) { + return new TestAbstractGet(null, null, null); + } +} diff --git a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/httpserver/TestAbstractPost.java b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/httpserver/TestAbstractPost.java new file mode 100644 index 000000000..8c8958084 --- /dev/null +++ b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/httpserver/TestAbstractPost.java @@ -0,0 +1,65 @@ +package com.a.eye.skywalking.collector.worker.httpserver; + +import com.a.eye.skywalking.collector.actor.ClusterWorkerContext; +import com.a.eye.skywalking.collector.actor.LocalWorkerContext; +import com.a.eye.skywalking.collector.actor.ProviderNotFoundException; +import com.a.eye.skywalking.collector.actor.Role; +import com.a.eye.skywalking.collector.actor.selector.RollingSelector; +import com.a.eye.skywalking.collector.actor.selector.WorkerSelector; + +/** + * @author pengys5 + */ +public class TestAbstractPost extends AbstractPost { + public TestAbstractPost(Role role, ClusterWorkerContext clusterContext, LocalWorkerContext selfContext) { + super(role, clusterContext, selfContext); + } + + @Override + public void preStart() throws ProviderNotFoundException { + super.preStart(); + } + + @Override + protected void onReceive(String reqJsonStr) throws Exception { + + } + + public enum WorkerRole implements Role { + INSTANCE; + + @Override + public String roleName() { + return TestAbstractPost.class.getSimpleName(); + } + + @Override + public WorkerSelector workerSelector() { + return new RollingSelector(); + } + } + + public static class Factory extends AbstractPostProvider { + public static Factory INSTANCE = new Factory(); + + @Override + public String servletPath() { + return "/TestAbstractPost"; + } + + @Override + public int queueSize() { + return 4; + } + + @Override + public Role role() { + return TestAbstractPost.WorkerRole.INSTANCE; + } + + @Override + public TestAbstractPost workerInstance(ClusterWorkerContext clusterContext) { + return new TestAbstractPost(role(), clusterContext, new LocalWorkerContext()); + } + } +} diff --git a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/httpserver/TestAbstractPostProvider.java b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/httpserver/TestAbstractPostProvider.java new file mode 100644 index 000000000..086f65188 --- /dev/null +++ b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/httpserver/TestAbstractPostProvider.java @@ -0,0 +1,30 @@ +package com.a.eye.skywalking.collector.worker.httpserver; + +import com.a.eye.skywalking.collector.actor.AbstractWorker; +import com.a.eye.skywalking.collector.actor.ClusterWorkerContext; +import com.a.eye.skywalking.collector.actor.Role; + +/** + * @author pengys5 + */ +public class TestAbstractPostProvider extends AbstractPostProvider { + @Override + public int queueSize() { + return 4; + } + + @Override + public String servletPath() { + return "testPost"; + } + + @Override + public Role role() { + return null; + } + + @Override + public AbstractWorker workerInstance(ClusterWorkerContext clusterContext) { + return new TestAbstractPost(null, null, null); + } +} diff --git a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/node/analysis/NodeCompAnalysisTestCase.java b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/node/analysis/NodeCompAnalysisTestCase.java index 0f659026a..655786e59 100644 --- a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/node/analysis/NodeCompAnalysisTestCase.java +++ b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/node/analysis/NodeCompAnalysisTestCase.java @@ -4,7 +4,7 @@ import com.a.eye.skywalking.collector.actor.ClusterWorkerContext; import com.a.eye.skywalking.collector.actor.LocalWorkerContext; import com.a.eye.skywalking.collector.actor.WorkerRefs; import com.a.eye.skywalking.collector.actor.selector.RollingSelector; -import com.a.eye.skywalking.collector.worker.WorkerConfig; +import com.a.eye.skywalking.collector.worker.config.WorkerConfig; import com.a.eye.skywalking.collector.worker.datamerge.RecordDataMergeJson; import com.a.eye.skywalking.collector.worker.mock.RecordDataAnswer; import com.a.eye.skywalking.collector.worker.node.persistence.NodeCompAgg; diff --git a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/node/analysis/NodeMappingDayAnalysisTestCase.java b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/node/analysis/NodeMappingDayAnalysisTestCase.java index 976fbda80..1fc30ab39 100644 --- a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/node/analysis/NodeMappingDayAnalysisTestCase.java +++ b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/node/analysis/NodeMappingDayAnalysisTestCase.java @@ -5,7 +5,7 @@ import com.a.eye.skywalking.collector.actor.LocalWorkerContext; import com.a.eye.skywalking.collector.actor.ProviderNotFoundException; import com.a.eye.skywalking.collector.actor.WorkerRefs; import com.a.eye.skywalking.collector.actor.selector.RollingSelector; -import com.a.eye.skywalking.collector.worker.WorkerConfig; +import com.a.eye.skywalking.collector.worker.config.WorkerConfig; import com.a.eye.skywalking.collector.worker.datamerge.RecordDataMergeJson; import com.a.eye.skywalking.collector.worker.mock.RecordDataAnswer; import com.a.eye.skywalking.collector.worker.node.persistence.NodeMappingDayAgg; diff --git a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/node/analysis/NodeMappingHourAnalysisTestCase.java b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/node/analysis/NodeMappingHourAnalysisTestCase.java index c10f67b46..3fd545b54 100644 --- a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/node/analysis/NodeMappingHourAnalysisTestCase.java +++ b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/node/analysis/NodeMappingHourAnalysisTestCase.java @@ -4,7 +4,7 @@ import com.a.eye.skywalking.collector.actor.ClusterWorkerContext; import com.a.eye.skywalking.collector.actor.LocalWorkerContext; import com.a.eye.skywalking.collector.actor.WorkerRefs; import com.a.eye.skywalking.collector.actor.selector.RollingSelector; -import com.a.eye.skywalking.collector.worker.WorkerConfig; +import com.a.eye.skywalking.collector.worker.config.WorkerConfig; import com.a.eye.skywalking.collector.worker.datamerge.RecordDataMergeJson; import com.a.eye.skywalking.collector.worker.mock.RecordDataAnswer; import com.a.eye.skywalking.collector.worker.node.persistence.NodeMappingHourAgg; diff --git a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/node/analysis/NodeMappingMinuteAnalysisTestCase.java b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/node/analysis/NodeMappingMinuteAnalysisTestCase.java index 64368a33a..430d6224a 100644 --- a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/node/analysis/NodeMappingMinuteAnalysisTestCase.java +++ b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/node/analysis/NodeMappingMinuteAnalysisTestCase.java @@ -4,7 +4,7 @@ import com.a.eye.skywalking.collector.actor.ClusterWorkerContext; import com.a.eye.skywalking.collector.actor.LocalWorkerContext; import com.a.eye.skywalking.collector.actor.WorkerRefs; import com.a.eye.skywalking.collector.actor.selector.RollingSelector; -import com.a.eye.skywalking.collector.worker.WorkerConfig; +import com.a.eye.skywalking.collector.worker.config.WorkerConfig; import com.a.eye.skywalking.collector.worker.datamerge.RecordDataMergeJson; import com.a.eye.skywalking.collector.worker.mock.RecordDataAnswer; import com.a.eye.skywalking.collector.worker.node.persistence.NodeMappingMinuteAgg; diff --git a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/node/persistence/NodeCompAggTestCase.java b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/node/persistence/NodeCompAggTestCase.java index c49583b8f..81ab627ec 100644 --- a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/node/persistence/NodeCompAggTestCase.java +++ b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/node/persistence/NodeCompAggTestCase.java @@ -5,12 +5,10 @@ import com.a.eye.skywalking.collector.actor.LocalWorkerContext; import com.a.eye.skywalking.collector.actor.ProviderNotFoundException; import com.a.eye.skywalking.collector.actor.WorkerRefs; import com.a.eye.skywalking.collector.actor.selector.HashCodeSelector; -import com.a.eye.skywalking.collector.worker.Const; -import com.a.eye.skywalking.collector.worker.WorkerConfig; +import com.a.eye.skywalking.collector.worker.config.WorkerConfig; import com.a.eye.skywalking.collector.worker.mock.RecordDataAnswer; import com.a.eye.skywalking.collector.worker.storage.RecordData; import com.a.eye.skywalking.collector.worker.tools.RecordDataAggTools; -import com.a.eye.skywalking.collector.worker.tools.RecordDataTool; import org.junit.Assert; import org.junit.Before; import org.junit.Test; diff --git a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/node/persistence/NodeCompSaveTestCase.java b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/node/persistence/NodeCompSaveTestCase.java index 24014f7e1..f48ee525a 100644 --- a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/node/persistence/NodeCompSaveTestCase.java +++ b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/node/persistence/NodeCompSaveTestCase.java @@ -3,9 +3,8 @@ package com.a.eye.skywalking.collector.worker.node.persistence; import com.a.eye.skywalking.collector.actor.ClusterWorkerContext; import com.a.eye.skywalking.collector.actor.LocalWorkerContext; import com.a.eye.skywalking.collector.actor.selector.HashCodeSelector; -import com.a.eye.skywalking.collector.worker.WorkerConfig; +import com.a.eye.skywalking.collector.worker.config.WorkerConfig; import com.a.eye.skywalking.collector.worker.node.NodeCompIndex; -import com.a.eye.skywalking.collector.worker.node.NodeMappingIndex; import org.junit.Assert; import org.junit.Before; import org.junit.Test; diff --git a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/node/persistence/NodeMappingDayAggTestCase.java b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/node/persistence/NodeMappingDayAggTestCase.java index f28e415b8..5855374b8 100644 --- a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/node/persistence/NodeMappingDayAggTestCase.java +++ b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/node/persistence/NodeMappingDayAggTestCase.java @@ -5,7 +5,7 @@ import com.a.eye.skywalking.collector.actor.LocalWorkerContext; import com.a.eye.skywalking.collector.actor.ProviderNotFoundException; import com.a.eye.skywalking.collector.actor.WorkerRefs; import com.a.eye.skywalking.collector.actor.selector.HashCodeSelector; -import com.a.eye.skywalking.collector.worker.WorkerConfig; +import com.a.eye.skywalking.collector.worker.config.WorkerConfig; import com.a.eye.skywalking.collector.worker.mock.RecordDataAnswer; import com.a.eye.skywalking.collector.worker.storage.RecordData; import com.a.eye.skywalking.collector.worker.tools.RecordDataAggTools; diff --git a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/node/persistence/NodeMappingDaySaveTestCase.java b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/node/persistence/NodeMappingDaySaveTestCase.java index 6c3ef0694..eb275d347 100644 --- a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/node/persistence/NodeMappingDaySaveTestCase.java +++ b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/node/persistence/NodeMappingDaySaveTestCase.java @@ -3,7 +3,7 @@ package com.a.eye.skywalking.collector.worker.node.persistence; import com.a.eye.skywalking.collector.actor.ClusterWorkerContext; import com.a.eye.skywalking.collector.actor.LocalWorkerContext; import com.a.eye.skywalking.collector.actor.selector.HashCodeSelector; -import com.a.eye.skywalking.collector.worker.WorkerConfig; +import com.a.eye.skywalking.collector.worker.config.WorkerConfig; import com.a.eye.skywalking.collector.worker.node.NodeMappingIndex; import org.junit.Assert; import org.junit.Before; diff --git a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/node/persistence/NodeMappingHourAggTestCase.java b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/node/persistence/NodeMappingHourAggTestCase.java index 123dbcd6c..14f95d404 100644 --- a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/node/persistence/NodeMappingHourAggTestCase.java +++ b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/node/persistence/NodeMappingHourAggTestCase.java @@ -5,7 +5,7 @@ import com.a.eye.skywalking.collector.actor.LocalWorkerContext; import com.a.eye.skywalking.collector.actor.ProviderNotFoundException; import com.a.eye.skywalking.collector.actor.WorkerRefs; import com.a.eye.skywalking.collector.actor.selector.HashCodeSelector; -import com.a.eye.skywalking.collector.worker.WorkerConfig; +import com.a.eye.skywalking.collector.worker.config.WorkerConfig; import com.a.eye.skywalking.collector.worker.mock.RecordDataAnswer; import com.a.eye.skywalking.collector.worker.storage.RecordData; import com.a.eye.skywalking.collector.worker.tools.RecordDataAggTools; diff --git a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/node/persistence/NodeMappingHourSaveTestCase.java b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/node/persistence/NodeMappingHourSaveTestCase.java index f32e25e9a..55ecad8a2 100644 --- a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/node/persistence/NodeMappingHourSaveTestCase.java +++ b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/node/persistence/NodeMappingHourSaveTestCase.java @@ -3,7 +3,7 @@ package com.a.eye.skywalking.collector.worker.node.persistence; import com.a.eye.skywalking.collector.actor.ClusterWorkerContext; import com.a.eye.skywalking.collector.actor.LocalWorkerContext; import com.a.eye.skywalking.collector.actor.selector.HashCodeSelector; -import com.a.eye.skywalking.collector.worker.WorkerConfig; +import com.a.eye.skywalking.collector.worker.config.WorkerConfig; import com.a.eye.skywalking.collector.worker.node.NodeMappingIndex; import org.junit.Assert; import org.junit.Before; diff --git a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/node/persistence/NodeMappingMinuteAggTestCase.java b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/node/persistence/NodeMappingMinuteAggTestCase.java index 6437ed704..e9996eefc 100644 --- a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/node/persistence/NodeMappingMinuteAggTestCase.java +++ b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/node/persistence/NodeMappingMinuteAggTestCase.java @@ -5,7 +5,7 @@ import com.a.eye.skywalking.collector.actor.LocalWorkerContext; import com.a.eye.skywalking.collector.actor.ProviderNotFoundException; import com.a.eye.skywalking.collector.actor.WorkerRefs; import com.a.eye.skywalking.collector.actor.selector.HashCodeSelector; -import com.a.eye.skywalking.collector.worker.WorkerConfig; +import com.a.eye.skywalking.collector.worker.config.WorkerConfig; import com.a.eye.skywalking.collector.worker.mock.RecordDataAnswer; import com.a.eye.skywalking.collector.worker.storage.RecordData; import com.a.eye.skywalking.collector.worker.tools.RecordDataAggTools; diff --git a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/node/persistence/NodeMappingMinuteSaveTestCase.java b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/node/persistence/NodeMappingMinuteSaveTestCase.java index 55dcd3726..20f1a62a1 100644 --- a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/node/persistence/NodeMappingMinuteSaveTestCase.java +++ b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/node/persistence/NodeMappingMinuteSaveTestCase.java @@ -3,7 +3,7 @@ package com.a.eye.skywalking.collector.worker.node.persistence; import com.a.eye.skywalking.collector.actor.ClusterWorkerContext; import com.a.eye.skywalking.collector.actor.LocalWorkerContext; import com.a.eye.skywalking.collector.actor.selector.HashCodeSelector; -import com.a.eye.skywalking.collector.worker.WorkerConfig; +import com.a.eye.skywalking.collector.worker.config.WorkerConfig; import com.a.eye.skywalking.collector.worker.node.NodeMappingIndex; import org.junit.Assert; import org.junit.Before; diff --git a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/noderef/analysis/NodeRefDayAnalysisTestCase.java b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/noderef/analysis/NodeRefDayAnalysisTestCase.java index c699d75d7..c30c76354 100644 --- a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/noderef/analysis/NodeRefDayAnalysisTestCase.java +++ b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/noderef/analysis/NodeRefDayAnalysisTestCase.java @@ -5,7 +5,7 @@ import com.a.eye.skywalking.collector.actor.LocalWorkerContext; import com.a.eye.skywalking.collector.actor.ProviderNotFoundException; import com.a.eye.skywalking.collector.actor.WorkerRefs; import com.a.eye.skywalking.collector.actor.selector.RollingSelector; -import com.a.eye.skywalking.collector.worker.WorkerConfig; +import com.a.eye.skywalking.collector.worker.config.WorkerConfig; import com.a.eye.skywalking.collector.worker.mock.RecordDataAnswer; import com.a.eye.skywalking.collector.worker.noderef.persistence.NodeRefDayAgg; import com.a.eye.skywalking.collector.worker.storage.RecordData; @@ -72,7 +72,7 @@ public class NodeRefDayAnalysisTestCase { Assert.assertEquals(NodeRefDayAnalysis.class.getSimpleName(), NodeRefDayAnalysis.Factory.INSTANCE.workerInstance(null).getClass().getSimpleName()); int testSize = 10; - WorkerConfig.Queue.Node.NodeRefDayAnalysis.Size = testSize; + WorkerConfig.Queue.NodeRef.NodeRefDayAnalysis.Size = testSize; Assert.assertEquals(testSize, NodeRefDayAnalysis.Factory.INSTANCE.queueSize()); } diff --git a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/noderef/analysis/NodeRefHourAnalysisTestCase.java b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/noderef/analysis/NodeRefHourAnalysisTestCase.java index 4994ad2e9..a4f110e66 100644 --- a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/noderef/analysis/NodeRefHourAnalysisTestCase.java +++ b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/noderef/analysis/NodeRefHourAnalysisTestCase.java @@ -5,7 +5,7 @@ import com.a.eye.skywalking.collector.actor.LocalWorkerContext; import com.a.eye.skywalking.collector.actor.ProviderNotFoundException; import com.a.eye.skywalking.collector.actor.WorkerRefs; import com.a.eye.skywalking.collector.actor.selector.RollingSelector; -import com.a.eye.skywalking.collector.worker.WorkerConfig; +import com.a.eye.skywalking.collector.worker.config.WorkerConfig; import com.a.eye.skywalking.collector.worker.mock.RecordDataAnswer; import com.a.eye.skywalking.collector.worker.noderef.persistence.NodeRefHourAgg; import com.a.eye.skywalking.collector.worker.storage.RecordData; @@ -71,7 +71,7 @@ public class NodeRefHourAnalysisTestCase { Assert.assertEquals(NodeRefHourAnalysis.class.getSimpleName(), NodeRefHourAnalysis.Factory.INSTANCE.workerInstance(null).getClass().getSimpleName()); int testSize = 10; - WorkerConfig.Queue.Node.NodeRefHourAnalysis.Size = testSize; + WorkerConfig.Queue.NodeRef.NodeRefHourAnalysis.Size = testSize; Assert.assertEquals(testSize, NodeRefHourAnalysis.Factory.INSTANCE.queueSize()); } diff --git a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/noderef/analysis/NodeRefMinuteAnalysisTestCase.java b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/noderef/analysis/NodeRefMinuteAnalysisTestCase.java index b1209144a..393f9d622 100644 --- a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/noderef/analysis/NodeRefMinuteAnalysisTestCase.java +++ b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/noderef/analysis/NodeRefMinuteAnalysisTestCase.java @@ -5,7 +5,7 @@ import com.a.eye.skywalking.collector.actor.LocalWorkerContext; import com.a.eye.skywalking.collector.actor.ProviderNotFoundException; import com.a.eye.skywalking.collector.actor.WorkerRefs; import com.a.eye.skywalking.collector.actor.selector.RollingSelector; -import com.a.eye.skywalking.collector.worker.WorkerConfig; +import com.a.eye.skywalking.collector.worker.config.WorkerConfig; import com.a.eye.skywalking.collector.worker.mock.RecordDataAnswer; import com.a.eye.skywalking.collector.worker.noderef.persistence.NodeRefMinuteAgg; import com.a.eye.skywalking.collector.worker.storage.RecordData; @@ -72,7 +72,7 @@ public class NodeRefMinuteAnalysisTestCase { Assert.assertEquals(NodeRefMinuteAnalysis.class.getSimpleName(), NodeRefMinuteAnalysis.Factory.INSTANCE.workerInstance(null).getClass().getSimpleName()); int testSize = 10; - WorkerConfig.Queue.Node.NodeRefMinuteAnalysis.Size = testSize; + WorkerConfig.Queue.NodeRef.NodeRefMinuteAnalysis.Size = testSize; Assert.assertEquals(testSize, NodeRefMinuteAnalysis.Factory.INSTANCE.queueSize()); } diff --git a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/noderef/analysis/NodeRefResSumDayAnalysisTestCase.java b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/noderef/analysis/NodeRefResSumDayAnalysisTestCase.java index a5bccb3b2..1069ab5cb 100644 --- a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/noderef/analysis/NodeRefResSumDayAnalysisTestCase.java +++ b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/noderef/analysis/NodeRefResSumDayAnalysisTestCase.java @@ -4,7 +4,7 @@ import com.a.eye.skywalking.collector.actor.ClusterWorkerContext; import com.a.eye.skywalking.collector.actor.LocalWorkerContext; import com.a.eye.skywalking.collector.actor.WorkerRefs; import com.a.eye.skywalking.collector.actor.selector.RollingSelector; -import com.a.eye.skywalking.collector.worker.WorkerConfig; +import com.a.eye.skywalking.collector.worker.config.WorkerConfig; import com.a.eye.skywalking.collector.worker.mock.MetricDataAnswer; import com.a.eye.skywalking.collector.worker.noderef.persistence.NodeRefResSumDayAgg; import com.a.eye.skywalking.collector.worker.storage.MetricData; diff --git a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/noderef/analysis/NodeRefResSumHourAnalysisTestCase.java b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/noderef/analysis/NodeRefResSumHourAnalysisTestCase.java index f1f8a0640..9c5c22d95 100644 --- a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/noderef/analysis/NodeRefResSumHourAnalysisTestCase.java +++ b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/noderef/analysis/NodeRefResSumHourAnalysisTestCase.java @@ -4,7 +4,7 @@ import com.a.eye.skywalking.collector.actor.ClusterWorkerContext; import com.a.eye.skywalking.collector.actor.LocalWorkerContext; import com.a.eye.skywalking.collector.actor.WorkerRefs; import com.a.eye.skywalking.collector.actor.selector.RollingSelector; -import com.a.eye.skywalking.collector.worker.WorkerConfig; +import com.a.eye.skywalking.collector.worker.config.WorkerConfig; import com.a.eye.skywalking.collector.worker.mock.MetricDataAnswer; import com.a.eye.skywalking.collector.worker.noderef.persistence.NodeRefResSumHourAgg; import com.a.eye.skywalking.collector.worker.storage.MetricData; diff --git a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/noderef/analysis/NodeRefResSumMinuteAnalysisTestCase.java b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/noderef/analysis/NodeRefResSumMinuteAnalysisTestCase.java index 36ac1203b..5970c80dc 100644 --- a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/noderef/analysis/NodeRefResSumMinuteAnalysisTestCase.java +++ b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/noderef/analysis/NodeRefResSumMinuteAnalysisTestCase.java @@ -4,7 +4,7 @@ import com.a.eye.skywalking.collector.actor.ClusterWorkerContext; import com.a.eye.skywalking.collector.actor.LocalWorkerContext; import com.a.eye.skywalking.collector.actor.WorkerRefs; import com.a.eye.skywalking.collector.actor.selector.RollingSelector; -import com.a.eye.skywalking.collector.worker.WorkerConfig; +import com.a.eye.skywalking.collector.worker.config.WorkerConfig; import com.a.eye.skywalking.collector.worker.mock.MetricDataAnswer; import com.a.eye.skywalking.collector.worker.noderef.persistence.NodeRefResSumMinuteAgg; import com.a.eye.skywalking.collector.worker.storage.MetricData; diff --git a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefDayAggTestCase.java b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefDayAggTestCase.java index 2e8b5a94d..1a4c17541 100644 --- a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefDayAggTestCase.java +++ b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefDayAggTestCase.java @@ -5,7 +5,7 @@ import com.a.eye.skywalking.collector.actor.LocalWorkerContext; import com.a.eye.skywalking.collector.actor.ProviderNotFoundException; import com.a.eye.skywalking.collector.actor.WorkerRefs; import com.a.eye.skywalking.collector.actor.selector.HashCodeSelector; -import com.a.eye.skywalking.collector.worker.WorkerConfig; +import com.a.eye.skywalking.collector.worker.config.WorkerConfig; import com.a.eye.skywalking.collector.worker.mock.RecordDataAnswer; import com.a.eye.skywalking.collector.worker.storage.RecordData; import com.a.eye.skywalking.collector.worker.tools.RecordDataAggTools; diff --git a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefDaySaveTestCase.java b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefDaySaveTestCase.java index ac995ce91..e053c803e 100644 --- a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefDaySaveTestCase.java +++ b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefDaySaveTestCase.java @@ -3,7 +3,7 @@ package com.a.eye.skywalking.collector.worker.noderef.persistence; import com.a.eye.skywalking.collector.actor.ClusterWorkerContext; import com.a.eye.skywalking.collector.actor.LocalWorkerContext; import com.a.eye.skywalking.collector.actor.selector.HashCodeSelector; -import com.a.eye.skywalking.collector.worker.WorkerConfig; +import com.a.eye.skywalking.collector.worker.config.WorkerConfig; import com.a.eye.skywalking.collector.worker.noderef.NodeRefIndex; import org.junit.Assert; import org.junit.Before; diff --git a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefHourAggTestCase.java b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefHourAggTestCase.java index e726adaee..d222acce1 100644 --- a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefHourAggTestCase.java +++ b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefHourAggTestCase.java @@ -5,7 +5,7 @@ import com.a.eye.skywalking.collector.actor.LocalWorkerContext; import com.a.eye.skywalking.collector.actor.ProviderNotFoundException; import com.a.eye.skywalking.collector.actor.WorkerRefs; import com.a.eye.skywalking.collector.actor.selector.HashCodeSelector; -import com.a.eye.skywalking.collector.worker.WorkerConfig; +import com.a.eye.skywalking.collector.worker.config.WorkerConfig; import com.a.eye.skywalking.collector.worker.mock.RecordDataAnswer; import com.a.eye.skywalking.collector.worker.storage.RecordData; import com.a.eye.skywalking.collector.worker.tools.RecordDataAggTools; diff --git a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefHourSaveTestCase.java b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefHourSaveTestCase.java index 7779e93e9..4f03e85fe 100644 --- a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefHourSaveTestCase.java +++ b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefHourSaveTestCase.java @@ -3,7 +3,7 @@ package com.a.eye.skywalking.collector.worker.noderef.persistence; import com.a.eye.skywalking.collector.actor.ClusterWorkerContext; import com.a.eye.skywalking.collector.actor.LocalWorkerContext; import com.a.eye.skywalking.collector.actor.selector.HashCodeSelector; -import com.a.eye.skywalking.collector.worker.WorkerConfig; +import com.a.eye.skywalking.collector.worker.config.WorkerConfig; import com.a.eye.skywalking.collector.worker.noderef.NodeRefIndex; import org.junit.Assert; import org.junit.Before; diff --git a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefMinuteAggTestCase.java b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefMinuteAggTestCase.java index 68e0927af..3fcaf433c 100644 --- a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefMinuteAggTestCase.java +++ b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefMinuteAggTestCase.java @@ -5,7 +5,7 @@ import com.a.eye.skywalking.collector.actor.LocalWorkerContext; import com.a.eye.skywalking.collector.actor.ProviderNotFoundException; import com.a.eye.skywalking.collector.actor.WorkerRefs; import com.a.eye.skywalking.collector.actor.selector.HashCodeSelector; -import com.a.eye.skywalking.collector.worker.WorkerConfig; +import com.a.eye.skywalking.collector.worker.config.WorkerConfig; import com.a.eye.skywalking.collector.worker.mock.RecordDataAnswer; import com.a.eye.skywalking.collector.worker.storage.RecordData; import com.a.eye.skywalking.collector.worker.tools.RecordDataAggTools; diff --git a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefMinuteSaveTestCase.java b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefMinuteSaveTestCase.java index d06237232..16db0de58 100644 --- a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefMinuteSaveTestCase.java +++ b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefMinuteSaveTestCase.java @@ -3,7 +3,7 @@ package com.a.eye.skywalking.collector.worker.noderef.persistence; import com.a.eye.skywalking.collector.actor.ClusterWorkerContext; import com.a.eye.skywalking.collector.actor.LocalWorkerContext; import com.a.eye.skywalking.collector.actor.selector.HashCodeSelector; -import com.a.eye.skywalking.collector.worker.WorkerConfig; +import com.a.eye.skywalking.collector.worker.config.WorkerConfig; import com.a.eye.skywalking.collector.worker.noderef.NodeRefIndex; import org.junit.Assert; import org.junit.Before; diff --git a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefResSumDayAggTestCase.java b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefResSumDayAggTestCase.java index d71af51b3..9aa70244f 100644 --- a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefResSumDayAggTestCase.java +++ b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefResSumDayAggTestCase.java @@ -5,7 +5,7 @@ import com.a.eye.skywalking.collector.actor.LocalWorkerContext; import com.a.eye.skywalking.collector.actor.ProviderNotFoundException; import com.a.eye.skywalking.collector.actor.WorkerRefs; import com.a.eye.skywalking.collector.actor.selector.HashCodeSelector; -import com.a.eye.skywalking.collector.worker.WorkerConfig; +import com.a.eye.skywalking.collector.worker.config.WorkerConfig; import com.a.eye.skywalking.collector.worker.mock.MetricDataAnswer; import com.a.eye.skywalking.collector.worker.storage.MetricData; import com.a.eye.skywalking.collector.worker.tools.MetricDataAggTools; diff --git a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefResSumDaySaveTestCase.java b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefResSumDaySaveTestCase.java index e0fedfb21..e189eb600 100644 --- a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefResSumDaySaveTestCase.java +++ b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefResSumDaySaveTestCase.java @@ -3,7 +3,7 @@ package com.a.eye.skywalking.collector.worker.noderef.persistence; import com.a.eye.skywalking.collector.actor.ClusterWorkerContext; import com.a.eye.skywalking.collector.actor.LocalWorkerContext; import com.a.eye.skywalking.collector.actor.selector.HashCodeSelector; -import com.a.eye.skywalking.collector.worker.WorkerConfig; +import com.a.eye.skywalking.collector.worker.config.WorkerConfig; import com.a.eye.skywalking.collector.worker.noderef.NodeRefResSumIndex; import org.junit.Assert; import org.junit.Before; diff --git a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefResSumHourAggTestCase.java b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefResSumHourAggTestCase.java index c670a26ce..0da38a8fe 100644 --- a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefResSumHourAggTestCase.java +++ b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefResSumHourAggTestCase.java @@ -5,7 +5,7 @@ import com.a.eye.skywalking.collector.actor.LocalWorkerContext; import com.a.eye.skywalking.collector.actor.ProviderNotFoundException; import com.a.eye.skywalking.collector.actor.WorkerRefs; import com.a.eye.skywalking.collector.actor.selector.HashCodeSelector; -import com.a.eye.skywalking.collector.worker.WorkerConfig; +import com.a.eye.skywalking.collector.worker.config.WorkerConfig; import com.a.eye.skywalking.collector.worker.mock.MetricDataAnswer; import com.a.eye.skywalking.collector.worker.storage.MetricData; import com.a.eye.skywalking.collector.worker.tools.MetricDataAggTools; diff --git a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefResSumHourSaveTestCase.java b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefResSumHourSaveTestCase.java index dfee15ad1..47811c272 100644 --- a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefResSumHourSaveTestCase.java +++ b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefResSumHourSaveTestCase.java @@ -3,7 +3,7 @@ package com.a.eye.skywalking.collector.worker.noderef.persistence; import com.a.eye.skywalking.collector.actor.ClusterWorkerContext; import com.a.eye.skywalking.collector.actor.LocalWorkerContext; import com.a.eye.skywalking.collector.actor.selector.HashCodeSelector; -import com.a.eye.skywalking.collector.worker.WorkerConfig; +import com.a.eye.skywalking.collector.worker.config.WorkerConfig; import com.a.eye.skywalking.collector.worker.noderef.NodeRefResSumIndex; import org.junit.Assert; import org.junit.Before; diff --git a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefResSumMinuteAggTestCase.java b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefResSumMinuteAggTestCase.java index 057a9fe4e..6f212086c 100644 --- a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefResSumMinuteAggTestCase.java +++ b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefResSumMinuteAggTestCase.java @@ -5,7 +5,7 @@ import com.a.eye.skywalking.collector.actor.LocalWorkerContext; import com.a.eye.skywalking.collector.actor.ProviderNotFoundException; import com.a.eye.skywalking.collector.actor.WorkerRefs; import com.a.eye.skywalking.collector.actor.selector.HashCodeSelector; -import com.a.eye.skywalking.collector.worker.WorkerConfig; +import com.a.eye.skywalking.collector.worker.config.WorkerConfig; import com.a.eye.skywalking.collector.worker.mock.MetricDataAnswer; import com.a.eye.skywalking.collector.worker.storage.MetricData; import com.a.eye.skywalking.collector.worker.tools.MetricDataAggTools; diff --git a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefResSumMinuteSaveTestCase.java b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefResSumMinuteSaveTestCase.java index ad228572e..4a33884bf 100644 --- a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefResSumMinuteSaveTestCase.java +++ b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefResSumMinuteSaveTestCase.java @@ -3,8 +3,7 @@ package com.a.eye.skywalking.collector.worker.noderef.persistence; import com.a.eye.skywalking.collector.actor.ClusterWorkerContext; import com.a.eye.skywalking.collector.actor.LocalWorkerContext; import com.a.eye.skywalking.collector.actor.selector.HashCodeSelector; -import com.a.eye.skywalking.collector.worker.WorkerConfig; -import com.a.eye.skywalking.collector.worker.noderef.NodeRefIndex; +import com.a.eye.skywalking.collector.worker.config.WorkerConfig; import com.a.eye.skywalking.collector.worker.noderef.NodeRefResSumIndex; import org.junit.Assert; import org.junit.Before; diff --git a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/segment/SegmentPostTestCase.java b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/segment/SegmentPostTestCase.java index e9748373e..f6d6b332d 100644 --- a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/segment/SegmentPostTestCase.java +++ b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/segment/SegmentPostTestCase.java @@ -2,7 +2,7 @@ package com.a.eye.skywalking.collector.worker.segment; import com.a.eye.skywalking.collector.actor.*; import com.a.eye.skywalking.collector.actor.selector.RollingSelector; -import com.a.eye.skywalking.collector.worker.WorkerConfig; +import com.a.eye.skywalking.collector.worker.config.WorkerConfig; import com.a.eye.skywalking.collector.worker.globaltrace.analysis.GlobalTraceAnalysis; import com.a.eye.skywalking.collector.worker.node.analysis.NodeCompAnalysis; import com.a.eye.skywalking.collector.worker.node.analysis.NodeMappingDayAnalysis; diff --git a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/segment/persistence/SegmentCostSaveTestCase.java b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/segment/persistence/SegmentCostSaveTestCase.java index 04ee8fb56..03f6ffb0f 100644 --- a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/segment/persistence/SegmentCostSaveTestCase.java +++ b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/segment/persistence/SegmentCostSaveTestCase.java @@ -3,7 +3,8 @@ package com.a.eye.skywalking.collector.worker.segment.persistence; import com.a.eye.skywalking.collector.actor.ClusterWorkerContext; import com.a.eye.skywalking.collector.actor.LocalWorkerContext; import com.a.eye.skywalking.collector.actor.selector.RollingSelector; -import com.a.eye.skywalking.collector.worker.WorkerConfig; +import com.a.eye.skywalking.collector.worker.config.CacheSizeConfig; +import com.a.eye.skywalking.collector.worker.config.WorkerConfig; import com.a.eye.skywalking.collector.worker.mock.MockEsBulkClient; import com.a.eye.skywalking.collector.worker.mock.SaveToEsSourceAnswer; import com.a.eye.skywalking.collector.worker.segment.SegmentCostIndex; @@ -86,7 +87,7 @@ public class SegmentCostSaveTestCase { @Test public void testPersistenceServiceAnalyse() throws Exception { - WorkerConfig.Persistence.Data.size = 1; + CacheSizeConfig.Cache.Persistence.size = 1; List segmentWithTimeSliceList = segmentMock.mockPersistenceServiceSegmentTimeSlice(); @@ -108,7 +109,7 @@ public class SegmentCostSaveTestCase { @Test public void testCacheServiceAnalyse() throws Exception { - WorkerConfig.Persistence.Data.size = 2; + CacheSizeConfig.Cache.Persistence.size = 2; List segmentWithTimeSliceList = segmentMock.mockCacheServiceSegmentSegmentTimeSlice(); @@ -145,7 +146,7 @@ public class SegmentCostSaveTestCase { @Test public void testPortalServiceAnalyse() throws Exception { - WorkerConfig.Persistence.Data.size = 1; + CacheSizeConfig.Cache.Persistence.size = 1; List segmentWithTimeSliceList = segmentMock.mockPortalServiceSegmentSegmentTimeSlice(); @@ -167,7 +168,7 @@ public class SegmentCostSaveTestCase { @Test public void testCacheServiceExceptionAnalyse() throws Exception { - WorkerConfig.Persistence.Data.size = 1; + CacheSizeConfig.Cache.Persistence.size = 1; List segmentWithTimeSliceList = segmentMock.mockCacheServiceExceptionSegmentTimeSlice(); @@ -189,7 +190,7 @@ public class SegmentCostSaveTestCase { @Test public void testPortalServiceExceptionAnalyse() throws Exception { - WorkerConfig.Persistence.Data.size = 1; + CacheSizeConfig.Cache.Persistence.size = 1; List segmentWithTimeSliceList = segmentMock.mockPortalServiceExceptionSegmentTimeSlice(); diff --git a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/segment/persistence/SegmentExceptionSaveTestCase.java b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/segment/persistence/SegmentExceptionSaveTestCase.java index 9e5464cc0..a0527cad2 100644 --- a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/segment/persistence/SegmentExceptionSaveTestCase.java +++ b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/segment/persistence/SegmentExceptionSaveTestCase.java @@ -3,7 +3,8 @@ package com.a.eye.skywalking.collector.worker.segment.persistence; import com.a.eye.skywalking.collector.actor.ClusterWorkerContext; import com.a.eye.skywalking.collector.actor.LocalWorkerContext; import com.a.eye.skywalking.collector.actor.selector.RollingSelector; -import com.a.eye.skywalking.collector.worker.WorkerConfig; +import com.a.eye.skywalking.collector.worker.config.CacheSizeConfig; +import com.a.eye.skywalking.collector.worker.config.WorkerConfig; import com.a.eye.skywalking.collector.worker.mock.MockEsBulkClient; import com.a.eye.skywalking.collector.worker.segment.SegmentExceptionIndex; import com.a.eye.skywalking.collector.worker.segment.SegmentPost; @@ -90,7 +91,7 @@ public class SegmentExceptionSaveTestCase { @Test public void testSuccessAnalyse() throws Exception { - WorkerConfig.Persistence.Data.size = 1; + CacheSizeConfig.Cache.Persistence.size = 1; List cacheServiceList = segmentMock.mockCacheServiceSegmentSegmentTimeSlice(); for (SegmentPost.SegmentWithTimeSlice segmentWithTimeSlice : cacheServiceList) { @@ -108,7 +109,7 @@ public class SegmentExceptionSaveTestCase { @Test public void testErrorAnalyse() throws Exception { - WorkerConfig.Persistence.Data.size = 1; + CacheSizeConfig.Cache.Persistence.size = 1; List cacheServiceList = segmentMock.mockCacheServiceExceptionSegmentTimeSlice(); for (SegmentPost.SegmentWithTimeSlice segmentWithTimeSlice : cacheServiceList) { diff --git a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/segment/persistence/SegmentSaveTestCase.java b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/segment/persistence/SegmentSaveTestCase.java index 1facf78fa..3cb499afe 100644 --- a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/segment/persistence/SegmentSaveTestCase.java +++ b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/segment/persistence/SegmentSaveTestCase.java @@ -3,9 +3,9 @@ package com.a.eye.skywalking.collector.worker.segment.persistence; import com.a.eye.skywalking.collector.actor.ClusterWorkerContext; import com.a.eye.skywalking.collector.actor.LocalWorkerContext; import com.a.eye.skywalking.collector.actor.selector.RollingSelector; -import com.a.eye.skywalking.collector.worker.WorkerConfig; +import com.a.eye.skywalking.collector.worker.config.CacheSizeConfig; +import com.a.eye.skywalking.collector.worker.config.WorkerConfig; import com.a.eye.skywalking.collector.worker.mock.MockEsBulkClient; -import com.a.eye.skywalking.collector.worker.segment.SegmentCostIndex; import com.a.eye.skywalking.collector.worker.segment.SegmentIndex; import com.a.eye.skywalking.collector.worker.storage.EsClient; import com.google.gson.Gson; @@ -81,7 +81,7 @@ public class SegmentSaveTestCase { @Test public void testAnalyse() throws Exception { - WorkerConfig.Persistence.Data.size = 1; + CacheSizeConfig.Cache.Persistence.size = 1; JsonObject segment_1 = new JsonObject(); segment_1.addProperty("ts", "segment_1"); diff --git a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/storage/AbstractIndexTestCase.java b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/storage/AbstractIndexTestCase.java index 28aef0e60..f53a8abf6 100644 --- a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/storage/AbstractIndexTestCase.java +++ b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/storage/AbstractIndexTestCase.java @@ -22,7 +22,7 @@ public class AbstractIndexTestCase { @Test public void testCreateSettingBuilder() throws IOException { IndexTest indexTest = new IndexTest(); - Assert.assertEquals("{\"index.number_of_shards\":2,\"index.number_of_replicas\":0}", indexTest.createSettingBuilder().string()); + Assert.assertEquals("{\"index.number_of_shards\":null,\"index.number_of_replicas\":null}", indexTest.createSettingBuilder().string()); } class IndexTest extends AbstractIndex { diff --git a/skywalking-collector/skywalking-collector-worker/src/test/resources/META-INF/services/com.a.eye.skywalking.collector.worker.httpserver.AbstractGetProvider b/skywalking-collector/skywalking-collector-worker/src/test/resources/META-INF/services/com.a.eye.skywalking.collector.worker.httpserver.AbstractGetProvider new file mode 100644 index 000000000..5ae02cf4f --- /dev/null +++ b/skywalking-collector/skywalking-collector-worker/src/test/resources/META-INF/services/com.a.eye.skywalking.collector.worker.httpserver.AbstractGetProvider @@ -0,0 +1 @@ +com.a.eye.skywalking.collector.worker.httpserver.TestAbstractGet$Factory \ No newline at end of file diff --git a/skywalking-collector/skywalking-collector-worker/src/test/resources/META-INF/services/com.a.eye.skywalking.collector.worker.httpserver.AbstractPostProvider b/skywalking-collector/skywalking-collector-worker/src/test/resources/META-INF/services/com.a.eye.skywalking.collector.worker.httpserver.AbstractPostProvider new file mode 100644 index 000000000..3d6736f0f --- /dev/null +++ b/skywalking-collector/skywalking-collector-worker/src/test/resources/META-INF/services/com.a.eye.skywalking.collector.worker.httpserver.AbstractPostProvider @@ -0,0 +1 @@ +com.a.eye.skywalking.collector.worker.httpserver.TestAbstractPost$Factory \ No newline at end of file