fix branch conflict between main and dev3.3

.github/workflows/golangci-lint.yml

@@ -22,10 +22,10 @@ jobs:
     steps:
       - uses: actions/setup-go@v5
         with:
-          go-version: ${{ matrix.go_version }}
+          go-version: ${{ matrix.golang }}
       - uses: actions/checkout@v4
       - name: golangci-lint
-        uses: golangci/golangci-lint-action@v6
+        uses: golangci/golangci-lint-action@v3.4.0
         with:
           version: v1.54
           args: --timeout=10m

.gitignore

@@ -41,3 +41,4 @@ metadata/report/zookeeper/zookeeper-4unittest/
 
 # macOS
 .DS_Store
+.history

client/action.go

@@ -154,8 +154,6 @@ func (refOpts *ReferenceOptions) refer(srv common.RPCService, info *ClientInfo)
 	refOpts.urls = urls
 	refOpts.invoker = invoker
 
-	// publish consumer's metadata
-	publishServiceDefinition(cfgURL)
 	// create proxy
 	if info == nil && srv != nil {
 		if ref.Async {
@@ -279,21 +277,6 @@ func buildInvoker(urls []*common.URL, ref *global.ReferenceConfig) (protocol.Inv
 	return resInvoker, nil
 }
 
-func publishServiceDefinition(url *common.URL) {
-	localService, err := extension.GetLocalMetadataService(constant.DefaultKey)
-	if err != nil {
-		logger.Warnf("get local metadata service failed, please check if you have imported _ \"dubbo.apache.org/dubbo-go/v3/metadata/service/local\"")
-		return
-	}
-	localService.PublishServiceDefinition(url)
-	if url.GetParam(constant.MetadataTypeKey, "") != constant.RemoteMetadataStorageType {
-		return
-	}
-	if remoteMetadataService, err := extension.GetRemoteMetadataService(); err == nil && remoteMetadataService != nil {
-		remoteMetadataService.PublishServiceDefinition(url)
-	}
-}
-
 func (refOpts *ReferenceOptions) CheckAvailable() bool {
 	ref := refOpts.Reference
 	if refOpts.invoker == nil {

client/client.go

@@ -20,11 +20,14 @@ package client
 
 import (
 	"context"
+	"time"
 )
 
 import (
 	"dubbo.apache.org/dubbo-go/v3/common"
 	"dubbo.apache.org/dubbo-go/v3/common/constant"
+	"dubbo.apache.org/dubbo-go/v3/global"
+	"dubbo.apache.org/dubbo-go/v3/metadata"
 	"dubbo.apache.org/dubbo-go/v3/protocol"
 	invocation_impl "dubbo.apache.org/dubbo-go/v3/protocol/invocation"
 )
@@ -118,6 +121,9 @@ func (cli *Client) DialWithDefinition(interfaceName string, definition *ClientDe
 }
 
 func (cli *Client) dial(interfaceName string, info *ClientInfo, opts ...ReferenceOption) (*Connection, error) {
+	if err := cli.initRegistryMetadataReport(); err != nil {
+		return nil, err
+	}
 	newRefOpts := defaultReferenceOptions()
 	finalOpts := []ReferenceOption{
 		setReference(cli.cliOpts.overallReference),
@@ -138,6 +144,44 @@ func (cli *Client) dial(interfaceName string, info *ClientInfo, opts ...Referenc
 	return &Connection{refOpts: newRefOpts}, nil
 }
 
+func (cli *Client) initRegistryMetadataReport() error {
+	if len(cli.cliOpts.Registries) > 0 {
+		for id, reg := range cli.cliOpts.Registries {
+			if reg.UseAsMetaReport == "true" {
+				opts, err := registryToReportOptions(id, reg)
+				if err != nil {
+					return err
+				}
+				if err := opts.Init(); err != nil {
+					return err
+				}
+			}
+		}
+	}
+	return nil
+}
+
+func registryToReportOptions(id string, rc *global.RegistryConfig) (*metadata.ReportOptions, error) {
+	opts := metadata.NewReportOptions(
+		metadata.WithRegistryId(id),
+		metadata.WithProtocol(rc.Protocol),
+		metadata.WithAddress(rc.Address),
+		metadata.WithUsername(rc.Username),
+		metadata.WithPassword(rc.Password),
+		metadata.WithGroup(rc.Group),
+		metadata.WithNamespace(rc.Namespace),
+		metadata.WithParams(rc.Params),
+	)
+	if rc.Timeout != "" {
+		timeout, err := time.ParseDuration(rc.Timeout)
+		if err != nil {
+			return nil, err
+		}
+		metadata.WithTimeout(timeout)(opts)
+	}
+	return opts, nil
+}
+
 func generateInvocation(methodName string, reqs []interface{}, resp interface{}, callType string, opts *CallOptions) (protocol.Invocation, error) {
 	var paramsRawVals []interface{}
 	for _, req := range reqs {

common/constant/key.go

@@ -164,6 +164,7 @@ const (
 // registry keys
 const (
 	RegistryKey             = "registry"
+	RegistryIdKey           = "registry.id"
 	RegistryProtocol        = "registry"
 	ServiceRegistryProtocol = "service-discovery-registry"
 	RegistryRoleKey         = "registry.role"
@@ -186,6 +187,7 @@ const (
 
 const (
 	ApplicationKey         = "application"
+	ApplicationTagKey      = "application.tag"
 	OrganizationKey        = "organization"
 	NameKey                = "name"
 	ModuleKey              = "module"

common/extension/metadata_report_factory.go

@@ -18,18 +18,18 @@
 package extension
 
 import (
-	"dubbo.apache.org/dubbo-go/v3/metadata/report/factory"
+	"dubbo.apache.org/dubbo-go/v3/metadata/report"
 )
 
-var metaDataReportFactories = make(map[string]func() factory.MetadataReportFactory, 8)
+var metaDataReportFactories = make(map[string]func() report.MetadataReportFactory, 8)
 
 // SetMetadataReportFactory sets the MetadataReportFactory with @name
-func SetMetadataReportFactory(name string, v func() factory.MetadataReportFactory) {
+func SetMetadataReportFactory(name string, v func() report.MetadataReportFactory) {
 	metaDataReportFactories[name] = v
 }
 
 // GetMetadataReportFactory finds the MetadataReportFactory with @name
-func GetMetadataReportFactory(name string) factory.MetadataReportFactory {
+func GetMetadataReportFactory(name string) report.MetadataReportFactory {
 	if metaDataReportFactories[name] == nil {
 		return nil
 	}