将trace_conf添加到wire里面

cmd/server/main.go

@@ -5,11 +5,11 @@ import (
 	"flag"
 	"os"
 
+	"git.ikuban.com/server/we-protobuf/client"
+
 	nacosConfig "git.ikuban.com/server/kratos-nacos/config"
 	"git.ikuban.com/server/kratos-nacos/registry"
 
-	"git.ikuban.com/server/kratos-utils/common"
-
 	"github.com/go-kratos/kratos/v2/config/file"
 
 	"git.ikuban.com/server/yaml"
@@ -114,11 +114,15 @@ func main() {
 		bc.Server.Registrar.Group = group
 	}
 
-	err := preInitService(bc.Jwt)
-	if err != nil {
-		panic(err)
+	if bc.TraceConf == nil {
+		bc.TraceConf = new(conf.TraceConf)
+	}
+	traceConf := &client.TraceConf{
+		Env:      bc.TraceConf.Env,
+		Endpoint: bc.TraceConf.Endpoint,
 	}
-	app, cleanup, err := initApp(ctx, &bc, logger)
+
+	app, cleanup, err := initApp(ctx, &bc, traceConf, logger)
 	if err != nil {
 		panic(err)
 	}
@@ -129,14 +133,6 @@ func main() {
 	}
 }
 
-//preInitService 在data和service初始化的之前的执行的方法
-func preInitService(jwt *conf.JWT) error {
-	if jwt != nil {
-		common.InitJWT(jwt.Secret, jwt.Expire)
-	}
-	return nil
-}
-
 //postInitService 在data和service初始化的之后的执行的方法
 func postInitService() error {
 	return nil

cmd/server/wire.go

@@ -7,6 +7,7 @@ package main
 import (
 	"context"
 
+	"git.ikuban.com/server/we-protobuf/client"
 	"github.com/go-kratos/kratos-layout/internal/conf"
 	"github.com/go-kratos/kratos-layout/internal/data"
 	"github.com/go-kratos/kratos-layout/internal/server"
@@ -17,6 +18,6 @@ import (
 )
 
 // initApp init kratos application.
-func initApp(context.Context, *conf.Bootstrap, log.Logger) (*kratos.App, func(), error) {
+func initApp(context.Context, *conf.Bootstrap, *client.TraceConf, log.Logger) (*kratos.App, func(), error) {
 	panic(wire.Build(server.ProviderSet, data.ProviderSet, service.ProviderSet, newApp))
 }

cmd/server/wire_gen.go

@@ -7,6 +7,7 @@ package main
 
 import (
 	"context"
+	"git.ikuban.com/server/we-protobuf/client"
 	"github.com/go-kratos/kratos-layout/internal/conf"
 	"github.com/go-kratos/kratos-layout/internal/data"
 	"github.com/go-kratos/kratos-layout/internal/server"
@@ -18,16 +19,16 @@ import (
 // Injectors from wire.go:
 
 // initApp init kratos application.
-func initApp(contextContext context.Context, bootstrap *conf.Bootstrap, logger log.Logger) (*kratos.App, func(), error) {
+func initApp(contextContext context.Context, bootstrap *conf.Bootstrap, traceConf *client.TraceConf, logger log.Logger) (*kratos.App, func(), error) {
 	registry := server.NewRegistrar(bootstrap)
-	client := data.NewRedis(bootstrap)
-	dataData, cleanup, err := data.NewData(bootstrap, client, logger)
+	redisClient := data.NewRedis(bootstrap)
+	dataData, cleanup, err := data.NewData(bootstrap, redisClient, logger)
 	if err != nil {
 		return nil, nil, err
 	}
 	greeterServer := service.NewGreeterService(logger, dataData)
-	httpServer := server.NewHTTPServer(bootstrap, logger, greeterServer)
-	grpcServer := server.NewGRPCServer(bootstrap, logger)
+	httpServer := server.NewHTTPServer(bootstrap, logger, traceConf, greeterServer)
+	grpcServer := server.NewGRPCServer(bootstrap, logger, traceConf)
 	app := newApp(contextContext, logger, registry, httpServer, grpcServer)
 	return app, func() {
 		cleanup()

go.sum

@@ -107,6 +107,7 @@ github.com/google/go-cmp v0.5.6 h1:BKbKCqvP6I+rmFHt06ZmyQtvB8xAkWdhFyr0ZUNZcxQ=
 github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
 github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI=
+github.com/google/subcommands v1.0.1 h1:/eqq+otEXm5vhfBrbREPCSVQbvofip6kIz+mX5TUH7k=
 github.com/google/subcommands v1.0.1/go.mod h1:ZjhPrFU+Olkh9WazFPsl27BQ4UPiG37m3yTrtFlrHVk=
 github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/google/uuid v1.2.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=

internal/server/grpc.go

@@ -16,8 +16,8 @@ import (
 )
 
 // NewGRPCServer new a gRPC server.
-func NewGRPCServer(c *conf.Bootstrap, logger log.Logger) *grpc.Server {
-	tp, err := trace.TracerProvider(c.TraceConf.Endpoint, "{kratos-layout}", c.TraceConf.Env)
+func NewGRPCServer(c *conf.Bootstrap, logger log.Logger, traceConf *client.TraceConf) *grpc.Server {
+	tp, err := trace.TracerProvider(traceConf.Endpoint, "{kratos-layout}", traceConf.Env)
 	chain := []middleware.Middleware{
 		recovery.Recovery(),
 		logging.Server(logger),

internal/server/http.go

@@ -3,6 +3,8 @@ package server
 import (
 	http2 "net/http"
 
+	"git.ikuban.com/server/we-protobuf/client"
+
 	"github.com/go-kratos/kratos/v2/middleware/tracing"
 	"go.opentelemetry.io/otel/propagation"
 
@@ -17,7 +19,7 @@ import (
 )
 
 // NewHTTPServer new a HTTP server.
-func NewHTTPServer(c *conf.Bootstrap, logger log.Logger, s1 v1.GreeterServer) *http.Server {
+func NewHTTPServer(c *conf.Bootstrap, logger log.Logger, traceConf *client.TraceConf, s1 v1.GreeterServer) *http.Server {
 	var opts = []http.ServerOption{}
 	if c.Server.Http.Network != "" {
 		opts = append(opts, http.Network(c.Server.Http.Network))
@@ -29,7 +31,7 @@ func NewHTTPServer(c *conf.Bootstrap, logger log.Logger, s1 v1.GreeterServer) *h
 		opts = append(opts, http.Timeout(c.Server.Http.Timeout.AsDuration()))
 	}
 
-	tp, err := trace.TracerProvider(c.TraceConf.Endpoint, "{kratos-layout}", c.TraceConf.Env)
+	tp, err := trace.TracerProvider(traceConf.Endpoint, "{kratos-layout}", traceConf.Env)
 	chain := []middleware.Middleware{
 		recovery.Recovery(),
 		logging.Server(logger),