go sdk support user define app labels #750
Closed
+119
−5
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
binbin0325
reviewed
May 9, 2024
common/remote/rpc/rpc_client.go
Outdated
| var rpcClient IRpcClient | ||
| if GRPC == connectionType { | ||
| rpcClient = NewGrpcClient(ctx, clientName, nacosServer, tlsConfig) | ||
| } | ||
| if rpcClient == nil { | ||
| return nil, errors.New("unsupported connection type") | ||
| } | ||
|
|
||
| logger.Infof("get app conn labels from client config ", appConnLabels) |
There was a problem hiding this comment.
日志需要格式化的占位符，才能正确的格式打印出来appConnlabels
common/remote/rpc/rpc_client.go
Outdated
|
|
||
| logger.Infof("get app conn labels from client config ", appConnLabels) | ||
| appConnLabelsEnv := getAppLabelsFromEnv() | ||
| logger.Infof("get app conn labels from env ", appConnLabelsEnv) |
common/remote/rpc/rpc_client.go
Outdated
| logger.Infof("get app conn labels from env ", appConnLabelsEnv) | ||
|
|
||
| appConnLabelsFinal := mergerAppLabels(appConnLabels, appConnLabelsEnv) | ||
| logger.Infof("final app conn labels : ", appConnLabelsFinal) |
common/remote/rpc/rpc_client.go
Outdated
| logger.Infof("final app conn labels : ", appConnLabelsFinal) | ||
|
|
||
| appConnLabelsFinal = addPrefixForEachKey(appConnLabelsFinal, "app_") | ||
| if appConnLabelsFinal != nil && len(appConnLabelsFinal) != 0 { |
There was a problem hiding this comment.
只判断len(appConnLabelsFinal) != 0 就可以了
common/remote/rpc/rpc_client.go
Outdated
| } | ||
|
|
||
| for k, v := range map2 { | ||
| if preferFirst && map1[k] != "" { |
common/remote/rpc/rpc_client.go
Outdated
| } | ||
|
|
||
| func mergeMaps(map1, map2 map[string]string, preferFirst bool) map[string]string { | ||
| result := make(map[string]string) |
common/remote/rpc/rpc_client.go
Outdated
| } | ||
|
|
||
| func getAppLabelsFromEnv() map[string]string { | ||
| configMap := make(map[string]string) |
common/remote/rpc/rpc_client.go
Outdated
| } | ||
|
|
||
| func addPrefixForEachKey(m map[string]string, prefix string) map[string]string { | ||
| if m == nil || len(m) == 0 { |
|
zunfei.lzf seems not to be a GitHub user. You need a GitHub account to be able to sign the CLA. If you have already a GitHub account, please add the email address used for this commit to your account. You have signed the CLA already but the status is still pending? Let us recheck it. |
…plabels # Conflicts: # clients/config_client/config_client_test.go
This reverts commit 5b64179
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
go sdk support user define app labels