Merge pull request #28 from FantasyRL/not_main

feat:RPC tracing(jaeger)

.dockerignore

@@ -0,0 +1,42 @@
+*.o
+*.a
+*.so
+_obj
+_test
+*.[568vq]
+[568vq].out
+*.cgo1.go
+*.cgo2.c
+_cgo_defun.c
+_cgo_gotypes.go
+_cgo_export.*
+_testmain.go
+*.exe
+*.exe~
+*.test
+*.prof
+*.rar
+*.zip
+*.gz
+*.psd
+*.bmd
+*.cfg
+*.pptx
+*.log
+*nohup.out
+*settings.pyc
+*.sublime-project
+*.sublime-workspace
+!.gitkeep
+.DS_Store
+/.idea
+/.vscode
+#/output
+*.local.yml
+dumped_hertz_remote_config.json
+
+/data
+hz_update.sh
+kitex_update.sh
+/codeql
+analz.sarif

.gitignore

@@ -34,7 +34,7 @@ _testmain.go
 /output
 *.local.yml
 dumped_hertz_remote_config.json
-
+/cmd/*/output
 /data
 hz_update.sh
 kitex_update.sh

Dockerfile

@@ -1,4 +1,4 @@
-FROM golang:latest AS builder
+FROM golang:1.22 AS builder
 LABEL authors="fanr"
 
 ENV TZ Asia/Shanghai
@@ -12,5 +12,6 @@ WORKDIR /app
 
 ADD . /app
 RUN go mod tidy
+#CMD ["go run","example"]
 RUN make build-all
 

Makefile

@@ -6,6 +6,7 @@ API_PATH= $(DIR)/cmd/api
 SHELL=/bin/bash
 KITEX_GEN_PATH=$(DIR)/kitex_gen
 MODULE= bibi
+OUTPUT=$(DIR)/output
 
 .PHONY: init
 init:
@@ -28,10 +29,19 @@ $(SERVICES):
 
 
 
-.PHONY: build-all
-build-all:
+.PHONY: start-all
+start-all:
 	sh start.sh
 
+SERVICES := api user video interaction follow chat
+.PHONY: build-all
+build-all:
+	@for service in $(SERVICES); do \
+  		cd ${RPC};cd $$service; \
+  		echo "build $$service ..." && sh build.sh; \
+  		cd ${RPC}/$$service/output/bin/ && cp -r . ${OUTPUT}/$$service; \
+  		echo "done"; \
+  	done \
 
 KSERVICES := user video interaction follow chat
 .PHONY: kgen

cmd/api/biz/mw/jwt/jwt.go

@@ -4,10 +4,12 @@ import (
 	"bibi/cmd/api/biz/model/api"
 	"bibi/cmd/api/biz/rpc"
 	"bibi/config"
-	"bibi/kitex_gen/base"
-	"bibi/kitex_gen/user"
 	"bibi/pkg/errno"
 	"bibi/pkg/pack"
+
+	"bibi/kitex_gen/base"
+	"bibi/kitex_gen/user"
+
 	"context"
 	"github.com/cloudwego/hertz/pkg/app"
 	"github.com/cloudwego/hertz/pkg/common/hlog"

cmd/api/biz/rpc/chat.go

@@ -5,6 +5,8 @@ import (
 	"bibi/kitex_gen/chat"
 	"bibi/kitex_gen/chat/chathandler"
 	"bibi/pkg/constants"
+	opentracing "github.com/kitex-contrib/tracer-opentracing"
+
 	"context"
 	"github.com/cloudwego/kitex/client"
 	"github.com/cloudwego/kitex/pkg/loadbalance"
@@ -26,6 +28,7 @@ func InitChatRPC() {
 		client.WithConnectTimeout(constants.ConnectTimeout),
 		client.WithFailureRetry(retry.NewFailurePolicy()),
 		client.WithResolver(r),
+		client.WithSuite(opentracing.NewDefaultClientSuite()),
 		client.WithLoadBalancer(loadbalance.NewWeightedRoundRobinBalancer()),
 	)
 

cmd/api/biz/rpc/follow.go

@@ -10,6 +10,7 @@ import (
 	"github.com/cloudwego/kitex/pkg/loadbalance"
 	"github.com/cloudwego/kitex/pkg/retry"
 	etcd "github.com/kitex-contrib/registry-etcd"
+	opentracing "github.com/kitex-contrib/tracer-opentracing"
 )
 
 func InitFollowRPC() {
@@ -26,6 +27,7 @@ func InitFollowRPC() {
 		client.WithConnectTimeout(constants.ConnectTimeout),
 		client.WithFailureRetry(retry.NewFailurePolicy()),
 		client.WithResolver(r),
+		client.WithSuite(opentracing.NewDefaultClientSuite()),
 		client.WithLoadBalancer(loadbalance.NewWeightedRoundRobinBalancer()),
 	)
 

cmd/api/biz/rpc/init.go

@@ -22,5 +22,4 @@ func Init() {
 	InitFollowRPC()
 	InitInteractionRPC()
 	InitChatRPC()
-
 }

cmd/api/biz/rpc/interaction.go

@@ -5,6 +5,7 @@ import (
 	"bibi/kitex_gen/interaction"
 	"bibi/kitex_gen/interaction/interactionhandler"
 	"context"
+	opentracing "github.com/kitex-contrib/tracer-opentracing"
 
 	"bibi/pkg/constants"
 	"github.com/cloudwego/kitex/client"
@@ -27,6 +28,7 @@ func InitInteractionRPC() {
 		client.WithConnectTimeout(constants.ConnectTimeout),
 		client.WithFailureRetry(retry.NewFailurePolicy()),
 		client.WithResolver(r),
+		client.WithSuite(opentracing.NewDefaultClientSuite()),
 		client.WithLoadBalancer(loadbalance.NewWeightedRoundRobinBalancer()),
 	)
 

cmd/api/biz/rpc/user.go

@@ -10,6 +10,7 @@ import (
 	"github.com/cloudwego/kitex/pkg/loadbalance"
 	"github.com/cloudwego/kitex/pkg/retry"
 	etcd "github.com/kitex-contrib/registry-etcd"
+	kopentracing "github.com/kitex-contrib/tracer-opentracing"
 )
 
 func InitUserRPC() {
@@ -19,13 +20,22 @@ func InitUserRPC() {
 		panic(err)
 	}
 
+	//kTracer, kCloser := tracer.InitJaegerTracer("kitex-client")
+	//defer kCloser.Close()
+	//tracer.InitJaegerTracer("kitex-client")
+
 	c, err := userhandler.NewClient(
 		constants.UserServiceName,
 		client.WithMuxConnection(constants.MuxConnection),
 		client.WithRPCTimeout(constants.RPCTimeout),
 		client.WithConnectTimeout(constants.ConnectTimeout),
 		client.WithFailureRetry(retry.NewFailurePolicy()),
 		client.WithResolver(r),
+		client.WithSuite(kopentracing.NewDefaultClientSuite()),
+		//client.WithSuite(kopentracing.NewClientSuite(kTracer, func(c context.Context) string {
+		//	endpoint := rpcinfo.GetRPCInfo(c).From()
+		//	return endpoint.ServiceName() + "::" + endpoint.Method()
+		//})), //jaeger
 		client.WithLoadBalancer(loadbalance.NewWeightedRoundRobinBalancer()),
 	)
 

cmd/api/biz/rpc/video.go

@@ -5,11 +5,13 @@ import (
 	"bibi/kitex_gen/video"
 	"bibi/kitex_gen/video/videohandler"
 	"bibi/pkg/constants"
+	"bibi/pkg/tracer"
 	"context"
 	"github.com/cloudwego/kitex/client"
 	"github.com/cloudwego/kitex/pkg/loadbalance"
 	"github.com/cloudwego/kitex/pkg/retry"
 	etcd "github.com/kitex-contrib/registry-etcd"
+	opentracing "github.com/kitex-contrib/tracer-opentracing"
 )
 
 func InitVideoRPC() {
@@ -19,13 +21,15 @@ func InitVideoRPC() {
 		panic(err)
 	}
 
+	tracer.InitJaegerTracer(constants.VideoServiceName)
 	c, err := videohandler.NewClient(
 		constants.VideoServiceName,
 		client.WithMuxConnection(constants.MuxConnection),
 		client.WithRPCTimeout(constants.RPCTimeout),
 		client.WithConnectTimeout(constants.ConnectTimeout),
 		client.WithFailureRetry(retry.NewFailurePolicy()),
 		client.WithResolver(r),
+		client.WithSuite(opentracing.NewDefaultClientSuite()),
 		client.WithLoadBalancer(loadbalance.NewWeightedRoundRobinBalancer()),
 	)
 

cmd/interaction/main.go

@@ -6,6 +6,7 @@ import (
 	"bibi/config"
 	interaction "bibi/kitex_gen/interaction/interactionhandler"
 	"bibi/pkg/constants"
+	"bibi/pkg/tracer"
 	"bibi/pkg/utils"
 	"bibi/pkg/utils/eslogrus"
 	"crypto/tls"
@@ -18,6 +19,7 @@ import (
 	elastic "github.com/elastic/go-elasticsearch/v8"
 	kitexlogrus "github.com/kitex-contrib/obs-opentelemetry/logging/logrus"
 	etcd "github.com/kitex-contrib/registry-etcd"
+	opentracing "github.com/kitex-contrib/tracer-opentracing"
 	"github.com/sirupsen/logrus"
 	"net"
 	"net/http"
@@ -36,7 +38,7 @@ func Init() {
 	InitEs()
 	klog.SetLevel(klog.LevelDebug)
 	klog.SetLogger(kitexlogrus.NewLogger(kitexlogrus.WithHook(EsHookLog())))
-
+	tracer.InitJaegerTracer(constants.UserServiceName)
 	rpc.InitVideoRPC()
 }
 
@@ -68,6 +70,7 @@ func main() {
 
 	svr := interaction.NewServer(interactionHandlerImpl, // 指定 Registry 与服务基本信息
 		server.WithRegistry(r),
+		server.WithSuite(opentracing.NewDefaultServerSuite()),
 		server.WithServiceAddr(serviceAddr),
 		server.WithServerBasicInfo(
 			&rpcinfo.EndpointBasicInfo{

cmd/interaction/rpc/video.go

@@ -10,6 +10,7 @@ import (
 	"github.com/cloudwego/kitex/pkg/loadbalance"
 	"github.com/cloudwego/kitex/pkg/retry"
 	etcd "github.com/kitex-contrib/registry-etcd"
+	opentracing "github.com/kitex-contrib/tracer-opentracing"
 )
 
 var videoClient videohandler.Client
@@ -28,6 +29,7 @@ func InitVideoRPC() {
 		client.WithConnectTimeout(constants.ConnectTimeout),
 		client.WithFailureRetry(retry.NewFailurePolicy()),
 		client.WithResolver(r),
+		client.WithSuite(opentracing.NewDefaultClientSuite()),
 		client.WithLoadBalancer(loadbalance.NewWeightedRoundRobinBalancer()),
 	)
 

cmd/user/handler.go

@@ -44,9 +44,12 @@ func (s *UserHandlerImpl) Register(ctx context.Context, req *user.RegisterReques
 // Login implements the UserHandlerImpl interface.
 func (s *UserHandlerImpl) Login(ctx context.Context, req *user.LoginRequest) (resp *user.LoginResponse, err error) {
 	resp = new(user.LoginResponse)
-
+	//stTracer, closer := tracer.InitJaegerTracer("login")
+	//defer closer.Close()
+	//parentSpan := stTracer.StartSpan("handler")
+	//defer parentSpan.Finish()
+	//userResp, err := service.NewUserService(ctx).Login(req, stTracer, parentSpan)
 	userResp, err := service.NewUserService(ctx).Login(req)
-
 	resp.Base = pack.BuildBaseResp(err)
 	if err != nil {
 		return resp, nil