diff --git a/registry/file/service_discovery.go b/registry/file/service_discovery.go
index f68498d30f34cda255a9417101c0bea9fb144b4a..40811dab8c7d15b06b9bae45ccce63a8b6c9a99c 100644
--- a/registry/file/service_discovery.go
+++ b/registry/file/service_discovery.go
@@ -144,11 +144,11 @@ func (fssd *fileSystemServiceDiscovery) Register(instance registry.ServiceInstan
// nolint
func getServiceInstanceId(si registry.ServiceInstance) string {
- if si.GetId() == "" {
+ if si.GetID() == "" {
return si.GetHost() + "." + strconv.Itoa(si.GetPort())
}
- return si.GetId()
+ return si.GetID()
}
// nolint
@@ -181,7 +181,7 @@ func (fssd *fileSystemServiceDiscovery) Unregister(instance registry.ServiceInst
return perrors.WithStack(err)
}
- delete(fssd.fileMap, instance.GetId())
+ delete(fssd.fileMap, instance.GetID())
return nil
}
diff --git a/registry/servicediscovery/service_discovery_registry.go b/registry/servicediscovery/service_discovery_registry.go
index b540ccac4648061bda5d1e4f4073c1bbfcbd4280..72b8dc6d4dbbb37a61926cdff341e7b3accddec0 100644
--- a/registry/servicediscovery/service_discovery_registry.go
+++ b/registry/servicediscovery/service_discovery_registry.go
@@ -457,7 +457,7 @@ func (s *serviceDiscoveryRegistry) initRevisionExportedURLsByInst(serviceInstanc
if len(revisionExportedURLsMap) > 0 {
// The case is that current ServiceInstance with the different revision
logger.Warnf("The ServiceInstance[id: %s, host : %s , port : %s] has different revision : %s"+
- ", please make sure the service [name : %s] is changing or not.", serviceInstance.GetId(),
+ ", please make sure the service [name : %s] is changing or not.", serviceInstance.GetID(),
serviceInstance.GetHost(), serviceInstance.GetPort(), revision, serviceInstance.GetServiceName())
} else {
firstGet = true
@@ -467,14 +467,14 @@ func (s *serviceDiscoveryRegistry) initRevisionExportedURLsByInst(serviceInstanc
revisionExportedURLsMap[revision] = revisionExportedURLs
logger.Debugf("Get the exported URLs[size : %s, first : %s] from the target service "+
"instance [id: %s , service : %s , host : %s , port : %s , revision : %s]",
- len(revisionExportedURLs), firstGet, serviceInstance.GetId(), serviceInstance.GetServiceName(),
+ len(revisionExportedURLs), firstGet, serviceInstance.GetID(), serviceInstance.GetServiceName(),
serviceInstance.GetHost(), serviceInstance.GetPort(), revision)
}
} else {
// Else, The cache is hit
logger.Debugf("Get the exported URLs[size : %s] from cache, the instance"+
"[id: %s , service : %s , host : %s , port : %s , revision : %s]", len(revisionExportedURLs), firstGet,
- serviceInstance.GetId(), serviceInstance.GetServiceName(), serviceInstance.GetHost(),
+ serviceInstance.GetID(), serviceInstance.GetServiceName(), serviceInstance.GetHost(),
serviceInstance.GetPort(), revision)
}
return revisionExportedURLs