Fix entity naming mechanism failure in MAL

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
 

oap-server/analyzer/meter-analyzer/src/test/java/org/apache/skywalking/oap/meter/analyzer/dsl/AnalyzerTest.java

@@ -24,17 +24,22 @@
 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;
 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.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 void setup() throws StorageException {
 
     }
 
+    @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(

oap-server/analyzer/meter-analyzer/src/test/java/org/apache/skywalking/oap/meter/analyzer/dsl/ScopeTest.java

@@ -25,7 +25,11 @@
 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 static Collection<Object[]> data() {
         });
     }
 
+    @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);

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.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 void prepare() throws ServiceNotProvidedException, ModuleStartException {
             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);

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,17 +32,21 @@
 @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;
     private String sourceServiceName;
     private String destServiceName;
     private DetectPoint detectPoint;
 
+    private MeterEntity() {
+
+    }
+
     public String id() {
         switch (scopeType) {
             case SERVICE:
@@ -76,43 +79,54 @@ public String destServiceId() {
         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;
     }
 }

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.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();

oap-server/server-core/src/test/java/org/apache/skywalking/oap/server/core/analysis/meter/function/PercentileFunctionTest.java

@@ -22,8 +22,12 @@
 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();

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.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();

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.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();

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.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)));