This is an automated email from the ASF dual-hosted git repository.
albumenj pushed a commit to branch 3.3
in repository https://gitbox.apache.org/repos/asf/dubbo.git
The following commit(s) were added to refs/heads/3.3 by this push:
new a2259685ed Add Service Discovery Labels (#15472)
a2259685ed is described below
commit a2259685ede7b73d4c756441bdd1c6e065bb0cff
Author: Ankit Shokeen <[email protected]>
AuthorDate: Thu Jun 19 07:42:48 2025 +0530
Add Service Discovery Labels (#15472)
* 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
---
.../org/apache/dubbo/rpc/model/ModuleModel.java | 3 ++-
.../org/apache/dubbo/config/ServiceConfig.java | 28 +++++++++++++++-------
.../builders/InternalServiceConfigBuilder.java | 4 ++--
.../ConfigurableMetadataServiceExporter.java | 6 +++--
.../dubbo/metadata/AbstractServiceNameMapping.java | 2 +-
.../org/apache/dubbo/metadata/MetadataInfo.java | 2 +-
.../report/support/AbstractMetadataReport.java | 8 +++----
.../registry/client/ServiceDiscoveryRegistry.java | 2 +-
.../metadata/MetadataServiceNameMapping.java | 5 +++-
.../registry/client/metadata/MetadataUtils.java | 2 +-
.../metadata/ServiceInstanceMetadataUtils.java | 2 +-
.../registry/integration/RegistryProtocol.java | 5 ++--
.../dubbo/registry/support/AbstractRegistry.java | 2 +-
.../dubbo/remoting/transport/AbstractServer.java | 4 ++--
14 files changed, 46 insertions(+), 29 deletions(-)
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
index 130fe863dd..0c9203442e 100644
--- 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 class ModuleModel extends ScopeModel {
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
index 278a12a35a..2d2f5d292c 100644
---
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 @@ public class ServiceConfig<T> extends
ServiceConfigBase<T> {
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 @@ public class ServiceConfig<T> extends ServiceConfigBase<T> {
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 @@ public class ServiceConfig<T> extends ServiceConfigBase<T> {
} 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 @@ public class ServiceConfig<T> extends ServiceConfigBase<T> {
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 @@ public class ServiceConfig<T> extends
ServiceConfigBase<T> {
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
index f9915833a5..c9a26b834a 100644
---
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 class InternalServiceConfigBuilder<T> {
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
index 0a29223ac9..eecbb44999 100644
---
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 @@ public class ConfigurableMetadataServiceExporter {
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 @@ public class ConfigurableMetadataServiceExporter {
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
index 9ef88b5d98..4506c3cda7 100644
---
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 abstract class AbstractServiceNameMapping implements
ServiceNameMapping {
// 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
index fe477a846e..3a400e8ae6 100644
---
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 class MetadataInfo implements Serializable {
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
index f21e99b3df..d2b54a2b1e 100644
---
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 @@ public abstract class AbstractMetadataReport implements
MetadataReport {
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 @@ public abstract class AbstractMetadataReport implements
MetadataReport {
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
index 074c7fe61e..81f9286a3a 100644
---
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 class ServiceDiscoveryRegistry extends
FailbackRegistry {
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
index 6db3dd7d21..85f1016c8c 100644
---
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 class MetadataServiceNameMapping extends
AbstractServiceNameMapping {
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
index bc5979e2c1..8b4019e227 100644
---
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
index ba84044c45..c80a7fb0b4 100644
---
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 class ServiceInstanceMetadataUtils {
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
index 84b99e2870..17d941f55c 100644
---
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 class RegistryProtocol implements Protocol,
ScopeModelAware {
.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
index 98623bf45f..757981ac55 100644
---
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 @@ public abstract class AbstractRegistry implements Registry {
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
index effdd73561..6afdd356e5 100644
---
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 abstract class AbstractServer extends AbstractEndpoint
implements Remotin
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(
