fix

cmd/server/injector.go

@@ -0,0 +1,14 @@
+package main
+
+import (
+	"github.com/google/wire"
+	"github.com/nextmicro/next"
+	"github.com/nextmicro/next-layout/internal/svc"
+)
+
+var InjectorSet = wire.NewSet(wire.Struct(new(Injector), "*"))
+
+type Injector struct {
+	Next           *next.Next
+	serviceContext *svc.ServiceContext
+}

cmd/server/main.go

@@ -11,6 +11,8 @@ import (
 	"github.com/nextmicro/next/config"
 	"github.com/nextmicro/next/transport/grpc"
 	"github.com/nextmicro/next/transport/http"
+	"github.com/prometheus/client_golang/prometheus"
+	"github.com/prometheus/client_golang/prometheus/promhttp"
 
 	_ "go.uber.org/automaxprocs"
 )
@@ -32,6 +34,11 @@ func init() {
 }
 
 func newApp(logger logger.Logger, gs *grpc.Server, hs *http.Server) (*next.Next, error) {
+	hs.Handle("/metrics", promhttp.HandlerFor(prometheus.DefaultGatherer, promhttp.HandlerOpts{
+		DisableCompression: true,
+		EnableOpenMetrics:  true,
+	}))
+
 	return next.New(
 		next.ID(id),
 		next.Name(Name),
@@ -58,14 +65,20 @@ func main() {
 		panic(err)
 	}
 
-	app, cleanup, err := wireApp(bc.Data, logger.DefaultLogger)
+	injector, cleanup, err := wireApp(bc.Data, logger.DefaultLogger)
+	if err != nil {
+		panic(err)
+	}
+
+	err = injector.serviceContext.Run()
 	if err != nil {
 		panic(err)
 	}
+
 	defer cleanup()
 
 	// start and wait for stop signal
-	if err := app.Run(); err != nil {
+	if err = injector.Next.Run(); err != nil {
 		panic(err)
 	}
 }

cmd/server/wire.go

@@ -7,17 +7,19 @@ package main
 
 import (
 	"github.com/nextmicro/logger"
-	"github.com/nextmicro/next"
 	"github.com/nextmicro/next-layout/internal/biz"
 	"github.com/nextmicro/next-layout/internal/conf"
 	"github.com/nextmicro/next-layout/internal/data"
 	"github.com/nextmicro/next-layout/internal/server"
 	"github.com/nextmicro/next-layout/internal/service"
+	"github.com/nextmicro/next-layout/internal/svc"
 
 	"github.com/google/wire"
 )
 
 // wireApp init next application.
-func wireApp(*conf.Data, logger.Logger) (*next.Next, func(), error) {
-	panic(wire.Build(server.ProviderSet, data.ProviderSet, biz.ProviderSet, service.ProviderSet, newApp))
+func wireApp(*conf.Data, logger.Logger) (*Injector, func(), error) {
+	panic(wire.Build(server.ProviderSet, data.ProviderSet, biz.ProviderSet, service.ProviderSet, svc.ProviderSet, InjectorSet, newApp))
+
+	return new(Injector), nil, nil
 }

configs/dev.yaml

@@ -1,9 +1,9 @@
 # ID
 id: '1001'
 # 名称
-name: gateway
+name: next-layout
 # 版本号
-version: v1.0.2-beta2
+version: v1.0.0
 # 服务元数据
 metadata:
   color: feature-v1
@@ -17,8 +17,9 @@ registry:
   addrs: '127.0.0.1:8500'
 # 链路追踪配置
 tracing:
-  endpoint: 'http://127.0.0.1:14268/api/traces'
+  endpoint: '127.0.0.1:4317'
   sampler: 1
+  exporter: otlpgrpc
 # 服务配置
 server:
   http:
@@ -28,6 +29,9 @@ server:
       - name: logging
         options:
           '@type': type.googleapis.com/next.middleware.logging.v1.Logging
+      - name: metrics
+        options:
+          '@type': type.googleapis.com/next.middleware.metrics.v1.Metrics
       - name: tracing
         options:
           '@type': type.googleapis.com/next.middleware.tracing.v1.Tracing
@@ -36,7 +40,7 @@ server:
           '@type': type.googleapis.com/next.middleware.metadata.v1.Metadata
           prefix: []
   grpc:
-    addr: '0.0.0.0:9000'
+    addr: '0.0.0.0:9002'
     timeout: 1s
     middlewares:
       - name: logging

go.mod

@@ -7,6 +7,7 @@ require (
 	github.com/google/wire v0.5.0
 	github.com/nextmicro/logger v1.0.3
 	github.com/nextmicro/next v1.0.1
+	github.com/prometheus/client_golang v1.17.0
 	go.uber.org/automaxprocs v1.5.1
 	google.golang.org/genproto/googleapis/api v0.0.0-20231016165738-49dd2c1f3d0b
 	google.golang.org/grpc v1.59.0
@@ -40,6 +41,7 @@ require (
 	github.com/golang/mock v1.6.0 // indirect
 	github.com/golang/protobuf v1.5.3 // indirect
 	github.com/golang/snappy v0.0.4 // indirect
+	github.com/google/subcommands v1.0.1 // indirect
 	github.com/google/uuid v1.4.0 // indirect
 	github.com/gorilla/mux v1.8.0 // indirect
 	github.com/hashicorp/consul/api v1.25.1 // indirect
@@ -77,8 +79,8 @@ require (
 	github.com/openzipkin/zipkin-go v0.4.2 // indirect
 	github.com/pierrec/lz4/v4 v4.1.18 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
+	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
 	github.com/power-devops/perfstat v0.0.0-20221212215047-62379fc7944b // indirect
-	github.com/prometheus/client_golang v1.17.0 // indirect
 	github.com/prometheus/client_model v0.5.0 // indirect
 	github.com/prometheus/common v0.45.0 // indirect
 	github.com/prometheus/procfs v0.12.0 // indirect

go.sum

@@ -121,6 +121,7 @@ github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeN
 github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
 github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
+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.4.0 h1:MtMxsa51/r9yyhkyLsVeVt0B+BGQZzpQiTQ4eHZ8bc4=
 github.com/google/uuid v1.4.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=

internal/svc/servicecontext.go

@@ -0,0 +1,13 @@
+package svc
+
+type ServiceContext struct {
+}
+
+//go:generate go run github.com/Bin-Huang/newc@v0.8.3
+func NewServiceContext() *ServiceContext {
+	return &ServiceContext{}
+}
+
+func (svc *ServiceContext) Run() error {
+	return nil
+}

internal/svc/svc.go

@@ -0,0 +1,8 @@
+package svc
+
+import (
+	"github.com/google/wire"
+)
+
+// ProviderSet is service providers.
+var ProviderSet = wire.NewSet(NewServiceContext)