Add Service Discovery Labels (#15472)

ankitshokeen · web-flow · commit a2259685ede7 · 2025-06-19T10:12:48.000+08:00
* Stage 1: Applied [METADATA_REGISTER], [INSTANCE_REGISTER], and [SERVICE_PUBLISH][METADATA_REGISTER] labels to service discovery stages

* Apply Spotless formatting after Stage 1 label updates
diff --git a/dubbo-common/src/main/java/org/apache/dubbo/rpc/model/ModuleModel.java b/dubbo-common/src/main/java/org/apache/dubbo/rpc/model/ModuleModel.java
@@ -209,7 +209,8 @@ public ConsumerModel registerInternalConsumer(
                 new HashMap<>(0),
                 ClassUtils.getClassLoader(internalService));
 
-        logger.info("Dynamically registering consumer model " + serviceKey + " into model " + this.getDesc());
+        logger.info("[INSTANCE_REGISTER] Dynamically registering consumer model " + serviceKey + " into model "
+                + this.getDesc());
         serviceRepository.registerConsumer(consumerModel);
         return consumerModel;
     }
diff --git a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ServiceConfig.java b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ServiceConfig.java
@@ -428,25 +428,30 @@ protected void mapServiceName(
         if (!exported) {
             return;
         }
-        logger.info("Try to register interface application mapping for service " + url.getServiceKey());
+        logger.info("[INSTANCE_REGISTER] [METADATA_REGISTER] Try to register interface application mapping for service "
+                + url.getServiceKey());
         boolean succeeded = false;
         try {
             succeeded = serviceNameMapping.map(url);
             if (succeeded) {
-                logger.info("Successfully registered interface application mapping for service " + url.getServiceKey());
+                logger.info(
+                        "[INSTANCE_REGISTER][METADATA_REGISTER] Successfully registered interface application mapping for service "
+                                + url.getServiceKey());
             } else {
                 logger.error(
                         CONFIG_SERVER_DISCONNECTED,
                         "configuration server disconnected",
                         "",
-                        "Failed register interface application mapping for service " + url.getServiceKey());
+                        "[INSTANCE_REGISTER] [METADATA_REGISTER] Failed register interface application mapping for service "
+                                + url.getServiceKey());
             }
         } catch (Exception e) {
             logger.error(
                     CONFIG_SERVER_DISCONNECTED,
                     "configuration server disconnected",
                     "",
-                    "Failed register interface application mapping for service " + url.getServiceKey(),
+                    "[INSTANCE_REGISTER] [METADATA_REGISTER] Failed register interface application mapping for service "
+                            + url.getServiceKey(),
                     e);
         }
         if (!succeeded && serviceNameMapping.hasValidMetadataCenter()) {
@@ -932,8 +937,8 @@ private URL exportRemote(URL url, List<URL> registryURLs, RegisterTypeEnum regis
 
                 if (logger.isInfoEnabled()) {
                     if (url.getParameter(REGISTER_KEY, true)) {
-                        logger.info("Register dubbo service " + interfaceClass.getName() + " url " + url
-                                + " to registry " + registryURL.getAddress());
+                        logger.info("[INSTANCE_REGISTER] Register dubbo service " + interfaceClass.getName() + " url "
+                                + url + " to registry " + registryURL.getAddress());
                     } else {
                         logger.info("Export dubbo service " + interfaceClass.getName() + " to url " + url);
                     }
@@ -945,7 +950,8 @@ private URL exportRemote(URL url, List<URL> registryURLs, RegisterTypeEnum regis
         } else {
 
             if (logger.isInfoEnabled()) {
-                logger.info("Export dubbo service " + interfaceClass.getName() + " to url " + url);
+                logger.info("[SERVICE_PUBLISH][METADATA_REGISTER] Export dubbo service " + interfaceClass.getName()
+                        + " to url " + url);
             }
 
             doExportUrl(url, true, registerType);
@@ -986,7 +992,8 @@ private void exportLocal(URL url) {
         local = local.setScopeModel(getScopeModel()).setServiceModel(providerModel);
         local = local.addParameter(EXPORTER_LISTENER_KEY, LOCAL_PROTOCOL);
         doExportUrl(local, false, RegisterTypeEnum.AUTO_REGISTER);
-        logger.info("Export dubbo service " + interfaceClass.getName() + " to local registry url : " + local);
+        logger.info("[SERVICE_PUBLISH][METADATA_REGISTER] Export dubbo service " + interfaceClass.getName()
+                + " to local registry url : " + local);
     }
 
     /**
@@ -1167,7 +1174,10 @@ private static void putRandomPort(String protocol, Integer port) {
         if (!RANDOM_PORT_MAP.containsKey(protocol)) {
             RANDOM_PORT_MAP.put(protocol, port);
             logger.warn(
-                    CONFIG_USE_RANDOM_PORT, "", "", "Use random available port(" + port + ") for protocol " + protocol);
+                    CONFIG_USE_RANDOM_PORT,
+                    "",
+                    "",
+                    "[SERVICE_PUBLISH] Use random available port(" + port + ") for protocol " + protocol);
         }
     }
 
diff --git a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/bootstrap/builders/InternalServiceConfigBuilder.java b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/bootstrap/builders/InternalServiceConfigBuilder.java
@@ -269,8 +269,8 @@ public ServiceConfig<T> build(Consumer<ServiceConfig<T>> configConsumer) {
 
         this.nullAssert();
 
-        logger.info("Using " + this.protocol + " protocol to export " + interfaceClass.getName() + " service on port "
-                + protocolConfig.getPort());
+        logger.info("[SERVICE_PUBLISH] [METADATA_REGISTER] Using " + this.protocol + " protocol to export "
+                + interfaceClass.getName() + " service on port " + protocolConfig.getPort());
 
         applicationModel
                 .getApplicationConfigManager()
diff --git a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/metadata/ConfigurableMetadataServiceExporter.java b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/metadata/ConfigurableMetadataServiceExporter.java
@@ -113,7 +113,8 @@ private void exportV1() {
         metadataService.setMetadataURL(serviceConfig.getExportedUrls().get(0));
 
         if (logger.isInfoEnabled()) {
-            logger.info("The MetadataService exports urls : " + serviceConfig.getExportedUrls());
+            logger.info("[SERVICE_PUBLISH] [METADATA_REGISTER] The MetadataService exports urls : "
+                    + serviceConfig.getExportedUrls());
         }
     }
 
@@ -137,7 +138,8 @@ private void exportV2() {
         metadataServiceV2.setMetadataUrl(serviceConfigV2.getExportedUrls().get(0));
 
         if (logger.isInfoEnabled()) {
-            logger.info("The MetadataServiceV2 exports urls : " + serviceConfigV2.getExportedUrls());
+            logger.info("[SERVICE_PUBLISH][METADATA_REGISTER] The MetadataServiceV2 exports urls : "
+                    + serviceConfigV2.getExportedUrls());
         }
     }
 
diff --git a/dubbo-metadata/dubbo-metadata-api/src/main/java/org/apache/dubbo/metadata/AbstractServiceNameMapping.java b/dubbo-metadata/dubbo-metadata-api/src/main/java/org/apache/dubbo/metadata/AbstractServiceNameMapping.java
@@ -102,7 +102,7 @@ public Set<String> getAndListen(URL registryURL, URL subscribedURL, MappingListe
         // Asynchronously register listener in case previous cache does not exist or cache expired.
         if (CollectionUtils.isEmpty(mappingServices)) {
             try {
-                logger.info("Local cache mapping is empty");
+                logger.info("[METADATA_REGISTER] Local cache mapping is empty");
                 mappingServices = (new AsyncMappingTask(listener, subscribedURL, false)).call();
             } catch (Exception e) {
                 // ignore
diff --git a/dubbo-metadata/dubbo-metadata-api/src/main/java/org/apache/dubbo/metadata/MetadataInfo.java b/dubbo-metadata/dubbo-metadata-api/src/main/java/org/apache/dubbo/metadata/MetadataInfo.java
@@ -197,7 +197,7 @@ public synchronized String calAndGetRevision() {
             if (!StringUtils.isEquals(this.revision, tempRevision)) {
                 if (logger.isInfoEnabled()) {
                     logger.info(String.format(
-                            "metadata revision changed: %s -> %s, app: %s, services: %d",
+                            "[METADATA_REGISTER] metadata revision changed: %s -> %s, app: %s, services: %d",
                             this.revision, tempRevision, this.app, this.services.size()));
                 }
                 this.revision = tempRevision;
diff --git a/dubbo-metadata/dubbo-metadata-api/src/main/java/org/apache/dubbo/metadata/report/support/AbstractMetadataReport.java b/dubbo-metadata/dubbo-metadata-api/src/main/java/org/apache/dubbo/metadata/report/support/AbstractMetadataReport.java
@@ -306,8 +306,8 @@ private void storeProviderMetadataTask(
                     boolean result = true;
                     try {
                         if (logger.isInfoEnabled()) {
-                            logger.info("store provider metadata. Identifier : " + providerMetadataIdentifier
-                                    + "; definition: " + serviceDefinition);
+                            logger.info("[METADATA_REGISTER] store provider metadata. Identifier : "
+                                    + providerMetadataIdentifier + "; definition: " + serviceDefinition);
                         }
                         allMetadataReports.put(providerMetadataIdentifier, serviceDefinition);
                         failedReports.remove(providerMetadataIdentifier);
@@ -347,8 +347,8 @@ protected void storeConsumerMetadataTask(
             MetadataIdentifier consumerMetadataIdentifier, Map<String, String> serviceParameterMap) {
         try {
             if (logger.isInfoEnabled()) {
-                logger.info("store consumer metadata. Identifier : " + consumerMetadataIdentifier + "; definition: "
-                        + serviceParameterMap);
+                logger.info("[METADATA_REGISTER] store consumer metadata. Identifier : " + consumerMetadataIdentifier
+                        + "; definition: " + serviceParameterMap);
             }
             allMetadataReports.put(consumerMetadataIdentifier, serviceParameterMap);
             failedReports.remove(consumerMetadataIdentifier);
diff --git a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/ServiceDiscoveryRegistry.java b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/ServiceDiscoveryRegistry.java
@@ -233,7 +233,7 @@ public void doSubscribe(URL url, NotifyListener listener) {
 
                 if (CollectionUtils.isEmpty(mappingByUrl)) {
                     logger.info(
-                            "No interface-apps mapping found in local cache, stop subscribing, will automatically wait for mapping listener callback: "
+                            "[METADATA_REGISTER] No interface-apps mapping found in local cache, stop subscribing, will automatically wait for mapping listener callback: "
                                     + url);
                     //                if (check) {
                     //                    throw new IllegalStateException("Should has at least one way to know which
diff --git a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/metadata/MetadataServiceNameMapping.java b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/metadata/MetadataServiceNameMapping.java
@@ -80,7 +80,10 @@ public boolean map(URL url) {
         if (CollectionUtils.isEmpty(
                 applicationModel.getApplicationConfigManager().getMetadataConfigs())) {
             logger.warn(
-                    COMMON_PROPERTY_TYPE_MISMATCH, "", "", "No valid metadata config center found for mapping report.");
+                    COMMON_PROPERTY_TYPE_MISMATCH,
+                    "",
+                    "",
+                    "[METADATA_REGISTER] No valid metadata config center found for mapping report.");
             return false;
         }
         String serviceInterface = url.getServiceInterface();
diff --git a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/metadata/MetadataUtils.java b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/metadata/MetadataUtils.java
@@ -77,7 +77,7 @@ public class MetadataUtils {
     public static void publishServiceDefinition(
             URL url, ServiceDescriptor serviceDescriptor, ApplicationModel applicationModel) {
         if (getMetadataReports(applicationModel).isEmpty()) {
-            logger.info("Remote Metadata Report Server is not provided or unavailable, "
+            logger.info("[METADATA_REGISTER] Remote Metadata Report Server is not provided or unavailable, "
                     + "will stop registering service definition to remote center!");
             return;
         }
diff --git a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/metadata/ServiceInstanceMetadataUtils.java b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/metadata/ServiceInstanceMetadataUtils.java
@@ -210,7 +210,7 @@ public static void registerMetadataAndInstance(ApplicationModel applicationModel
         RegistryManager registryManager = applicationModel.getBeanFactory().getBean(RegistryManager.class);
         // register service instance
         if (CollectionUtils.isNotEmpty(registryManager.getServiceDiscoveries())) {
-            LOGGER.info("Start registering instance address to registry.");
+            LOGGER.info("[METADATA_REGISTER] Start registering instance address to registry.");
             List<ServiceDiscovery> serviceDiscoveries = registryManager.getServiceDiscoveries();
             for (ServiceDiscovery serviceDiscovery : serviceDiscoveries) {
                 MetricsEventBus.post(
diff --git a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/integration/RegistryProtocol.java b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/integration/RegistryProtocol.java
@@ -1078,8 +1078,9 @@ public void register() {
                                         .getProtocol()
                                         .equals(getRegisterUrl().getProtocol()))
                         .forEach(u -> u.setRegistered(true));
-                logger.info("Registered dubbo service " + getRegisterUrl().getServiceKey() + " url " + getRegisterUrl()
-                        + " to registry " + registryUrl);
+                logger.info("[INSTANCE_REGISTER] Registered dubbo service "
+                        + getRegisterUrl().getServiceKey() + " url " + getRegisterUrl() + " to registry "
+                        + registryUrl);
             }
         }
 
diff --git a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/support/AbstractRegistry.java b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/support/AbstractRegistry.java
@@ -555,7 +555,7 @@ protected void notify(URL url, NotifyListener listener, List<URL> urls) {
             return;
         }
         if (logger.isInfoEnabled()) {
-            logger.info("Notify urls for subscribe url " + url + ", url size: " + urls.size());
+            logger.info("[INSTANCE_REGISTER] Notify urls for subscribe url " + url + ", url size: " + urls.size());
         }
         // keep every provider's category.
         Map<String, List<URL>> result = new HashMap<>();
diff --git a/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/transport/AbstractServer.java b/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/transport/AbstractServer.java
@@ -66,8 +66,8 @@ public AbstractServer(URL url, ChannelHandler handler) throws RemotingException
         try {
             doOpen();
             if (logger.isInfoEnabled()) {
-                logger.info("Start " + getClass().getSimpleName() + " bind " + getBindAddress() + ", export "
-                        + getLocalAddress());
+                logger.info("[SERVICE_PUBLISH][METADATA_REGISTER] Start "
+                        + getClass().getSimpleName() + " bind " + getBindAddress() + ", export " + getLocalAddress());
             }
         } catch (Throwable t) {
             throw new RemotingException(

Original file line number	Diff line number	Diff line change
`@@ -209,7 +209,8 @@ public ConsumerModel registerInternalConsumer(`
`209`	`209`	`new HashMap<>(0),`
`210`	`210`	`ClassUtils.getClassLoader(internalService));`
`211`	`211`
`212`		`- logger.info("Dynamically registering consumer model " + serviceKey + " into model " + this.getDesc());`
	`212`	`+ logger.info("[INSTANCE_REGISTER] Dynamically registering consumer model " + serviceKey + " into model "`
	`213`	`+ + this.getDesc());`
`213`	`214`	`serviceRepository.registerConsumer(consumerModel);`
`214`	`215`	`return consumerModel;`
`215`	`216`	`}`
Original file line number	Diff line number	Diff line change
`@@ -113,7 +113,8 @@ private void exportV1() {`
`113`	`113`	`metadataService.setMetadataURL(serviceConfig.getExportedUrls().get(0));`
`114`	`114`
`115`	`115`	`if (logger.isInfoEnabled()) {`
`116`		`- logger.info("The MetadataService exports urls : " + serviceConfig.getExportedUrls());`
	`116`	`+ logger.info("[SERVICE_PUBLISH] [METADATA_REGISTER] The MetadataService exports urls : "`
	`117`	`+ + serviceConfig.getExportedUrls());`
`117`	`118`	`}`
`118`	`119`	`}`
`119`	`120`
`@@ -137,7 +138,8 @@ private void exportV2() {`
`137`	`138`	`metadataServiceV2.setMetadataUrl(serviceConfigV2.getExportedUrls().get(0));`
`138`	`139`
`139`	`140`	`if (logger.isInfoEnabled()) {`
`140`		`- logger.info("The MetadataServiceV2 exports urls : " + serviceConfigV2.getExportedUrls());`
	`141`	`+ logger.info("[SERVICE_PUBLISH][METADATA_REGISTER] The MetadataServiceV2 exports urls : "`
	`142`	`+ + serviceConfigV2.getExportedUrls());`
`141`	`143`	`}`
`142`	`144`	`}`
`143`	`145`
Original file line number	Diff line number	Diff line change
`@@ -197,7 +197,7 @@ public synchronized String calAndGetRevision() {`
`197`	`197`	`if (!StringUtils.isEquals(this.revision, tempRevision)) {`
`198`	`198`	`if (logger.isInfoEnabled()) {`
`199`	`199`	`logger.info(String.format(`
`200`		`- "metadata revision changed: %s -> %s, app: %s, services: %d",`
	`200`	`+ "[METADATA_REGISTER] metadata revision changed: %s -> %s, app: %s, services: %d",`
`201`	`201`	`this.revision, tempRevision, this.app, this.services.size()));`
`202`	`202`	`}`
`203`	`203`	`this.revision = tempRevision;`
Original file line number	Diff line number	Diff line change
`@@ -77,7 +77,7 @@ public class MetadataUtils {`
`77`	`77`	`public static void publishServiceDefinition(`
`78`	`78`	`URL url, ServiceDescriptor serviceDescriptor, ApplicationModel applicationModel) {`
`79`	`79`	`if (getMetadataReports(applicationModel).isEmpty()) {`
`80`		`- logger.info("Remote Metadata Report Server is not provided or unavailable, "`
	`80`	`+ logger.info("[METADATA_REGISTER] Remote Metadata Report Server is not provided or unavailable, "`
`81`	`81`	`+ "will stop registering service definition to remote center!");`
`82`	`82`	`return;`
`83`	`83`	`}`