This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch booting-log
in repository https://gitbox.apache.org/repos/asf/skywalking.git
The following commit(s) were added to refs/heads/booting-log by this push:
new ae4256c536 Fix tests.
ae4256c536 is described below
commit ae4256c536853cd9d2c09a92e8be92ac0bb29452
Author: Wu Sheng <wu.sh...@foxmail.com>
AuthorDate: Mon Nov 6 23:00:15 2023 +0800
Fix tests.
---
.../zookeeper/ClusterModuleZookeeperProviderFunctionalIT.java | 11 +++++------
.../server/configuration/apollo/ApolloConfigurationIT.java | 2 +-
.../server/configuration/consul/ConsulConfigurationIT.java | 2 +-
.../oap/server/configuration/etcd/EtcdConfigurationIT.java | 2 +-
.../oap/server/configuration/nacos/NacosConfigurationIT.java | 2 +-
.../configuration/zookeeper/it/ZookeeperConfigurationIT.java | 2 +-
.../server/analyzer/agent/kafka/mock/MockModuleManager.java | 1 +
.../skywalking/oap/server/library/module/ModuleProvider.java | 2 +-
.../otel/otlp/OpenTelemetryMetricRequestProcessorTest.java | 2 +-
.../oap/server/receiver/telegraf/mock/MockModuleManager.java | 1 +
.../profile/exporter/ProfileSnapshotExporterBootstrap.java | 2 +-
11 files changed, 15 insertions(+), 14 deletions(-)
diff --git
a/oap-server/server-cluster-plugin/cluster-zookeeper-plugin/src/test/java/org/apache/skywalking/oap/server/cluster/plugin/zookeeper/ClusterModuleZookeeperProviderFunctionalIT.java
b/oap-server/server-cluster-plugin/cluster-zookeeper-plugin/src/test/java/org/apache/skywalking/oap/server/cluster/plugin/zookeeper/ClusterModuleZookeeperProviderFunctionalIT.java
index 9270eb1f01..171f125aa5 100644
---
a/oap-server/server-cluster-plugin/cluster-zookeeper-plugin/src/test/java/org/apache/skywalking/oap/server/cluster/plugin/zookeeper/ClusterModuleZookeeperProviderFunctionalIT.java
+++
b/oap-server/server-cluster-plugin/cluster-zookeeper-plugin/src/test/java/org/apache/skywalking/oap/server/cluster/plugin/zookeeper/ClusterModuleZookeeperProviderFunctionalIT.java
@@ -18,6 +18,9 @@
package org.apache.skywalking.oap.server.cluster.plugin.zookeeper;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
import lombok.Getter;
import org.apache.curator.x.discovery.ServiceDiscovery;
import org.apache.skywalking.oap.server.core.cluster.ClusterCoordinator;
@@ -45,10 +48,6 @@ import org.testcontainers.junit.jupiter.Container;
import org.testcontainers.junit.jupiter.Testcontainers;
import org.testcontainers.utility.DockerImageName;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -73,7 +72,7 @@ public class ClusterModuleZookeeperProviderFunctionalIT {
@BeforeEach
public void init() {
Mockito.when(telemetryProvider.getService(MetricsCreator.class))
- .thenReturn(new MetricsCreatorNoop());
+ .thenReturn(new MetricsCreatorNoop());
TelemetryModule telemetryModule = Mockito.spy(TelemetryModule.class);
Whitebox.setInternalState(telemetryModule, "loadedProvider",
telemetryProvider);
Mockito.when(moduleManager.find(TelemetryModule.NAME)).thenReturn(telemetryModule);
@@ -229,7 +228,7 @@ public class ClusterModuleZookeeperProviderFunctionalIT {
}
private ClusterModuleZookeeperProvider createProvider(String namespace,
String internalComHost,
- int internalComPort) throws Exception {
+ int internalComPort)
throws Exception {
ClusterModuleZookeeperProvider provider = new
ClusterModuleZookeeperProvider();
provider.setManager(moduleManager);
ClusterModuleZookeeperConfig moduleConfig = new
ClusterModuleZookeeperConfig();
diff --git
a/oap-server/server-configuration/configuration-apollo/src/test/java/org/apache/skywalking/oap/server/configuration/apollo/ApolloConfigurationIT.java
b/oap-server/server-configuration/configuration-apollo/src/test/java/org/apache/skywalking/oap/server/configuration/apollo/ApolloConfigurationIT.java
index fabc664109..286f7115a9 100644
---
a/oap-server/server-configuration/configuration-apollo/src/test/java/org/apache/skywalking/oap/server/configuration/apollo/ApolloConfigurationIT.java
+++
b/oap-server/server-configuration/configuration-apollo/src/test/java/org/apache/skywalking/oap/server/configuration/apollo/ApolloConfigurationIT.java
@@ -95,7 +95,7 @@ public class ApolloConfigurationIT {
final ApplicationConfiguration applicationConfiguration = new
ApplicationConfiguration();
loadConfig(applicationConfiguration);
- final ModuleManager moduleManager = new ModuleManager();
+ final ModuleManager moduleManager = new ModuleManager("Test");
moduleManager.init(applicationConfiguration);
provider = (ApolloConfigurationTestProvider)
moduleManager.find(ApolloConfigurationTestModule.NAME).provider();
diff --git
a/oap-server/server-configuration/configuration-consul/src/test/java/org/apache/skywalking/oap/server/configuration/consul/ConsulConfigurationIT.java
b/oap-server/server-configuration/configuration-consul/src/test/java/org/apache/skywalking/oap/server/configuration/consul/ConsulConfigurationIT.java
index 0c7d7b801c..d3a2e79906 100644
---
a/oap-server/server-configuration/configuration-consul/src/test/java/org/apache/skywalking/oap/server/configuration/consul/ConsulConfigurationIT.java
+++
b/oap-server/server-configuration/configuration-consul/src/test/java/org/apache/skywalking/oap/server/configuration/consul/ConsulConfigurationIT.java
@@ -65,7 +65,7 @@ public class ConsulConfigurationIT {
final ApplicationConfiguration applicationConfiguration = new
ApplicationConfiguration();
loadConfig(applicationConfiguration);
- final ModuleManager moduleManager = new ModuleManager();
+ final ModuleManager moduleManager = new ModuleManager("Test");
moduleManager.init(applicationConfiguration);
provider = (ConsulConfigurationTestProvider)
moduleManager.find(ConsulConfigurationTestModule.NAME).provider();
diff --git
a/oap-server/server-configuration/configuration-etcd/src/test/java/org/apache/skywalking/oap/server/configuration/etcd/EtcdConfigurationIT.java
b/oap-server/server-configuration/configuration-etcd/src/test/java/org/apache/skywalking/oap/server/configuration/etcd/EtcdConfigurationIT.java
index f10a18f59c..1d9e9a8d90 100644
---
a/oap-server/server-configuration/configuration-etcd/src/test/java/org/apache/skywalking/oap/server/configuration/etcd/EtcdConfigurationIT.java
+++
b/oap-server/server-configuration/configuration-etcd/src/test/java/org/apache/skywalking/oap/server/configuration/etcd/EtcdConfigurationIT.java
@@ -73,7 +73,7 @@ public class EtcdConfigurationIT {
final ApplicationConfiguration applicationConfiguration = new
ApplicationConfiguration();
loadConfig(applicationConfiguration);
- final ModuleManager moduleManager = new ModuleManager();
+ final ModuleManager moduleManager = new ModuleManager("Test");
moduleManager.init(applicationConfiguration);
provider = (EtcdConfigurationTestProvider)
moduleManager.find(EtcdConfigurationTestModule.NAME).provider();
diff --git
a/oap-server/server-configuration/configuration-nacos/src/test/java/org/apache/skywalking/oap/server/configuration/nacos/NacosConfigurationIT.java
b/oap-server/server-configuration/configuration-nacos/src/test/java/org/apache/skywalking/oap/server/configuration/nacos/NacosConfigurationIT.java
index 55d973d36a..9f65b03a5e 100644
---
a/oap-server/server-configuration/configuration-nacos/src/test/java/org/apache/skywalking/oap/server/configuration/nacos/NacosConfigurationIT.java
+++
b/oap-server/server-configuration/configuration-nacos/src/test/java/org/apache/skywalking/oap/server/configuration/nacos/NacosConfigurationIT.java
@@ -70,7 +70,7 @@ public class NacosConfigurationIT {
final ApplicationConfiguration applicationConfiguration = new
ApplicationConfiguration();
loadConfig(applicationConfiguration);
- final ModuleManager moduleManager = new ModuleManager();
+ final ModuleManager moduleManager = new ModuleManager("Test");
moduleManager.init(applicationConfiguration);
provider = (NacosConfigurationTestProvider)
moduleManager.find(NacosConfigurationTestModule.NAME).provider();
diff --git
a/oap-server/server-configuration/configuration-zookeeper/src/test/java/org/apache/skywalking/oap/server/configuration/zookeeper/it/ZookeeperConfigurationIT.java
b/oap-server/server-configuration/configuration-zookeeper/src/test/java/org/apache/skywalking/oap/server/configuration/zookeeper/it/ZookeeperConfigurationIT.java
index 234f38647b..edad1c3b7e 100644
---
a/oap-server/server-configuration/configuration-zookeeper/src/test/java/org/apache/skywalking/oap/server/configuration/zookeeper/it/ZookeeperConfigurationIT.java
+++
b/oap-server/server-configuration/configuration-zookeeper/src/test/java/org/apache/skywalking/oap/server/configuration/zookeeper/it/ZookeeperConfigurationIT.java
@@ -71,7 +71,7 @@ public class ZookeeperConfigurationIT {
final ApplicationConfiguration applicationConfiguration = new
ApplicationConfiguration();
loadConfig(applicationConfiguration);
- final ModuleManager moduleManager = new ModuleManager();
+ final ModuleManager moduleManager = new ModuleManager("Test");
moduleManager.init(applicationConfiguration);
provider = (MockZookeeperConfigurationProvider)
moduleManager.find(MockZookeeperConfigurationModule.NAME)
diff --git
a/oap-server/server-fetcher-plugin/kafka-fetcher-plugin/src/test/java/org/apache/skywalking/oap/server/analyzer/agent/kafka/mock/MockModuleManager.java
b/oap-server/server-fetcher-plugin/kafka-fetcher-plugin/src/test/java/org/apache/skywalking/oap/server/analyzer/agent/kafka/mock/MockModuleManager.java
index 63c95bb349..9e3040de5e 100644
---
a/oap-server/server-fetcher-plugin/kafka-fetcher-plugin/src/test/java/org/apache/skywalking/oap/server/analyzer/agent/kafka/mock/MockModuleManager.java
+++
b/oap-server/server-fetcher-plugin/kafka-fetcher-plugin/src/test/java/org/apache/skywalking/oap/server/analyzer/agent/kafka/mock/MockModuleManager.java
@@ -28,6 +28,7 @@ public abstract class MockModuleManager extends ModuleManager
{
private final Map<String, ModuleProviderHolder> moduleProviderHolderMap =
Maps.newHashMap();
public MockModuleManager() {
+ super("Test");
init();
}
diff --git
a/oap-server/server-library/library-module/src/main/java/org/apache/skywalking/oap/server/library/module/ModuleProvider.java
b/oap-server/server-library/library-module/src/main/java/org/apache/skywalking/oap/server/library/module/ModuleProvider.java
index dabc689eee..c128b23f96 100644
---
a/oap-server/server-library/library-module/src/main/java/org/apache/skywalking/oap/server/library/module/ModuleProvider.java
+++
b/oap-server/server-library/library-module/src/main/java/org/apache/skywalking/oap/server/library/module/ModuleProvider.java
@@ -29,7 +29,7 @@ import lombok.Setter;
* And each moduleDefine can have one or more implementation, which depends on
`application.yml`
*/
public abstract class ModuleProvider implements ModuleServiceHolder {
- @Setter(AccessLevel.PACKAGE)
+ @Setter
private ModuleManager manager;
@Setter(AccessLevel.PACKAGE)
private ModuleDefine moduleDefine;
diff --git
a/oap-server/server-receiver-plugin/otel-receiver-plugin/src/test/java/org/apache/skywalking/oap/server/receiver/otel/otlp/OpenTelemetryMetricRequestProcessorTest.java
b/oap-server/server-receiver-plugin/otel-receiver-plugin/src/test/java/org/apache/skywalking/oap/server/receiver/otel/otlp/OpenTelemetryMetricRequestProcessorTest.java
index 0a40e3bd21..883ece0429 100644
---
a/oap-server/server-receiver-plugin/otel-receiver-plugin/src/test/java/org/apache/skywalking/oap/server/receiver/otel/otlp/OpenTelemetryMetricRequestProcessorTest.java
+++
b/oap-server/server-receiver-plugin/otel-receiver-plugin/src/test/java/org/apache/skywalking/oap/server/receiver/otel/otlp/OpenTelemetryMetricRequestProcessorTest.java
@@ -48,7 +48,7 @@ public class OpenTelemetryMetricRequestProcessorTest {
@BeforeEach
public void setUp() {
- manager = new ModuleManager();
+ manager = new ModuleManager("Test");
config = new OtelMetricReceiverConfig();
metricRequestProcessor = new
OpenTelemetryMetricRequestProcessor(manager, config);
nodeLabels = new HashMap<>();
diff --git
a/oap-server/server-receiver-plugin/skywalking-telegraf-receiver-plugin/src/test/java/org/apache/skywalking/oap/server/receiver/telegraf/mock/MockModuleManager.java
b/oap-server/server-receiver-plugin/skywalking-telegraf-receiver-plugin/src/test/java/org/apache/skywalking/oap/server/receiver/telegraf/mock/MockModuleManager.java
index 6db9734b25..e6751f572b 100644
---
a/oap-server/server-receiver-plugin/skywalking-telegraf-receiver-plugin/src/test/java/org/apache/skywalking/oap/server/receiver/telegraf/mock/MockModuleManager.java
+++
b/oap-server/server-receiver-plugin/skywalking-telegraf-receiver-plugin/src/test/java/org/apache/skywalking/oap/server/receiver/telegraf/mock/MockModuleManager.java
@@ -29,6 +29,7 @@ public abstract class MockModuleManager extends ModuleManager
{
private final Map<String, ModuleProviderHolder> moduleProviderHolderMap =
Maps.newHashMap();
public MockModuleManager() {
+ super("Test");
init();
}
diff --git
a/oap-server/server-tools/profile-exporter/tool-profile-snapshot-bootstrap/src/main/java/org/apache/skywalking/oap/server/tool/profile/exporter/ProfileSnapshotExporterBootstrap.java
b/oap-server/server-tools/profile-exporter/tool-profile-snapshot-bootstrap/src/main/java/org/apache/skywalking/oap/server/tool/profile/exporter/ProfileSnapshotExporterBootstrap.java
index fc1cf3dce0..12ac3c3955 100644
---
a/oap-server/server-tools/profile-exporter/tool-profile-snapshot-bootstrap/src/main/java/org/apache/skywalking/oap/server/tool/profile/exporter/ProfileSnapshotExporterBootstrap.java
+++
b/oap-server/server-tools/profile-exporter/tool-profile-snapshot-bootstrap/src/main/java/org/apache/skywalking/oap/server/tool/profile/exporter/ProfileSnapshotExporterBootstrap.java
@@ -33,7 +33,7 @@ public class ProfileSnapshotExporterBootstrap {
= new TerminalFriendlyTable("The key booting parameters of Apache
SkyWalking OAP are listed as following.");
ApplicationConfigLoader configLoader = new
ApplicationConfigLoader(bootingParameters);
- ModuleManager manager = new ModuleManager();
+ ModuleManager manager = new ModuleManager("Apache SkyWalking OAP
Exporter");
try {
// parse config and init
ExporterConfig exporterConfig = ExporterConfig.parse(args);
