Skip to content

Commit

Permalink
fix(net/gclient): remove default discovery for gclient when Discovery…
Browse files Browse the repository at this point in the history
… feature enabled
  • Loading branch information
gqcn committed Feb 28, 2025
1 parent 4a65e7a commit 43b2005
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 12 deletions.
2 changes: 1 addition & 1 deletion examples
Submodule examples updated 71 files
+6 −1 .ai-prompt.zh.md
+2 −2 balancer/polaris/README.md
+2 −2 httpserver/jwt/README.ZH.MD
+3 −3 httpserver/proxy/README.ZH.MD
+2 −1 httpserver/rate-limit/README.ZH.MD
+7 −7 httpserver/response-json-array/README.ZH.MD
+1 −1 httpserver/upload-file/README.ZH.MD
+9 −6 httpserver/websocket/README.MD
+7 −5 httpserver/websocket/README.ZH.MD
+1 −1 nosql/mongodb/README.MD
+1 −1 nosql/mongodb/README.ZH.MD
+1 −1 nosql/redis/README.MD
+1 −1 nosql/redis/README.ZH.MD
+148 −0 practices/injection/README.MD
+149 −0 practices/injection/README.ZH.MD
+2 −2 practices/injection/app/gateway/Makefile
+12 −12 practices/injection/app/gateway/api/user/v1/user.go
+1 −1 practices/injection/app/gateway/internal/controller/user/user_new.go
+1 −1 practices/injection/app/gateway/internal/controller/user/user_v1_create.go
+1 −1 practices/injection/app/gateway/internal/controller/user/user_v1_delete.go
+1 −1 practices/injection/app/gateway/internal/controller/user/user_v1_get_list.go
+1 −1 practices/injection/app/gateway/internal/controller/user/user_v1_get_one.go
+1 −1 practices/injection/app/gateway/manifest/deploy/kustomize/base/configmap.yaml
+8 −8 practices/injection/app/gateway/manifest/deploy/kustomize/base/deployment.yaml
+2 −2 practices/injection/app/gateway/manifest/deploy/kustomize/base/service.yaml
+1 −1 practices/injection/app/gateway/manifest/deploy/kustomize/overlays/develop/configmap.yaml
+2 −2 practices/injection/app/gateway/manifest/deploy/kustomize/overlays/develop/deployment.yaml
+1 −1 practices/injection/app/gateway/manifest/deploy/kustomize/overlays/product/configmap.yaml
+2 −2 practices/injection/app/gateway/manifest/deploy/kustomize/overlays/product/deployment.yaml
+0 −61 practices/injection/app/user-service/internal/controller/user/user.go
+0 −10 practices/injection/app/user-service/internal/model/entity/user.go
+0 −72 practices/injection/app/user-service/internal/service/user/user.go
+0 −16 practices/injection/app/user-service/manifest/protobuf/entity/user.proto
+0 −47 practices/injection/app/user-service/manifest/protobuf/user/v1/user.proto
+2 −2 practices/injection/app/user/Makefile
+0 −0 practices/injection/app/user/README.MD
+4 −5 practices/injection/app/user/api/entity/user.pb.go
+36 −29 practices/injection/app/user/api/user/v1/user.pb.go
+10 −4 practices/injection/app/user/api/user/v1/user_grpc.pb.go
+0 −0 practices/injection/app/user/hack/config.yaml
+0 −0 practices/injection/app/user/internal/cmd/cmd.go
+2 −2 practices/injection/app/user/internal/cmd/cmd_server.go
+0 −0 practices/injection/app/user/internal/cmd/cmd_worker.go
+0 −0 practices/injection/app/user/internal/consts/consts.go
+78 −0 practices/injection/app/user/internal/controller/user/user.go
+108 −0 practices/injection/app/user/internal/controller/user/user_test.go
+32 −16 practices/injection/app/user/internal/dao/user/user.go
+1 −1 practices/injection/app/user/internal/dao/user/user_test.go
+0 −0 practices/injection/app/user/internal/model/.gitkeep
+10 −0 practices/injection/app/user/internal/model/entity/user.go
+114 −0 practices/injection/app/user/internal/service/user/user.go
+1 −1 practices/injection/app/user/internal/service/user/user_test.go
+1 −1 practices/injection/app/user/main.go
+0 −0 practices/injection/app/user/manifest/config/config.yaml
+1 −1 practices/injection/app/user/manifest/deploy/kustomize/base/configmap.yaml
+8 −8 practices/injection/app/user/manifest/deploy/kustomize/base/deployment.yaml
+0 −0 practices/injection/app/user/manifest/deploy/kustomize/base/kustomization.yaml
+2 −2 practices/injection/app/user/manifest/deploy/kustomize/base/service.yaml
+1 −1 practices/injection/app/user/manifest/deploy/kustomize/overlays/develop/configmap.yaml
+2 −2 practices/injection/app/user/manifest/deploy/kustomize/overlays/develop/deployment.yaml
+0 −0 practices/injection/app/user/manifest/deploy/kustomize/overlays/develop/kustomization.yaml
+1 −1 practices/injection/app/user/manifest/deploy/kustomize/overlays/product/configmap.yaml
+2 −2 practices/injection/app/user/manifest/deploy/kustomize/overlays/product/deployment.yaml
+0 −0 practices/injection/app/user/manifest/deploy/kustomize/overlays/product/kustomization.yaml
+0 −0 practices/injection/app/user/manifest/docker/Dockerfile
+0 −0 practices/injection/app/user/manifest/docker/docker.sh
+12 −0 practices/injection/app/user/manifest/protobuf/entity/user.proto
+62 −0 practices/injection/app/user/manifest/protobuf/user/v1/user.proto
+60 −2 practices/injection/utility/injection/injection.go
+1 −1 practices/injection/utility/injection/injection_grpc_clients.go
+0 −67 practices/injection/utility/injection/injection_helper.go
2 changes: 1 addition & 1 deletion net/gclient/gclient.go
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ func New() *Client {
header: make(map[string]string),
cookies: make(map[string]string),
builder: gsel.GetBuilder(),
discovery: gsvc.GetRegistry(),
discovery: nil,
}
c.header[httpHeaderUserAgent] = defaultClientAgent
// It enables OpenTelemetry for client in default.
Expand Down
11 changes: 1 addition & 10 deletions net/gclient/gclient_discovery.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ import (
"github.com/gogf/gf/v2/internal/intlog"
"github.com/gogf/gf/v2/net/gsel"
"github.com/gogf/gf/v2/net/gsvc"
"github.com/gogf/gf/v2/text/gstr"
)

type discoveryNode struct {
Expand All @@ -39,7 +38,7 @@ var clientSelectorMap = gmap.New(true)

// internalMiddlewareDiscovery is a client middleware that enables service discovery feature for client.
func internalMiddlewareDiscovery(c *Client, r *http.Request) (response *Response, err error) {
if c.discovery == nil && !isServiceName(r.URL.Host) {
if c.discovery == nil {
return c.Next(r)
}
var (
Expand Down Expand Up @@ -107,11 +106,3 @@ func updateSelectorNodesByService(ctx context.Context, selector gsel.Selector, s
}
return selector.Update(ctx, nodes)
}

// isServiceName checks and returns whether given input parameter is service name or not.
// It checks by whether the parameter is address by containing port delimiter character ':'.
//
// It does not contain any port number if using service discovery.
func isServiceName(serviceNameOrAddress string) bool {
return !gstr.Contains(serviceNameOrAddress, gsvc.EndpointHostPortDelimiter)
}

0 comments on commit 43b2005

Please sign in to comment.