You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@skywalking.apache.org by wu...@apache.org on 2021/09/24 11:35:15 UTC
[skywalking] branch master updated: Fix entity naming mechanism
failure in MAL (#7790)
This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/skywalking.git
The following commit(s) were added to refs/heads/master by this push:
new b7ba282 Fix entity naming mechanism failure in MAL (#7790)
b7ba282 is described below
commit b7ba282a5851ef6ba4114ec124a23a7653e909fe
Author: 吴晟 Wu Sheng <wu...@foxmail.com>
AuthorDate: Fri Sep 24 19:34:56 2021 +0800
Fix entity naming mechanism failure in MAL (#7790)
---
CHANGES.md | 6 ++-
.../oap/meter/analyzer/dsl/AnalyzerTest.java | 16 +++++++
.../oap/meter/analyzer/dsl/ScopeTest.java | 19 ++++++++
.../oap/server/core/CoreModuleProvider.java | 7 ++-
.../server/core/analysis/meter/MeterEntity.java | 56 ++++++++++++++--------
.../meter/function/HistogramFunctionTest.java | 15 ++++++
.../meter/function/PercentileFunctionTest.java | 15 ++++++
.../function/avg/AvgHistogramFunctionTest.java | 15 ++++++
.../avg/AvgHistogramPercentileFunctionTest.java | 15 ++++++
.../meter/function/avg/AvgLabeledFunctionTest.java | 15 ++++++
.../meter/function/latest/LatestFunctionTest.java | 15 ++++++
.../zabbix/provider/ZabbixMetricsTest.java | 16 +++++++
12 files changed, 185 insertions(+), 25 deletions(-)
diff --git a/CHANGES.md b/CHANGES.md
index 7e5f567..fbc4d39 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -71,11 +71,13 @@ Release Notes.
* Fix wrong service name when IP is node IP in `k8s-mesh`.
* Support dynamic configurations for openAPI endpoint name grouping rule.
* Add component definition for `Alibaba Druid` and `HikariCP`.
-* Fix `Hour` and `Day` dimensionality metrics not accurate, due to the cache read-then-clear mechanism conflicts with low
- down metrics flush period added in 8.7.0.
+* Fix `Hour` and `Day` dimensionality metrics not accurate, due to the cache read-then-clear mechanism conflicts with
+ low down metrics flush period added in 8.7.0.
* Fix `Slow SQL sampling` not accurate, due to TopN works conflict with cache read-then-clear mechanism.
* The persistent cache is only read when necessary.
* Add component definition for `Alibaba Fastjson`.
+* Fix entity(service/instance/endpoint) names in the MAL system(prometheus, native meter, open census, envoy metric
+ service) are not controlled by core's naming-control mechanism.
#### UI
diff --git a/oap-server/analyzer/meter-analyzer/src/test/java/org/apache/skywalking/oap/meter/analyzer/dsl/AnalyzerTest.java b/oap-server/analyzer/meter-analyzer/src/test/java/org/apache/skywalking/oap/meter/analyzer/dsl/AnalyzerTest.java
index 20639cc..e5e1813 100644
--- a/oap-server/analyzer/meter-analyzer/src/test/java/org/apache/skywalking/oap/meter/analyzer/dsl/AnalyzerTest.java
+++ b/oap-server/analyzer/meter-analyzer/src/test/java/org/apache/skywalking/oap/meter/analyzer/dsl/AnalyzerTest.java
@@ -24,6 +24,7 @@ import java.util.Map;
import org.apache.skywalking.oap.meter.analyzer.Analyzer;
import org.apache.skywalking.oap.server.core.analysis.IDManager;
import org.apache.skywalking.oap.server.core.analysis.StreamDefinition;
+import org.apache.skywalking.oap.server.core.analysis.meter.MeterEntity;
import org.apache.skywalking.oap.server.core.analysis.meter.MeterSystem;
import org.apache.skywalking.oap.server.core.analysis.meter.function.AcceptableValue;
import org.apache.skywalking.oap.server.core.analysis.meter.function.avg.AvgFunction;
@@ -31,10 +32,14 @@ import org.apache.skywalking.oap.server.core.analysis.meter.function.avg.AvgHist
import org.apache.skywalking.oap.server.core.analysis.meter.function.avg.AvgLabeledFunction;
import org.apache.skywalking.oap.server.core.analysis.metrics.IntList;
import org.apache.skywalking.oap.server.core.analysis.worker.MetricsStreamProcessor;
+import org.apache.skywalking.oap.server.core.config.NamingControl;
+import org.apache.skywalking.oap.server.core.config.group.EndpointNameGrouping;
import org.apache.skywalking.oap.server.core.storage.StorageException;
import org.apache.skywalking.oap.server.library.module.ModuleManager;
+import org.junit.AfterClass;
import org.junit.Assert;
import org.junit.Before;
+import org.junit.BeforeClass;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
@@ -67,6 +72,17 @@ public class AnalyzerTest {
}
+ @BeforeClass
+ public static void init() {
+ MeterEntity.setNamingControl(
+ new NamingControl(512, 512, 512, new EndpointNameGrouping()));
+ }
+
+ @AfterClass
+ public static void tearDown() {
+ MeterEntity.setNamingControl(null);
+ }
+
@Test
public void testSingle() {
analyzer = Analyzer.build(
diff --git a/oap-server/analyzer/meter-analyzer/src/test/java/org/apache/skywalking/oap/meter/analyzer/dsl/ScopeTest.java b/oap-server/analyzer/meter-analyzer/src/test/java/org/apache/skywalking/oap/meter/analyzer/dsl/ScopeTest.java
index 6fb6c07..49e57d3 100644
--- a/oap-server/analyzer/meter-analyzer/src/test/java/org/apache/skywalking/oap/meter/analyzer/dsl/ScopeTest.java
+++ b/oap-server/analyzer/meter-analyzer/src/test/java/org/apache/skywalking/oap/meter/analyzer/dsl/ScopeTest.java
@@ -25,7 +25,11 @@ import java.util.HashMap;
import java.util.Map;
import lombok.extern.slf4j.Slf4j;
import org.apache.skywalking.oap.server.core.analysis.meter.MeterEntity;
+import org.apache.skywalking.oap.server.core.config.NamingControl;
+import org.apache.skywalking.oap.server.core.config.group.EndpointNameGrouping;
import org.apache.skywalking.oap.server.core.source.DetectPoint;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
@@ -56,6 +60,10 @@ public class ScopeTest {
@Parameterized.Parameters(name = "{index}: {0}")
public static Collection<Object[]> data() {
+ // This method is called before `@BeforeClass`.
+ MeterEntity.setNamingControl(
+ new NamingControl(512, 512, 512, new EndpointNameGrouping()));
+
return Arrays.asList(new Object[][] {
{
"sum_service",
@@ -527,6 +535,17 @@ public class ScopeTest {
});
}
+ @BeforeClass
+ public static void setup() {
+ MeterEntity.setNamingControl(
+ new NamingControl(512, 512, 512, new EndpointNameGrouping()));
+ }
+
+ @AfterClass
+ public static void tearDown() {
+ MeterEntity.setNamingControl(null);
+ }
+
@Test
public void test() {
Expression e = DSL.parse(expression);
diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/CoreModuleProvider.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/CoreModuleProvider.java
index 87fd5a3..8e61db8 100755
--- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/CoreModuleProvider.java
+++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/CoreModuleProvider.java
@@ -27,6 +27,7 @@ import org.apache.skywalking.oap.server.configuration.api.DynamicConfigurationSe
import org.apache.skywalking.oap.server.core.analysis.ApdexThresholdConfig;
import org.apache.skywalking.oap.server.core.analysis.DisableRegister;
import org.apache.skywalking.oap.server.core.analysis.StreamAnnotationListener;
+import org.apache.skywalking.oap.server.core.analysis.meter.MeterEntity;
import org.apache.skywalking.oap.server.core.analysis.meter.MeterSystem;
import org.apache.skywalking.oap.server.core.analysis.metrics.ApdexMetrics;
import org.apache.skywalking.oap.server.core.analysis.worker.ManagementStreamProcessor;
@@ -154,12 +155,14 @@ public class CoreModuleProvider extends ModuleProvider {
DefaultScopeDefine.activeExtraModelColumns();
}
EndpointNameGrouping endpointNameGrouping = new EndpointNameGrouping();
- this.registerServiceImplementation(NamingControl.class, new NamingControl(
+ final NamingControl namingControl = new NamingControl(
moduleConfig.getServiceNameMaxLength(),
moduleConfig.getInstanceNameMaxLength(),
moduleConfig.getEndpointNameMaxLength(),
endpointNameGrouping
- ));
+ );
+ this.registerServiceImplementation(NamingControl.class, namingControl);
+ MeterEntity.setNamingControl(namingControl);
try {
endpointNameGroupingRuleWatcher = new EndpointNameGroupingRuleWatcher(
this, endpointNameGrouping);
diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/meter/MeterEntity.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/meter/MeterEntity.java
index d2d5958..d2f5f59 100644
--- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/meter/MeterEntity.java
+++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/meter/MeterEntity.java
@@ -18,13 +18,12 @@
package org.apache.skywalking.oap.server.core.analysis.meter;
-import lombok.Builder;
import lombok.EqualsAndHashCode;
import lombok.Getter;
-import lombok.Setter;
import lombok.ToString;
import org.apache.skywalking.oap.server.core.UnexpectedException;
import org.apache.skywalking.oap.server.core.analysis.IDManager;
+import org.apache.skywalking.oap.server.core.config.NamingControl;
import org.apache.skywalking.oap.server.core.source.DetectPoint;
/**
@@ -33,10 +32,10 @@ import org.apache.skywalking.oap.server.core.source.DetectPoint;
@EqualsAndHashCode
@ToString
@Getter
-@Builder(toBuilder = true)
public class MeterEntity {
+ private static NamingControl NAMING_CONTROL;
+
private ScopeType scopeType;
- @Setter
private String serviceName;
private String instanceName;
private String endpointName;
@@ -44,6 +43,10 @@ public class MeterEntity {
private String destServiceName;
private DetectPoint detectPoint;
+ private MeterEntity() {
+
+ }
+
public String id() {
switch (scopeType) {
case SERVICE:
@@ -76,43 +79,54 @@ public class MeterEntity {
return IDManager.ServiceID.buildId(destServiceName, true);
}
+ public static void setNamingControl(final NamingControl namingControl) {
+ NAMING_CONTROL = namingControl;
+ }
+
+ public void setServiceName(final String serviceName) {
+ this.serviceName = NAMING_CONTROL.formatServiceName(serviceName);
+ }
+
/**
* Create a service level meter entity.
*/
public static MeterEntity newService(String serviceName) {
- return MeterEntity.builder().scopeType(ScopeType.SERVICE).serviceName(serviceName).build();
+ final MeterEntity meterEntity = new MeterEntity();
+ meterEntity.scopeType = ScopeType.SERVICE;
+ meterEntity.serviceName = NAMING_CONTROL.formatServiceName(serviceName);
+ return meterEntity;
}
/**
* Create a service instance level meter entity.
*/
public static MeterEntity newServiceInstance(String serviceName, String serviceInstance) {
- return MeterEntity.builder()
- .scopeType(ScopeType.SERVICE_INSTANCE)
- .serviceName(serviceName)
- .instanceName(serviceInstance)
- .build();
+ final MeterEntity meterEntity = new MeterEntity();
+ meterEntity.scopeType = ScopeType.SERVICE_INSTANCE;
+ meterEntity.serviceName = NAMING_CONTROL.formatServiceName(serviceName);
+ meterEntity.instanceName = NAMING_CONTROL.formatInstanceName(serviceInstance);
+ return meterEntity;
}
/**
* Create an endpoint level meter entity.
*/
public static MeterEntity newEndpoint(String serviceName, String endpointName) {
- return MeterEntity.builder()
- .scopeType(ScopeType.ENDPOINT)
- .serviceName(serviceName)
- .endpointName(endpointName)
- .build();
+ final MeterEntity meterEntity = new MeterEntity();
+ meterEntity.scopeType = ScopeType.ENDPOINT;
+ meterEntity.serviceName = NAMING_CONTROL.formatServiceName(serviceName);
+ meterEntity.endpointName = NAMING_CONTROL.formatEndpointName(serviceName, endpointName);
+ return meterEntity;
}
public static MeterEntity newServiceRelation(String sourceServiceName,
String destServiceName,
DetectPoint detectPoint) {
- return MeterEntity.builder()
- .scopeType(ScopeType.SERVICE_RELATION)
- .sourceServiceName(sourceServiceName)
- .destServiceName(destServiceName)
- .detectPoint(detectPoint)
- .build();
+ final MeterEntity meterEntity = new MeterEntity();
+ meterEntity.scopeType = ScopeType.SERVICE_RELATION;
+ meterEntity.sourceServiceName = NAMING_CONTROL.formatServiceName(sourceServiceName);
+ meterEntity.destServiceName = NAMING_CONTROL.formatServiceName(destServiceName);
+ meterEntity.detectPoint = detectPoint;
+ return meterEntity;
}
}
diff --git a/oap-server/server-core/src/test/java/org/apache/skywalking/oap/server/core/analysis/meter/function/HistogramFunctionTest.java b/oap-server/server-core/src/test/java/org/apache/skywalking/oap/server/core/analysis/meter/function/HistogramFunctionTest.java
index 5ddbb0a..73e04c1 100644
--- a/oap-server/server-core/src/test/java/org/apache/skywalking/oap/server/core/analysis/meter/function/HistogramFunctionTest.java
+++ b/oap-server/server-core/src/test/java/org/apache/skywalking/oap/server/core/analysis/meter/function/HistogramFunctionTest.java
@@ -22,10 +22,14 @@ import java.util.Map;
import java.util.stream.IntStream;
import org.apache.skywalking.oap.server.core.analysis.meter.MeterEntity;
import org.apache.skywalking.oap.server.core.analysis.metrics.DataTable;
+import org.apache.skywalking.oap.server.core.config.NamingControl;
+import org.apache.skywalking.oap.server.core.config.group.EndpointNameGrouping;
import org.apache.skywalking.oap.server.core.query.type.Bucket;
import org.apache.skywalking.oap.server.core.query.type.HeatMap;
import org.apache.skywalking.oap.server.core.storage.StorageHashMapBuilder;
+import org.junit.AfterClass;
import org.junit.Assert;
+import org.junit.BeforeClass;
import org.junit.Test;
import static org.apache.skywalking.oap.server.core.analysis.meter.function.HistogramFunction.DATASET;
@@ -52,6 +56,17 @@ public class HistogramFunctionTest {
10
};
+ @BeforeClass
+ public static void setup() {
+ MeterEntity.setNamingControl(
+ new NamingControl(512, 512, 512, new EndpointNameGrouping()));
+ }
+
+ @AfterClass
+ public static void tearDown() {
+ MeterEntity.setNamingControl(null);
+ }
+
@Test
public void testFunction() {
HistogramFunctionInst inst = new HistogramFunctionInst();
diff --git a/oap-server/server-core/src/test/java/org/apache/skywalking/oap/server/core/analysis/meter/function/PercentileFunctionTest.java b/oap-server/server-core/src/test/java/org/apache/skywalking/oap/server/core/analysis/meter/function/PercentileFunctionTest.java
index b7f477c..714b4c1 100644
--- a/oap-server/server-core/src/test/java/org/apache/skywalking/oap/server/core/analysis/meter/function/PercentileFunctionTest.java
+++ b/oap-server/server-core/src/test/java/org/apache/skywalking/oap/server/core/analysis/meter/function/PercentileFunctionTest.java
@@ -22,8 +22,12 @@ import java.util.Map;
import org.apache.skywalking.oap.server.core.analysis.meter.MeterEntity;
import org.apache.skywalking.oap.server.core.analysis.metrics.DataTable;
import org.apache.skywalking.oap.server.core.analysis.metrics.IntList;
+import org.apache.skywalking.oap.server.core.config.NamingControl;
+import org.apache.skywalking.oap.server.core.config.group.EndpointNameGrouping;
import org.apache.skywalking.oap.server.core.storage.StorageHashMapBuilder;
+import org.junit.AfterClass;
import org.junit.Assert;
+import org.junit.BeforeClass;
import org.junit.Test;
public class PercentileFunctionTest {
@@ -46,6 +50,17 @@ public class PercentileFunctionTest {
90
};
+ @BeforeClass
+ public static void setup() {
+ MeterEntity.setNamingControl(
+ new NamingControl(512, 512, 512, new EndpointNameGrouping()));
+ }
+
+ @AfterClass
+ public static void tearDown() {
+ MeterEntity.setNamingControl(null);
+ }
+
@Test
public void testFunction() {
PercentileFunctionInst inst = new PercentileFunctionInst();
diff --git a/oap-server/server-core/src/test/java/org/apache/skywalking/oap/server/core/analysis/meter/function/avg/AvgHistogramFunctionTest.java b/oap-server/server-core/src/test/java/org/apache/skywalking/oap/server/core/analysis/meter/function/avg/AvgHistogramFunctionTest.java
index b5d0588..d75f9f0 100644
--- a/oap-server/server-core/src/test/java/org/apache/skywalking/oap/server/core/analysis/meter/function/avg/AvgHistogramFunctionTest.java
+++ b/oap-server/server-core/src/test/java/org/apache/skywalking/oap/server/core/analysis/meter/function/avg/AvgHistogramFunctionTest.java
@@ -24,10 +24,14 @@ import org.apache.skywalking.oap.server.core.analysis.meter.MeterEntity;
import org.apache.skywalking.oap.server.core.analysis.meter.function.AcceptableValue;
import org.apache.skywalking.oap.server.core.analysis.meter.function.BucketedValues;
import org.apache.skywalking.oap.server.core.analysis.metrics.DataTable;
+import org.apache.skywalking.oap.server.core.config.NamingControl;
+import org.apache.skywalking.oap.server.core.config.group.EndpointNameGrouping;
import org.apache.skywalking.oap.server.core.query.type.Bucket;
import org.apache.skywalking.oap.server.core.query.type.HeatMap;
import org.apache.skywalking.oap.server.core.storage.StorageHashMapBuilder;
+import org.junit.AfterClass;
import org.junit.Assert;
+import org.junit.BeforeClass;
import org.junit.Test;
import static org.apache.skywalking.oap.server.core.analysis.meter.function.avg.AvgHistogramFunction.DATASET;
@@ -49,6 +53,17 @@ public class AvgHistogramFunctionTest {
10
};
+ @BeforeClass
+ public static void setup() {
+ MeterEntity.setNamingControl(
+ new NamingControl(512, 512, 512, new EndpointNameGrouping()));
+ }
+
+ @AfterClass
+ public static void tearDown() {
+ MeterEntity.setNamingControl(null);
+ }
+
@Test
public void testFunction() {
HistogramFunctionInst inst = new HistogramFunctionInst();
diff --git a/oap-server/server-core/src/test/java/org/apache/skywalking/oap/server/core/analysis/meter/function/avg/AvgHistogramPercentileFunctionTest.java b/oap-server/server-core/src/test/java/org/apache/skywalking/oap/server/core/analysis/meter/function/avg/AvgHistogramPercentileFunctionTest.java
index 29db026..6078e79 100644
--- a/oap-server/server-core/src/test/java/org/apache/skywalking/oap/server/core/analysis/meter/function/avg/AvgHistogramPercentileFunctionTest.java
+++ b/oap-server/server-core/src/test/java/org/apache/skywalking/oap/server/core/analysis/meter/function/avg/AvgHistogramPercentileFunctionTest.java
@@ -25,8 +25,12 @@ import org.apache.skywalking.oap.server.core.analysis.meter.function.BucketedVal
import org.apache.skywalking.oap.server.core.analysis.meter.function.PercentileArgument;
import org.apache.skywalking.oap.server.core.analysis.metrics.DataTable;
import org.apache.skywalking.oap.server.core.analysis.metrics.IntList;
+import org.apache.skywalking.oap.server.core.config.NamingControl;
+import org.apache.skywalking.oap.server.core.config.group.EndpointNameGrouping;
import org.apache.skywalking.oap.server.core.storage.StorageHashMapBuilder;
+import org.junit.AfterClass;
import org.junit.Assert;
+import org.junit.BeforeClass;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
@@ -45,6 +49,17 @@ public class AvgHistogramPercentileFunctionTest {
90
};
+ @BeforeClass
+ public static void setup() {
+ MeterEntity.setNamingControl(
+ new NamingControl(512, 512, 512, new EndpointNameGrouping()));
+ }
+
+ @AfterClass
+ public static void tearDown() {
+ MeterEntity.setNamingControl(null);
+ }
+
@Test
public void testFunction() {
PercentileFunctionInst inst = new PercentileFunctionInst();
diff --git a/oap-server/server-core/src/test/java/org/apache/skywalking/oap/server/core/analysis/meter/function/avg/AvgLabeledFunctionTest.java b/oap-server/server-core/src/test/java/org/apache/skywalking/oap/server/core/analysis/meter/function/avg/AvgLabeledFunctionTest.java
index 612868e..a3eba7e 100644
--- a/oap-server/server-core/src/test/java/org/apache/skywalking/oap/server/core/analysis/meter/function/avg/AvgLabeledFunctionTest.java
+++ b/oap-server/server-core/src/test/java/org/apache/skywalking/oap/server/core/analysis/meter/function/avg/AvgLabeledFunctionTest.java
@@ -24,7 +24,11 @@ import java.util.List;
import java.util.Map;
import org.apache.skywalking.oap.server.core.analysis.meter.MeterEntity;
import org.apache.skywalking.oap.server.core.analysis.metrics.DataTable;
+import org.apache.skywalking.oap.server.core.config.NamingControl;
+import org.apache.skywalking.oap.server.core.config.group.EndpointNameGrouping;
import org.apache.skywalking.oap.server.core.storage.StorageHashMapBuilder;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mockito;
@@ -43,6 +47,17 @@ public class AvgLabeledFunctionTest {
@Spy
private AvgLabeledFunction function;
+ @BeforeClass
+ public static void setup() {
+ MeterEntity.setNamingControl(
+ new NamingControl(512, 512, 512, new EndpointNameGrouping()));
+ }
+
+ @AfterClass
+ public static void tearDown() {
+ MeterEntity.setNamingControl(null);
+ }
+
@Test
public void testAccept() {
function.accept(MeterEntity.newService("request_count"), build(asList("200", "404"), asList(10L, 2L)));
diff --git a/oap-server/server-core/src/test/java/org/apache/skywalking/oap/server/core/analysis/meter/function/latest/LatestFunctionTest.java b/oap-server/server-core/src/test/java/org/apache/skywalking/oap/server/core/analysis/meter/function/latest/LatestFunctionTest.java
index 8eb7bb0..731cd7d 100644
--- a/oap-server/server-core/src/test/java/org/apache/skywalking/oap/server/core/analysis/meter/function/latest/LatestFunctionTest.java
+++ b/oap-server/server-core/src/test/java/org/apache/skywalking/oap/server/core/analysis/meter/function/latest/LatestFunctionTest.java
@@ -20,7 +20,11 @@ package org.apache.skywalking.oap.server.core.analysis.meter.function.latest;
import java.util.Map;
import org.apache.skywalking.oap.server.core.analysis.meter.MeterEntity;
+import org.apache.skywalking.oap.server.core.config.NamingControl;
+import org.apache.skywalking.oap.server.core.config.group.EndpointNameGrouping;
import org.apache.skywalking.oap.server.core.storage.StorageHashMapBuilder;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mockito;
@@ -36,6 +40,17 @@ public class LatestFunctionTest {
@Spy
private LatestFunction function;
+ @BeforeClass
+ public static void setup() {
+ MeterEntity.setNamingControl(
+ new NamingControl(512, 512, 512, new EndpointNameGrouping()));
+ }
+
+ @AfterClass
+ public static void tearDown() {
+ MeterEntity.setNamingControl(null);
+ }
+
@Test
public void testAccept() {
long time = 1597113318673L;
diff --git a/oap-server/server-receiver-plugin/skywalking-zabbix-receiver-plugin/src/test/java/org/apache/skywalking/oap/server/receiver/zabbix/provider/ZabbixMetricsTest.java b/oap-server/server-receiver-plugin/skywalking-zabbix-receiver-plugin/src/test/java/org/apache/skywalking/oap/server/receiver/zabbix/provider/ZabbixMetricsTest.java
index 6766e71..5398a05 100644
--- a/oap-server/server-receiver-plugin/skywalking-zabbix-receiver-plugin/src/test/java/org/apache/skywalking/oap/server/receiver/zabbix/provider/ZabbixMetricsTest.java
+++ b/oap-server/server-receiver-plugin/skywalking-zabbix-receiver-plugin/src/test/java/org/apache/skywalking/oap/server/receiver/zabbix/provider/ZabbixMetricsTest.java
@@ -23,6 +23,7 @@ import org.apache.skywalking.oap.server.core.CoreModule;
import org.apache.skywalking.oap.server.core.CoreModuleProvider;
import org.apache.skywalking.oap.server.core.analysis.IDManager;
import org.apache.skywalking.oap.server.core.analysis.StreamDefinition;
+import org.apache.skywalking.oap.server.core.analysis.meter.MeterEntity;
import org.apache.skywalking.oap.server.core.analysis.meter.MeterSystem;
import org.apache.skywalking.oap.server.core.analysis.meter.function.AcceptableValue;
import org.apache.skywalking.oap.server.core.analysis.meter.function.avg.AvgFunction;
@@ -30,10 +31,14 @@ import org.apache.skywalking.oap.server.core.analysis.meter.function.avg.AvgHist
import org.apache.skywalking.oap.server.core.analysis.meter.function.avg.AvgHistogramPercentileFunction;
import org.apache.skywalking.oap.server.core.analysis.meter.function.avg.AvgLabeledFunction;
import org.apache.skywalking.oap.server.core.analysis.worker.MetricsStreamProcessor;
+import org.apache.skywalking.oap.server.core.config.NamingControl;
+import org.apache.skywalking.oap.server.core.config.group.EndpointNameGrouping;
import org.apache.skywalking.oap.server.library.module.ModuleManager;
import org.apache.skywalking.oap.server.receiver.zabbix.provider.config.ZabbixConfig;
import org.apache.skywalking.oap.server.receiver.zabbix.provider.config.ZabbixConfigs;
+import org.junit.AfterClass;
import org.junit.Assert;
+import org.junit.BeforeClass;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mockito;
@@ -59,6 +64,17 @@ public class ZabbixMetricsTest extends ZabbixBaseTest {
private List<AcceptableValue> values = new ArrayList<>();
+ @BeforeClass
+ public static void setup() {
+ MeterEntity.setNamingControl(
+ new NamingControl(512, 512, 512, new EndpointNameGrouping()));
+ }
+
+ @AfterClass
+ public static void tearDown() {
+ MeterEntity.setNamingControl(null);
+ }
+
@Override
public void setupMetrics() throws Throwable {
moduleProvider = Mockito.mock(CoreModuleProvider.class);