[dubbo] branch 3.0 updated: Add 'timestamp' as the default key of the instance url (#10022)

[liujun]

This is an automated email from the ASF dual-hosted git repository.

liujun pushed a commit to branch 3.0
in repository https://gitbox.apache.org/repos/asf/dubbo.git


The following commit(s) were added to refs/heads/3.0 by this push:
     new c1c9aa80f5 Add 'timestamp' as the default key of the instance url 
(#10022)
c1c9aa80f5 is described below

commit c1c9aa80f51cf1aa2b50989014387c2151bbd653
Author: ken.lj <ken.lj...@gmail.com>
AuthorDate: Tue May 10 15:59:35 2022 +0800

    Add 'timestamp' as the default key of the instance url (#10022)
---
 .../java/org/apache/dubbo/metadata/DefaultMetadataParamsFilter.java   | 4 ++--
 .../src/main/java/org/apache/dubbo/metadata/MetadataInfo.java         | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git 
a/dubbo-metadata/dubbo-metadata-api/src/main/java/org/apache/dubbo/metadata/DefaultMetadataParamsFilter.java
 
b/dubbo-metadata/dubbo-metadata-api/src/main/java/org/apache/dubbo/metadata/DefaultMetadataParamsFilter.java
index aa16b51e56..7687b04026 100644
--- 
a/dubbo-metadata/dubbo-metadata-api/src/main/java/org/apache/dubbo/metadata/DefaultMetadataParamsFilter.java
+++ 
b/dubbo-metadata/dubbo-metadata-api/src/main/java/org/apache/dubbo/metadata/DefaultMetadataParamsFilter.java
@@ -37,9 +37,9 @@ public class DefaultMetadataParamsFilter implements 
MetadataParamsFilter {
     private final String[] includedInstanceParams;
 
     public DefaultMetadataParamsFilter() {
-        this.includedInstanceParams = new String[]{HEARTBEAT_TIMEOUT_KEY};
+        this.includedInstanceParams = new String[]{HEARTBEAT_TIMEOUT_KEY, 
TIMESTAMP_KEY};
         this.excludedServiceParams = new String[]{MONITOR_KEY, BIND_IP_KEY, 
BIND_PORT_KEY, QOS_ENABLE,
-            QOS_HOST, QOS_PORT, ACCEPT_FOREIGN_IP, VALIDATION_KEY, INTERFACES, 
PID_KEY, TIMESTAMP_KEY};
+            QOS_HOST, QOS_PORT, ACCEPT_FOREIGN_IP, VALIDATION_KEY, INTERFACES, 
PID_KEY, TIMESTAMP_KEY, HEARTBEAT_TIMEOUT_KEY};
     }
 
     @Override
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 dc7c25bbf8..443ac497d3 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
@@ -47,6 +47,7 @@ import java.util.concurrent.atomic.AtomicBoolean;
 import static org.apache.dubbo.common.constants.CommonConstants.DOT_SEPARATOR;
 import static 
org.apache.dubbo.common.constants.CommonConstants.GROUP_CHAR_SEPARATOR;
 import static org.apache.dubbo.common.constants.CommonConstants.METHODS_KEY;
+import static org.apache.dubbo.common.constants.CommonConstants.TIMESTAMP_KEY;
 import static org.apache.dubbo.metadata.RevisionResolver.EMPTY_REVISION;
 
 public class MetadataInfo implements Serializable {
@@ -394,7 +395,7 @@ public class MetadataInfo implements Serializable {
 
         tmpInstanceParams.forEach((key, value) -> {
             String oldValue = instanceParams.put(key, value);
-            if (oldValue != null && !oldValue.equals(value)) {
+            if (!TIMESTAMP_KEY.equals(key) && oldValue != null && 
!oldValue.equals(value)) {
                 throw new IllegalStateException(String.format("Inconsistent 
instance metadata found in different services: %s, %s", oldValue, value));
             }
         });