Merge pull request #37 from justlorain/fix_otel

fix: shutdown otel provider
cloudwego · Mar 9, 2023 · 537f2a3 · 537f2a3
2 parents e0b5b91 + 33ef267
commit 537f2a3
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 5 deletions.
diff --git a/easy_note/cmd/api/rpc/note.go b/easy_note/cmd/api/rpc/note.go
@@ -37,11 +37,14 @@ func initNote() {
 	if err != nil {
 		panic(err)
 	}
-	provider.NewOpenTelemetryProvider(
+	p := provider.NewOpenTelemetryProvider(
 		provider.WithServiceName(consts.ApiServiceName),
 		provider.WithExportEndpoint(consts.ExportEndpoint),
 		provider.WithInsecure(),
 	)
+	defer func(ctx context.Context, p provider.OtelProvider) {
+		_ = p.Shutdown(ctx)
+	}(context.Background(), p)
 	c, err := noteservice.NewClient(
 		consts.NoteServiceName,
 		client.WithResolver(r),

diff --git a/easy_note/cmd/api/rpc/user.go b/easy_note/cmd/api/rpc/user.go
@@ -37,11 +37,14 @@ func initUser() {
 	if err != nil {
 		panic(err)
 	}
-	provider.NewOpenTelemetryProvider(
+	p := provider.NewOpenTelemetryProvider(
 		provider.WithServiceName(consts.ApiServiceName),
 		provider.WithExportEndpoint(consts.ExportEndpoint),
 		provider.WithInsecure(),
 	)
+	defer func(ctx context.Context, p provider.OtelProvider) {
+		_ = p.Shutdown(ctx)
+	}(context.Background(), p)
 	c, err := userservice.NewClient(
 		consts.UserServiceName,
 		client.WithResolver(r),

diff --git a/easy_note/cmd/note/main.go b/easy_note/cmd/note/main.go
@@ -16,6 +16,7 @@
 package main
 
 import (
+	"context"
 	"net"
 
 	"github.com/cloudwego/biz-demo/easy_note/cmd/note/dal"
@@ -51,11 +52,14 @@ func main() {
 		panic(err)
 	}
 	Init()
-	provider.NewOpenTelemetryProvider(
+	p := provider.NewOpenTelemetryProvider(
 		provider.WithServiceName(consts.NoteServiceName),
 		provider.WithExportEndpoint(consts.ExportEndpoint),
 		provider.WithInsecure(),
 	)
+	defer func(ctx context.Context, p provider.OtelProvider) {
+		_ = p.Shutdown(ctx)
+	}(context.Background(), p)
 	svr := noteservice.NewServer(new(NoteServiceImpl),
 		server.WithServiceAddr(addr),
 		server.WithRegistry(r),

diff --git a/easy_note/cmd/note/rpc/user.go b/easy_note/cmd/note/rpc/user.go
@@ -37,11 +37,14 @@ func initUser() {
 	if err != nil {
 		panic(err)
 	}
-	provider.NewOpenTelemetryProvider(
+	p := provider.NewOpenTelemetryProvider(
 		provider.WithServiceName(consts.NoteServiceName),
 		provider.WithExportEndpoint(consts.ExportEndpoint),
 		provider.WithInsecure(),
 	)
+	defer func(ctx context.Context, p provider.OtelProvider) {
+		_ = p.Shutdown(ctx)
+	}(context.Background(), p)
 	c, err := userservice.NewClient(
 		consts.UserServiceName, // DestService
 		client.WithResolver(r),

diff --git a/easy_note/cmd/user/main.go b/easy_note/cmd/user/main.go
@@ -16,6 +16,7 @@
 package main
 
 import (
+	"context"
 	"net"
 
 	"github.com/cloudwego/biz-demo/easy_note/cmd/user/dal"
@@ -49,11 +50,14 @@ func main() {
 		panic(err)
 	}
 	Init()
-	provider.NewOpenTelemetryProvider(
+	p := provider.NewOpenTelemetryProvider(
 		provider.WithServiceName(consts.UserServiceName),
 		provider.WithExportEndpoint(consts.ExportEndpoint),
 		provider.WithInsecure(),
 	)
+	defer func(ctx context.Context, p provider.OtelProvider) {
+		_ = p.Shutdown(ctx)
+	}(context.Background(), p)
 	svr := userservice.NewServer(new(UserServiceImpl),
 		server.WithServiceAddr(addr),
 		server.WithRegistry(r),