Merge branch 'main' into fix/apollo

contrib/log/fluent/fluent.go

@@ -99,8 +99,9 @@ type Logger struct {
 
 // NewLogger new a std logger with options.
 // target:
-//   tcp://127.0.0.1:24224
+//
-//   unix://var/run/fluent/fluent.sock
+//	tcp://127.0.0.1:24224
+//	unix://var/run/fluent/fluent.sock
 func NewLogger(addr string, opts ...Option) (*Logger, error) {
 	option := options{}
 	for _, o := range opts {

contrib/registry/discovery/impl_registrar.go

@@ -62,7 +62,7 @@ func (d *Discovery) Register(ctx context.Context, service *registry.ServiceInsta
 	return
 }
 
-//  register an instance with Discovery
+// register an instance with Discovery
 func (d *Discovery) register(ctx context.Context, ins *discoveryInstance) (err error) {
 	d.mutex.RLock()
 	c := d.config

contrib/registry/kubernetes/registry.go

@@ -32,37 +32,37 @@ import (
 // kratos-service-protocols: define the protocols of the service
 //
 // Example Deployment:
-//
+/*
-// apiVersion: apps/v1
+apiVersion: apps/v1
-// kind: Deployment
+kind: Deployment
-// metadata:
+metadata:
-//  name: nginx
+name: nginx
-//  labels:
+labels:
-//    app: nginx
+  app: nginx
-// spec:
+spec:
-//  replicas: 5
+replicas: 5
-//  selector:
+selector:
-//    matchLabels:
+  matchLabels:
-//      app: nginx
+    app: nginx
-//  template:
+template:
-//    metadata:
+  metadata:
-//      labels:
+    labels:
-//        app: nginx
+      app: nginx
-//        kratos-service-id: "56991810-c77f-4a95-8190-393efa9c1a61"
+      kratos-service-id: "56991810-c77f-4a95-8190-393efa9c1a61"
-//        kratos-service-app: "nginx"
+      kratos-service-app: "nginx"
-//        kratos-service-version: "v3.5.0"
+      kratos-service-version: "v3.5.0"
-//      annotations:
+    annotations:
-//        kratos-service-protocols: |
+      kratos-service-protocols: |
-//          {"80": "http"}
+        {"80": "http"}
-//        kratos-service-metadata: |
+      kratos-service-metadata: |
-//          {"region": "sh", "zone": "sh001", "cluster": "pd"}
+        {"region": "sh", "zone": "sh001", "cluster": "pd"}
-//    spec:
+  spec:
-//      containers:
+    containers:
-//        - name: nginx
+      - name: nginx
-//          image: nginx:1.7.9
+        image: nginx:1.7.9
-//          ports:
+        ports:
-//            - containerPort: 80
+          - containerPort: 80
-//
+*/
 const (
 	// LabelsKeyServiceID is used to define the ID of the service
 	LabelsKeyServiceID = "kratos-service-id"

transport/grpc/resolver/direct/builder.go

@@ -14,7 +14,8 @@ type directBuilder struct{}
 
 // NewBuilder creates a directBuilder which is used to factory direct resolvers.
 // example:
-//   direct://<authority>/127.0.0.1:9000,127.0.0.2:9000
+//
+//	direct://<authority>/127.0.0.1:9000,127.0.0.2:9000
 func NewBuilder() resolver.Builder {
 	return &directBuilder{}
 }

transport/grpc/server.go

@@ -176,7 +176,8 @@ func (s *Server) Use(selector string, m ...middleware.Middleware) {
 
 // Endpoint return a real address to registry endpoint.
 // examples:
-//   grpc://127.0.0.1:9000?isSecure=false
+//
+//	grpc://127.0.0.1:9000?isSecure=false
 func (s *Server) Endpoint() (*url.URL, error) {
 	if err := s.listenAndEndpoint(); err != nil {
 		return nil, s.err

transport/http/server.go

@@ -256,8 +256,9 @@ func (s *Server) filter() mux.MiddlewareFunc {
 
 // Endpoint return a real address to registry endpoint.
 // examples:
-//   https://127.0.0.1:8000
+//
-//   Legacy: http://127.0.0.1:8000?isSecure=false
+//	https://127.0.0.1:8000
+//	Legacy: http://127.0.0.1:8000?isSecure=false
 func (s *Server) Endpoint() (*url.URL, error) {
 	if err := s.listenAndEndpoint(); err != nil {
 		return nil, err