Merge pull request #1316 from qinyuguang/otel

Otel

go.mod

@@ -12,9 +12,9 @@ require (
 	github.com/grokify/html-strip-tags-go v0.0.0-20190921062105-daaa06bf1aaf
 	github.com/mattn/go-runewidth v0.0.10 // indirect
 	github.com/olekukonko/tablewriter v0.0.5
-	go.opentelemetry.io/otel v0.19.0
-	go.opentelemetry.io/otel/oteltest v0.19.0
-	go.opentelemetry.io/otel/trace v0.19.0
+	go.opentelemetry.io/otel v1.0.0-RC1
+	go.opentelemetry.io/otel/oteltest v1.0.0-RC1
+	go.opentelemetry.io/otel/trace v1.0.0-RC1
 	golang.org/x/net v0.0.0-20201031054903-ff519b6c9102
 	golang.org/x/text v0.3.4
 	gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c

go.sum

@@ -10,8 +10,8 @@ github.com/gogf/mysql v1.6.1-0.20210603073548-16164ae25579 h1:pP/uEy52biKDytlgK/
 github.com/gogf/mysql v1.6.1-0.20210603073548-16164ae25579/go.mod h1:52e6mXyNnHAsFrXrSnj5JPRSKsZKpHylVtA3j4AtMz8=
 github.com/gomodule/redigo v2.0.0+incompatible h1:K/R+8tc58AaqLkqG2Ol3Qk+DR/TlNuhuh457pBFPtt0=
 github.com/gomodule/redigo v2.0.0+incompatible/go.mod h1:B4C85qUVwatsJoIUNIfCRsp7qO0iAmpGFZ4EELWSbC4=
-github.com/google/go-cmp v0.5.5 h1:Khx7svrCpmxxtHBq5j2mp/xVjsi8hQMfNLvJFAlrGgU=
-github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+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/gorilla/websocket v1.4.1 h1:q7AeDBpnBk8AogcD4DSag/Ukw/KV+YhzLj2bP5HvKCM=
 github.com/gorilla/websocket v1.4.1/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
 github.com/grokify/html-strip-tags-go v0.0.0-20190921062105-daaa06bf1aaf h1:wIOAyJMMen0ELGiFzlmqxdcV1yGbkyHBAB6PolcNbLA=
@@ -28,14 +28,12 @@ github.com/rivo/uniseg v0.1.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJ
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY=
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-go.opentelemetry.io/otel v0.19.0 h1:Lenfy7QHRXPZVsw/12CWpxX6d/JkrX8wrx2vO8G80Ng=
-go.opentelemetry.io/otel v0.19.0/go.mod h1:j9bF567N9EfomkSidSfmMwIwIBuP37AMAIzVW85OxSg=
-go.opentelemetry.io/otel/metric v0.19.0 h1:dtZ1Ju44gkJkYvo+3qGqVXmf88tc+a42edOywypengg=
-go.opentelemetry.io/otel/metric v0.19.0/go.mod h1:8f9fglJPRnXuskQmKpnad31lcLJ2VmNNqIsx/uIwBSc=
-go.opentelemetry.io/otel/oteltest v0.19.0 h1:YVfA0ByROYqTwOxqHVZYZExzEpfZor+MU1rU+ip2v9Q=
-go.opentelemetry.io/otel/oteltest v0.19.0/go.mod h1:tI4yxwh8U21v7JD6R3BcA/2+RBoTKFexE/PJ/nSO7IA=
-go.opentelemetry.io/otel/trace v0.19.0 h1:1ucYlenXIDA1OlHVLDZKX0ObXV5RLaq06DtUKz5e5zc=
-go.opentelemetry.io/otel/trace v0.19.0/go.mod h1:4IXiNextNOpPnRlI4ryK69mn5iC84bjBWZQA5DXz/qg=
+go.opentelemetry.io/otel v1.0.0-RC1 h1:4CeoX93DNTWt8awGK9JmNXzF9j7TyOu9upscEdtcdXc=
+go.opentelemetry.io/otel v1.0.0-RC1/go.mod h1:x9tRa9HK4hSSq7jf2TKbqFbtt58/TGk0f9XiEYISI1I=
+go.opentelemetry.io/otel/oteltest v1.0.0-RC1 h1:G685iP3XiskCwk/z0eIabL55XUl2gk0cljhGk9sB0Yk=
+go.opentelemetry.io/otel/oteltest v1.0.0-RC1/go.mod h1:+eoIG0gdEOaPNftuy1YScLr1Gb4mL/9lpDkZ0JjMRq4=
+go.opentelemetry.io/otel/trace v1.0.0-RC1 h1:jrjqKJZEibFrDz+umEASeU3LvdVyWKlnTh7XEfwrT58=
+go.opentelemetry.io/otel/trace v1.0.0-RC1/go.mod h1:86UHmyHWFEtWjfWPSbu0+d0Pf9Q6e1U+3ViBOc+NXAg=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=

net/gtrace/gtrace_baggage.go

@@ -10,7 +10,7 @@ import (
 	"context"
 	"github.com/gogf/gf/container/gmap"
 	"github.com/gogf/gf/container/gvar"
-	"go.opentelemetry.io/otel/attribute"
+	"github.com/gogf/gf/util/gconv"
 	"go.opentelemetry.io/otel/baggage"
 )
 
@@ -37,39 +37,37 @@ func (b *Baggage) Ctx() context.Context {
 // SetValue is a convenient function for adding one key-value pair to baggage.
 // Note that it uses attribute.Any to set the key-value pair.
 func (b *Baggage) SetValue(key string, value interface{}) context.Context {
-	b.ctx = baggage.ContextWithValues(b.ctx, attribute.Any(key, value))
+	member, _ := baggage.NewMember(key, gconv.String(value))
+	bag, _ := baggage.New(member)
+	b.ctx = baggage.ContextWithBaggage(b.ctx, bag)
 	return b.ctx
 }
 
 // SetMap is a convenient function for adding map key-value pairs to baggage.
 // Note that it uses attribute.Any to set the key-value pair.
 func (b *Baggage) SetMap(data map[string]interface{}) context.Context {
-	pairs := make([]attribute.KeyValue, 0)
+	members := make([]baggage.Member, 0)
 	for k, v := range data {
-		pairs = append(pairs, attribute.Any(k, v))
+		member, _ := baggage.NewMember(k, gconv.String(v))
+		members = append(members, member)
 	}
-	b.ctx = baggage.ContextWithValues(b.ctx, pairs...)
+	bag, _ := baggage.New(members...)
+	b.ctx = baggage.ContextWithBaggage(b.ctx, bag)
 	return b.ctx
 }
 
 // GetMap retrieves and returns the baggage values as map.
 func (b *Baggage) GetMap() *gmap.StrAnyMap {
 	m := gmap.NewStrAnyMap()
-	set := baggage.Set(b.ctx)
-	if length := set.Len(); length > 0 {
-		if length == 0 {
-			return m
-		}
-		inter := set.Iter()
-		for inter.Next() {
-			m.Set(string(inter.Label().Key), inter.Label().Value.AsInterface())
-		}
+	members := baggage.FromContext(b.ctx).Members()
+	for i := range members {
+		m.Set(members[i].Key(), members[i].Value())
 	}
 	return m
 }
 
 // GetVar retrieves value and returns a *gvar.Var for specified key from baggage.
 func (b *Baggage) GetVar(key string) *gvar.Var {
-	value := baggage.Value(b.ctx, attribute.Key(key))
-	return gvar.New(value.AsInterface())
+	value := baggage.FromContext(b.ctx).Member(key).Value()
+	return gvar.New(value)
 }

net/gtrace/gtrace_span.go

@@ -16,7 +16,7 @@ type Span struct {
 }
 
 // NewSpan creates a span using default tracer.
-func NewSpan(ctx context.Context, spanName string, opts ...trace.SpanOption) (context.Context, *Span) {
+func NewSpan(ctx context.Context, spanName string, opts ...trace.SpanStartOption) (context.Context, *Span) {
 	ctx, span := NewTracer().Start(ctx, spanName, opts...)
 	return ctx, &Span{
 		Span: span,

net/gtrace/gtrace_unit_carrier_test.go

@@ -57,7 +57,7 @@ func TestNewCarrier(t *testing.T) {
 		t.Assert(carrier1.String(), `{"traceparent":"00-4bf92f3577b34da6a3ce929d0e0e4736-0000000000000002-01","tracestate":""}`)
 
 		ctx = otel.GetTextMapPropagator().Extract(ctx, carrier1)
-		gotSc := trace.RemoteSpanContextFromContext(ctx)
+		gotSc := trace.SpanContextFromContext(ctx)
 		t.Assert(gotSc.TraceID().String(), traceID.String())
 		t.Assert(gotSc.SpanID().String(), "0000000000000002")
 	})