From d269ef5c98f5461dc5061692245a62f79014f520 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B8=82=E5=B7=9D=E6=81=AD=E4=BD=91?= Date: Wed, 27 Nov 2024 11:01:36 +0900 Subject: [PATCH] Modify sample code --- gcp/testdata/go.mod | 6 ++---- gcp/testdata/go.sum | 2 ++ gcp/testdata/main.go | 9 ++------- go.mod | 2 +- go.sum | 4 ---- 5 files changed, 7 insertions(+), 16 deletions(-) diff --git a/gcp/testdata/go.mod b/gcp/testdata/go.mod index 4bf34df..ff22bd2 100644 --- a/gcp/testdata/go.mod +++ b/gcp/testdata/go.mod @@ -1,11 +1,11 @@ -module testdata +module github.com/ebi-yade/spans/gcp/testdata go 1.23.2 require ( github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace v1.25.0 github.com/cockroachdb/errors v1.11.3 - github.com/ebi-yade/spans v0.0.0-00010101000000-000000000000 + github.com/ebi-yade/spans v0.0.3-0.20241111013100-1103f2c50d5c go.opentelemetry.io/otel v1.31.0 go.opentelemetry.io/otel/sdk v1.31.0 google.golang.org/api v0.205.0 @@ -50,5 +50,3 @@ require ( google.golang.org/grpc v1.67.1 // indirect google.golang.org/protobuf v1.35.1 // indirect ) - -replace github.com/ebi-yade/spans => ../.. diff --git a/gcp/testdata/go.sum b/gcp/testdata/go.sum index b112bf6..752e236 100644 --- a/gcp/testdata/go.sum +++ b/gcp/testdata/go.sum @@ -34,6 +34,8 @@ github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ3 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/ebi-yade/spans v0.0.3-0.20241111013100-1103f2c50d5c h1:EJ0oeFl/iB9htSl8K1ZMHznQu/YkxTT32xsPe38HvnU= +github.com/ebi-yade/spans v0.0.3-0.20241111013100-1103f2c50d5c/go.mod h1:k9fSIt9lTCsI6uryTBb7fJ3REnU92+KfiQRM2mhBVuE= github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98= diff --git a/gcp/testdata/main.go b/gcp/testdata/main.go index f33a4e2..8b4b16f 100644 --- a/gcp/testdata/main.go +++ b/gcp/testdata/main.go @@ -57,9 +57,6 @@ type Something struct { SecretString string `otel:"-"` - Time time.Time - Duration time.Duration - IntSlice []int StringSlice []string } @@ -73,17 +70,15 @@ func newSomething() Something { SecretString: "secret", - Time: time.Now(), - Duration: 10 * time.Second, - IntSlice: []int{1, 2, 3}, StringSlice: []string{"hello", "world"}, } } func doSomething(ctx context.Context) error { + sth := newSomething() ctx, span := tracer.Start(ctx, "doSomething", spans.WithAttrs( - spans.ObjectAttr("something", newSomething()), + spans.ObjectAttr("something", sth), )) defer span.End() diff --git a/go.mod b/go.mod index 002fc5d..35f058e 100644 --- a/go.mod +++ b/go.mod @@ -7,6 +7,7 @@ toolchain go1.22.7 require ( github.com/stretchr/testify v1.9.0 go.opentelemetry.io/otel v1.31.0 + go.opentelemetry.io/otel/sdk v1.31.0 go.opentelemetry.io/otel/trace v1.31.0 ) @@ -17,7 +18,6 @@ require ( github.com/google/uuid v1.6.0 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect go.opentelemetry.io/otel/metric v1.31.0 // indirect - go.opentelemetry.io/otel/sdk v1.31.0 // indirect golang.org/x/sys v0.26.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/go.sum b/go.sum index 92712cb..3493396 100644 --- a/go.sum +++ b/go.sum @@ -13,16 +13,12 @@ github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZb github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= -go.opentelemetry.io/otel v1.30.0 h1:F2t8sK4qf1fAmY9ua4ohFS/K+FUuOPemHUIXHtktrts= -go.opentelemetry.io/otel v1.30.0/go.mod h1:tFw4Br9b7fOS+uEao81PJjVMjW/5fvNCbpsDIXqP0pc= go.opentelemetry.io/otel v1.31.0 h1:NsJcKPIW0D0H3NgzPDHmo0WW6SptzPdqg/L1zsIm2hY= go.opentelemetry.io/otel v1.31.0/go.mod h1:O0C14Yl9FgkjqcCZAsE053C13OaddMYr/hz6clDkEJE= go.opentelemetry.io/otel/metric v1.31.0 h1:FSErL0ATQAmYHUIzSezZibnyVlft1ybhy4ozRPcF2fE= go.opentelemetry.io/otel/metric v1.31.0/go.mod h1:C3dEloVbLuYoX41KpmAhOqNriGbA+qqH6PQ5E5mUfnY= go.opentelemetry.io/otel/sdk v1.31.0 h1:xLY3abVHYZ5HSfOg3l2E5LUj2Cwva5Y7yGxnSW9H5Gk= go.opentelemetry.io/otel/sdk v1.31.0/go.mod h1:TfRbMdhvxIIr/B2N2LQW2S5v9m3gOQ/08KsbbO5BPT0= -go.opentelemetry.io/otel/trace v1.30.0 h1:7UBkkYzeg3C7kQX8VAidWh2biiQbtAKjyIML8dQ9wmc= -go.opentelemetry.io/otel/trace v1.30.0/go.mod h1:5EyKqTzzmyqB9bwtCCq6pDLktPK6fmGf/Dph+8VI02o= go.opentelemetry.io/otel/trace v1.31.0 h1:ffjsj1aRouKewfr85U2aGagJ46+MvodynlQ1HYdmJys= go.opentelemetry.io/otel/trace v1.31.0/go.mod h1:TXZkRk7SM2ZQLtR6eoAWQFIHPvzQ06FJAsO1tJg480A= golang.org/x/sys v0.26.0 h1:KHjCJyddX0LoSTb3J+vWpupP9p0oznkqVk/IfjymZbo=