up

gogf · Mar 27, 2024 · 34955c3 · 34955c3
1 parent 313d9d1
commit 34955c3
Show file tree

Hide file tree

Showing 8 changed files with 38 additions and 2 deletions.
diff --git a/contrib/trace/otlpgrpc/otlpgrpc.go b/contrib/trace/otlpgrpc/otlpgrpc.go
@@ -93,6 +93,9 @@ func Init(serviceName, endpoint, traceToken string) (func(), error) {
 	return func() {
 		ctx, cancel := context.WithTimeout(ctx, time.Second)
 		defer cancel()
+		if err = tracerProvider.Shutdown(ctx); err != nil {
+			g.Log().Errorf(ctx, "Shutdown tracerProvider failed err:%+v", err)
+		}
 		if err = traceExp.Shutdown(ctx); err != nil {
 			g.Log().Errorf(ctx, "Shutdown traceExp failed err:%+v", err)
 			otel.Handle(err)

diff --git a/contrib/trace/otlphttp/otlphttp.go b/contrib/trace/otlphttp/otlphttp.go
@@ -91,6 +91,9 @@ func Init(serviceName, endpoint, path string) (func(), error) {
 	return func() {
 		ctx, cancel := context.WithTimeout(ctx, time.Second)
 		defer cancel()
+		if err = tracerProvider.Shutdown(ctx); err != nil {
+			g.Log().Errorf(ctx, "Shutdown tracerProvider failed err:%+v", err)
+		}
 		if err = traceExp.Shutdown(ctx); err != nil {
 			g.Log().Errorf(ctx, "Shutdown traceExp failed err:%+v", err)
 			otel.Handle(err)

diff --git a/example/trace/grpc-with-db/client/client.go b/example/trace/grpc-with-db/client/client.go
@@ -7,6 +7,8 @@
 package main
 
 import (
+	"time"
+
 	"github.com/gogf/gf/contrib/registry/etcd/v2"
 	"github.com/gogf/gf/contrib/rpc/grpcx/v2"
 	"github.com/gogf/gf/contrib/trace/otlpgrpc/v2"
@@ -81,4 +83,7 @@ func StartRequests() {
 		return
 	}
 	g.Log().Info(ctx, "delete id:", -1)
+
+	// Leave a little time to complete the report.
+	time.Sleep(3 * time.Second)
 }
diff --git a/example/trace/http-with-db/client/client.go b/example/trace/http-with-db/client/client.go
@@ -7,6 +7,8 @@
 package main
 
 import (
+	"time"
+
 	"github.com/gogf/gf/contrib/trace/otlphttp/v2"
 	"github.com/gogf/gf/v2/database/gdb"
 	"github.com/gogf/gf/v2/frame/g"
@@ -81,4 +83,7 @@ func StartRequests() {
 		panic(err)
 	}
 	g.Log().Info(ctx, "delete result:", deleteRes)
+
+	// Leave a little time to complete the report.
+	time.Sleep(3 * time.Second)
 }
diff --git a/example/trace/http/client/client.go b/example/trace/http/client/client.go
@@ -7,6 +7,8 @@
 package main
 
 import (
+	"time"
+
 	"github.com/gogf/gf/contrib/trace/otlphttp/v2"
 	"github.com/gogf/gf/v2/frame/g"
 	"github.com/gogf/gf/v2/net/gtrace"
@@ -39,4 +41,7 @@ func StartRequests() {
 
 	content := g.Client().GetContent(ctx, "http://127.0.0.1:8199/hello")
 	g.Log().Print(ctx, content)
+
+	// Leave a little time to complete the report.
+	time.Sleep(3 * time.Second)
 }
diff --git a/example/trace/inprocess/main.go b/example/trace/inprocess/main.go
@@ -18,8 +18,8 @@ import (
 
 const (
 	serviceName = "inprocess"
-	endpoint    = "localhost:6831"
-	path        = "adapt_******_******/api/otlp/traces"
+	endpoint    = "192.168.10.42:4318"
+	path        = "/v1/traces"
 )
 
 func main() {
@@ -40,6 +40,11 @@ func main() {
 	// Trace 2.
 	user100 := GetUser(ctx, 100)
 	g.Dump(user100)
+
+	// Leave a little time to complete the report.
+	span.End()
+	// time.Sleep(6 * time.Second)
+	shutdown()
 }
 
 // GetUser retrieves and returns hard coded user data for demonstration.

diff --git a/example/trace/otlp/grpc/main.go b/example/trace/otlp/grpc/main.go
@@ -7,6 +7,8 @@
 package main
 
 import (
+	"time"
+
 	"github.com/gogf/gf/contrib/trace/otlpgrpc/v2"
 
 	"github.com/gogf/gf/v2/frame/g"
@@ -29,6 +31,9 @@ func main() {
 	defer shutdown()
 
 	StartRequests()
+
+	// Leave a little time to complete the report.
+	time.Sleep(3 * time.Second)
 }
 
 // StartRequests starts requests.

diff --git a/example/trace/otlp/http/main.go b/example/trace/otlp/http/main.go
@@ -7,6 +7,8 @@
 package main
 
 import (
+	"time"
+
 	"github.com/gogf/gf/contrib/trace/otlphttp/v2"
 	"github.com/gogf/gf/v2/frame/g"
 	"github.com/gogf/gf/v2/net/gtrace"
@@ -28,6 +30,9 @@ func main() {
 	defer shutdown()
 
 	StartRequests()
+
+	// Leave a little time to complete the report.
+	time.Sleep(3 * time.Second)
 }
 
 // StartRequests starts requests.