diff --git a/go.mod b/go.mod index c23bbc639..b27eb6035 100644 --- a/go.mod +++ b/go.mod @@ -13,16 +13,9 @@ require ( github.com/mattn/go-runewidth v0.0.10 // indirect github.com/olekukonko/tablewriter v0.0.1 go.opentelemetry.io/otel v0.19.0 - go.opentelemetry.io/otel/metric v0.19.0 // indirect go.opentelemetry.io/otel/oteltest v0.19.0 go.opentelemetry.io/otel/trace v0.19.0 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 ) - -replace ( - go.opentelemetry.io/otel => go.opentelemetry.io/otel v0.18.0 - go.opentelemetry.io/otel/oteltest => go.opentelemetry.io/otel/oteltest v0.18.0 - go.opentelemetry.io/otel/trace => go.opentelemetry.io/otel/trace v0.18.0 -) diff --git a/go.sum b/go.sum index 6de4225b3..f936b51f4 100644 --- a/go.sum +++ b/go.sum @@ -10,7 +10,6 @@ github.com/go-sql-driver/mysql v1.5.0 h1:ozyZYNQW3x3HtqT1jira07DN2PArx2v7/mN66gG github.com/go-sql-driver/mysql v1.5.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg= 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.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= 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/gorilla/websocket v1.4.1 h1:q7AeDBpnBk8AogcD4DSag/Ukw/KV+YhzLj2bP5HvKCM= @@ -28,18 +27,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.18.0 h1:d5Of7+Zw4ANFOJB+TIn2K3QWsgS2Ht7OU9DqZHI6qu8= -go.opentelemetry.io/otel v0.18.0/go.mod h1:PT5zQj4lTsR1YeARt8YNKcFb88/c2IKoSABK9mX0r78= 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.18.0/go.mod h1:kEH2QtzAyBy3xDVQfGZKIcok4ZZFvd5xyKPfPcuK6pE= 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.18.0/go.mod h1:NyierCU3/G8DLTva7KRzGii2fdxdR89zXKH1bNWY7Bo= 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.18.0 h1:ilCfc/fptVKaDMK1vWk0elxpolurJbEgey9J6g6s+wk= -go.opentelemetry.io/otel/trace v0.18.0/go.mod h1:FzdUu3BPwZSZebfQ1vl5/tAa8LyMLXSJN57AXIt/iDk= go.opentelemetry.io/otel/trace v0.19.0 h1:1ucYlenXIDA1OlHVLDZKX0ObXV5RLaq06DtUKz5e5zc= go.opentelemetry.io/otel/trace v0.19.0/go.mod h1:4IXiNextNOpPnRlI4ryK69mn5iC84bjBWZQA5DXz/qg= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= diff --git a/net/gtrace/gtrace.go b/net/gtrace/gtrace.go index 6dadbf83e..34d906cee 100644 --- a/net/gtrace/gtrace.go +++ b/net/gtrace/gtrace.go @@ -85,7 +85,7 @@ func GetTraceId(ctx context.Context) string { if ctx == nil { return "" } - traceId := trace.SpanContextFromContext(ctx).TraceID + traceId := trace.SpanContextFromContext(ctx).TraceID() if traceId.IsValid() { return traceId.String() } @@ -98,7 +98,7 @@ func GetSpanId(ctx context.Context) string { if ctx == nil { return "" } - spanId := trace.SpanContextFromContext(ctx).SpanID + spanId := trace.SpanContextFromContext(ctx).SpanID() if spanId.IsValid() { return spanId.String() } diff --git a/os/glog/glog_logger.go b/os/glog/glog_logger.go index 47cda36b0..59d3d4f88 100644 --- a/os/glog/glog_logger.go +++ b/os/glog/glog_logger.go @@ -166,7 +166,7 @@ func (l *Logger) print(std io.Writer, lead string, values ...interface{}) { if l.ctx != nil { // Tracing values. spanCtx := trace.SpanContextFromContext(l.ctx) - if traceId := spanCtx.TraceID; traceId.IsValid() { + if traceId := spanCtx.TraceID(); traceId.IsValid() { buffer.WriteString(fmt.Sprintf("{TraceID:%s} ", traceId.String())) } // Context values.