diff --git a/CHANGELOG.md b/CHANGELOG.md index 44f6d470254..03dc9d2fe2b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,8 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm ## [Unreleased] +## [0.12.0] - 2020-09-25 + ### Added - Benchmark tests for the gRPC instrumentation. (#296) @@ -184,7 +186,8 @@ First official tagged release of `contrib` repository. - Prefix support for dogstatsd (#34) - Update Go Runtime package to use batch observer (#44) -[Unreleased]: https://github.com/open-telemetry/opentelemetry-go-contrib/compare/v0.11.0...HEAD +[Unreleased]: https://github.com/open-telemetry/opentelemetry-go-contrib/compare/v0.12.0...HEAD +[0.12.0]: https://github.com/open-telemetry/opentelemetry-go-contrib/releases/tag/v0.12.0 [0.11.0]: https://github.com/open-telemetry/opentelemetry-go-contrib/releases/tag/v0.11.0 [0.10.1]: https://github.com/open-telemetry/opentelemetry-go-contrib/releases/tag/v0.10.1 [0.10.0]: https://github.com/open-telemetry/opentelemetry-go-contrib/releases/tag/v0.10.0 diff --git a/contrib.go b/contrib.go index 8cc2f019d38..ab97820365c 100644 --- a/contrib.go +++ b/contrib.go @@ -18,7 +18,7 @@ package contrib // import "go.opentelemetry.io/contrib" // Version is the current release version of OpenTelemetry Contrib in use. func Version() string { - return "0.11.0" + return "0.12.0" // This string is updated by the pre_release.sh script during release } diff --git a/detectors/aws/go.mod b/detectors/aws/go.mod index ad10a4217a1..42d7264c67c 100644 --- a/detectors/aws/go.mod +++ b/detectors/aws/go.mod @@ -4,6 +4,6 @@ go 1.14 require ( github.com/aws/aws-sdk-go v1.34.30 - go.opentelemetry.io/otel v0.11.0 - go.opentelemetry.io/otel/sdk v0.11.0 + go.opentelemetry.io/otel v0.12.0 + go.opentelemetry.io/otel/sdk v0.12.0 ) diff --git a/detectors/aws/go.sum b/detectors/aws/go.sum index 262fc68980c..c7049b7c5cd 100644 --- a/detectors/aws/go.sum +++ b/detectors/aws/go.sum @@ -21,8 +21,8 @@ github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5y github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw= github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.1 h1:JFrFEBb2xKufg6XkJsJr+WbKb4FQlURi5RUcBveYu9k= -github.com/google/go-cmp v0.5.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.2 h1:X2ev0eStA3AbceY54o37/0PQ/UWqKEiiO2dKL5OPaFM= +github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/gofuzz v1.1.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg= github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo= @@ -35,10 +35,10 @@ github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1: github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/testify v1.6.1 h1:hDPOHmpOpP40lSULcqw7IrRb/u7w6RpDC9399XyoNd0= github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -go.opentelemetry.io/otel v0.11.0 h1:IN2tzQa9Gc4ZVKnTaMbPVcHjvzOdg5n9QfnmlqiET7E= -go.opentelemetry.io/otel v0.11.0/go.mod h1:G8UCk+KooF2HLkgo8RHX9epABH/aRGYET7gQOqBVdB0= -go.opentelemetry.io/otel/sdk v0.11.0 h1:bkDMymVj6gIkPfgC5ci5atq0OYbfUHSn8NvsmyfyMq4= -go.opentelemetry.io/otel/sdk v0.11.0/go.mod h1:XbZ6MrzIZ+d+qr7pH0FwHIbCnANMvXYgkq4afL/IUMQ= +go.opentelemetry.io/otel v0.12.0 h1:bwWaPd/h2q+U6KdKaAiOS5GLwOMd1LDt9iNaeyIoAI8= +go.opentelemetry.io/otel v0.12.0/go.mod h1:dlSNewoRYikTkotEnxdmuBHgzT+k/idJSfDv/FxEnOY= +go.opentelemetry.io/otel/sdk v0.12.0 h1:YVUyDXsGvFWjhJxGXT4kBcGdfoTbo1vSGjbGRUdRh5U= +go.opentelemetry.io/otel/sdk v0.12.0/go.mod h1:u3joRdxhrS1hUf9xSFH8vgdXdujQ3jxXxZl3loZFSqs= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= @@ -71,7 +71,7 @@ google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY= -google.golang.org/grpc v1.31.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= +google.golang.org/grpc v1.32.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10= diff --git a/detectors/gcp/go.mod b/detectors/gcp/go.mod index 42d19cae9ca..0f42c46595a 100644 --- a/detectors/gcp/go.mod +++ b/detectors/gcp/go.mod @@ -4,6 +4,6 @@ go 1.14 require ( cloud.google.com/go v0.66.0 - go.opentelemetry.io/otel v0.11.0 - go.opentelemetry.io/otel/sdk v0.11.0 + go.opentelemetry.io/otel v0.12.0 + go.opentelemetry.io/otel/sdk v0.12.0 ) diff --git a/detectors/gcp/go.sum b/detectors/gcp/go.sum index df6f95b8d8b..cb596ab6a01 100644 --- a/detectors/gcp/go.sum +++ b/detectors/gcp/go.sum @@ -136,10 +136,10 @@ go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= -go.opentelemetry.io/otel v0.11.0 h1:IN2tzQa9Gc4ZVKnTaMbPVcHjvzOdg5n9QfnmlqiET7E= -go.opentelemetry.io/otel v0.11.0/go.mod h1:G8UCk+KooF2HLkgo8RHX9epABH/aRGYET7gQOqBVdB0= -go.opentelemetry.io/otel/sdk v0.11.0 h1:bkDMymVj6gIkPfgC5ci5atq0OYbfUHSn8NvsmyfyMq4= -go.opentelemetry.io/otel/sdk v0.11.0/go.mod h1:XbZ6MrzIZ+d+qr7pH0FwHIbCnANMvXYgkq4afL/IUMQ= +go.opentelemetry.io/otel v0.12.0 h1:bwWaPd/h2q+U6KdKaAiOS5GLwOMd1LDt9iNaeyIoAI8= +go.opentelemetry.io/otel v0.12.0/go.mod h1:dlSNewoRYikTkotEnxdmuBHgzT+k/idJSfDv/FxEnOY= +go.opentelemetry.io/otel/sdk v0.12.0 h1:YVUyDXsGvFWjhJxGXT4kBcGdfoTbo1vSGjbGRUdRh5U= +go.opentelemetry.io/otel/sdk v0.12.0/go.mod h1:u3joRdxhrS1hUf9xSFH8vgdXdujQ3jxXxZl3loZFSqs= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= @@ -373,6 +373,7 @@ google.golang.org/grpc v1.30.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM google.golang.org/grpc v1.31.0 h1:T7P4R73V3SSDPhH7WW7ATbfViLtmamH0DKrP3f9AuDI= google.golang.org/grpc v1.31.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= google.golang.org/grpc v1.31.1/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= +google.golang.org/grpc v1.32.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= diff --git a/exporters/metric/cortex/cortex.go b/exporters/metric/cortex/cortex.go index 0f689f4803f..b4fff4f4264 100644 --- a/exporters/metric/cortex/cortex.go +++ b/exporters/metric/cortex/cortex.go @@ -105,13 +105,13 @@ func NewExportPipeline(config Config, options ...push.Option) (*push.Controller, return pusher, nil } -// InstallNewPipeline registers a push Controller's Provider globally. +// InstallNewPipeline registers a push Controller's MeterProvider globally. func InstallNewPipeline(config Config, options ...push.Option) (*push.Controller, error) { pusher, err := NewExportPipeline(config, options...) if err != nil { return nil, err } - global.SetMeterProvider(pusher.Provider()) + global.SetMeterProvider(pusher.MeterProvider()) return pusher, nil } diff --git a/exporters/metric/cortex/cortex_test.go b/exporters/metric/cortex/cortex_test.go index 151228e40c9..a72537ba41c 100644 --- a/exporters/metric/cortex/cortex_test.go +++ b/exporters/metric/cortex/cortex_test.go @@ -189,13 +189,13 @@ func TestNewExportPipeline(t *testing.T) { } // TestInstallNewPipeline checks whether InstallNewPipeline successfully returns a push -// Controller and whether that controller's Provider is registered globally. +// Controller and whether that controller's MeterProvider is registered globally. func TestInstallNewPipeline(t *testing.T) { pusher, err := InstallNewPipeline(validConfig) if err != nil { t.Fatalf("Failed to create install pipeline with error %v", err) } - if global.MeterProvider() != pusher.Provider() { + if global.MeterProvider() != pusher.MeterProvider() { t.Fatalf("Failed to register push Controller provider globally") } } diff --git a/exporters/metric/cortex/example/go.mod b/exporters/metric/cortex/example/go.mod index 1bfad619d67..4af6ca1369b 100644 --- a/exporters/metric/cortex/example/go.mod +++ b/exporters/metric/cortex/example/go.mod @@ -2,10 +2,15 @@ module go.opentelemetry.io/contrib/exporters/metric/cortex/example go 1.14 +replace ( + go.opentelemetry.io/contrib/exporters/metric/cortex => ../ + go.opentelemetry.io/contrib/exporters/metric/cortex/utils => ../utils/ +) + require ( - go.opentelemetry.io/contrib/exporters/metric/cortex v0.11.0 - go.opentelemetry.io/contrib/exporters/metric/cortex/utils v0.11.0 - go.opentelemetry.io/otel v0.11.0 - go.opentelemetry.io/otel/sdk v0.11.0 + go.opentelemetry.io/contrib/exporters/metric/cortex v0.12.0 + go.opentelemetry.io/contrib/exporters/metric/cortex/utils v0.12.0 + go.opentelemetry.io/otel v0.12.0 + go.opentelemetry.io/otel/sdk v0.12.0 gopkg.in/yaml.v2 v2.2.5 // indirect ) diff --git a/exporters/metric/cortex/example/go.sum b/exporters/metric/cortex/example/go.sum index f377a059a89..1c62175abac 100644 --- a/exporters/metric/cortex/example/go.sum +++ b/exporters/metric/cortex/example/go.sum @@ -70,15 +70,15 @@ github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5y github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.3.3 h1:gyjaxf+svBWX08ZjK86iN9geUJF0H6gp2IRKX6Nf6/I= github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw= -github.com/golang/snappy v0.0.1 h1:Qgr9rKW7uDUkrbSmQeiDsGa8SjGyCOGtuasMWwvp2P4= -github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= +github.com/golang/snappy v0.0.2 h1:aeE13tS0IiQgFjYdoL8qN3K1N2bXXtI6Vi51/y7BpMw= +github.com/golang/snappy v0.0.2/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.1 h1:JFrFEBb2xKufg6XkJsJr+WbKb4FQlURi5RUcBveYu9k= -github.com/google/go-cmp v0.5.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.2 h1:X2ev0eStA3AbceY54o37/0PQ/UWqKEiiO2dKL5OPaFM= +github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/gofuzz v1.1.0 h1:Hsa8mG0dQ46ij8Sl2AYJDUv1oA9/d6Vk+3LG99Oe02g= github.com/google/gofuzz v1.1.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs= @@ -186,8 +186,8 @@ github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9 github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM= github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ= -github.com/spf13/afero v1.3.4 h1:8q6vk3hthlpb2SouZcnBVKboxWQWMDNF38bwholZrJc= -github.com/spf13/afero v1.3.4/go.mod h1:Ai8FlHk4v/PARR026UzYexafAt9roJ7LcLMAmO6Z93I= +github.com/spf13/afero v1.4.0 h1:jsLTaI1zwYO3vjrzHalkVcIHXTNmdQFepW4OI8H3+x8= +github.com/spf13/afero v1.4.0/go.mod h1:Ai8FlHk4v/PARR026UzYexafAt9roJ7LcLMAmO6Z93I= github.com/spf13/cast v1.3.0 h1:oget//CVOEoFewqQxwr0Ej5yjygnqGkvggSE/gB35Q8= github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= github.com/spf13/jwalterweatherman v1.0.0 h1:XHEdyB+EcvlqZamSM4ZOMGlc93t6AcsBEu9Gc1vn7yk= @@ -210,14 +210,10 @@ github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= -go.opentelemetry.io/contrib/exporters/metric/cortex v0.11.0 h1:JXXC9Q6ykERkE36BoXcpEVPxU145dj+RbZASMltM124= -go.opentelemetry.io/contrib/exporters/metric/cortex v0.11.0/go.mod h1:pgvKTEzZZYj7KDPJos0dGHJDg+VHnXij66qUBNFaWVI= -go.opentelemetry.io/contrib/exporters/metric/cortex/utils v0.11.0 h1:3Ih/kE7c35n41cyfJ7sUbCmxzgd+bHjYiYEJURJxXhs= -go.opentelemetry.io/contrib/exporters/metric/cortex/utils v0.11.0/go.mod h1:M/DWtSlAAWkh8gir+ZvY0Sz+L/V8ekVxRsxfOB68WZc= -go.opentelemetry.io/otel v0.11.0 h1:IN2tzQa9Gc4ZVKnTaMbPVcHjvzOdg5n9QfnmlqiET7E= -go.opentelemetry.io/otel v0.11.0/go.mod h1:G8UCk+KooF2HLkgo8RHX9epABH/aRGYET7gQOqBVdB0= -go.opentelemetry.io/otel/sdk v0.11.0 h1:bkDMymVj6gIkPfgC5ci5atq0OYbfUHSn8NvsmyfyMq4= -go.opentelemetry.io/otel/sdk v0.11.0/go.mod h1:XbZ6MrzIZ+d+qr7pH0FwHIbCnANMvXYgkq4afL/IUMQ= +go.opentelemetry.io/otel v0.12.0 h1:bwWaPd/h2q+U6KdKaAiOS5GLwOMd1LDt9iNaeyIoAI8= +go.opentelemetry.io/otel v0.12.0/go.mod h1:dlSNewoRYikTkotEnxdmuBHgzT+k/idJSfDv/FxEnOY= +go.opentelemetry.io/otel/sdk v0.12.0 h1:YVUyDXsGvFWjhJxGXT4kBcGdfoTbo1vSGjbGRUdRh5U= +go.opentelemetry.io/otel/sdk v0.12.0/go.mod h1:u3joRdxhrS1hUf9xSFH8vgdXdujQ3jxXxZl3loZFSqs= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0= go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= @@ -340,8 +336,8 @@ google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyac google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY= google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= google.golang.org/grpc v1.29.1/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3IjizoKk= -google.golang.org/grpc v1.31.0 h1:T7P4R73V3SSDPhH7WW7ATbfViLtmamH0DKrP3f9AuDI= -google.golang.org/grpc v1.31.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= +google.golang.org/grpc v1.32.0 h1:zWTV+LMdc3kaiJMSTOFz2UgSBgx8RNQoTGiZu3fR9S0= +google.golang.org/grpc v1.32.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY= diff --git a/exporters/metric/cortex/example/main.go b/exporters/metric/cortex/example/main.go index b8cde35fe20..7dcc6d629b5 100644 --- a/exporters/metric/cortex/example/main.go +++ b/exporters/metric/cortex/example/main.go @@ -47,7 +47,7 @@ func main() { fmt.Println("Success: Installed Exporter Pipeline") // Create a counter and a value recorder - meter := pusher.Provider().Meter("example") + meter := pusher.MeterProvider().Meter("example") ctx := context.Background() // Create instruments. diff --git a/exporters/metric/cortex/go.mod b/exporters/metric/cortex/go.mod index e248bd314a2..370b93839ca 100644 --- a/exporters/metric/cortex/go.mod +++ b/exporters/metric/cortex/go.mod @@ -9,6 +9,6 @@ require ( github.com/grpc-ecosystem/grpc-gateway v1.14.6 // indirect github.com/prometheus/prometheus v2.5.0+incompatible github.com/stretchr/testify v1.6.1 - go.opentelemetry.io/otel v0.11.0 - go.opentelemetry.io/otel/sdk v0.11.0 + go.opentelemetry.io/otel v0.12.0 + go.opentelemetry.io/otel/sdk v0.12.0 ) diff --git a/exporters/metric/cortex/go.sum b/exporters/metric/cortex/go.sum index cbc769e637e..599302e4fd8 100644 --- a/exporters/metric/cortex/go.sum +++ b/exporters/metric/cortex/go.sum @@ -28,8 +28,6 @@ github.com/golang/snappy v0.0.2 h1:aeE13tS0IiQgFjYdoL8qN3K1N2bXXtI6Vi51/y7BpMw= github.com/golang/snappy v0.0.2/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.1 h1:JFrFEBb2xKufg6XkJsJr+WbKb4FQlURi5RUcBveYu9k= -github.com/google/go-cmp v0.5.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.2 h1:X2ev0eStA3AbceY54o37/0PQ/UWqKEiiO2dKL5OPaFM= github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/gofuzz v1.1.0 h1:Hsa8mG0dQ46ij8Sl2AYJDUv1oA9/d6Vk+3LG99Oe02g= @@ -48,10 +46,10 @@ github.com/stretchr/objx v0.1.0 h1:4G4v2dO3VZwixGIRoQ5Lfboy6nUhCyYzaqnIAPPhYs4= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/testify v1.6.1 h1:hDPOHmpOpP40lSULcqw7IrRb/u7w6RpDC9399XyoNd0= github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -go.opentelemetry.io/otel v0.11.0 h1:IN2tzQa9Gc4ZVKnTaMbPVcHjvzOdg5n9QfnmlqiET7E= -go.opentelemetry.io/otel v0.11.0/go.mod h1:G8UCk+KooF2HLkgo8RHX9epABH/aRGYET7gQOqBVdB0= -go.opentelemetry.io/otel/sdk v0.11.0 h1:bkDMymVj6gIkPfgC5ci5atq0OYbfUHSn8NvsmyfyMq4= -go.opentelemetry.io/otel/sdk v0.11.0/go.mod h1:XbZ6MrzIZ+d+qr7pH0FwHIbCnANMvXYgkq4afL/IUMQ= +go.opentelemetry.io/otel v0.12.0 h1:bwWaPd/h2q+U6KdKaAiOS5GLwOMd1LDt9iNaeyIoAI8= +go.opentelemetry.io/otel v0.12.0/go.mod h1:dlSNewoRYikTkotEnxdmuBHgzT+k/idJSfDv/FxEnOY= +go.opentelemetry.io/otel/sdk v0.12.0 h1:YVUyDXsGvFWjhJxGXT4kBcGdfoTbo1vSGjbGRUdRh5U= +go.opentelemetry.io/otel/sdk v0.12.0/go.mod h1:u3joRdxhrS1hUf9xSFH8vgdXdujQ3jxXxZl3loZFSqs= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= @@ -93,8 +91,8 @@ google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyac google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY= google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= google.golang.org/grpc v1.29.1/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3IjizoKk= -google.golang.org/grpc v1.31.0 h1:T7P4R73V3SSDPhH7WW7ATbfViLtmamH0DKrP3f9AuDI= -google.golang.org/grpc v1.31.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= +google.golang.org/grpc v1.32.0 h1:zWTV+LMdc3kaiJMSTOFz2UgSBgx8RNQoTGiZu3fR9S0= +google.golang.org/grpc v1.32.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/yaml.v2 v2.2.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= diff --git a/exporters/metric/cortex/utils/go.mod b/exporters/metric/cortex/utils/go.mod index 9449c2cabf3..537106eb70b 100644 --- a/exporters/metric/cortex/utils/go.mod +++ b/exporters/metric/cortex/utils/go.mod @@ -8,5 +8,5 @@ require ( github.com/spf13/afero v1.4.0 github.com/spf13/viper v1.7.1 github.com/stretchr/testify v1.6.1 - go.opentelemetry.io/contrib/exporters/metric/cortex v0.11.0 + go.opentelemetry.io/contrib/exporters/metric/cortex v0.12.0 ) diff --git a/exporters/metric/cortex/utils/go.sum b/exporters/metric/cortex/utils/go.sum index f86459876dd..4bb0422d5e2 100644 --- a/exporters/metric/cortex/utils/go.sum +++ b/exporters/metric/cortex/utils/go.sum @@ -77,8 +77,6 @@ github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.1 h1:JFrFEBb2xKufg6XkJsJr+WbKb4FQlURi5RUcBveYu9k= -github.com/google/go-cmp v0.5.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.2 h1:X2ev0eStA3AbceY54o37/0PQ/UWqKEiiO2dKL5OPaFM= github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/gofuzz v1.1.0 h1:Hsa8mG0dQ46ij8Sl2AYJDUv1oA9/d6Vk+3LG99Oe02g= @@ -212,10 +210,10 @@ github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= -go.opentelemetry.io/otel v0.11.0 h1:IN2tzQa9Gc4ZVKnTaMbPVcHjvzOdg5n9QfnmlqiET7E= -go.opentelemetry.io/otel v0.11.0/go.mod h1:G8UCk+KooF2HLkgo8RHX9epABH/aRGYET7gQOqBVdB0= -go.opentelemetry.io/otel/sdk v0.11.0 h1:bkDMymVj6gIkPfgC5ci5atq0OYbfUHSn8NvsmyfyMq4= -go.opentelemetry.io/otel/sdk v0.11.0/go.mod h1:XbZ6MrzIZ+d+qr7pH0FwHIbCnANMvXYgkq4afL/IUMQ= +go.opentelemetry.io/otel v0.12.0 h1:bwWaPd/h2q+U6KdKaAiOS5GLwOMd1LDt9iNaeyIoAI8= +go.opentelemetry.io/otel v0.12.0/go.mod h1:dlSNewoRYikTkotEnxdmuBHgzT+k/idJSfDv/FxEnOY= +go.opentelemetry.io/otel/sdk v0.12.0 h1:YVUyDXsGvFWjhJxGXT4kBcGdfoTbo1vSGjbGRUdRh5U= +go.opentelemetry.io/otel/sdk v0.12.0/go.mod h1:u3joRdxhrS1hUf9xSFH8vgdXdujQ3jxXxZl3loZFSqs= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0= go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= @@ -339,8 +337,8 @@ google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyac google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY= google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= google.golang.org/grpc v1.29.1/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3IjizoKk= -google.golang.org/grpc v1.31.0 h1:T7P4R73V3SSDPhH7WW7ATbfViLtmamH0DKrP3f9AuDI= -google.golang.org/grpc v1.31.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= +google.golang.org/grpc v1.32.0 h1:zWTV+LMdc3kaiJMSTOFz2UgSBgx8RNQoTGiZu3fR9S0= +google.golang.org/grpc v1.32.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY= diff --git a/exporters/metric/datadog/example_test.go b/exporters/metric/datadog/example_test.go index 772a9a2056b..6fc6a22ab9d 100644 --- a/exporters/metric/datadog/example_test.go +++ b/exporters/metric/datadog/example_test.go @@ -61,7 +61,7 @@ func ExampleExporter() { pusher := push.New(processor, exp, push.WithPeriod(time.Second*10)) defer pusher.Stop() pusher.Start() - global.SetMeterProvider(pusher.Provider()) + global.SetMeterProvider(pusher.MeterProvider()) meter := global.Meter("marwandist") m := metric.Must(meter).NewInt64ValueRecorder("myrecorder") meter.RecordBatch(context.Background(), []label.KeyValue{label.Int("l", 1)}, diff --git a/exporters/metric/datadog/go.mod b/exporters/metric/datadog/go.mod index a717a7df7d9..cb2938db81d 100644 --- a/exporters/metric/datadog/go.mod +++ b/exporters/metric/datadog/go.mod @@ -5,6 +5,6 @@ go 1.14 require ( github.com/DataDog/datadog-go v3.7.2+incompatible github.com/DataDog/sketches-go v0.0.1 - go.opentelemetry.io/otel v0.11.0 - go.opentelemetry.io/otel/sdk v0.11.0 + go.opentelemetry.io/otel v0.12.0 + go.opentelemetry.io/otel/sdk v0.12.0 ) diff --git a/exporters/metric/datadog/go.sum b/exporters/metric/datadog/go.sum index f7284308140..f9807a41202 100644 --- a/exporters/metric/datadog/go.sum +++ b/exporters/metric/datadog/go.sum @@ -23,8 +23,8 @@ github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaW github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= github.com/google/go-cmp v0.4.0 h1:xsAVV57WRhGj6kEIi8ReJzQlHHqcBYCElAvkovg3B/4= github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.1 h1:JFrFEBb2xKufg6XkJsJr+WbKb4FQlURi5RUcBveYu9k= -github.com/google/go-cmp v0.5.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.2 h1:X2ev0eStA3AbceY54o37/0PQ/UWqKEiiO2dKL5OPaFM= +github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/gofuzz v1.1.0 h1:Hsa8mG0dQ46ij8Sl2AYJDUv1oA9/d6Vk+3LG99Oe02g= github.com/google/gofuzz v1.1.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= @@ -34,10 +34,10 @@ github.com/stretchr/objx v0.1.0 h1:4G4v2dO3VZwixGIRoQ5Lfboy6nUhCyYzaqnIAPPhYs4= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/testify v1.6.1 h1:hDPOHmpOpP40lSULcqw7IrRb/u7w6RpDC9399XyoNd0= github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -go.opentelemetry.io/otel v0.11.0 h1:IN2tzQa9Gc4ZVKnTaMbPVcHjvzOdg5n9QfnmlqiET7E= -go.opentelemetry.io/otel v0.11.0/go.mod h1:G8UCk+KooF2HLkgo8RHX9epABH/aRGYET7gQOqBVdB0= -go.opentelemetry.io/otel/sdk v0.11.0 h1:bkDMymVj6gIkPfgC5ci5atq0OYbfUHSn8NvsmyfyMq4= -go.opentelemetry.io/otel/sdk v0.11.0/go.mod h1:XbZ6MrzIZ+d+qr7pH0FwHIbCnANMvXYgkq4afL/IUMQ= +go.opentelemetry.io/otel v0.12.0 h1:bwWaPd/h2q+U6KdKaAiOS5GLwOMd1LDt9iNaeyIoAI8= +go.opentelemetry.io/otel v0.12.0/go.mod h1:dlSNewoRYikTkotEnxdmuBHgzT+k/idJSfDv/FxEnOY= +go.opentelemetry.io/otel/sdk v0.12.0 h1:YVUyDXsGvFWjhJxGXT4kBcGdfoTbo1vSGjbGRUdRh5U= +go.opentelemetry.io/otel/sdk v0.12.0/go.mod h1:u3joRdxhrS1hUf9xSFH8vgdXdujQ3jxXxZl3loZFSqs= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= @@ -67,7 +67,7 @@ google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY= -google.golang.org/grpc v1.31.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= +google.golang.org/grpc v1.32.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo= diff --git a/exporters/metric/dogstatsd/dogstatsd.go b/exporters/metric/dogstatsd/dogstatsd.go index 207dc86c57f..bbb6e154285 100644 --- a/exporters/metric/dogstatsd/dogstatsd.go +++ b/exporters/metric/dogstatsd/dogstatsd.go @@ -74,7 +74,7 @@ func InstallNewPipeline(config Config) (*push.Controller, error) { if err != nil { return controller, err } - global.SetMeterProvider(controller.Provider()) + global.SetMeterProvider(controller.MeterProvider()) return controller, err } diff --git a/exporters/metric/dogstatsd/example_test.go b/exporters/metric/dogstatsd/example_test.go index c7f2bd8392d..113fd7e551f 100644 --- a/exporters/metric/dogstatsd/example_test.go +++ b/exporters/metric/dogstatsd/example_test.go @@ -77,7 +77,7 @@ func ExampleNew() { key := label.Key("key") // pusher implements the metric.MeterProvider interface: - meter := pusher.Provider().Meter("example") + meter := pusher.MeterProvider().Meter("example") // Create and update a single counter: counter := metric.Must(meter).NewInt64Counter("a.counter") diff --git a/exporters/metric/dogstatsd/go.mod b/exporters/metric/dogstatsd/go.mod index 78fec031b92..80a490f998c 100644 --- a/exporters/metric/dogstatsd/go.mod +++ b/exporters/metric/dogstatsd/go.mod @@ -4,6 +4,6 @@ go 1.14 require ( github.com/stretchr/testify v1.6.1 - go.opentelemetry.io/otel v0.11.0 - go.opentelemetry.io/otel/sdk v0.11.0 + go.opentelemetry.io/otel v0.12.0 + go.opentelemetry.io/otel/sdk v0.12.0 ) diff --git a/exporters/metric/dogstatsd/go.sum b/exporters/metric/dogstatsd/go.sum index aa3aace2589..a94400d55f3 100644 --- a/exporters/metric/dogstatsd/go.sum +++ b/exporters/metric/dogstatsd/go.sum @@ -21,8 +21,8 @@ github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaW github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= github.com/google/go-cmp v0.4.0 h1:xsAVV57WRhGj6kEIi8ReJzQlHHqcBYCElAvkovg3B/4= github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.1 h1:JFrFEBb2xKufg6XkJsJr+WbKb4FQlURi5RUcBveYu9k= -github.com/google/go-cmp v0.5.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.2 h1:X2ev0eStA3AbceY54o37/0PQ/UWqKEiiO2dKL5OPaFM= +github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/gofuzz v1.1.0 h1:Hsa8mG0dQ46ij8Sl2AYJDUv1oA9/d6Vk+3LG99Oe02g= github.com/google/gofuzz v1.1.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= @@ -32,10 +32,10 @@ github.com/stretchr/objx v0.1.0 h1:4G4v2dO3VZwixGIRoQ5Lfboy6nUhCyYzaqnIAPPhYs4= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/testify v1.6.1 h1:hDPOHmpOpP40lSULcqw7IrRb/u7w6RpDC9399XyoNd0= github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -go.opentelemetry.io/otel v0.11.0 h1:IN2tzQa9Gc4ZVKnTaMbPVcHjvzOdg5n9QfnmlqiET7E= -go.opentelemetry.io/otel v0.11.0/go.mod h1:G8UCk+KooF2HLkgo8RHX9epABH/aRGYET7gQOqBVdB0= -go.opentelemetry.io/otel/sdk v0.11.0 h1:bkDMymVj6gIkPfgC5ci5atq0OYbfUHSn8NvsmyfyMq4= -go.opentelemetry.io/otel/sdk v0.11.0/go.mod h1:XbZ6MrzIZ+d+qr7pH0FwHIbCnANMvXYgkq4afL/IUMQ= +go.opentelemetry.io/otel v0.12.0 h1:bwWaPd/h2q+U6KdKaAiOS5GLwOMd1LDt9iNaeyIoAI8= +go.opentelemetry.io/otel v0.12.0/go.mod h1:dlSNewoRYikTkotEnxdmuBHgzT+k/idJSfDv/FxEnOY= +go.opentelemetry.io/otel/sdk v0.12.0 h1:YVUyDXsGvFWjhJxGXT4kBcGdfoTbo1vSGjbGRUdRh5U= +go.opentelemetry.io/otel/sdk v0.12.0/go.mod h1:u3joRdxhrS1hUf9xSFH8vgdXdujQ3jxXxZl3loZFSqs= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= @@ -65,7 +65,7 @@ google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY= -google.golang.org/grpc v1.31.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= +google.golang.org/grpc v1.32.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo= diff --git a/exporters/metric/dogstatsd/internal/statsd/conn.go b/exporters/metric/dogstatsd/internal/statsd/conn.go index ca55e8828a8..f0c0ff9f970 100644 --- a/exporters/metric/dogstatsd/internal/statsd/conn.go +++ b/exporters/metric/dogstatsd/internal/statsd/conn.go @@ -28,10 +28,10 @@ import ( "strconv" "go.opentelemetry.io/otel/api/metric" - "go.opentelemetry.io/otel/api/unit" export "go.opentelemetry.io/otel/sdk/export/metric" "go.opentelemetry.io/otel/sdk/export/metric/aggregation" "go.opentelemetry.io/otel/sdk/resource" + "go.opentelemetry.io/otel/unit" ) type ( diff --git a/exporters/metric/dogstatsd/internal/statsd/conn_test.go b/exporters/metric/dogstatsd/internal/statsd/conn_test.go index aa8b4354f30..333a2773946 100644 --- a/exporters/metric/dogstatsd/internal/statsd/conn_test.go +++ b/exporters/metric/dogstatsd/internal/statsd/conn_test.go @@ -26,7 +26,6 @@ import ( "go.opentelemetry.io/contrib/exporters/metric/dogstatsd/internal/statsd" "go.opentelemetry.io/otel/api/metric" - "go.opentelemetry.io/otel/api/unit" "go.opentelemetry.io/otel/label" export "go.opentelemetry.io/otel/sdk/export/metric" "go.opentelemetry.io/otel/sdk/export/metric/metrictest" @@ -35,6 +34,7 @@ import ( "go.opentelemetry.io/otel/sdk/metric/aggregator/lastvalue" "go.opentelemetry.io/otel/sdk/metric/aggregator/sum" "go.opentelemetry.io/otel/sdk/resource" + "go.opentelemetry.io/otel/unit" ) var testResource = resource.New(label.String("host", "value")) diff --git a/go.mod b/go.mod index d284d2b8997..305f9837b74 100644 --- a/go.mod +++ b/go.mod @@ -5,6 +5,6 @@ go 1.14 require ( github.com/davecgh/go-spew v1.1.1 // indirect github.com/kr/pretty v0.1.0 // indirect - go.opentelemetry.io/otel v0.11.0 + go.opentelemetry.io/otel v0.12.0 gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 // indirect ) diff --git a/go.sum b/go.sum index 46bc3de222b..feb0fd86f6d 100644 --- a/go.sum +++ b/go.sum @@ -1,8 +1,8 @@ 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/google/go-cmp v0.5.1 h1:JFrFEBb2xKufg6XkJsJr+WbKb4FQlURi5RUcBveYu9k= -github.com/google/go-cmp v0.5.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.2 h1:X2ev0eStA3AbceY54o37/0PQ/UWqKEiiO2dKL5OPaFM= +github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= @@ -14,8 +14,8 @@ github.com/stretchr/objx v0.1.0 h1:4G4v2dO3VZwixGIRoQ5Lfboy6nUhCyYzaqnIAPPhYs4= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/testify v1.6.1 h1:hDPOHmpOpP40lSULcqw7IrRb/u7w6RpDC9399XyoNd0= github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -go.opentelemetry.io/otel v0.11.0 h1:IN2tzQa9Gc4ZVKnTaMbPVcHjvzOdg5n9QfnmlqiET7E= -go.opentelemetry.io/otel v0.11.0/go.mod h1:G8UCk+KooF2HLkgo8RHX9epABH/aRGYET7gQOqBVdB0= +go.opentelemetry.io/otel v0.12.0 h1:bwWaPd/h2q+U6KdKaAiOS5GLwOMd1LDt9iNaeyIoAI8= +go.opentelemetry.io/otel v0.12.0/go.mod h1:dlSNewoRYikTkotEnxdmuBHgzT+k/idJSfDv/FxEnOY= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= diff --git a/instrumentation/github.com/Shopify/sarama/otelsarama/consumer_test.go b/instrumentation/github.com/Shopify/sarama/otelsarama/consumer_test.go index a8e3f54f8cf..c472c207467 100644 --- a/instrumentation/github.com/Shopify/sarama/otelsarama/consumer_test.go +++ b/instrumentation/github.com/Shopify/sarama/otelsarama/consumer_test.go @@ -43,7 +43,7 @@ var ( func TestWrapPartitionConsumer(t *testing.T) { // Mock provider - provider, mt := newProviderAndTracer() + provider, mt := NewTracerProviderAndTracer() // Mock partition consumer controller consumer := mocks.NewConsumer(t, sarama.NewConfig()) @@ -60,7 +60,7 @@ func TestWrapPartitionConsumer(t *testing.T) { func TestWrapConsumer(t *testing.T) { // Mock provider - provider, mt := newProviderAndTracer() + provider, mt := NewTracerProviderAndTracer() // Mock partition consumer controller mockConsumer := mocks.NewConsumer(t, sarama.NewConfig()) @@ -166,7 +166,7 @@ func TestConsumerConsumePartitionWithError(t *testing.T) { func BenchmarkWrapPartitionConsumer(b *testing.B) { // Mock provider - provider, _ := newProviderAndTracer() + provider, _ := NewTracerProviderAndTracer() mockPartitionConsumer, partitionConsumer := createMockPartitionConsumer(b) diff --git a/instrumentation/github.com/Shopify/sarama/otelsarama/dispatcher.go b/instrumentation/github.com/Shopify/sarama/otelsarama/dispatcher.go index 63ed3dcc204..420f3e7a24e 100644 --- a/instrumentation/github.com/Shopify/sarama/otelsarama/dispatcher.go +++ b/instrumentation/github.com/Shopify/sarama/otelsarama/dispatcher.go @@ -68,7 +68,7 @@ func (w *consumerMessagesDispatcherWrapper) Run() { semconv.MessagingMessageIDKey.String(strconv.FormatInt(msg.Offset, 10)), kafkaPartitionKey.Int32(msg.Partition), } - opts := []trace.StartOption{ + opts := []trace.SpanOption{ trace.WithAttributes(attrs...), trace.WithSpanKind(trace.SpanKindConsumer), } diff --git a/instrumentation/github.com/Shopify/sarama/otelsarama/example/go.mod b/instrumentation/github.com/Shopify/sarama/otelsarama/example/go.mod index d0bde43ab8a..7bff4729314 100644 --- a/instrumentation/github.com/Shopify/sarama/otelsarama/example/go.mod +++ b/instrumentation/github.com/Shopify/sarama/otelsarama/example/go.mod @@ -8,8 +8,8 @@ replace go.opentelemetry.io/contrib/instrumentation/github.com/Shopify/sarama/ot require ( github.com/Shopify/sarama v1.27.0 - go.opentelemetry.io/contrib/instrumentation/github.com/Shopify/sarama/otelsarama v0.11.0 - go.opentelemetry.io/otel v0.11.0 - go.opentelemetry.io/otel/exporters/stdout v0.11.0 - go.opentelemetry.io/otel/sdk v0.11.0 + go.opentelemetry.io/contrib/instrumentation/github.com/Shopify/sarama/otelsarama v0.12.0 + go.opentelemetry.io/otel v0.12.0 + go.opentelemetry.io/otel/exporters/stdout v0.12.0 + go.opentelemetry.io/otel/sdk v0.12.0 ) diff --git a/instrumentation/github.com/Shopify/sarama/otelsarama/example/go.sum b/instrumentation/github.com/Shopify/sarama/otelsarama/example/go.sum index 49c36e72f10..b3d6197b758 100644 --- a/instrumentation/github.com/Shopify/sarama/otelsarama/example/go.sum +++ b/instrumentation/github.com/Shopify/sarama/otelsarama/example/go.sum @@ -39,8 +39,8 @@ github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEW github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.1 h1:JFrFEBb2xKufg6XkJsJr+WbKb4FQlURi5RUcBveYu9k= -github.com/google/go-cmp v0.5.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.2 h1:X2ev0eStA3AbceY54o37/0PQ/UWqKEiiO2dKL5OPaFM= +github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/gofuzz v1.1.0 h1:Hsa8mG0dQ46ij8Sl2AYJDUv1oA9/d6Vk+3LG99Oe02g= github.com/google/gofuzz v1.1.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/hashicorp/go-uuid v1.0.2 h1:cfejS+Tpcp13yd5nYHWDI6qVCny6wyX2Mt5SGur2IGE= @@ -72,12 +72,12 @@ github.com/stretchr/testify v1.6.1 h1:hDPOHmpOpP40lSULcqw7IrRb/u7w6RpDC9399XyoNd github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/xdg/scram v0.0.0-20180814205039-7eeb5667e42c/go.mod h1:lB8K/P019DLNhemzwFU4jHLhdvlE6uDZjXFejJXr49I= github.com/xdg/stringprep v1.0.0/go.mod h1:Jhud4/sHMO4oL310DaZAKk9ZaJ08SJfe+sJh0HrGL1Y= -go.opentelemetry.io/otel v0.11.0 h1:IN2tzQa9Gc4ZVKnTaMbPVcHjvzOdg5n9QfnmlqiET7E= -go.opentelemetry.io/otel v0.11.0/go.mod h1:G8UCk+KooF2HLkgo8RHX9epABH/aRGYET7gQOqBVdB0= -go.opentelemetry.io/otel/exporters/stdout v0.11.0 h1:5Hn/XKgq7aCJQWGacF093Ts1VpJuiJkwC75c1PqHTPE= -go.opentelemetry.io/otel/exporters/stdout v0.11.0/go.mod h1:XP4gbV2Ikc7/ZyTGtwrA7/FzrhWJr3nfRU+LRvhxY24= -go.opentelemetry.io/otel/sdk v0.11.0 h1:bkDMymVj6gIkPfgC5ci5atq0OYbfUHSn8NvsmyfyMq4= -go.opentelemetry.io/otel/sdk v0.11.0/go.mod h1:XbZ6MrzIZ+d+qr7pH0FwHIbCnANMvXYgkq4afL/IUMQ= +go.opentelemetry.io/otel v0.12.0 h1:bwWaPd/h2q+U6KdKaAiOS5GLwOMd1LDt9iNaeyIoAI8= +go.opentelemetry.io/otel v0.12.0/go.mod h1:dlSNewoRYikTkotEnxdmuBHgzT+k/idJSfDv/FxEnOY= +go.opentelemetry.io/otel/exporters/stdout v0.12.0 h1:ji9VVPmKg+oONcqwULcO0AHZseGU6CFOIdvwKCxNZ9Y= +go.opentelemetry.io/otel/exporters/stdout v0.12.0/go.mod h1:IGUi+IGDXlxXo7nYuPrxfAEpqTcKsWqFtflwFMGGPZQ= +go.opentelemetry.io/otel/sdk v0.12.0 h1:YVUyDXsGvFWjhJxGXT4kBcGdfoTbo1vSGjbGRUdRh5U= +go.opentelemetry.io/otel/sdk v0.12.0/go.mod h1:u3joRdxhrS1hUf9xSFH8vgdXdujQ3jxXxZl3loZFSqs= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20200510223506-06a226fb4e37 h1:cg5LA/zNPRzIXIWSCxQW10Rvpy94aQh3LT/ShoCpkHw= golang.org/x/crypto v0.0.0-20200510223506-06a226fb4e37/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= @@ -117,8 +117,8 @@ google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY= -google.golang.org/grpc v1.31.0 h1:T7P4R73V3SSDPhH7WW7ATbfViLtmamH0DKrP3f9AuDI= -google.golang.org/grpc v1.31.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= +google.golang.org/grpc v1.32.0 h1:zWTV+LMdc3kaiJMSTOFz2UgSBgx8RNQoTGiZu3fR9S0= +google.golang.org/grpc v1.32.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo= gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= diff --git a/instrumentation/github.com/Shopify/sarama/otelsarama/example/init.go b/instrumentation/github.com/Shopify/sarama/otelsarama/example/init.go index 9c65ee00dff..d2147e5bb9a 100644 --- a/instrumentation/github.com/Shopify/sarama/otelsarama/example/init.go +++ b/instrumentation/github.com/Shopify/sarama/otelsarama/example/init.go @@ -34,12 +34,12 @@ func InitTracer() { cfg := sdktrace.Config{ DefaultSampler: sdktrace.AlwaysSample(), } - tp, err := sdktrace.NewProvider( + tp := sdktrace.NewTracerProvider( sdktrace.WithConfig(cfg), sdktrace.WithSyncer(exporter), ) if err != nil { log.Fatal(err) } - otelglobal.SetTraceProvider(tp) + otelglobal.SetTracerProvider(tp) } diff --git a/instrumentation/github.com/Shopify/sarama/otelsarama/go.mod b/instrumentation/github.com/Shopify/sarama/otelsarama/go.mod index 29bdfa88453..d8e80caa090 100644 --- a/instrumentation/github.com/Shopify/sarama/otelsarama/go.mod +++ b/instrumentation/github.com/Shopify/sarama/otelsarama/go.mod @@ -7,6 +7,6 @@ replace go.opentelemetry.io/contrib => ../../../../.. require ( github.com/Shopify/sarama v1.27.0 github.com/stretchr/testify v1.6.1 - go.opentelemetry.io/contrib v0.11.0 - go.opentelemetry.io/otel v0.11.0 + go.opentelemetry.io/contrib v0.12.0 + go.opentelemetry.io/otel v0.12.0 ) diff --git a/instrumentation/github.com/Shopify/sarama/otelsarama/go.sum b/instrumentation/github.com/Shopify/sarama/otelsarama/go.sum index 37261078178..e87df13d94f 100644 --- a/instrumentation/github.com/Shopify/sarama/otelsarama/go.sum +++ b/instrumentation/github.com/Shopify/sarama/otelsarama/go.sum @@ -21,8 +21,8 @@ github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEW github.com/google/go-cmp v0.4.0 h1:xsAVV57WRhGj6kEIi8ReJzQlHHqcBYCElAvkovg3B/4= github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.1 h1:JFrFEBb2xKufg6XkJsJr+WbKb4FQlURi5RUcBveYu9k= -github.com/google/go-cmp v0.5.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.2 h1:X2ev0eStA3AbceY54o37/0PQ/UWqKEiiO2dKL5OPaFM= +github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/hashicorp/go-uuid v1.0.2 h1:cfejS+Tpcp13yd5nYHWDI6qVCny6wyX2Mt5SGur2IGE= github.com/hashicorp/go-uuid v1.0.2/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= github.com/jcmturner/gofork v1.0.0 h1:J7uCkflzTEhUZ64xqKnkDxq3kzc96ajM1Gli5ktUem8= @@ -51,8 +51,8 @@ github.com/stretchr/testify v1.6.1 h1:hDPOHmpOpP40lSULcqw7IrRb/u7w6RpDC9399XyoNd github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/xdg/scram v0.0.0-20180814205039-7eeb5667e42c/go.mod h1:lB8K/P019DLNhemzwFU4jHLhdvlE6uDZjXFejJXr49I= github.com/xdg/stringprep v1.0.0/go.mod h1:Jhud4/sHMO4oL310DaZAKk9ZaJ08SJfe+sJh0HrGL1Y= -go.opentelemetry.io/otel v0.11.0 h1:IN2tzQa9Gc4ZVKnTaMbPVcHjvzOdg5n9QfnmlqiET7E= -go.opentelemetry.io/otel v0.11.0/go.mod h1:G8UCk+KooF2HLkgo8RHX9epABH/aRGYET7gQOqBVdB0= +go.opentelemetry.io/otel v0.12.0 h1:bwWaPd/h2q+U6KdKaAiOS5GLwOMd1LDt9iNaeyIoAI8= +go.opentelemetry.io/otel v0.12.0/go.mod h1:dlSNewoRYikTkotEnxdmuBHgzT+k/idJSfDv/FxEnOY= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20200510223506-06a226fb4e37 h1:cg5LA/zNPRzIXIWSCxQW10Rvpy94aQh3LT/ShoCpkHw= golang.org/x/crypto v0.0.0-20200510223506-06a226fb4e37/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= diff --git a/instrumentation/github.com/Shopify/sarama/otelsarama/option.go b/instrumentation/github.com/Shopify/sarama/otelsarama/option.go index 6c42296ebc6..9116dd4546a 100644 --- a/instrumentation/github.com/Shopify/sarama/otelsarama/option.go +++ b/instrumentation/github.com/Shopify/sarama/otelsarama/option.go @@ -28,7 +28,7 @@ const ( ) type config struct { - TracerProvider trace.Provider + TracerProvider trace.TracerProvider Propagators otelpropagation.Propagators Tracer trace.Tracer @@ -38,7 +38,7 @@ type config struct { func newConfig(opts ...Option) config { cfg := config{ Propagators: global.Propagators(), - TracerProvider: global.TraceProvider(), + TracerProvider: global.TracerProvider(), } for _, opt := range opts { opt(&cfg) @@ -54,7 +54,7 @@ type Option func(*config) // WithTracerProvider specifies a tracer provider to use for creating a tracer. // If none is specified, the global provider is used. -func WithTracerProvider(provider trace.Provider) Option { +func WithTracerProvider(provider trace.TracerProvider) Option { return func(cfg *config) { cfg.TracerProvider = provider } diff --git a/instrumentation/github.com/Shopify/sarama/otelsarama/option_test.go b/instrumentation/github.com/Shopify/sarama/otelsarama/option_test.go index 4ed23c78dff..f1f2ab6a613 100644 --- a/instrumentation/github.com/Shopify/sarama/otelsarama/option_test.go +++ b/instrumentation/github.com/Shopify/sarama/otelsarama/option_test.go @@ -31,11 +31,11 @@ func TestNewConfig(t *testing.T) { { name: "with provider", opts: []Option{ - WithTracerProvider(global.TraceProvider()), + WithTracerProvider(global.TracerProvider()), }, expected: config{ - TracerProvider: global.TraceProvider(), - Tracer: global.TraceProvider().Tracer(defaultTracerName), + TracerProvider: global.TracerProvider(), + Tracer: global.TracerProvider().Tracer(defaultTracerName), Propagators: global.Propagators(), }, }, @@ -45,8 +45,8 @@ func TestNewConfig(t *testing.T) { WithPropagators(nil), }, expected: config{ - TracerProvider: global.TraceProvider(), - Tracer: global.TraceProvider().Tracer(defaultTracerName), + TracerProvider: global.TracerProvider(), + Tracer: global.TracerProvider().Tracer(defaultTracerName), Propagators: nil, }, }, diff --git a/instrumentation/github.com/Shopify/sarama/otelsarama/producer.go b/instrumentation/github.com/Shopify/sarama/otelsarama/producer.go index 5c1ca955b31..ed148331b88 100644 --- a/instrumentation/github.com/Shopify/sarama/otelsarama/producer.go +++ b/instrumentation/github.com/Shopify/sarama/otelsarama/producer.go @@ -239,7 +239,7 @@ func startProducerSpan(cfg config, version sarama.KafkaVersion, msg *sarama.Prod semconv.MessagingDestinationKindKeyTopic, semconv.MessagingDestinationKey.String(msg.Topic), } - opts := []trace.StartOption{ + opts := []trace.SpanOption{ trace.WithAttributes(attrs...), trace.WithSpanKind(trace.SpanKindProducer), } diff --git a/instrumentation/github.com/Shopify/sarama/otelsarama/producer_test.go b/instrumentation/github.com/Shopify/sarama/otelsarama/producer_test.go index d3801d8980f..4ffd71336fa 100644 --- a/instrumentation/github.com/Shopify/sarama/otelsarama/producer_test.go +++ b/instrumentation/github.com/Shopify/sarama/otelsarama/producer_test.go @@ -34,8 +34,8 @@ import ( mocktracer "go.opentelemetry.io/contrib/internal/trace" ) -func newProviderAndTracer() (*mocktracer.Provider, *mocktracer.Tracer) { - var provider mocktracer.Provider +func NewTracerProviderAndTracer() (*mocktracer.TracerProvider, *mocktracer.Tracer) { + var provider mocktracer.TracerProvider tracer := provider.Tracer(defaultTracerName) return &provider, tracer.(*mocktracer.Tracer) @@ -45,7 +45,7 @@ func TestWrapSyncProducer(t *testing.T) { var err error // Mock provider - provider, mt := newProviderAndTracer() + provider, mt := NewTracerProviderAndTracer() cfg := newSaramaConfig() // Mock sync producer @@ -163,7 +163,7 @@ func TestWrapAsyncProducer(t *testing.T) { t.Run("without successes config", func(t *testing.T) { // Mock provider - provider, mt := newProviderAndTracer() + provider, mt := NewTracerProviderAndTracer() cfg := newSaramaConfig() mockAsyncProducer := mocks.NewAsyncProducer(t, cfg) @@ -230,7 +230,7 @@ func TestWrapAsyncProducer(t *testing.T) { t.Run("with successes config", func(t *testing.T) { // Mock provider - provider, mt := newProviderAndTracer() + provider, mt := NewTracerProviderAndTracer() // Set producer with successes config cfg := newSaramaConfig() @@ -308,7 +308,7 @@ func TestWrapAsyncProducer(t *testing.T) { func TestWrapAsyncProducerError(t *testing.T) { // Mock provider - provider, mt := newProviderAndTracer() + provider, mt := NewTracerProviderAndTracer() // Set producer with successes config cfg := newSaramaConfig() @@ -342,7 +342,7 @@ func newSaramaConfig() *sarama.Config { func BenchmarkWrapSyncProducer(b *testing.B) { // Mock provider - provider, _ := newProviderAndTracer() + provider, _ := NewTracerProviderAndTracer() cfg := newSaramaConfig() // Mock sync producer @@ -383,7 +383,7 @@ func BenchmarkMockSyncProducer(b *testing.B) { func BenchmarkWrapAsyncProducer(b *testing.B) { // Mock provider - provider, _ := newProviderAndTracer() + provider, _ := NewTracerProviderAndTracer() cfg := newSaramaConfig() cfg.Producer.Return.Successes = true diff --git a/instrumentation/github.com/astaxie/beego/otelbeego/beego_test.go b/instrumentation/github.com/astaxie/beego/otelbeego/beego_test.go index 3e687bf0863..824b8e11ae0 100644 --- a/instrumentation/github.com/astaxie/beego/otelbeego/beego_test.go +++ b/instrumentation/github.com/astaxie/beego/otelbeego/beego_test.go @@ -39,6 +39,7 @@ import ( mockmeter "go.opentelemetry.io/contrib/internal/metric" mocktrace "go.opentelemetry.io/contrib/internal/trace" + "go.opentelemetry.io/contrib/propagators/b3" ) // ------------------------------------------ Mock Trace Provider @@ -203,9 +204,9 @@ func TestWithFilters(t *testing.T) { func TestSpanFromContextDefaultProvider(t *testing.T) { defer replaceBeego() - _, provider := mockmeter.NewProvider() + _, provider := mockmeter.NewMeterProvider() global.SetMeterProvider(provider) - global.SetTraceProvider(NewTracerProvider()) + global.SetTracerProvider(NewTracerProvider()) router := beego.NewControllerRegister() router.Get("/hello-with-span", func(ctx *beegoCtx.Context) { assertSpanFromContext(ctx.Request.Context(), t) @@ -225,7 +226,7 @@ func TestSpanFromContextDefaultProvider(t *testing.T) { func TestSpanFromContextCustomProvider(t *testing.T) { defer replaceBeego() - _, provider := mockmeter.NewProvider() + _, provider := mockmeter.NewMeterProvider() router := beego.NewControllerRegister() router.Get("/hello-with-span", func(ctx *beegoCtx.Context) { assertSpanFromContext(ctx.Request.Context(), t) @@ -250,7 +251,7 @@ func TestSpanFromContextCustomProvider(t *testing.T) { func TestStatic(t *testing.T) { defer replaceBeego() tracerProvider := NewTracerProvider() - meterimpl, meterProvider := mockmeter.NewProvider() + meterimpl, meterProvider := mockmeter.NewMeterProvider() file, err := ioutil.TempFile("", "static-*.html") require.NoError(t, err) defer os.Remove(file.Name()) @@ -348,7 +349,7 @@ func TestRender(t *testing.T) { func runTest(t *testing.T, tc *testCase, url string) { tracerProvider := NewTracerProvider() - meterimpl, meterProvider := mockmeter.NewProvider() + meterimpl, meterProvider := mockmeter.NewMeterProvider() addTestRoutes(t) defer replaceBeego() @@ -503,8 +504,8 @@ var testCases = []*testCase{ path: "/", options: []Option{ WithPropagators(prop.New( - prop.WithExtractors(trace.B3{}), - prop.WithInjectors(trace.B3{}), + prop.WithExtractors(b3.B3{}), + prop.WithInjectors(b3.B3{}), )), }, hasSpan: true, diff --git a/instrumentation/github.com/astaxie/beego/otelbeego/config.go b/instrumentation/github.com/astaxie/beego/otelbeego/config.go index 7321a9d33ff..ac56efb5297 100644 --- a/instrumentation/github.com/astaxie/beego/otelbeego/config.go +++ b/instrumentation/github.com/astaxie/beego/otelbeego/config.go @@ -24,8 +24,8 @@ import ( // config provides configuration for the beego OpenTelemetry // middleware. Configuration is modified using the provided Options. type config struct { - tracerProvider trace.Provider - meterProvider metric.Provider + tracerProvider trace.TracerProvider + meterProvider metric.MeterProvider propagators propagation.Propagators filters []Filter formatter SpanNameFormatter @@ -49,7 +49,7 @@ func (o OptionFunc) Apply(c *config) { // WithTracerProvider specifies a tracer provider to use for creating a tracer. // If none is specified, the global provider is used. -func WithTracerProvider(provider trace.Provider) Option { +func WithTracerProvider(provider trace.TracerProvider) Option { return OptionFunc(func(cfg *config) { cfg.tracerProvider = provider }) @@ -57,7 +57,7 @@ func WithTracerProvider(provider trace.Provider) Option { // WithMeterProvider specifies a meter provider to use for creating a meter. // If none is specified, the global provider is used. -func WithMeterProvider(provider metric.Provider) Option { +func WithMeterProvider(provider metric.MeterProvider) Option { return OptionFunc(func(cfg *config) { cfg.meterProvider = provider }) @@ -91,7 +91,7 @@ func WithSpanNameFormatter(f SpanNameFormatter) OptionFunc { func newConfig(options ...Option) *config { config := &config{ - tracerProvider: global.TraceProvider(), + tracerProvider: global.TracerProvider(), meterProvider: global.MeterProvider(), propagators: global.Propagators(), filters: []Filter{}, diff --git a/instrumentation/github.com/astaxie/beego/otelbeego/example/go.mod b/instrumentation/github.com/astaxie/beego/otelbeego/example/go.mod index 3b1c97dbd1c..9c5d9025389 100644 --- a/instrumentation/github.com/astaxie/beego/otelbeego/example/go.mod +++ b/instrumentation/github.com/astaxie/beego/otelbeego/example/go.mod @@ -4,14 +4,15 @@ go 1.14 require ( github.com/astaxie/beego v1.12.2 - go.opentelemetry.io/contrib/instrumentation/github.com/astaxie/beego/otelbeego v0.11.0 - go.opentelemetry.io/otel v0.11.0 - go.opentelemetry.io/otel/exporters/stdout v0.11.0 - go.opentelemetry.io/otel/sdk v0.11.0 + go.opentelemetry.io/contrib/instrumentation/github.com/astaxie/beego/otelbeego v0.12.0 + go.opentelemetry.io/otel v0.12.0 + go.opentelemetry.io/otel/exporters/stdout v0.12.0 + go.opentelemetry.io/otel/sdk v0.12.0 ) replace ( go.opentelemetry.io/contrib => ../../../../../../ go.opentelemetry.io/contrib/instrumentation/github.com/astaxie/beego/otelbeego => ../ go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp => ../../../../../net/http/otelhttp + go.opentelemetry.io/contrib/propagators => ../../../../../../propagators ) diff --git a/instrumentation/github.com/astaxie/beego/otelbeego/example/go.sum b/instrumentation/github.com/astaxie/beego/otelbeego/example/go.sum index 582baa23631..9f494ce6d4d 100644 --- a/instrumentation/github.com/astaxie/beego/otelbeego/example/go.sum +++ b/instrumentation/github.com/astaxie/beego/otelbeego/example/go.sum @@ -76,8 +76,8 @@ github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMyw github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.1 h1:JFrFEBb2xKufg6XkJsJr+WbKb4FQlURi5RUcBveYu9k= -github.com/google/go-cmp v0.5.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.2 h1:X2ev0eStA3AbceY54o37/0PQ/UWqKEiiO2dKL5OPaFM= +github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/gofuzz v1.1.0 h1:Hsa8mG0dQ46ij8Sl2AYJDUv1oA9/d6Vk+3LG99Oe02g= github.com/google/gofuzz v1.1.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= @@ -151,12 +151,12 @@ github.com/syndtr/goleveldb v0.0.0-20181127023241-353a9fca669c/go.mod h1:Z4AUp2K github.com/ugorji/go v0.0.0-20171122102828-84cb69a8af83/go.mod h1:hnLbHMwcvSihnDhEfx2/BzKp2xb0Y+ErdfYcrs9tkJQ= github.com/wendal/errors v0.0.0-20130201093226-f66c77a7882b/go.mod h1:Q12BUT7DqIlHRmgv3RskH+UCM/4eqVMgI0EMmlSpAXc= github.com/yuin/gopher-lua v0.0.0-20171031051903-609c9cd26973/go.mod h1:aEV29XrmTYFr3CiRxZeGHpkvbwq+prZduBqMaascyCU= -go.opentelemetry.io/otel v0.11.0 h1:IN2tzQa9Gc4ZVKnTaMbPVcHjvzOdg5n9QfnmlqiET7E= -go.opentelemetry.io/otel v0.11.0/go.mod h1:G8UCk+KooF2HLkgo8RHX9epABH/aRGYET7gQOqBVdB0= -go.opentelemetry.io/otel/exporters/stdout v0.11.0 h1:5Hn/XKgq7aCJQWGacF093Ts1VpJuiJkwC75c1PqHTPE= -go.opentelemetry.io/otel/exporters/stdout v0.11.0/go.mod h1:XP4gbV2Ikc7/ZyTGtwrA7/FzrhWJr3nfRU+LRvhxY24= -go.opentelemetry.io/otel/sdk v0.11.0 h1:bkDMymVj6gIkPfgC5ci5atq0OYbfUHSn8NvsmyfyMq4= -go.opentelemetry.io/otel/sdk v0.11.0/go.mod h1:XbZ6MrzIZ+d+qr7pH0FwHIbCnANMvXYgkq4afL/IUMQ= +go.opentelemetry.io/otel v0.12.0 h1:bwWaPd/h2q+U6KdKaAiOS5GLwOMd1LDt9iNaeyIoAI8= +go.opentelemetry.io/otel v0.12.0/go.mod h1:dlSNewoRYikTkotEnxdmuBHgzT+k/idJSfDv/FxEnOY= +go.opentelemetry.io/otel/exporters/stdout v0.12.0 h1:ji9VVPmKg+oONcqwULcO0AHZseGU6CFOIdvwKCxNZ9Y= +go.opentelemetry.io/otel/exporters/stdout v0.12.0/go.mod h1:IGUi+IGDXlxXo7nYuPrxfAEpqTcKsWqFtflwFMGGPZQ= +go.opentelemetry.io/otel/sdk v0.12.0 h1:YVUyDXsGvFWjhJxGXT4kBcGdfoTbo1vSGjbGRUdRh5U= +go.opentelemetry.io/otel/sdk v0.12.0/go.mod h1:u3joRdxhrS1hUf9xSFH8vgdXdujQ3jxXxZl3loZFSqs= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550 h1:ObdrDkeb4kJdCP557AjRjq69pTHfNouLtWZG7j9rPN8= @@ -223,8 +223,8 @@ google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZi google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY= google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= -google.golang.org/grpc v1.31.0 h1:T7P4R73V3SSDPhH7WW7ATbfViLtmamH0DKrP3f9AuDI= -google.golang.org/grpc v1.31.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= +google.golang.org/grpc v1.32.0 h1:zWTV+LMdc3kaiJMSTOFz2UgSBgx8RNQoTGiZu3fR9S0= +google.golang.org/grpc v1.32.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= diff --git a/instrumentation/github.com/astaxie/beego/otelbeego/example/server/server.go b/instrumentation/github.com/astaxie/beego/otelbeego/example/server/server.go index 1b2ff4d222d..dcb2f03afa4 100644 --- a/instrumentation/github.com/astaxie/beego/otelbeego/example/server/server.go +++ b/instrumentation/github.com/astaxie/beego/otelbeego/example/server/server.go @@ -58,13 +58,13 @@ func initTracer() { // For the demonstration, use sdktrace.AlwaysSample sampler to sample all traces. // In a production application, use sdktrace.ProbabilitySampler with a desired probability. - tp, err := sdktrace.NewProvider(sdktrace.WithConfig(sdktrace.Config{DefaultSampler: sdktrace.AlwaysSample()}), + tp := sdktrace.NewTracerProvider(sdktrace.WithConfig(sdktrace.Config{DefaultSampler: sdktrace.AlwaysSample()}), sdktrace.WithSyncer(exporter), sdktrace.WithResource(resource.New(semconv.ServiceNameKey.String("ExampleService")))) if err != nil { log.Fatal(err) } - global.SetTraceProvider(tp) + global.SetTracerProvider(tp) } func main() { diff --git a/instrumentation/github.com/astaxie/beego/otelbeego/go.mod b/instrumentation/github.com/astaxie/beego/otelbeego/go.mod index 5024631cabe..46339ac6449 100644 --- a/instrumentation/github.com/astaxie/beego/otelbeego/go.mod +++ b/instrumentation/github.com/astaxie/beego/otelbeego/go.mod @@ -5,9 +5,10 @@ go 1.14 require ( github.com/astaxie/beego v1.12.2 github.com/stretchr/testify v1.6.1 - go.opentelemetry.io/contrib v0.11.0 - go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.11.0 - go.opentelemetry.io/otel v0.11.0 + go.opentelemetry.io/contrib v0.12.0 + go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.12.0 + go.opentelemetry.io/contrib/propagators v0.12.0 + go.opentelemetry.io/otel v0.12.0 golang.org/x/net v0.0.0-20200707034311-ab3426394381 // indirect golang.org/x/sys v0.0.0-20200803210538-64077c9b5642 // indirect golang.org/x/text v0.3.3 // indirect @@ -17,4 +18,5 @@ require ( replace ( go.opentelemetry.io/contrib => ../../../../.. go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp => ../../../../net/http/otelhttp + go.opentelemetry.io/contrib/propagators => ../../../../../propagators ) diff --git a/instrumentation/github.com/astaxie/beego/otelbeego/go.sum b/instrumentation/github.com/astaxie/beego/otelbeego/go.sum index ffc8f3f3e53..59074d70f5d 100644 --- a/instrumentation/github.com/astaxie/beego/otelbeego/go.sum +++ b/instrumentation/github.com/astaxie/beego/otelbeego/go.sum @@ -69,8 +69,8 @@ github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMyw github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.1 h1:JFrFEBb2xKufg6XkJsJr+WbKb4FQlURi5RUcBveYu9k= -github.com/google/go-cmp v0.5.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.2 h1:X2ev0eStA3AbceY54o37/0PQ/UWqKEiiO2dKL5OPaFM= +github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/hashicorp/golang-lru v0.5.4 h1:YDjusn29QI/Das2iO9M0BHnIbxPeyuCHsjMW+lJfyTc= github.com/hashicorp/golang-lru v0.5.4/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4= @@ -143,8 +143,8 @@ github.com/syndtr/goleveldb v0.0.0-20181127023241-353a9fca669c/go.mod h1:Z4AUp2K github.com/ugorji/go v0.0.0-20171122102828-84cb69a8af83/go.mod h1:hnLbHMwcvSihnDhEfx2/BzKp2xb0Y+ErdfYcrs9tkJQ= github.com/wendal/errors v0.0.0-20130201093226-f66c77a7882b/go.mod h1:Q12BUT7DqIlHRmgv3RskH+UCM/4eqVMgI0EMmlSpAXc= github.com/yuin/gopher-lua v0.0.0-20171031051903-609c9cd26973/go.mod h1:aEV29XrmTYFr3CiRxZeGHpkvbwq+prZduBqMaascyCU= -go.opentelemetry.io/otel v0.11.0 h1:IN2tzQa9Gc4ZVKnTaMbPVcHjvzOdg5n9QfnmlqiET7E= -go.opentelemetry.io/otel v0.11.0/go.mod h1:G8UCk+KooF2HLkgo8RHX9epABH/aRGYET7gQOqBVdB0= +go.opentelemetry.io/otel v0.12.0 h1:bwWaPd/h2q+U6KdKaAiOS5GLwOMd1LDt9iNaeyIoAI8= +go.opentelemetry.io/otel v0.12.0/go.mod h1:dlSNewoRYikTkotEnxdmuBHgzT+k/idJSfDv/FxEnOY= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550 h1:ObdrDkeb4kJdCP557AjRjq69pTHfNouLtWZG7j9rPN8= diff --git a/instrumentation/github.com/bradfitz/gomemcache/memcache/otelmemcache/config.go b/instrumentation/github.com/bradfitz/gomemcache/memcache/otelmemcache/config.go index 97e2600be22..8a691e82391 100644 --- a/instrumentation/github.com/bradfitz/gomemcache/memcache/otelmemcache/config.go +++ b/instrumentation/github.com/bradfitz/gomemcache/memcache/otelmemcache/config.go @@ -20,7 +20,7 @@ import ( type config struct { serviceName string - tracerProvider oteltrace.Provider + tracerProvider oteltrace.TracerProvider } // Option is used to configure the client. @@ -28,7 +28,7 @@ type Option func(*config) // WithTracerProvider specifies a tracer provider to use for creating a tracer. // If none is specified, the global provider is used. -func WithTracerProvider(provider oteltrace.Provider) Option { +func WithTracerProvider(provider oteltrace.TracerProvider) Option { return func(cfg *config) { cfg.tracerProvider = provider } diff --git a/instrumentation/github.com/bradfitz/gomemcache/memcache/otelmemcache/example/client.go b/instrumentation/github.com/bradfitz/gomemcache/memcache/otelmemcache/example/client.go index 16a2b07a12f..f024d77b03a 100644 --- a/instrumentation/github.com/bradfitz/gomemcache/memcache/otelmemcache/example/client.go +++ b/instrumentation/github.com/bradfitz/gomemcache/memcache/otelmemcache/example/client.go @@ -73,7 +73,7 @@ func doMemcacheOperations(ctx context.Context, c *otelmemcache.Client) { } } -func initTracer() oteltrace.Provider { +func initTracer() oteltrace.TracerProvider { exporter, err := oteltracestdout.NewExporter(oteltracestdout.WithPrettyPrint()) if err != nil { log.Fatal(err) @@ -81,7 +81,7 @@ func initTracer() oteltrace.Provider { cfg := sdktrace.Config{ DefaultSampler: sdktrace.AlwaysSample(), } - tp, err := sdktrace.NewProvider( + tp := sdktrace.NewTracerProvider( sdktrace.WithConfig(cfg), sdktrace.WithSyncer(exporter), ) diff --git a/instrumentation/github.com/bradfitz/gomemcache/memcache/otelmemcache/go.mod b/instrumentation/github.com/bradfitz/gomemcache/memcache/otelmemcache/go.mod index 807b35b13bb..9ef233f6331 100644 --- a/instrumentation/github.com/bradfitz/gomemcache/memcache/otelmemcache/go.mod +++ b/instrumentation/github.com/bradfitz/gomemcache/memcache/otelmemcache/go.mod @@ -7,9 +7,9 @@ replace go.opentelemetry.io/contrib => ../../../../../../ require ( github.com/bradfitz/gomemcache v0.0.0-20190913173617-a41fca850d0b github.com/stretchr/testify v1.6.1 - go.opentelemetry.io/contrib v0.11.0 - go.opentelemetry.io/otel v0.11.0 - go.opentelemetry.io/otel/exporters/stdout v0.11.0 - go.opentelemetry.io/otel/sdk v0.11.0 + go.opentelemetry.io/contrib v0.12.0 + go.opentelemetry.io/otel v0.12.0 + go.opentelemetry.io/otel/exporters/stdout v0.12.0 + go.opentelemetry.io/otel/sdk v0.12.0 google.golang.org/genproto v0.0.0-20200331122359-1ee6d9798940 // indirect ) diff --git a/instrumentation/github.com/bradfitz/gomemcache/memcache/otelmemcache/go.sum b/instrumentation/github.com/bradfitz/gomemcache/memcache/otelmemcache/go.sum index 25641786343..8bd81d98f13 100644 --- a/instrumentation/github.com/bradfitz/gomemcache/memcache/otelmemcache/go.sum +++ b/instrumentation/github.com/bradfitz/gomemcache/memcache/otelmemcache/go.sum @@ -24,8 +24,8 @@ github.com/golang/protobuf v1.3.3 h1:gyjaxf+svBWX08ZjK86iN9geUJF0H6gp2IRKX6Nf6/I github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw= github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.1 h1:JFrFEBb2xKufg6XkJsJr+WbKb4FQlURi5RUcBveYu9k= -github.com/google/go-cmp v0.5.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.2 h1:X2ev0eStA3AbceY54o37/0PQ/UWqKEiiO2dKL5OPaFM= +github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/gofuzz v1.1.0 h1:Hsa8mG0dQ46ij8Sl2AYJDUv1oA9/d6Vk+3LG99Oe02g= github.com/google/gofuzz v1.1.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI= @@ -40,12 +40,12 @@ github.com/stretchr/objx v0.1.0 h1:4G4v2dO3VZwixGIRoQ5Lfboy6nUhCyYzaqnIAPPhYs4= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/testify v1.6.1 h1:hDPOHmpOpP40lSULcqw7IrRb/u7w6RpDC9399XyoNd0= github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -go.opentelemetry.io/otel v0.11.0 h1:IN2tzQa9Gc4ZVKnTaMbPVcHjvzOdg5n9QfnmlqiET7E= -go.opentelemetry.io/otel v0.11.0/go.mod h1:G8UCk+KooF2HLkgo8RHX9epABH/aRGYET7gQOqBVdB0= -go.opentelemetry.io/otel/exporters/stdout v0.11.0 h1:5Hn/XKgq7aCJQWGacF093Ts1VpJuiJkwC75c1PqHTPE= -go.opentelemetry.io/otel/exporters/stdout v0.11.0/go.mod h1:XP4gbV2Ikc7/ZyTGtwrA7/FzrhWJr3nfRU+LRvhxY24= -go.opentelemetry.io/otel/sdk v0.11.0 h1:bkDMymVj6gIkPfgC5ci5atq0OYbfUHSn8NvsmyfyMq4= -go.opentelemetry.io/otel/sdk v0.11.0/go.mod h1:XbZ6MrzIZ+d+qr7pH0FwHIbCnANMvXYgkq4afL/IUMQ= +go.opentelemetry.io/otel v0.12.0 h1:bwWaPd/h2q+U6KdKaAiOS5GLwOMd1LDt9iNaeyIoAI8= +go.opentelemetry.io/otel v0.12.0/go.mod h1:dlSNewoRYikTkotEnxdmuBHgzT+k/idJSfDv/FxEnOY= +go.opentelemetry.io/otel/exporters/stdout v0.12.0 h1:ji9VVPmKg+oONcqwULcO0AHZseGU6CFOIdvwKCxNZ9Y= +go.opentelemetry.io/otel/exporters/stdout v0.12.0/go.mod h1:IGUi+IGDXlxXo7nYuPrxfAEpqTcKsWqFtflwFMGGPZQ= +go.opentelemetry.io/otel/sdk v0.12.0 h1:YVUyDXsGvFWjhJxGXT4kBcGdfoTbo1vSGjbGRUdRh5U= +go.opentelemetry.io/otel/sdk v0.12.0/go.mod h1:u3joRdxhrS1hUf9xSFH8vgdXdujQ3jxXxZl3loZFSqs= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= @@ -81,8 +81,8 @@ google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZi google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY= google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= -google.golang.org/grpc v1.31.0 h1:T7P4R73V3SSDPhH7WW7ATbfViLtmamH0DKrP3f9AuDI= -google.golang.org/grpc v1.31.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= +google.golang.org/grpc v1.32.0 h1:zWTV+LMdc3kaiJMSTOFz2UgSBgx8RNQoTGiZu3fR9S0= +google.golang.org/grpc v1.32.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo= gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= diff --git a/instrumentation/github.com/bradfitz/gomemcache/memcache/otelmemcache/gomemcache.go b/instrumentation/github.com/bradfitz/gomemcache/memcache/otelmemcache/gomemcache.go index 12f79e0e09c..f1c8c70f3c3 100644 --- a/instrumentation/github.com/bradfitz/gomemcache/memcache/otelmemcache/gomemcache.go +++ b/instrumentation/github.com/bradfitz/gomemcache/memcache/otelmemcache/gomemcache.go @@ -59,7 +59,7 @@ func NewClientWithTracing(client *memcache.Client, opts ...Option) *Client { } if cfg.tracerProvider == nil { - cfg.tracerProvider = otelglobal.TraceProvider() + cfg.tracerProvider = otelglobal.TracerProvider() } return &Client{ @@ -91,7 +91,7 @@ func (c *Client) attrsByOperationAndItemKey(operation operation, key ...string) // Starts span with appropriate span kind and attributes func (c *Client) startSpan(operationName operation, itemKey ...string) oteltrace.Span { - opts := []oteltrace.StartOption{ + opts := []oteltrace.SpanOption{ // for database client calls, always use CLIENT span kind oteltrace.WithSpanKind(oteltrace.SpanKindClient), oteltrace.WithAttributes( diff --git a/instrumentation/github.com/bradfitz/gomemcache/memcache/otelmemcache/gomemcache_test.go b/instrumentation/github.com/bradfitz/gomemcache/memcache/otelmemcache/gomemcache_test.go index a28b57e3de6..bd4ca5eb20d 100644 --- a/instrumentation/github.com/bradfitz/gomemcache/memcache/otelmemcache/gomemcache_test.go +++ b/instrumentation/github.com/bradfitz/gomemcache/memcache/otelmemcache/gomemcache_test.go @@ -101,8 +101,8 @@ func TestOperationWithCacheMissError(t *testing.T) { } // tests require running memcached instance -func initClientWithMockTracerProvider(t *testing.T) (*Client, *mocktracer.Provider) { - mt := &mocktracer.Provider{} +func initClientWithMockTracerProvider(t *testing.T) (*Client, *mocktracer.TracerProvider) { + mt := &mocktracer.TracerProvider{} host, port := "localhost", "11211" mc := memcache.New(host + ":" + port) diff --git a/instrumentation/github.com/emicklei/go-restful/otelrestful/config.go b/instrumentation/github.com/emicklei/go-restful/otelrestful/config.go index 447d777822d..6c8fdda63d9 100644 --- a/instrumentation/github.com/emicklei/go-restful/otelrestful/config.go +++ b/instrumentation/github.com/emicklei/go-restful/otelrestful/config.go @@ -21,7 +21,7 @@ import ( // config is used to configure the go-restful middleware. type config struct { - TracerProvider oteltrace.Provider + TracerProvider oteltrace.TracerProvider Propagators otelpropagation.Propagators } @@ -39,7 +39,7 @@ func WithPropagators(propagators otelpropagation.Propagators) Option { // WithTracerProvider specifies a tracer provider to use for creating a tracer. // If none is specified, the global provider is used. -func WithTracerProvider(provider oteltrace.Provider) Option { +func WithTracerProvider(provider oteltrace.TracerProvider) Option { return func(cfg *config) { cfg.TracerProvider = provider } diff --git a/instrumentation/github.com/emicklei/go-restful/otelrestful/example/server.go b/instrumentation/github.com/emicklei/go-restful/otelrestful/example/server.go index 7d2bd8e907d..eccce38cd7a 100644 --- a/instrumentation/github.com/emicklei/go-restful/otelrestful/example/server.go +++ b/instrumentation/github.com/emicklei/go-restful/otelrestful/example/server.go @@ -68,15 +68,15 @@ func initTracer() { cfg := sdktrace.Config{ DefaultSampler: sdktrace.AlwaysSample(), } - tp, err := sdktrace.NewProvider( + tp := sdktrace.NewTracerProvider( sdktrace.WithConfig(cfg), sdktrace.WithSyncer(exporter), ) if err != nil { log.Fatal(err) } - otelglobal.SetTraceProvider(tp) - tracer = otelglobal.TraceProvider().Tracer("go-restful-server", oteltrace.WithInstrumentationVersion("0.1")) + otelglobal.SetTracerProvider(tp) + tracer = otelglobal.TracerProvider().Tracer("go-restful-server", oteltrace.WithInstrumentationVersion("0.1")) } func (u UserResource) getUser(req *restful.Request, resp *restful.Response) { diff --git a/instrumentation/github.com/emicklei/go-restful/otelrestful/go.mod b/instrumentation/github.com/emicklei/go-restful/otelrestful/go.mod index 262f6cb4710..71699584312 100644 --- a/instrumentation/github.com/emicklei/go-restful/otelrestful/go.mod +++ b/instrumentation/github.com/emicklei/go-restful/otelrestful/go.mod @@ -2,14 +2,18 @@ module go.opentelemetry.io/contrib/instrumentation/github.com/emicklei/go-restfu go 1.14 -replace go.opentelemetry.io/contrib => ../../../../.. +replace ( + go.opentelemetry.io/contrib => ../../../../../ + go.opentelemetry.io/contrib/propagators => ../../../../../propagators +) require ( github.com/emicklei/go-restful/v3 v3.3.1 github.com/json-iterator/go v1.1.10 // indirect github.com/stretchr/testify v1.6.1 - go.opentelemetry.io/contrib v0.11.0 - go.opentelemetry.io/otel v0.11.0 - go.opentelemetry.io/otel/exporters/stdout v0.11.0 - go.opentelemetry.io/otel/sdk v0.11.0 + go.opentelemetry.io/contrib v0.12.0 + go.opentelemetry.io/contrib/propagators v0.12.0 + go.opentelemetry.io/otel v0.12.0 + go.opentelemetry.io/otel/exporters/stdout v0.12.0 + go.opentelemetry.io/otel/sdk v0.12.0 ) diff --git a/instrumentation/github.com/emicklei/go-restful/otelrestful/go.sum b/instrumentation/github.com/emicklei/go-restful/otelrestful/go.sum index dceb0cbfa85..db0b8786812 100644 --- a/instrumentation/github.com/emicklei/go-restful/otelrestful/go.sum +++ b/instrumentation/github.com/emicklei/go-restful/otelrestful/go.sum @@ -23,8 +23,8 @@ github.com/golang/protobuf v1.3.3 h1:gyjaxf+svBWX08ZjK86iN9geUJF0H6gp2IRKX6Nf6/I github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw= github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.1 h1:JFrFEBb2xKufg6XkJsJr+WbKb4FQlURi5RUcBveYu9k= -github.com/google/go-cmp v0.5.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.2 h1:X2ev0eStA3AbceY54o37/0PQ/UWqKEiiO2dKL5OPaFM= +github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/gofuzz v1.0.0 h1:A8PeW59pxE9IoFRqBp37U+mSNaQoZ46F1f0f863XSXw= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/gofuzz v1.1.0 h1:Hsa8mG0dQ46ij8Sl2AYJDUv1oA9/d6Vk+3LG99Oe02g= @@ -47,12 +47,12 @@ github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+ github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.6.1 h1:hDPOHmpOpP40lSULcqw7IrRb/u7w6RpDC9399XyoNd0= github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -go.opentelemetry.io/otel v0.11.0 h1:IN2tzQa9Gc4ZVKnTaMbPVcHjvzOdg5n9QfnmlqiET7E= -go.opentelemetry.io/otel v0.11.0/go.mod h1:G8UCk+KooF2HLkgo8RHX9epABH/aRGYET7gQOqBVdB0= -go.opentelemetry.io/otel/exporters/stdout v0.11.0 h1:5Hn/XKgq7aCJQWGacF093Ts1VpJuiJkwC75c1PqHTPE= -go.opentelemetry.io/otel/exporters/stdout v0.11.0/go.mod h1:XP4gbV2Ikc7/ZyTGtwrA7/FzrhWJr3nfRU+LRvhxY24= -go.opentelemetry.io/otel/sdk v0.11.0 h1:bkDMymVj6gIkPfgC5ci5atq0OYbfUHSn8NvsmyfyMq4= -go.opentelemetry.io/otel/sdk v0.11.0/go.mod h1:XbZ6MrzIZ+d+qr7pH0FwHIbCnANMvXYgkq4afL/IUMQ= +go.opentelemetry.io/otel v0.12.0 h1:bwWaPd/h2q+U6KdKaAiOS5GLwOMd1LDt9iNaeyIoAI8= +go.opentelemetry.io/otel v0.12.0/go.mod h1:dlSNewoRYikTkotEnxdmuBHgzT+k/idJSfDv/FxEnOY= +go.opentelemetry.io/otel/exporters/stdout v0.12.0 h1:ji9VVPmKg+oONcqwULcO0AHZseGU6CFOIdvwKCxNZ9Y= +go.opentelemetry.io/otel/exporters/stdout v0.12.0/go.mod h1:IGUi+IGDXlxXo7nYuPrxfAEpqTcKsWqFtflwFMGGPZQ= +go.opentelemetry.io/otel/sdk v0.12.0 h1:YVUyDXsGvFWjhJxGXT4kBcGdfoTbo1vSGjbGRUdRh5U= +go.opentelemetry.io/otel/sdk v0.12.0/go.mod h1:u3joRdxhrS1hUf9xSFH8vgdXdujQ3jxXxZl3loZFSqs= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= @@ -83,8 +83,8 @@ google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY= -google.golang.org/grpc v1.31.0 h1:T7P4R73V3SSDPhH7WW7ATbfViLtmamH0DKrP3f9AuDI= -google.golang.org/grpc v1.31.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= +google.golang.org/grpc v1.32.0 h1:zWTV+LMdc3kaiJMSTOFz2UgSBgx8RNQoTGiZu3fR9S0= +google.golang.org/grpc v1.32.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo= gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= diff --git a/instrumentation/github.com/emicklei/go-restful/otelrestful/restful.go b/instrumentation/github.com/emicklei/go-restful/otelrestful/restful.go index 54e5cd306ef..a48cedc4962 100644 --- a/instrumentation/github.com/emicklei/go-restful/otelrestful/restful.go +++ b/instrumentation/github.com/emicklei/go-restful/otelrestful/restful.go @@ -39,7 +39,7 @@ func OTelFilter(service string, opts ...Option) restful.FilterFunction { opt(&cfg) } if cfg.TracerProvider == nil { - cfg.TracerProvider = otelglobal.TraceProvider() + cfg.TracerProvider = otelglobal.TracerProvider() } tracer := cfg.TracerProvider.Tracer(tracerName, oteltrace.WithInstrumentationVersion(tracerVersion)) if cfg.Propagators == nil { @@ -51,7 +51,7 @@ func OTelFilter(service string, opts ...Option) restful.FilterFunction { route := req.SelectedRoutePath() spanName := route - opts := []oteltrace.StartOption{ + opts := []oteltrace.SpanOption{ oteltrace.WithAttributes(semconv.NetAttributesFromHTTPRequest("tcp", r)...), oteltrace.WithAttributes(semconv.EndUserAttributesFromHTTPRequest(r)...), oteltrace.WithAttributes(semconv.HTTPServerAttributesFromHTTPRequest(service, route, r)...), diff --git a/instrumentation/github.com/emicklei/go-restful/otelrestful/restful_test.go b/instrumentation/github.com/emicklei/go-restful/otelrestful/restful_test.go index 5cc21a43fd3..127d3af780a 100644 --- a/instrumentation/github.com/emicklei/go-restful/otelrestful/restful_test.go +++ b/instrumentation/github.com/emicklei/go-restful/otelrestful/restful_test.go @@ -27,6 +27,7 @@ import ( "go.opentelemetry.io/contrib/instrumentation/github.com/emicklei/go-restful/otelrestful" mocktrace "go.opentelemetry.io/contrib/internal/trace" + b3prop "go.opentelemetry.io/contrib/propagators/b3" otelglobal "go.opentelemetry.io/otel/api/global" otelpropagation "go.opentelemetry.io/otel/api/propagation" oteltrace "go.opentelemetry.io/otel/api/trace" @@ -36,7 +37,7 @@ import ( const tracerName = "go.opentelemetry.io/contrib/instrumentation/github.com/emicklei/go-restful/otelrestful" func TestChildSpanFromGlobalTracer(t *testing.T) { - otelglobal.SetTraceProvider(&mocktrace.Provider{}) + otelglobal.SetTracerProvider(&mocktrace.TracerProvider{}) handlerFunc := func(req *restful.Request, resp *restful.Response) { span := oteltrace.SpanFromContext(req.Request.Context()) @@ -63,7 +64,7 @@ func TestChildSpanFromGlobalTracer(t *testing.T) { } func TestChildSpanFromCustomTracer(t *testing.T) { - provider, _ := mocktrace.NewProviderAndTracer(tracerName) + provider, _ := mocktrace.NewTracerProviderAndTracer(tracerName) handlerFunc := func(req *restful.Request, resp *restful.Response) { span := oteltrace.SpanFromContext(req.Request.Context()) @@ -89,7 +90,7 @@ func TestChildSpanFromCustomTracer(t *testing.T) { } func TestChildSpanNames(t *testing.T) { - provider, tracer := mocktrace.NewProviderAndTracer(tracerName) + provider, tracer := mocktrace.NewTracerProviderAndTracer(tracerName) handlerFunc := func(req *restful.Request, resp *restful.Response) { resp.WriteHeader(http.StatusOK) @@ -138,7 +139,7 @@ func TestChildSpanNames(t *testing.T) { func TestGetSpanNotInstrumented(t *testing.T) { handlerFunc := func(req *restful.Request, resp *restful.Response) { span := oteltrace.SpanFromContext(req.Request.Context()) - _, ok := span.(oteltrace.NoopSpan) + ok := !span.SpanContext().IsValid() assert.True(t, ok) resp.WriteHeader(http.StatusOK) } @@ -154,7 +155,7 @@ func TestGetSpanNotInstrumented(t *testing.T) { } func TestPropagationWithGlobalPropagators(t *testing.T) { - provider, tracer := mocktrace.NewProviderAndTracer(tracerName) + provider, tracer := mocktrace.NewTracerProviderAndTracer(tracerName) r := httptest.NewRequest("GET", "/user/123", nil) w := httptest.NewRecorder() @@ -181,8 +182,8 @@ func TestPropagationWithGlobalPropagators(t *testing.T) { } func TestPropagationWithCustomPropagators(t *testing.T) { - provider, tracer := mocktrace.NewProviderAndTracer(tracerName) - b3 := oteltrace.B3{} + provider, tracer := mocktrace.NewTracerProviderAndTracer(tracerName) + b3 := b3prop.B3{} props := otelpropagation.New( otelpropagation.WithExtractors(b3), otelpropagation.WithInjectors(b3), @@ -215,7 +216,7 @@ func TestPropagationWithCustomPropagators(t *testing.T) { } func TestMultiFilters(t *testing.T) { - provider, _ := mocktrace.NewProviderAndTracer(tracerName) + provider, _ := mocktrace.NewTracerProviderAndTracer(tracerName) wrappedFunc := func(tracerName string) restful.RouteFunction { return func(req *restful.Request, resp *restful.Response) { diff --git a/instrumentation/github.com/gin-gonic/gin/otelgin/example/server.go b/instrumentation/github.com/gin-gonic/gin/otelgin/example/server.go index 692c4d4f963..6af378a31fd 100644 --- a/instrumentation/github.com/gin-gonic/gin/otelgin/example/server.go +++ b/instrumentation/github.com/gin-gonic/gin/otelgin/example/server.go @@ -58,14 +58,14 @@ func initTracer() { cfg := sdktrace.Config{ DefaultSampler: sdktrace.AlwaysSample(), } - tp, err := sdktrace.NewProvider( + tp := sdktrace.NewTracerProvider( sdktrace.WithConfig(cfg), sdktrace.WithSyncer(exporter), ) if err != nil { log.Fatal(err) } - otelglobal.SetTraceProvider(tp) + otelglobal.SetTracerProvider(tp) } func getUser(c *gin.Context, id string) string { diff --git a/instrumentation/github.com/gin-gonic/gin/otelgin/gintrace.go b/instrumentation/github.com/gin-gonic/gin/otelgin/gintrace.go index 98f6c85d799..9d3d829cfff 100644 --- a/instrumentation/github.com/gin-gonic/gin/otelgin/gintrace.go +++ b/instrumentation/github.com/gin-gonic/gin/otelgin/gintrace.go @@ -46,7 +46,7 @@ func Middleware(service string, opts ...Option) gin.HandlerFunc { opt(&cfg) } if cfg.TracerProvider == nil { - cfg.TracerProvider = otelglobal.TraceProvider() + cfg.TracerProvider = otelglobal.TracerProvider() } tracer := cfg.TracerProvider.Tracer( tracerName, @@ -62,7 +62,7 @@ func Middleware(service string, opts ...Option) gin.HandlerFunc { c.Request = c.Request.WithContext(savedCtx) }() ctx := otelpropagation.ExtractHTTP(savedCtx, cfg.Propagators, c.Request.Header) - opts := []oteltrace.StartOption{ + opts := []oteltrace.SpanOption{ oteltrace.WithAttributes(semconv.NetAttributesFromHTTPRequest("tcp", c.Request)...), oteltrace.WithAttributes(semconv.EndUserAttributesFromHTTPRequest(c.Request)...), oteltrace.WithAttributes(semconv.HTTPServerAttributesFromHTTPRequest(service, c.FullPath(), c.Request)...), @@ -103,7 +103,7 @@ func HTML(c *gin.Context, code int, name string, obj interface{}) { tracer, ok = tracerInterface.(oteltrace.Tracer) } if !ok { - tracer = otelglobal.TraceProvider().Tracer( + tracer = otelglobal.TracerProvider().Tracer( tracerName, oteltrace.WithInstrumentationVersion(otelcontrib.SemVersion()), ) diff --git a/instrumentation/github.com/gin-gonic/gin/otelgin/gintrace_test.go b/instrumentation/github.com/gin-gonic/gin/otelgin/gintrace_test.go index cf3e329168c..b9df2aa6acd 100644 --- a/instrumentation/github.com/gin-gonic/gin/otelgin/gintrace_test.go +++ b/instrumentation/github.com/gin-gonic/gin/otelgin/gintrace_test.go @@ -31,6 +31,7 @@ import ( "go.opentelemetry.io/otel/codes" mocktrace "go.opentelemetry.io/contrib/internal/trace" + b3prop "go.opentelemetry.io/contrib/propagators/b3" otelglobal "go.opentelemetry.io/otel/api/global" otelpropagation "go.opentelemetry.io/otel/api/propagation" oteltrace "go.opentelemetry.io/otel/api/trace" @@ -42,7 +43,7 @@ func init() { } func TestChildSpanFromGlobalTracer(t *testing.T) { - otelglobal.SetTraceProvider(&mocktrace.Provider{}) + otelglobal.SetTracerProvider(&mocktrace.TracerProvider{}) router := gin.New() router.Use(Middleware("foobar")) @@ -63,7 +64,7 @@ func TestChildSpanFromGlobalTracer(t *testing.T) { } func TestChildSpanFromCustomTracer(t *testing.T) { - provider, _ := mocktrace.NewProviderAndTracer(tracerName) + provider, _ := mocktrace.NewTracerProviderAndTracer(tracerName) router := gin.New() router.Use(Middleware("foobar", WithTracerProvider(provider))) @@ -84,7 +85,7 @@ func TestChildSpanFromCustomTracer(t *testing.T) { } func TestTrace200(t *testing.T) { - provider, tracer := mocktrace.NewProviderAndTracer(tracerName) + provider, tracer := mocktrace.NewTracerProviderAndTracer(tracerName) router := gin.New() router.Use(Middleware("foobar", WithTracerProvider(provider))) @@ -119,7 +120,7 @@ func TestTrace200(t *testing.T) { } func TestError(t *testing.T) { - provider, tracer := mocktrace.NewProviderAndTracer(tracerName) + provider, tracer := mocktrace.NewTracerProviderAndTracer(tracerName) // setup router := gin.New() @@ -149,7 +150,7 @@ func TestError(t *testing.T) { } func TestHTML(t *testing.T) { - provider, tracer := mocktrace.NewProviderAndTracer(tracerName) + provider, tracer := mocktrace.NewTracerProviderAndTracer(tracerName) // setup router := gin.New() @@ -191,7 +192,7 @@ func TestGetSpanNotInstrumented(t *testing.T) { router.GET("/ping", func(c *gin.Context) { // Assert we don't have a span on the context. span := oteltrace.SpanFromContext(c.Request.Context()) - _, ok := span.(oteltrace.NoopSpan) + ok := !span.SpanContext().IsValid() assert.True(t, ok) _, _ = c.Writer.Write([]byte("ok")) }) @@ -203,7 +204,7 @@ func TestGetSpanNotInstrumented(t *testing.T) { } func TestPropagationWithGlobalPropagators(t *testing.T) { - provider, tracer := mocktrace.NewProviderAndTracer(tracerName) + provider, tracer := mocktrace.NewTracerProviderAndTracer(tracerName) r := httptest.NewRequest("GET", "/user/123", nil) w := httptest.NewRecorder() @@ -225,8 +226,8 @@ func TestPropagationWithGlobalPropagators(t *testing.T) { } func TestPropagationWithCustomPropagators(t *testing.T) { - provider, tracer := mocktrace.NewProviderAndTracer(tracerName) - b3 := oteltrace.B3{} + provider, tracer := mocktrace.NewTracerProviderAndTracer(tracerName) + b3 := b3prop.B3{} props := otelpropagation.New( otelpropagation.WithExtractors(b3), otelpropagation.WithInjectors(b3), diff --git a/instrumentation/github.com/gin-gonic/gin/otelgin/go.mod b/instrumentation/github.com/gin-gonic/gin/otelgin/go.mod index c469e022b8d..048c2b9d4cc 100644 --- a/instrumentation/github.com/gin-gonic/gin/otelgin/go.mod +++ b/instrumentation/github.com/gin-gonic/gin/otelgin/go.mod @@ -2,13 +2,17 @@ module go.opentelemetry.io/contrib/instrumentation/github.com/gin-gonic/gin/otel go 1.14 -replace go.opentelemetry.io/contrib => ../../../../../ +replace ( + go.opentelemetry.io/contrib => ../../../../../ + go.opentelemetry.io/contrib/propagators => ../../../../../propagators +) require ( github.com/gin-gonic/gin v1.6.3 github.com/stretchr/testify v1.6.1 - go.opentelemetry.io/contrib v0.11.0 - go.opentelemetry.io/otel v0.11.0 - go.opentelemetry.io/otel/exporters/stdout v0.11.0 - go.opentelemetry.io/otel/sdk v0.11.0 + go.opentelemetry.io/contrib v0.12.0 + go.opentelemetry.io/contrib/propagators v0.12.0 + go.opentelemetry.io/otel v0.12.0 + go.opentelemetry.io/otel/exporters/stdout v0.12.0 + go.opentelemetry.io/otel/sdk v0.12.0 ) diff --git a/instrumentation/github.com/gin-gonic/gin/otelgin/go.sum b/instrumentation/github.com/gin-gonic/gin/otelgin/go.sum index 1775ee2692e..352d8ea1643 100644 --- a/instrumentation/github.com/gin-gonic/gin/otelgin/go.sum +++ b/instrumentation/github.com/gin-gonic/gin/otelgin/go.sum @@ -34,8 +34,8 @@ github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaW github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= github.com/google/go-cmp v0.4.0 h1:xsAVV57WRhGj6kEIi8ReJzQlHHqcBYCElAvkovg3B/4= github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.1 h1:JFrFEBb2xKufg6XkJsJr+WbKb4FQlURi5RUcBveYu9k= -github.com/google/go-cmp v0.5.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.2 h1:X2ev0eStA3AbceY54o37/0PQ/UWqKEiiO2dKL5OPaFM= +github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/gofuzz v1.0.0 h1:A8PeW59pxE9IoFRqBp37U+mSNaQoZ46F1f0f863XSXw= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/gofuzz v1.1.0 h1:Hsa8mG0dQ46ij8Sl2AYJDUv1oA9/d6Vk+3LG99Oe02g= @@ -69,12 +69,12 @@ github.com/ugorji/go v1.1.7 h1:/68gy2h+1mWMrwZFeD1kQialdSzAb432dtpeJ42ovdo= github.com/ugorji/go v1.1.7/go.mod h1:kZn38zHttfInRq0xu/PH0az30d+z6vm202qpg1oXVMw= github.com/ugorji/go/codec v1.1.7 h1:2SvQaVZ1ouYrrKKwoSk2pzd4A9evlKJb9oTL+OaLUSs= github.com/ugorji/go/codec v1.1.7/go.mod h1:Ax+UKWsSmolVDwsd+7N3ZtXu+yMGCf907BLYF3GoBXY= -go.opentelemetry.io/otel v0.11.0 h1:IN2tzQa9Gc4ZVKnTaMbPVcHjvzOdg5n9QfnmlqiET7E= -go.opentelemetry.io/otel v0.11.0/go.mod h1:G8UCk+KooF2HLkgo8RHX9epABH/aRGYET7gQOqBVdB0= -go.opentelemetry.io/otel/exporters/stdout v0.11.0 h1:5Hn/XKgq7aCJQWGacF093Ts1VpJuiJkwC75c1PqHTPE= -go.opentelemetry.io/otel/exporters/stdout v0.11.0/go.mod h1:XP4gbV2Ikc7/ZyTGtwrA7/FzrhWJr3nfRU+LRvhxY24= -go.opentelemetry.io/otel/sdk v0.11.0 h1:bkDMymVj6gIkPfgC5ci5atq0OYbfUHSn8NvsmyfyMq4= -go.opentelemetry.io/otel/sdk v0.11.0/go.mod h1:XbZ6MrzIZ+d+qr7pH0FwHIbCnANMvXYgkq4afL/IUMQ= +go.opentelemetry.io/otel v0.12.0 h1:bwWaPd/h2q+U6KdKaAiOS5GLwOMd1LDt9iNaeyIoAI8= +go.opentelemetry.io/otel v0.12.0/go.mod h1:dlSNewoRYikTkotEnxdmuBHgzT+k/idJSfDv/FxEnOY= +go.opentelemetry.io/otel/exporters/stdout v0.12.0 h1:ji9VVPmKg+oONcqwULcO0AHZseGU6CFOIdvwKCxNZ9Y= +go.opentelemetry.io/otel/exporters/stdout v0.12.0/go.mod h1:IGUi+IGDXlxXo7nYuPrxfAEpqTcKsWqFtflwFMGGPZQ= +go.opentelemetry.io/otel/sdk v0.12.0 h1:YVUyDXsGvFWjhJxGXT4kBcGdfoTbo1vSGjbGRUdRh5U= +go.opentelemetry.io/otel/sdk v0.12.0/go.mod h1:u3joRdxhrS1hUf9xSFH8vgdXdujQ3jxXxZl3loZFSqs= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= @@ -111,8 +111,8 @@ google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY= -google.golang.org/grpc v1.31.0 h1:T7P4R73V3SSDPhH7WW7ATbfViLtmamH0DKrP3f9AuDI= -google.golang.org/grpc v1.31.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= +google.golang.org/grpc v1.32.0 h1:zWTV+LMdc3kaiJMSTOFz2UgSBgx8RNQoTGiZu3fR9S0= +google.golang.org/grpc v1.32.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo= gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= diff --git a/instrumentation/github.com/gin-gonic/gin/otelgin/option.go b/instrumentation/github.com/gin-gonic/gin/otelgin/option.go index 023e0bc923d..06390c075a7 100644 --- a/instrumentation/github.com/gin-gonic/gin/otelgin/option.go +++ b/instrumentation/github.com/gin-gonic/gin/otelgin/option.go @@ -22,7 +22,7 @@ import ( ) type config struct { - TracerProvider oteltrace.Provider + TracerProvider oteltrace.TracerProvider Propagators otelpropagation.Propagators } @@ -40,7 +40,7 @@ func WithPropagators(propagators otelpropagation.Propagators) Option { // WithTracerProvider specifies a tracer provider to use for creating a tracer. // If none is specified, the global provider is used. -func WithTracerProvider(provider oteltrace.Provider) Option { +func WithTracerProvider(provider oteltrace.TracerProvider) Option { return func(cfg *config) { cfg.TracerProvider = provider } diff --git a/instrumentation/github.com/gocql/gocql/otelgocql/config.go b/instrumentation/github.com/gocql/gocql/otelgocql/config.go index 4ad45f04f55..89bf855ad44 100644 --- a/instrumentation/github.com/gocql/gocql/otelgocql/config.go +++ b/instrumentation/github.com/gocql/gocql/otelgocql/config.go @@ -25,8 +25,8 @@ import ( // TracedSessionConfig provides configuration for sessions // created with NewSessionWithTracing. type TracedSessionConfig struct { - tracerProvider trace.Provider - meterProvider metric.Provider + tracerProvider trace.TracerProvider + meterProvider metric.MeterProvider instrumentQuery bool instrumentBatch bool instrumentConnect bool @@ -81,8 +81,8 @@ func WithConnectObserver(observer gocql.ConnectObserver) TracedSessionOption { } // WithTracerProvider will set the trace provider used to get a tracer -// for creating spans. Defaults to global.TraceProvider() -func WithTracerProvider(provider trace.Provider) TracedSessionOption { +// for creating spans. Defaults to TracerProvider() +func WithTracerProvider(provider trace.TracerProvider) TracedSessionOption { return TracedSessionOptionFunc(func(c *TracedSessionConfig) { c.tracerProvider = provider }) @@ -91,7 +91,7 @@ func WithTracerProvider(provider trace.Provider) TracedSessionOption { // WithMeterProvider will set the meter provider used to get a meter // for creating instruments. // Defaults to global.MeterProvider(). -func WithMeterProvider(provider metric.Provider) TracedSessionOption { +func WithMeterProvider(provider metric.MeterProvider) TracedSessionOption { return TracedSessionOptionFunc(func(c *TracedSessionConfig) { c.meterProvider = provider }) @@ -125,7 +125,7 @@ func WithConnectInstrumentation(enabled bool) TracedSessionOption { func newTracedSessionConfig(options ...TracedSessionOption) *TracedSessionConfig { config := &TracedSessionConfig{ - tracerProvider: global.TraceProvider(), + tracerProvider: global.TracerProvider(), meterProvider: global.MeterProvider(), instrumentQuery: true, instrumentBatch: true, diff --git a/instrumentation/github.com/gocql/gocql/otelgocql/example/go.mod b/instrumentation/github.com/gocql/gocql/otelgocql/example/go.mod index 9a44cd2b972..c9464383458 100644 --- a/instrumentation/github.com/gocql/gocql/otelgocql/example/go.mod +++ b/instrumentation/github.com/gocql/gocql/otelgocql/example/go.mod @@ -9,9 +9,9 @@ replace ( require ( github.com/gocql/gocql v0.0.0-20200624222514-34081eda590e - go.opentelemetry.io/contrib/instrumentation/github.com/gocql/gocql/otelgocql v0.11.0 - go.opentelemetry.io/otel v0.11.0 - go.opentelemetry.io/otel/exporters/metric/prometheus v0.11.0 - go.opentelemetry.io/otel/exporters/trace/zipkin v0.11.0 + go.opentelemetry.io/contrib/instrumentation/github.com/gocql/gocql/otelgocql v0.12.0 + go.opentelemetry.io/otel v0.12.0 + go.opentelemetry.io/otel/exporters/metric/prometheus v0.12.0 + go.opentelemetry.io/otel/exporters/trace/zipkin v0.12.0 golang.org/x/sys v0.0.0-20200722175500-76b94024e4b6 // indirect ) diff --git a/instrumentation/github.com/gocql/gocql/otelgocql/example/go.sum b/instrumentation/github.com/gocql/gocql/otelgocql/example/go.sum index 5efffca7f53..5cf17f203e2 100644 --- a/instrumentation/github.com/gocql/gocql/otelgocql/example/go.sum +++ b/instrumentation/github.com/gocql/gocql/otelgocql/example/go.sum @@ -41,9 +41,7 @@ github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= github.com/gocql/gocql v0.0.0-20200624222514-34081eda590e h1:SroDcndcOU9BVAduPf/PXihXoR2ZYTQYLXbupbqxAyQ= github.com/gocql/gocql v0.0.0-20200624222514-34081eda590e/go.mod h1:DL0ekTmBSTdlNF25Orwt/JMzqIq3EJ4MVa/J/uK64OY= -github.com/gogo/googleapis v1.1.0/go.mod h1:gf4bu3Q80BeJ6H1S1vYPm8/ELATdvryBaNFGgqEef3s= github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= -github.com/gogo/protobuf v1.2.0/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= @@ -70,8 +68,8 @@ github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMyw github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.0 h1:/QaMHBdZ26BB3SSst0Iwl10Epc+xhTquomWX0oZEB6w= github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.1 h1:JFrFEBb2xKufg6XkJsJr+WbKb4FQlURi5RUcBveYu9k= -github.com/google/go-cmp v0.5.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.2 h1:X2ev0eStA3AbceY54o37/0PQ/UWqKEiiO2dKL5OPaFM= +github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/gofuzz v1.0.0 h1:A8PeW59pxE9IoFRqBp37U+mSNaQoZ46F1f0f863XSXw= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/gofuzz v1.1.0 h1:Hsa8mG0dQ46ij8Sl2AYJDUv1oA9/d6Vk+3LG99Oe02g= @@ -91,7 +89,6 @@ github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORN github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= -github.com/lyft/protoc-gen-validate v0.0.13/go.mod h1:XbGvPuh87YZc5TdIa2/I4pLk0QoUACkjt2znoq26NVQ= github.com/matttproud/golang_protobuf_extensions v1.0.1 h1:4hp9jkHxhMHkqkrB3Ix0jegS5sx/RkqARlsWZ6pIwiU= github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= @@ -102,8 +99,8 @@ github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRW github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= -github.com/openzipkin/zipkin-go v0.2.3 h1:Ygv80onOuzQTaRs7aZGwPut9nkEXoNtluU1yuIGI67c= -github.com/openzipkin/zipkin-go v0.2.3/go.mod h1:uEP5ksAmClUBnhP2JY/Km6gfQ5JCNS1WLrVYLnvDC0M= +github.com/openzipkin/zipkin-go v0.2.4 h1:U5TVrlsR1jPV1oJp7XqkC1XDk32tSZGwQIIywTQvQhc= +github.com/openzipkin/zipkin-go v0.2.4/go.mod h1:KpXfKdgRDnnhsxw4pNIH9Md5lyFqKUa4YDFlwRYAMyE= github.com/pierrec/lz4 v1.0.2-0.20190131084431-473cd7ce01a1/go.mod h1:3/3N9NVKO0jef7pBehbT1qWhCMrIgbYNnFAZCqQ5LRc= github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= @@ -137,14 +134,14 @@ github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UV github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= github.com/stretchr/testify v1.6.1 h1:hDPOHmpOpP40lSULcqw7IrRb/u7w6RpDC9399XyoNd0= github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -go.opentelemetry.io/otel v0.11.0 h1:IN2tzQa9Gc4ZVKnTaMbPVcHjvzOdg5n9QfnmlqiET7E= -go.opentelemetry.io/otel v0.11.0/go.mod h1:G8UCk+KooF2HLkgo8RHX9epABH/aRGYET7gQOqBVdB0= -go.opentelemetry.io/otel/exporters/metric/prometheus v0.11.0 h1:ANs0WoaTBtMQJIIdLmJz9hWaDHXSl7w+3z762Mwq5qA= -go.opentelemetry.io/otel/exporters/metric/prometheus v0.11.0/go.mod h1:UztR8YbWSjO17RWjZ+QxiTMf5k0Ba0uoimYsxGO5n3s= -go.opentelemetry.io/otel/exporters/trace/zipkin v0.11.0 h1:3F1Fp5jYRPQK9jg1VEV7Kr1AI0U5sMieH2wL9SDcTMQ= -go.opentelemetry.io/otel/exporters/trace/zipkin v0.11.0/go.mod h1:JuFs9e72mfov6GVmz8KR4sU/j1APSZtwDVC2qH+3tEQ= -go.opentelemetry.io/otel/sdk v0.11.0 h1:bkDMymVj6gIkPfgC5ci5atq0OYbfUHSn8NvsmyfyMq4= -go.opentelemetry.io/otel/sdk v0.11.0/go.mod h1:XbZ6MrzIZ+d+qr7pH0FwHIbCnANMvXYgkq4afL/IUMQ= +go.opentelemetry.io/otel v0.12.0 h1:bwWaPd/h2q+U6KdKaAiOS5GLwOMd1LDt9iNaeyIoAI8= +go.opentelemetry.io/otel v0.12.0/go.mod h1:dlSNewoRYikTkotEnxdmuBHgzT+k/idJSfDv/FxEnOY= +go.opentelemetry.io/otel/exporters/metric/prometheus v0.12.0 h1:QHLoNZWJ5j6Hn8AUV3fe95Qg6khcMx33Gzp9I1tnKlM= +go.opentelemetry.io/otel/exporters/metric/prometheus v0.12.0/go.mod h1:EYhf3CC9yhRMU6csMW2l1B1X7zaikwtd4HR6pJchXhw= +go.opentelemetry.io/otel/exporters/trace/zipkin v0.12.0 h1:PDDkylx7yLRQxu8w8dKD7YdOYuWXNx/EKGciNEaJjhU= +go.opentelemetry.io/otel/exporters/trace/zipkin v0.12.0/go.mod h1:bXGoJoqaBkDnCGMst7DvK97dBBjwJ4rqsOE2YA4PSv8= +go.opentelemetry.io/otel/sdk v0.12.0 h1:YVUyDXsGvFWjhJxGXT4kBcGdfoTbo1vSGjbGRUdRh5U= +go.opentelemetry.io/otel/sdk v0.12.0/go.mod h1:u3joRdxhrS1hUf9xSFH8vgdXdujQ3jxXxZl3loZFSqs= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= @@ -194,8 +191,8 @@ google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQ google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= google.golang.org/grpc v1.30.0 h1:M5a8xTlYTxwMn5ZFkwhRabsygDY5G8TYLyQDBxJNAxE= google.golang.org/grpc v1.30.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= -google.golang.org/grpc v1.31.0 h1:T7P4R73V3SSDPhH7WW7ATbfViLtmamH0DKrP3f9AuDI= -google.golang.org/grpc v1.31.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= +google.golang.org/grpc v1.32.0 h1:zWTV+LMdc3kaiJMSTOFz2UgSBgx8RNQoTGiZu3fR9S0= +google.golang.org/grpc v1.32.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= diff --git a/instrumentation/github.com/gocql/gocql/otelgocql/go.mod b/instrumentation/github.com/gocql/gocql/otelgocql/go.mod index 5f4fe303fbc..0a00b80f239 100644 --- a/instrumentation/github.com/gocql/gocql/otelgocql/go.mod +++ b/instrumentation/github.com/gocql/gocql/otelgocql/go.mod @@ -8,7 +8,7 @@ require ( github.com/gocql/gocql v0.0.0-20200624222514-34081eda590e github.com/golang/snappy v0.0.1 // indirect github.com/stretchr/testify v1.6.1 - go.opentelemetry.io/contrib v0.11.0 - go.opentelemetry.io/otel v0.11.0 - go.opentelemetry.io/otel/sdk v0.11.0 + go.opentelemetry.io/contrib v0.12.0 + go.opentelemetry.io/otel v0.12.0 + go.opentelemetry.io/otel/sdk v0.12.0 ) diff --git a/instrumentation/github.com/gocql/gocql/otelgocql/go.sum b/instrumentation/github.com/gocql/gocql/otelgocql/go.sum index 726f1baebb0..726d1eeddf9 100644 --- a/instrumentation/github.com/gocql/gocql/otelgocql/go.sum +++ b/instrumentation/github.com/gocql/gocql/otelgocql/go.sum @@ -31,8 +31,8 @@ github.com/golang/snappy v0.0.1 h1:Qgr9rKW7uDUkrbSmQeiDsGa8SjGyCOGtuasMWwvp2P4= github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.1 h1:JFrFEBb2xKufg6XkJsJr+WbKb4FQlURi5RUcBveYu9k= -github.com/google/go-cmp v0.5.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.2 h1:X2ev0eStA3AbceY54o37/0PQ/UWqKEiiO2dKL5OPaFM= +github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/gofuzz v1.1.0 h1:Hsa8mG0dQ46ij8Sl2AYJDUv1oA9/d6Vk+3LG99Oe02g= github.com/google/gofuzz v1.1.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/hailocab/go-hostpool v0.0.0-20160125115350-e80d13ce29ed h1:5upAirOpQc1Q53c0bnx2ufif5kANL7bfZWcc6VJWJd8= @@ -50,10 +50,10 @@ github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+ github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.6.1 h1:hDPOHmpOpP40lSULcqw7IrRb/u7w6RpDC9399XyoNd0= github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -go.opentelemetry.io/otel v0.11.0 h1:IN2tzQa9Gc4ZVKnTaMbPVcHjvzOdg5n9QfnmlqiET7E= -go.opentelemetry.io/otel v0.11.0/go.mod h1:G8UCk+KooF2HLkgo8RHX9epABH/aRGYET7gQOqBVdB0= -go.opentelemetry.io/otel/sdk v0.11.0 h1:bkDMymVj6gIkPfgC5ci5atq0OYbfUHSn8NvsmyfyMq4= -go.opentelemetry.io/otel/sdk v0.11.0/go.mod h1:XbZ6MrzIZ+d+qr7pH0FwHIbCnANMvXYgkq4afL/IUMQ= +go.opentelemetry.io/otel v0.12.0 h1:bwWaPd/h2q+U6KdKaAiOS5GLwOMd1LDt9iNaeyIoAI8= +go.opentelemetry.io/otel v0.12.0/go.mod h1:dlSNewoRYikTkotEnxdmuBHgzT+k/idJSfDv/FxEnOY= +go.opentelemetry.io/otel/sdk v0.12.0 h1:YVUyDXsGvFWjhJxGXT4kBcGdfoTbo1vSGjbGRUdRh5U= +go.opentelemetry.io/otel/sdk v0.12.0/go.mod h1:u3joRdxhrS1hUf9xSFH8vgdXdujQ3jxXxZl3loZFSqs= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= @@ -86,8 +86,7 @@ google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY= -google.golang.org/grpc v1.31.0 h1:T7P4R73V3SSDPhH7WW7ATbfViLtmamH0DKrP3f9AuDI= -google.golang.org/grpc v1.31.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= +google.golang.org/grpc v1.32.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo= gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= diff --git a/instrumentation/github.com/gocql/gocql/otelgocql/gocql_test.go b/instrumentation/github.com/gocql/gocql/otelgocql/gocql_test.go index e231b311630..48317bb61d5 100644 --- a/instrumentation/github.com/gocql/gocql/otelgocql/gocql_test.go +++ b/instrumentation/github.com/gocql/gocql/otelgocql/gocql_test.go @@ -130,7 +130,7 @@ func TestQuery(t *testing.T) { ctx, cluster, WithTracerProvider(tracerProvider), - WithMeterProvider(controller.Provider()), + WithMeterProvider(controller.MeterProvider()), WithConnectInstrumentation(false), ) require.NoError(t, err) @@ -252,7 +252,7 @@ func TestBatch(t *testing.T) { ctx, cluster, WithTracerProvider(tracerProvider), - WithMeterProvider(controller.Provider()), + WithMeterProvider(controller.MeterProvider()), WithConnectInstrumentation(false), ) require.NoError(t, err) @@ -350,7 +350,7 @@ func TestConnection(t *testing.T) { ctx, cluster, WithTracerProvider(tracerProvider), - WithMeterProvider(controller.Provider()), + WithMeterProvider(controller.MeterProvider()), WithConnectObserver(connectObserver), ) require.NoError(t, err) diff --git a/instrumentation/github.com/gocql/gocql/otelgocql/instrument.go b/instrumentation/github.com/gocql/gocql/otelgocql/instrument.go index 4fab327f8c9..c6d5ccce8e3 100644 --- a/instrumentation/github.com/gocql/gocql/otelgocql/instrument.go +++ b/instrumentation/github.com/gocql/gocql/otelgocql/instrument.go @@ -19,7 +19,7 @@ import ( otelcontrib "go.opentelemetry.io/contrib" "go.opentelemetry.io/otel/api/metric" - "go.opentelemetry.io/otel/api/unit" + "go.opentelemetry.io/otel/unit" ) type instruments struct { @@ -42,7 +42,7 @@ type instruments struct { // newInstruments will create instruments using a meter // from the given provider p. -func newInstruments(p metric.Provider) *instruments { +func newInstruments(p metric.MeterProvider) *instruments { meter := p.Meter( instrumentationName, metric.WithInstrumentationVersion(otelcontrib.SemVersion()), diff --git a/instrumentation/github.com/gocql/gocql/otelgocql/observer.go b/instrumentation/github.com/gocql/gocql/otelgocql/observer.go index 072452a1f61..fd53eabc996 100644 --- a/instrumentation/github.com/gocql/gocql/otelgocql/observer.go +++ b/instrumentation/github.com/gocql/gocql/otelgocql/observer.go @@ -73,7 +73,7 @@ func (o *OTelQueryObserver) ObserveQuery(ctx context.Context, observedQuery gocq ctx, span := o.tracer.Start( ctx, observedQuery.Statement, - trace.WithStartTime(observedQuery.Start), + trace.WithTimestamp(observedQuery.Start), trace.WithAttributes(attributes...), trace.WithSpanKind(trace.SpanKindClient), ) @@ -100,7 +100,7 @@ func (o *OTelQueryObserver) ObserveQuery(ctx context.Context, observedQuery gocq ) } - span.End(trace.WithEndTime(observedQuery.End)) + span.End(trace.WithTimestamp(observedQuery.End)) inst.queryRows.Record( ctx, @@ -135,7 +135,7 @@ func (o *OTelBatchObserver) ObserveBatch(ctx context.Context, observedBatch gocq ctx, span := o.tracer.Start( ctx, cassBatchQueryName, - trace.WithStartTime(observedBatch.Start), + trace.WithTimestamp(observedBatch.Start), trace.WithAttributes(attributes...), trace.WithSpanKind(trace.SpanKindClient), ) @@ -158,7 +158,7 @@ func (o *OTelBatchObserver) ObserveBatch(ctx context.Context, observedBatch gocq ) } - span.End(trace.WithEndTime(observedBatch.End)) + span.End(trace.WithTimestamp(observedBatch.End)) inst.latency.Record( ctx, @@ -183,7 +183,7 @@ func (o *OTelConnectObserver) ObserveConnect(observedConnect gocql.ObservedConne _, span := o.tracer.Start( o.ctx, cassConnectName, - trace.WithStartTime(observedConnect.Start), + trace.WithTimestamp(observedConnect.Start), trace.WithAttributes(attributes...), trace.WithSpanKind(trace.SpanKindClient), ) @@ -203,7 +203,7 @@ func (o *OTelConnectObserver) ObserveConnect(observedConnect gocql.ObservedConne ) } - span.End(trace.WithEndTime(observedConnect.End)) + span.End(trace.WithTimestamp(observedConnect.End)) } if o.observer != nil { diff --git a/instrumentation/github.com/gorilla/mux/otelmux/config.go b/instrumentation/github.com/gorilla/mux/otelmux/config.go index 826ab20c833..5ef79913e4a 100644 --- a/instrumentation/github.com/gorilla/mux/otelmux/config.go +++ b/instrumentation/github.com/gorilla/mux/otelmux/config.go @@ -21,7 +21,7 @@ import ( // config is used to configure the mux middleware. type config struct { - TracerProvider oteltrace.Provider + TracerProvider oteltrace.TracerProvider Propagators otelpropagation.Propagators } @@ -39,7 +39,7 @@ func WithPropagators(propagators otelpropagation.Propagators) Option { // WithTracerProvider specifies a tracer provider to use for creating a tracer. // If none is specified, the global provider is used. -func WithTracerProvider(provider oteltrace.Provider) Option { +func WithTracerProvider(provider oteltrace.TracerProvider) Option { return func(cfg *config) { cfg.TracerProvider = provider } diff --git a/instrumentation/github.com/gorilla/mux/otelmux/example/server.go b/instrumentation/github.com/gorilla/mux/otelmux/example/server.go index 734e3fa63c8..bef52fe1c94 100644 --- a/instrumentation/github.com/gorilla/mux/otelmux/example/server.go +++ b/instrumentation/github.com/gorilla/mux/otelmux/example/server.go @@ -55,14 +55,14 @@ func initTracer() { cfg := sdktrace.Config{ DefaultSampler: sdktrace.AlwaysSample(), } - tp, err := sdktrace.NewProvider( + tp := sdktrace.NewTracerProvider( sdktrace.WithConfig(cfg), sdktrace.WithSyncer(exporter), ) if err != nil { log.Fatal(err) } - otelglobal.SetTraceProvider(tp) + otelglobal.SetTracerProvider(tp) } func getUser(ctx context.Context, id string) string { diff --git a/instrumentation/github.com/gorilla/mux/otelmux/go.mod b/instrumentation/github.com/gorilla/mux/otelmux/go.mod index cd2915b8901..e0fac3e435d 100644 --- a/instrumentation/github.com/gorilla/mux/otelmux/go.mod +++ b/instrumentation/github.com/gorilla/mux/otelmux/go.mod @@ -2,13 +2,17 @@ module go.opentelemetry.io/contrib/instrumentation/github.com/gorilla/mux/otelmu go 1.14 -replace go.opentelemetry.io/contrib => ../../../../.. +replace ( + go.opentelemetry.io/contrib => ../../../../.. + go.opentelemetry.io/contrib/propagators => ../../../../../propagators +) require ( github.com/gorilla/mux v1.8.0 github.com/stretchr/testify v1.6.1 - go.opentelemetry.io/contrib v0.11.0 - go.opentelemetry.io/otel v0.11.0 - go.opentelemetry.io/otel/exporters/stdout v0.11.0 - go.opentelemetry.io/otel/sdk v0.11.0 + go.opentelemetry.io/contrib v0.12.0 + go.opentelemetry.io/contrib/propagators v0.12.0 + go.opentelemetry.io/otel v0.12.0 + go.opentelemetry.io/otel/exporters/stdout v0.12.0 + go.opentelemetry.io/otel/sdk v0.12.0 ) diff --git a/instrumentation/github.com/gorilla/mux/otelmux/go.sum b/instrumentation/github.com/gorilla/mux/otelmux/go.sum index 558c7e2050b..e75e1287fdd 100644 --- a/instrumentation/github.com/gorilla/mux/otelmux/go.sum +++ b/instrumentation/github.com/gorilla/mux/otelmux/go.sum @@ -22,8 +22,8 @@ github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaW github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= github.com/google/go-cmp v0.4.0 h1:xsAVV57WRhGj6kEIi8ReJzQlHHqcBYCElAvkovg3B/4= github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.1 h1:JFrFEBb2xKufg6XkJsJr+WbKb4FQlURi5RUcBveYu9k= -github.com/google/go-cmp v0.5.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.2 h1:X2ev0eStA3AbceY54o37/0PQ/UWqKEiiO2dKL5OPaFM= +github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/gofuzz v1.1.0 h1:Hsa8mG0dQ46ij8Sl2AYJDUv1oA9/d6Vk+3LG99Oe02g= github.com/google/gofuzz v1.1.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/gorilla/mux v1.8.0 h1:i40aqfkR1h2SlN9hojwV5ZA91wcXFOvkdNIeFDP5koI= @@ -40,12 +40,12 @@ github.com/stretchr/objx v0.1.0 h1:4G4v2dO3VZwixGIRoQ5Lfboy6nUhCyYzaqnIAPPhYs4= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/testify v1.6.1 h1:hDPOHmpOpP40lSULcqw7IrRb/u7w6RpDC9399XyoNd0= github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -go.opentelemetry.io/otel v0.11.0 h1:IN2tzQa9Gc4ZVKnTaMbPVcHjvzOdg5n9QfnmlqiET7E= -go.opentelemetry.io/otel v0.11.0/go.mod h1:G8UCk+KooF2HLkgo8RHX9epABH/aRGYET7gQOqBVdB0= -go.opentelemetry.io/otel/exporters/stdout v0.11.0 h1:5Hn/XKgq7aCJQWGacF093Ts1VpJuiJkwC75c1PqHTPE= -go.opentelemetry.io/otel/exporters/stdout v0.11.0/go.mod h1:XP4gbV2Ikc7/ZyTGtwrA7/FzrhWJr3nfRU+LRvhxY24= -go.opentelemetry.io/otel/sdk v0.11.0 h1:bkDMymVj6gIkPfgC5ci5atq0OYbfUHSn8NvsmyfyMq4= -go.opentelemetry.io/otel/sdk v0.11.0/go.mod h1:XbZ6MrzIZ+d+qr7pH0FwHIbCnANMvXYgkq4afL/IUMQ= +go.opentelemetry.io/otel v0.12.0 h1:bwWaPd/h2q+U6KdKaAiOS5GLwOMd1LDt9iNaeyIoAI8= +go.opentelemetry.io/otel v0.12.0/go.mod h1:dlSNewoRYikTkotEnxdmuBHgzT+k/idJSfDv/FxEnOY= +go.opentelemetry.io/otel/exporters/stdout v0.12.0 h1:ji9VVPmKg+oONcqwULcO0AHZseGU6CFOIdvwKCxNZ9Y= +go.opentelemetry.io/otel/exporters/stdout v0.12.0/go.mod h1:IGUi+IGDXlxXo7nYuPrxfAEpqTcKsWqFtflwFMGGPZQ= +go.opentelemetry.io/otel/sdk v0.12.0 h1:YVUyDXsGvFWjhJxGXT4kBcGdfoTbo1vSGjbGRUdRh5U= +go.opentelemetry.io/otel/sdk v0.12.0/go.mod h1:u3joRdxhrS1hUf9xSFH8vgdXdujQ3jxXxZl3loZFSqs= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= @@ -76,8 +76,8 @@ google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY= -google.golang.org/grpc v1.31.0 h1:T7P4R73V3SSDPhH7WW7ATbfViLtmamH0DKrP3f9AuDI= -google.golang.org/grpc v1.31.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= +google.golang.org/grpc v1.32.0 h1:zWTV+LMdc3kaiJMSTOFz2UgSBgx8RNQoTGiZu3fR9S0= +google.golang.org/grpc v1.32.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo= gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= diff --git a/instrumentation/github.com/gorilla/mux/otelmux/mux.go b/instrumentation/github.com/gorilla/mux/otelmux/mux.go index 456e9daecf4..78055c0b02a 100644 --- a/instrumentation/github.com/gorilla/mux/otelmux/mux.go +++ b/instrumentation/github.com/gorilla/mux/otelmux/mux.go @@ -42,7 +42,7 @@ func Middleware(service string, opts ...Option) mux.MiddlewareFunc { opt(&cfg) } if cfg.TracerProvider == nil { - cfg.TracerProvider = otelglobal.TraceProvider() + cfg.TracerProvider = otelglobal.TracerProvider() } tracer := cfg.TracerProvider.Tracer( tracerName, @@ -134,7 +134,7 @@ func (tw traceware) ServeHTTP(w http.ResponseWriter, r *http.Request) { if spanName == "" { spanName = fmt.Sprintf("HTTP %s route not found", r.Method) } - opts := []oteltrace.StartOption{ + opts := []oteltrace.SpanOption{ oteltrace.WithAttributes(semconv.NetAttributesFromHTTPRequest("tcp", r)...), oteltrace.WithAttributes(semconv.EndUserAttributesFromHTTPRequest(r)...), oteltrace.WithAttributes(semconv.HTTPServerAttributesFromHTTPRequest(tw.service, routeStr, r)...), diff --git a/instrumentation/github.com/gorilla/mux/otelmux/mux_test.go b/instrumentation/github.com/gorilla/mux/otelmux/mux_test.go index eb19f7a772a..cf29d947100 100644 --- a/instrumentation/github.com/gorilla/mux/otelmux/mux_test.go +++ b/instrumentation/github.com/gorilla/mux/otelmux/mux_test.go @@ -25,6 +25,7 @@ import ( "github.com/stretchr/testify/require" mocktrace "go.opentelemetry.io/contrib/internal/trace" + b3prop "go.opentelemetry.io/contrib/propagators/b3" otelglobal "go.opentelemetry.io/otel/api/global" otelpropagation "go.opentelemetry.io/otel/api/propagation" oteltrace "go.opentelemetry.io/otel/api/trace" @@ -32,7 +33,7 @@ import ( ) func TestChildSpanFromGlobalTracer(t *testing.T) { - otelglobal.SetTraceProvider(&mocktrace.Provider{}) + otelglobal.SetTracerProvider(&mocktrace.TracerProvider{}) router := mux.NewRouter() router.Use(Middleware("foobar")) @@ -54,7 +55,7 @@ func TestChildSpanFromGlobalTracer(t *testing.T) { } func TestChildSpanFromCustomTracer(t *testing.T) { - provider, _ := mocktrace.NewProviderAndTracer(tracerName) + provider, _ := mocktrace.NewTracerProviderAndTracer(tracerName) router := mux.NewRouter() router.Use(Middleware("foobar", WithTracerProvider(provider))) @@ -76,7 +77,7 @@ func TestChildSpanFromCustomTracer(t *testing.T) { } func TestChildSpanNames(t *testing.T) { - provider, tracer := mocktrace.NewProviderAndTracer(tracerName) + provider, tracer := mocktrace.NewTracerProviderAndTracer(tracerName) router := mux.NewRouter() router.Use(Middleware("foobar", WithTracerProvider(provider))) @@ -120,7 +121,7 @@ func TestGetSpanNotInstrumented(t *testing.T) { router := mux.NewRouter() router.HandleFunc("/user/{id}", http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { span := oteltrace.SpanFromContext(r.Context()) - _, ok := span.(oteltrace.NoopSpan) + ok := !span.SpanContext().IsValid() assert.True(t, ok) w.WriteHeader(http.StatusOK) })) @@ -132,7 +133,7 @@ func TestGetSpanNotInstrumented(t *testing.T) { } func TestPropagationWithGlobalPropagators(t *testing.T) { - provider, tracer := mocktrace.NewProviderAndTracer(tracerName) + provider, tracer := mocktrace.NewTracerProviderAndTracer(tracerName) r := httptest.NewRequest("GET", "/user/123", nil) w := httptest.NewRecorder() @@ -155,9 +156,9 @@ func TestPropagationWithGlobalPropagators(t *testing.T) { } func TestPropagationWithCustomPropagators(t *testing.T) { - provider, tracer := mocktrace.NewProviderAndTracer(tracerName) + provider, tracer := mocktrace.NewTracerProviderAndTracer(tracerName) - b3 := oteltrace.B3{} + b3 := b3prop.B3{} props := otelpropagation.New( otelpropagation.WithExtractors(b3), otelpropagation.WithInjectors(b3), diff --git a/instrumentation/github.com/labstack/echo/otelecho/config.go b/instrumentation/github.com/labstack/echo/otelecho/config.go index a910cd0cc0b..ec2e2e4fc9b 100644 --- a/instrumentation/github.com/labstack/echo/otelecho/config.go +++ b/instrumentation/github.com/labstack/echo/otelecho/config.go @@ -21,7 +21,7 @@ import ( // config is used to configure the mux middleware. type config struct { - TracerProvider oteltrace.Provider + TracerProvider oteltrace.TracerProvider Propagators otelpropagation.Propagators } @@ -39,7 +39,7 @@ func WithPropagators(propagators otelpropagation.Propagators) Option { // WithTracerProvider specifies a tracer provider to use for creating a tracer. // If none is specified, the global provider is used. -func WithTracerProvider(provider oteltrace.Provider) Option { +func WithTracerProvider(provider oteltrace.TracerProvider) Option { return func(cfg *config) { cfg.TracerProvider = provider } diff --git a/instrumentation/github.com/labstack/echo/otelecho/echo.go b/instrumentation/github.com/labstack/echo/otelecho/echo.go index 0c3da0ea9ee..436ae939af3 100644 --- a/instrumentation/github.com/labstack/echo/otelecho/echo.go +++ b/instrumentation/github.com/labstack/echo/otelecho/echo.go @@ -40,7 +40,7 @@ func Middleware(service string, opts ...Option) echo.MiddlewareFunc { opt(&cfg) } if cfg.TracerProvider == nil { - cfg.TracerProvider = otelglobal.TraceProvider() + cfg.TracerProvider = otelglobal.TracerProvider() } tracer := cfg.TracerProvider.Tracer( tracerName, @@ -59,7 +59,7 @@ func Middleware(service string, opts ...Option) echo.MiddlewareFunc { c.SetRequest(request) }() ctx := otelpropagation.ExtractHTTP(savedCtx, cfg.Propagators, request.Header) - opts := []oteltrace.StartOption{ + opts := []oteltrace.SpanOption{ oteltrace.WithAttributes(semconv.NetAttributesFromHTTPRequest("tcp", request)...), oteltrace.WithAttributes(semconv.EndUserAttributesFromHTTPRequest(request)...), oteltrace.WithAttributes(semconv.HTTPServerAttributesFromHTTPRequest(service, c.Path(), request)...), diff --git a/instrumentation/github.com/labstack/echo/otelecho/echo_test.go b/instrumentation/github.com/labstack/echo/otelecho/echo_test.go index a2924980385..c93e0003abe 100644 --- a/instrumentation/github.com/labstack/echo/otelecho/echo_test.go +++ b/instrumentation/github.com/labstack/echo/otelecho/echo_test.go @@ -31,6 +31,7 @@ import ( "go.opentelemetry.io/otel/codes" mocktrace "go.opentelemetry.io/contrib/internal/trace" + b3prop "go.opentelemetry.io/contrib/propagators/b3" otelglobal "go.opentelemetry.io/otel/api/global" otelpropagation "go.opentelemetry.io/otel/api/propagation" oteltrace "go.opentelemetry.io/otel/api/trace" @@ -38,7 +39,7 @@ import ( ) func TestChildSpanFromGlobalTracer(t *testing.T) { - otelglobal.SetTraceProvider(&mocktrace.Provider{}) + otelglobal.SetTracerProvider(&mocktrace.TracerProvider{}) router := echo.New() router.Use(Middleware("foobar")) @@ -60,7 +61,7 @@ func TestChildSpanFromGlobalTracer(t *testing.T) { } func TestChildSpanFromCustomTracer(t *testing.T) { - provider, _ := mocktrace.NewProviderAndTracer(tracerName) + provider, _ := mocktrace.NewTracerProviderAndTracer(tracerName) router := echo.New() router.Use(Middleware("foobar", WithTracerProvider(provider))) @@ -82,7 +83,7 @@ func TestChildSpanFromCustomTracer(t *testing.T) { } func TestTrace200(t *testing.T) { - provider, tracer := mocktrace.NewProviderAndTracer(tracerName) + provider, tracer := mocktrace.NewTracerProviderAndTracer(tracerName) router := echo.New() router.Use(Middleware("foobar", WithTracerProvider(provider))) @@ -117,7 +118,7 @@ func TestTrace200(t *testing.T) { } func TestError(t *testing.T) { - provider, tracer := mocktrace.NewProviderAndTracer(tracerName) + provider, tracer := mocktrace.NewTracerProviderAndTracer(tracerName) // setup router := echo.New() @@ -151,7 +152,7 @@ func TestGetSpanNotInstrumented(t *testing.T) { router.GET("/ping", func(c echo.Context) error { // Assert we don't have a span on the context. span := oteltrace.SpanFromContext(c.Request().Context()) - _, ok := span.(oteltrace.NoopSpan) + ok := !span.SpanContext().IsValid() assert.True(t, ok) return c.String(200, "ok") }) @@ -163,7 +164,7 @@ func TestGetSpanNotInstrumented(t *testing.T) { } func TestPropagationWithGlobalPropagators(t *testing.T) { - provider, tracer := mocktrace.NewProviderAndTracer(tracerName) + provider, tracer := mocktrace.NewTracerProviderAndTracer(tracerName) r := httptest.NewRequest("GET", "/user/123", nil) w := httptest.NewRecorder() @@ -186,9 +187,9 @@ func TestPropagationWithGlobalPropagators(t *testing.T) { } func TestPropagationWithCustomPropagators(t *testing.T) { - provider, tracer := mocktrace.NewProviderAndTracer(tracerName) + provider, tracer := mocktrace.NewTracerProviderAndTracer(tracerName) - b3 := oteltrace.B3{} + b3 := b3prop.B3{} props := otelpropagation.New( otelpropagation.WithExtractors(b3), otelpropagation.WithInjectors(b3), diff --git a/instrumentation/github.com/labstack/echo/otelecho/example/server.go b/instrumentation/github.com/labstack/echo/otelecho/example/server.go index 0743cbcc969..913b377f798 100644 --- a/instrumentation/github.com/labstack/echo/otelecho/example/server.go +++ b/instrumentation/github.com/labstack/echo/otelecho/example/server.go @@ -58,14 +58,14 @@ func initTracer() { cfg := sdktrace.Config{ DefaultSampler: sdktrace.AlwaysSample(), } - tp, err := sdktrace.NewProvider( + tp := sdktrace.NewTracerProvider( sdktrace.WithConfig(cfg), sdktrace.WithSyncer(exporter), ) if err != nil { log.Fatal(err) } - otelglobal.SetTraceProvider(tp) + otelglobal.SetTracerProvider(tp) } func getUser(ctx context.Context, id string) string { diff --git a/instrumentation/github.com/labstack/echo/otelecho/go.mod b/instrumentation/github.com/labstack/echo/otelecho/go.mod index 24b80fed4c0..6e1cc33c8c0 100644 --- a/instrumentation/github.com/labstack/echo/otelecho/go.mod +++ b/instrumentation/github.com/labstack/echo/otelecho/go.mod @@ -2,13 +2,17 @@ module go.opentelemetry.io/contrib/instrumentation/github.com/labstack/echo/otel go 1.14 -replace go.opentelemetry.io/contrib => ../../../../../ +replace ( + go.opentelemetry.io/contrib => ../../../../../ + go.opentelemetry.io/contrib/propagators => ../../../../../propagators +) require ( github.com/labstack/echo/v4 v4.1.17 github.com/stretchr/testify v1.6.1 - go.opentelemetry.io/contrib v0.11.0 - go.opentelemetry.io/otel v0.11.0 - go.opentelemetry.io/otel/exporters/stdout v0.11.0 - go.opentelemetry.io/otel/sdk v0.11.0 + go.opentelemetry.io/contrib v0.12.0 + go.opentelemetry.io/contrib/propagators v0.12.0 + go.opentelemetry.io/otel v0.12.0 + go.opentelemetry.io/otel/exporters/stdout v0.12.0 + go.opentelemetry.io/otel/sdk v0.12.0 ) diff --git a/instrumentation/github.com/labstack/echo/otelecho/go.sum b/instrumentation/github.com/labstack/echo/otelecho/go.sum index 1793f7d126a..68317a56b90 100644 --- a/instrumentation/github.com/labstack/echo/otelecho/go.sum +++ b/instrumentation/github.com/labstack/echo/otelecho/go.sum @@ -24,8 +24,8 @@ github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaW github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= github.com/google/go-cmp v0.4.0 h1:xsAVV57WRhGj6kEIi8ReJzQlHHqcBYCElAvkovg3B/4= github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.1 h1:JFrFEBb2xKufg6XkJsJr+WbKb4FQlURi5RUcBveYu9k= -github.com/google/go-cmp v0.5.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.2 h1:X2ev0eStA3AbceY54o37/0PQ/UWqKEiiO2dKL5OPaFM= +github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/gofuzz v1.1.0 h1:Hsa8mG0dQ46ij8Sl2AYJDUv1oA9/d6Vk+3LG99Oe02g= github.com/google/gofuzz v1.1.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI= @@ -58,12 +58,12 @@ github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyC github.com/valyala/fasttemplate v1.0.1/go.mod h1:UQGH1tvbgY+Nz5t2n7tXsz52dQxojPUpymEIMZ47gx8= github.com/valyala/fasttemplate v1.2.1 h1:TVEnxayobAdVkhQfrfes2IzOB6o+z4roRkPF52WA1u4= github.com/valyala/fasttemplate v1.2.1/go.mod h1:KHLXt3tVN2HBp8eijSv/kGJopbvo7S+qRAEEKiv+SiQ= -go.opentelemetry.io/otel v0.11.0 h1:IN2tzQa9Gc4ZVKnTaMbPVcHjvzOdg5n9QfnmlqiET7E= -go.opentelemetry.io/otel v0.11.0/go.mod h1:G8UCk+KooF2HLkgo8RHX9epABH/aRGYET7gQOqBVdB0= -go.opentelemetry.io/otel/exporters/stdout v0.11.0 h1:5Hn/XKgq7aCJQWGacF093Ts1VpJuiJkwC75c1PqHTPE= -go.opentelemetry.io/otel/exporters/stdout v0.11.0/go.mod h1:XP4gbV2Ikc7/ZyTGtwrA7/FzrhWJr3nfRU+LRvhxY24= -go.opentelemetry.io/otel/sdk v0.11.0 h1:bkDMymVj6gIkPfgC5ci5atq0OYbfUHSn8NvsmyfyMq4= -go.opentelemetry.io/otel/sdk v0.11.0/go.mod h1:XbZ6MrzIZ+d+qr7pH0FwHIbCnANMvXYgkq4afL/IUMQ= +go.opentelemetry.io/otel v0.12.0 h1:bwWaPd/h2q+U6KdKaAiOS5GLwOMd1LDt9iNaeyIoAI8= +go.opentelemetry.io/otel v0.12.0/go.mod h1:dlSNewoRYikTkotEnxdmuBHgzT+k/idJSfDv/FxEnOY= +go.opentelemetry.io/otel/exporters/stdout v0.12.0 h1:ji9VVPmKg+oONcqwULcO0AHZseGU6CFOIdvwKCxNZ9Y= +go.opentelemetry.io/otel/exporters/stdout v0.12.0/go.mod h1:IGUi+IGDXlxXo7nYuPrxfAEpqTcKsWqFtflwFMGGPZQ= +go.opentelemetry.io/otel/sdk v0.12.0 h1:YVUyDXsGvFWjhJxGXT4kBcGdfoTbo1vSGjbGRUdRh5U= +go.opentelemetry.io/otel/sdk v0.12.0/go.mod h1:u3joRdxhrS1hUf9xSFH8vgdXdujQ3jxXxZl3loZFSqs= 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/crypto v0.0.0-20200820211705-5c72a883971a h1:vclmkQCjlDX5OydZ9wv8rBCcS0QyQY66Mpf/7BZbInM= @@ -112,8 +112,8 @@ google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY= -google.golang.org/grpc v1.31.0 h1:T7P4R73V3SSDPhH7WW7ATbfViLtmamH0DKrP3f9AuDI= -google.golang.org/grpc v1.31.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= +google.golang.org/grpc v1.32.0 h1:zWTV+LMdc3kaiJMSTOFz2UgSBgx8RNQoTGiZu3fR9S0= +google.golang.org/grpc v1.32.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo= gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= diff --git a/instrumentation/go.mongodb.org/mongo-driver/mongo/otelmongo/config.go b/instrumentation/go.mongodb.org/mongo-driver/mongo/otelmongo/config.go index 6a716745b15..2a67de3e3b6 100644 --- a/instrumentation/go.mongodb.org/mongo-driver/mongo/otelmongo/config.go +++ b/instrumentation/go.mongodb.org/mongo-driver/mongo/otelmongo/config.go @@ -25,7 +25,7 @@ const ( // config is used to configure the mongo tracer. type config struct { - TracerProvider trace.Provider + TracerProvider trace.TracerProvider Tracer trace.Tracer } @@ -33,7 +33,7 @@ type config struct { // newConfig returns a config with all Options set. func newConfig(opts ...Option) config { cfg := config{ - TracerProvider: global.TraceProvider(), + TracerProvider: global.TracerProvider(), } for _, opt := range opts { opt(&cfg) @@ -48,7 +48,7 @@ type Option func(*config) // WithTracerProvider specifies a tracer provider to use for creating a tracer. // If none is specified, the global provider is used. -func WithTracerProvider(provider trace.Provider) Option { +func WithTracerProvider(provider trace.TracerProvider) Option { return func(cfg *config) { cfg.TracerProvider = provider } diff --git a/instrumentation/go.mongodb.org/mongo-driver/mongo/otelmongo/go.mod b/instrumentation/go.mongodb.org/mongo-driver/mongo/otelmongo/go.mod index afc99c6456c..297a0e3b6eb 100644 --- a/instrumentation/go.mongodb.org/mongo-driver/mongo/otelmongo/go.mod +++ b/instrumentation/go.mongodb.org/mongo-driver/mongo/otelmongo/go.mod @@ -8,7 +8,7 @@ require ( github.com/stretchr/testify v1.6.1 github.com/xdg/stringprep v1.0.0 // indirect go.mongodb.org/mongo-driver v1.4.1 - go.opentelemetry.io/contrib v0.11.0 - go.opentelemetry.io/otel v0.11.0 + go.opentelemetry.io/contrib v0.12.0 + go.opentelemetry.io/otel v0.12.0 golang.org/x/crypto v0.0.0-20191105034135-c7e5f84aec59 // indirect ) diff --git a/instrumentation/go.mongodb.org/mongo-driver/mongo/otelmongo/go.sum b/instrumentation/go.mongodb.org/mongo-driver/mongo/otelmongo/go.sum index f436a2d7ef4..d2abf20c797 100644 --- a/instrumentation/go.mongodb.org/mongo-driver/mongo/otelmongo/go.sum +++ b/instrumentation/go.mongodb.org/mongo-driver/mongo/otelmongo/go.sum @@ -35,8 +35,8 @@ github.com/gobuffalo/syncx v0.0.0-20190224160051-33c29581e754/go.mod h1:HhnNqWY9 github.com/golang/snappy v0.0.1 h1:Qgr9rKW7uDUkrbSmQeiDsGa8SjGyCOGtuasMWwvp2P4= github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= -github.com/google/go-cmp v0.5.1 h1:JFrFEBb2xKufg6XkJsJr+WbKb4FQlURi5RUcBveYu9k= -github.com/google/go-cmp v0.5.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.2 h1:X2ev0eStA3AbceY54o37/0PQ/UWqKEiiO2dKL5OPaFM= +github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af h1:pmfjZENx5imkbgOkpRUYLnmbU7UEFbjtDA2hxJ1ichM= github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k= @@ -88,8 +88,8 @@ github.com/xdg/stringprep v1.0.0 h1:d9X0esnoa3dFsV0FG35rAT0RIhYFlPq7MiP+DW89La0= github.com/xdg/stringprep v1.0.0/go.mod h1:Jhud4/sHMO4oL310DaZAKk9ZaJ08SJfe+sJh0HrGL1Y= go.mongodb.org/mongo-driver v1.4.1 h1:38NSAyDPagwnFpUA/D5SFgbugUYR3NzYRNa4Qk9UxKs= go.mongodb.org/mongo-driver v1.4.1/go.mod h1:llVBH2pkj9HywK0Dtdt6lDikOjFLbceHVu/Rc0iMKLs= -go.opentelemetry.io/otel v0.11.0 h1:IN2tzQa9Gc4ZVKnTaMbPVcHjvzOdg5n9QfnmlqiET7E= -go.opentelemetry.io/otel v0.11.0/go.mod h1:G8UCk+KooF2HLkgo8RHX9epABH/aRGYET7gQOqBVdB0= +go.opentelemetry.io/otel v0.12.0 h1:bwWaPd/h2q+U6KdKaAiOS5GLwOMd1LDt9iNaeyIoAI8= +go.opentelemetry.io/otel v0.12.0/go.mod h1:dlSNewoRYikTkotEnxdmuBHgzT+k/idJSfDv/FxEnOY= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190422162423-af44ce270edf/go.mod h1:WFFai1msRO1wXaEeE5yQxYXgSfI8pQAWXbQop6sCtWE= diff --git a/instrumentation/go.mongodb.org/mongo-driver/mongo/otelmongo/mongo.go b/instrumentation/go.mongodb.org/mongo-driver/mongo/otelmongo/mongo.go index 0679bf1fcf1..46d0ca672e3 100644 --- a/instrumentation/go.mongodb.org/mongo-driver/mongo/otelmongo/mongo.go +++ b/instrumentation/go.mongodb.org/mongo-driver/mongo/otelmongo/mongo.go @@ -51,7 +51,7 @@ func (m *monitor) Started(ctx context.Context, evt *event.CommandStartedEvent) { PeerHostname(hostname), PeerPort(port), } - opts := []trace.StartOption{ + opts := []trace.SpanOption{ trace.WithAttributes(attrs...), } _, span := m.cfg.Tracer.Start(ctx, "mongodb.query", opts...) diff --git a/instrumentation/go.mongodb.org/mongo-driver/mongo/otelmongo/mongo_test.go b/instrumentation/go.mongodb.org/mongo-driver/mongo/otelmongo/mongo_test.go index 1afcf8bcc0d..e57ba1da0f9 100644 --- a/instrumentation/go.mongodb.org/mongo-driver/mongo/otelmongo/mongo_test.go +++ b/instrumentation/go.mongodb.org/mongo-driver/mongo/otelmongo/mongo_test.go @@ -36,7 +36,7 @@ func TestMain(m *testing.M) { } func Test(t *testing.T) { - provider, mt := mocktracer.NewProviderAndTracer(defaultTracerName) + provider, mt := mocktracer.NewTracerProviderAndTracer(defaultTracerName) hostname, port := "localhost", "27017" diff --git a/instrumentation/google.golang.org/grpc/otelgrpc/benchmark_test.go b/instrumentation/google.golang.org/grpc/otelgrpc/benchmark_test.go index 4440a873501..4ec04c2b6cd 100644 --- a/instrumentation/google.golang.org/grpc/otelgrpc/benchmark_test.go +++ b/instrumentation/google.golang.org/grpc/otelgrpc/benchmark_test.go @@ -33,7 +33,7 @@ const ( instName = "go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc" ) -var tracer = tracetest.NewProvider().Tracer(instName) +var tracer = tracetest.NewTracerProvider().Tracer(instName) func benchmark(b *testing.B, cOpt []grpc.DialOption, sOpt []grpc.ServerOption) { l := bufconn.Listen(bufSize) diff --git a/instrumentation/google.golang.org/grpc/otelgrpc/example/config/config.go b/instrumentation/google.golang.org/grpc/otelgrpc/example/config/config.go index 9c1034e7ebf..63e3e1fd9f2 100644 --- a/instrumentation/google.golang.org/grpc/otelgrpc/example/config/config.go +++ b/instrumentation/google.golang.org/grpc/otelgrpc/example/config/config.go @@ -28,12 +28,12 @@ func Init() { if err != nil { log.Fatal(err) } - tp, err := sdktrace.NewProvider( + tp := sdktrace.NewTracerProvider( sdktrace.WithConfig(sdktrace.Config{DefaultSampler: sdktrace.AlwaysSample()}), sdktrace.WithSyncer(exporter), ) if err != nil { log.Fatal(err) } - global.SetTraceProvider(tp) + global.SetTracerProvider(tp) } diff --git a/instrumentation/google.golang.org/grpc/otelgrpc/example/go.mod b/instrumentation/google.golang.org/grpc/otelgrpc/example/go.mod index 2439d0b298f..4f49ee2e6c5 100644 --- a/instrumentation/google.golang.org/grpc/otelgrpc/example/go.mod +++ b/instrumentation/google.golang.org/grpc/otelgrpc/example/go.mod @@ -6,10 +6,10 @@ replace go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelg require ( github.com/golang/protobuf v1.4.2 - go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.11.0 - go.opentelemetry.io/otel v0.11.0 - go.opentelemetry.io/otel/exporters/stdout v0.11.0 - go.opentelemetry.io/otel/sdk v0.11.0 + go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.12.0 + go.opentelemetry.io/otel v0.12.0 + go.opentelemetry.io/otel/exporters/stdout v0.12.0 + go.opentelemetry.io/otel/sdk v0.12.0 golang.org/x/net v0.0.0-20200707034311-ab3426394381 google.golang.org/grpc v1.32.0 ) diff --git a/instrumentation/google.golang.org/grpc/otelgrpc/example/go.sum b/instrumentation/google.golang.org/grpc/otelgrpc/example/go.sum index 3c48c6fa0b2..646d802a4c3 100644 --- a/instrumentation/google.golang.org/grpc/otelgrpc/example/go.sum +++ b/instrumentation/google.golang.org/grpc/otelgrpc/example/go.sum @@ -29,8 +29,8 @@ github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5a github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.1 h1:JFrFEBb2xKufg6XkJsJr+WbKb4FQlURi5RUcBveYu9k= -github.com/google/go-cmp v0.5.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.2 h1:X2ev0eStA3AbceY54o37/0PQ/UWqKEiiO2dKL5OPaFM= +github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/gofuzz v1.1.0 h1:Hsa8mG0dQ46ij8Sl2AYJDUv1oA9/d6Vk+3LG99Oe02g= github.com/google/gofuzz v1.1.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= @@ -39,12 +39,12 @@ github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1: github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/testify v1.6.1 h1:hDPOHmpOpP40lSULcqw7IrRb/u7w6RpDC9399XyoNd0= github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -go.opentelemetry.io/otel v0.11.0 h1:IN2tzQa9Gc4ZVKnTaMbPVcHjvzOdg5n9QfnmlqiET7E= -go.opentelemetry.io/otel v0.11.0/go.mod h1:G8UCk+KooF2HLkgo8RHX9epABH/aRGYET7gQOqBVdB0= -go.opentelemetry.io/otel/exporters/stdout v0.11.0 h1:5Hn/XKgq7aCJQWGacF093Ts1VpJuiJkwC75c1PqHTPE= -go.opentelemetry.io/otel/exporters/stdout v0.11.0/go.mod h1:XP4gbV2Ikc7/ZyTGtwrA7/FzrhWJr3nfRU+LRvhxY24= -go.opentelemetry.io/otel/sdk v0.11.0 h1:bkDMymVj6gIkPfgC5ci5atq0OYbfUHSn8NvsmyfyMq4= -go.opentelemetry.io/otel/sdk v0.11.0/go.mod h1:XbZ6MrzIZ+d+qr7pH0FwHIbCnANMvXYgkq4afL/IUMQ= +go.opentelemetry.io/otel v0.12.0 h1:bwWaPd/h2q+U6KdKaAiOS5GLwOMd1LDt9iNaeyIoAI8= +go.opentelemetry.io/otel v0.12.0/go.mod h1:dlSNewoRYikTkotEnxdmuBHgzT+k/idJSfDv/FxEnOY= +go.opentelemetry.io/otel/exporters/stdout v0.12.0 h1:ji9VVPmKg+oONcqwULcO0AHZseGU6CFOIdvwKCxNZ9Y= +go.opentelemetry.io/otel/exporters/stdout v0.12.0/go.mod h1:IGUi+IGDXlxXo7nYuPrxfAEpqTcKsWqFtflwFMGGPZQ= +go.opentelemetry.io/otel/sdk v0.12.0 h1:YVUyDXsGvFWjhJxGXT4kBcGdfoTbo1vSGjbGRUdRh5U= +go.opentelemetry.io/otel/sdk v0.12.0/go.mod h1:u3joRdxhrS1hUf9xSFH8vgdXdujQ3jxXxZl3loZFSqs= 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/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= @@ -85,8 +85,6 @@ google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY= -google.golang.org/grpc v1.31.0 h1:T7P4R73V3SSDPhH7WW7ATbfViLtmamH0DKrP3f9AuDI= -google.golang.org/grpc v1.31.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= google.golang.org/grpc v1.32.0 h1:zWTV+LMdc3kaiJMSTOFz2UgSBgx8RNQoTGiZu3fR9S0= google.golang.org/grpc v1.32.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= diff --git a/instrumentation/google.golang.org/grpc/otelgrpc/go.mod b/instrumentation/google.golang.org/grpc/otelgrpc/go.mod index e7eadb657d0..6a2c7314abb 100644 --- a/instrumentation/google.golang.org/grpc/otelgrpc/go.mod +++ b/instrumentation/google.golang.org/grpc/otelgrpc/go.mod @@ -5,6 +5,6 @@ go 1.14 require ( github.com/golang/protobuf v1.4.2 github.com/stretchr/testify v1.6.1 - go.opentelemetry.io/otel v0.11.0 + go.opentelemetry.io/otel v0.12.0 google.golang.org/grpc v1.32.0 ) diff --git a/instrumentation/google.golang.org/grpc/otelgrpc/go.sum b/instrumentation/google.golang.org/grpc/otelgrpc/go.sum index ef3fc82a037..ee45773e987 100644 --- a/instrumentation/google.golang.org/grpc/otelgrpc/go.sum +++ b/instrumentation/google.golang.org/grpc/otelgrpc/go.sum @@ -25,16 +25,16 @@ github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5a github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.1 h1:JFrFEBb2xKufg6XkJsJr+WbKb4FQlURi5RUcBveYu9k= -github.com/google/go-cmp v0.5.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.2 h1:X2ev0eStA3AbceY54o37/0PQ/UWqKEiiO2dKL5OPaFM= +github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/testify v1.6.1 h1:hDPOHmpOpP40lSULcqw7IrRb/u7w6RpDC9399XyoNd0= github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -go.opentelemetry.io/otel v0.11.0 h1:IN2tzQa9Gc4ZVKnTaMbPVcHjvzOdg5n9QfnmlqiET7E= -go.opentelemetry.io/otel v0.11.0/go.mod h1:G8UCk+KooF2HLkgo8RHX9epABH/aRGYET7gQOqBVdB0= +go.opentelemetry.io/otel v0.12.0 h1:bwWaPd/h2q+U6KdKaAiOS5GLwOMd1LDt9iNaeyIoAI8= +go.opentelemetry.io/otel v0.12.0/go.mod h1:dlSNewoRYikTkotEnxdmuBHgzT+k/idJSfDv/FxEnOY= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= diff --git a/instrumentation/google.golang.org/grpc/otelgrpc/grpc_test.go b/instrumentation/google.golang.org/grpc/otelgrpc/grpc_test.go index bbf66c45bc9..d3e0bd42585 100644 --- a/instrumentation/google.golang.org/grpc/otelgrpc/grpc_test.go +++ b/instrumentation/google.golang.org/grpc/otelgrpc/grpc_test.go @@ -73,16 +73,16 @@ func doCalls(cOpt []grpc.DialOption, sOpt []grpc.ServerOption) error { func TestInterceptors(t *testing.T) { clientUnarySR := new(tracetest.StandardSpanRecorder) - clientUnaryTracer := tracetest.NewProvider(tracetest.WithSpanRecorder(clientUnarySR)).Tracer("TestUnaryClientInterceptor") + clientUnaryTracer := tracetest.NewTracerProvider(tracetest.WithSpanRecorder(clientUnarySR)).Tracer("TestUnaryClientInterceptor") clientStreamSR := new(tracetest.StandardSpanRecorder) - clientStreamTracer := tracetest.NewProvider(tracetest.WithSpanRecorder(clientStreamSR)).Tracer("TestStreamClientInterceptor") + clientStreamTracer := tracetest.NewTracerProvider(tracetest.WithSpanRecorder(clientStreamSR)).Tracer("TestStreamClientInterceptor") serverUnarySR := new(tracetest.StandardSpanRecorder) - serverUnaryTracer := tracetest.NewProvider(tracetest.WithSpanRecorder(serverUnarySR)).Tracer("TestUnaryServerInterceptor") + serverUnaryTracer := tracetest.NewTracerProvider(tracetest.WithSpanRecorder(serverUnarySR)).Tracer("TestUnaryServerInterceptor") serverStreamSR := new(tracetest.StandardSpanRecorder) - serverStreamTracer := tracetest.NewProvider(tracetest.WithSpanRecorder(serverStreamSR)).Tracer("TestStreamServerInterceptor") + serverStreamTracer := tracetest.NewTracerProvider(tracetest.WithSpanRecorder(serverStreamSR)).Tracer("TestStreamServerInterceptor") assert.NoError(t, doCalls( []grpc.DialOption{ diff --git a/instrumentation/google.golang.org/grpc/otelgrpc/grpctrace.go b/instrumentation/google.golang.org/grpc/otelgrpc/grpctrace.go index 3c38ced3c8b..68d04e0cb00 100644 --- a/instrumentation/google.golang.org/grpc/otelgrpc/grpctrace.go +++ b/instrumentation/google.golang.org/grpc/otelgrpc/grpctrace.go @@ -19,7 +19,7 @@ import ( "google.golang.org/grpc/metadata" - "go.opentelemetry.io/otel/api/correlation" + "go.opentelemetry.io/otel/api/baggage" "go.opentelemetry.io/otel/api/global" "go.opentelemetry.io/otel/api/propagation" "go.opentelemetry.io/otel/api/trace" @@ -86,7 +86,7 @@ func Extract(ctx context.Context, metadata *metadata.MD, opts ...Option) ([]labe spanContext := trace.RemoteSpanContextFromContext(ctx) var correlationCtxLabels []label.KeyValue - correlation.MapFromContext(ctx).Foreach(func(l label.KeyValue) bool { + baggage.MapFromContext(ctx).Foreach(func(l label.KeyValue) bool { correlationCtxLabels = append(correlationCtxLabels, l) return true }) diff --git a/instrumentation/google.golang.org/grpc/otelgrpc/interceptor.go b/instrumentation/google.golang.org/grpc/otelgrpc/interceptor.go index 7956a8a4af9..3664d916d57 100644 --- a/instrumentation/google.golang.org/grpc/otelgrpc/interceptor.go +++ b/instrumentation/google.golang.org/grpc/otelgrpc/interceptor.go @@ -29,7 +29,7 @@ import ( "google.golang.org/grpc/peer" "google.golang.org/grpc/status" - "go.opentelemetry.io/otel/api/correlation" + "go.opentelemetry.io/otel/api/baggage" "go.opentelemetry.io/otel/api/trace" "go.opentelemetry.io/otel/codes" "go.opentelemetry.io/otel/label" @@ -293,7 +293,7 @@ func UnaryServerInterceptor(tracer trace.Tracer, opts ...Option) grpc.UnaryServe metadataCopy := requestMetadata.Copy() entries, spanCtx := Extract(ctx, &metadataCopy, opts...) - ctx = correlation.ContextWithMap(ctx, correlation.NewMap(correlation.MapUpdate{ + ctx = baggage.ContextWithMap(ctx, baggage.NewMap(baggage.MapUpdate{ MultiKV: entries, })) @@ -377,7 +377,7 @@ func StreamServerInterceptor(tracer trace.Tracer, opts ...Option) grpc.StreamSer metadataCopy := requestMetadata.Copy() entries, spanCtx := Extract(ctx, &metadataCopy, opts...) - ctx = correlation.ContextWithMap(ctx, correlation.NewMap(correlation.MapUpdate{ + ctx = baggage.ContextWithMap(ctx, baggage.NewMap(baggage.MapUpdate{ MultiKV: entries, })) diff --git a/instrumentation/google.golang.org/grpc/otelgrpc/interceptor_test.go b/instrumentation/google.golang.org/grpc/otelgrpc/interceptor_test.go index dcfb379999a..c75f017d59d 100644 --- a/instrumentation/google.golang.org/grpc/otelgrpc/interceptor_test.go +++ b/instrumentation/google.golang.org/grpc/otelgrpc/interceptor_test.go @@ -88,7 +88,7 @@ func TestUnaryClientInterceptor(t *testing.T) { } sr := NewSpanRecorder() - tp := tracetest.NewProvider(tracetest.WithSpanRecorder(sr)) + tp := tracetest.NewTracerProvider(tracetest.WithSpanRecorder(sr)) tracer := tp.Tracer("grpc/client") unaryInterceptor := UnaryClientInterceptor(tracer) @@ -258,7 +258,7 @@ func TestStreamClientInterceptor(t *testing.T) { // tracer sr := NewSpanRecorder() - tp := tracetest.NewProvider(tracetest.WithSpanRecorder(sr)) + tp := tracetest.NewTracerProvider(tracetest.WithSpanRecorder(sr)) tracer := tp.Tracer("grpc/Server") streamCI := StreamClientInterceptor(tracer) @@ -342,7 +342,7 @@ func TestStreamClientInterceptor(t *testing.T) { func TestServerInterceptorError(t *testing.T) { sr := NewSpanRecorder() - tp := tracetest.NewProvider(tracetest.WithSpanRecorder(sr)) + tp := tracetest.NewTracerProvider(tracetest.WithSpanRecorder(sr)) tracer := tp.Tracer("grpc/Server") usi := UnaryServerInterceptor(tracer) deniedErr := status.Error(codes.PermissionDenied, "PERMISSION_DENIED_TEXT") diff --git a/instrumentation/gopkg.in/macaron.v1/otelmacaron/example/server.go b/instrumentation/gopkg.in/macaron.v1/otelmacaron/example/server.go index 4c88629d91e..8e88083939b 100644 --- a/instrumentation/gopkg.in/macaron.v1/otelmacaron/example/server.go +++ b/instrumentation/gopkg.in/macaron.v1/otelmacaron/example/server.go @@ -51,14 +51,14 @@ func initTracer() { cfg := sdktrace.Config{ DefaultSampler: sdktrace.AlwaysSample(), } - tp, err := sdktrace.NewProvider( + tp := sdktrace.NewTracerProvider( sdktrace.WithConfig(cfg), sdktrace.WithSyncer(exporter), ) if err != nil { log.Fatal(err) } - otelglobal.SetTraceProvider(tp) + otelglobal.SetTracerProvider(tp) } func getUser(ctx context.Context, id string) string { diff --git a/instrumentation/gopkg.in/macaron.v1/otelmacaron/go.mod b/instrumentation/gopkg.in/macaron.v1/otelmacaron/go.mod index 330b94487df..40ca1cf760c 100644 --- a/instrumentation/gopkg.in/macaron.v1/otelmacaron/go.mod +++ b/instrumentation/gopkg.in/macaron.v1/otelmacaron/go.mod @@ -2,13 +2,17 @@ module go.opentelemetry.io/contrib/instrumentation/gopkg.in/macaron.v1/otelmacar go 1.14 -replace go.opentelemetry.io/contrib => ../../../.. +replace ( + go.opentelemetry.io/contrib => ../../../.. + go.opentelemetry.io/contrib/propagators => ../../../../propagators +) require ( github.com/stretchr/testify v1.6.1 - go.opentelemetry.io/contrib v0.11.0 - go.opentelemetry.io/otel v0.11.0 - go.opentelemetry.io/otel/exporters/stdout v0.11.0 - go.opentelemetry.io/otel/sdk v0.11.0 + go.opentelemetry.io/contrib v0.12.0 + go.opentelemetry.io/contrib/propagators v0.12.0 + go.opentelemetry.io/otel v0.12.0 + go.opentelemetry.io/otel/exporters/stdout v0.12.0 + go.opentelemetry.io/otel/sdk v0.12.0 gopkg.in/macaron.v1 v1.3.9 ) diff --git a/instrumentation/gopkg.in/macaron.v1/otelmacaron/go.sum b/instrumentation/gopkg.in/macaron.v1/otelmacaron/go.sum index 5bc2a3c616e..2fa5adf3986 100644 --- a/instrumentation/gopkg.in/macaron.v1/otelmacaron/go.sum +++ b/instrumentation/gopkg.in/macaron.v1/otelmacaron/go.sum @@ -24,8 +24,8 @@ github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaW github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= github.com/google/go-cmp v0.4.0 h1:xsAVV57WRhGj6kEIi8ReJzQlHHqcBYCElAvkovg3B/4= github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.1 h1:JFrFEBb2xKufg6XkJsJr+WbKb4FQlURi5RUcBveYu9k= -github.com/google/go-cmp v0.5.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.2 h1:X2ev0eStA3AbceY54o37/0PQ/UWqKEiiO2dKL5OPaFM= +github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/gofuzz v1.1.0 h1:Hsa8mG0dQ46ij8Sl2AYJDUv1oA9/d6Vk+3LG99Oe02g= github.com/google/gofuzz v1.1.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= @@ -56,12 +56,12 @@ github.com/stretchr/testify v1.6.1 h1:hDPOHmpOpP40lSULcqw7IrRb/u7w6RpDC9399XyoNd github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/unknwon/com v0.0.0-20190804042917-757f69c95f3e h1:GSGeB9EAKY2spCABz6xOX5DbxZEXolK+nBSvmsQwRjM= github.com/unknwon/com v0.0.0-20190804042917-757f69c95f3e/go.mod h1:tOOxU81rwgoCLoOVVPHb6T/wt8HZygqH5id+GNnlCXM= -go.opentelemetry.io/otel v0.11.0 h1:IN2tzQa9Gc4ZVKnTaMbPVcHjvzOdg5n9QfnmlqiET7E= -go.opentelemetry.io/otel v0.11.0/go.mod h1:G8UCk+KooF2HLkgo8RHX9epABH/aRGYET7gQOqBVdB0= -go.opentelemetry.io/otel/exporters/stdout v0.11.0 h1:5Hn/XKgq7aCJQWGacF093Ts1VpJuiJkwC75c1PqHTPE= -go.opentelemetry.io/otel/exporters/stdout v0.11.0/go.mod h1:XP4gbV2Ikc7/ZyTGtwrA7/FzrhWJr3nfRU+LRvhxY24= -go.opentelemetry.io/otel/sdk v0.11.0 h1:bkDMymVj6gIkPfgC5ci5atq0OYbfUHSn8NvsmyfyMq4= -go.opentelemetry.io/otel/sdk v0.11.0/go.mod h1:XbZ6MrzIZ+d+qr7pH0FwHIbCnANMvXYgkq4afL/IUMQ= +go.opentelemetry.io/otel v0.12.0 h1:bwWaPd/h2q+U6KdKaAiOS5GLwOMd1LDt9iNaeyIoAI8= +go.opentelemetry.io/otel v0.12.0/go.mod h1:dlSNewoRYikTkotEnxdmuBHgzT+k/idJSfDv/FxEnOY= +go.opentelemetry.io/otel/exporters/stdout v0.12.0 h1:ji9VVPmKg+oONcqwULcO0AHZseGU6CFOIdvwKCxNZ9Y= +go.opentelemetry.io/otel/exporters/stdout v0.12.0/go.mod h1:IGUi+IGDXlxXo7nYuPrxfAEpqTcKsWqFtflwFMGGPZQ= +go.opentelemetry.io/otel/sdk v0.12.0 h1:YVUyDXsGvFWjhJxGXT4kBcGdfoTbo1vSGjbGRUdRh5U= +go.opentelemetry.io/otel/sdk v0.12.0/go.mod h1:u3joRdxhrS1hUf9xSFH8vgdXdujQ3jxXxZl3loZFSqs= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4 h1:HuIa8hRrWRSrqYzx1qI49NNxhdi2PrY7gxVSq1JjLDc= golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= @@ -97,8 +97,8 @@ google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY= -google.golang.org/grpc v1.31.0 h1:T7P4R73V3SSDPhH7WW7ATbfViLtmamH0DKrP3f9AuDI= -google.golang.org/grpc v1.31.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= +google.golang.org/grpc v1.32.0 h1:zWTV+LMdc3kaiJMSTOFz2UgSBgx8RNQoTGiZu3fR9S0= +google.golang.org/grpc v1.32.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo= gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= diff --git a/instrumentation/gopkg.in/macaron.v1/otelmacaron/macaron.go b/instrumentation/gopkg.in/macaron.v1/otelmacaron/macaron.go index ee593ffe24a..8b772f9f041 100644 --- a/instrumentation/gopkg.in/macaron.v1/otelmacaron/macaron.go +++ b/instrumentation/gopkg.in/macaron.v1/otelmacaron/macaron.go @@ -49,7 +49,7 @@ func Middleware(service string, opts ...Option) macaron.Handler { }() ctx := otelpropagation.ExtractHTTP(savedCtx, cfg.Propagators, c.Req.Header) - opts := []oteltrace.StartOption{ + opts := []oteltrace.SpanOption{ oteltrace.WithAttributes(semconv.NetAttributesFromHTTPRequest("tcp", c.Req.Request)...), oteltrace.WithAttributes(semconv.EndUserAttributesFromHTTPRequest(c.Req.Request)...), oteltrace.WithAttributes(semconv.HTTPServerAttributesFromHTTPRequest(service, "", c.Req.Request)...), diff --git a/instrumentation/gopkg.in/macaron.v1/otelmacaron/macaron_test.go b/instrumentation/gopkg.in/macaron.v1/otelmacaron/macaron_test.go index 2d65334ce55..4a2891968e8 100644 --- a/instrumentation/gopkg.in/macaron.v1/otelmacaron/macaron_test.go +++ b/instrumentation/gopkg.in/macaron.v1/otelmacaron/macaron_test.go @@ -25,6 +25,7 @@ import ( "gopkg.in/macaron.v1" mocktrace "go.opentelemetry.io/contrib/internal/trace" + b3prop "go.opentelemetry.io/contrib/propagators/b3" otelglobal "go.opentelemetry.io/otel/api/global" otelpropagation "go.opentelemetry.io/otel/api/propagation" oteltrace "go.opentelemetry.io/otel/api/trace" @@ -32,7 +33,7 @@ import ( ) func TestChildSpanFromGlobalTracer(t *testing.T) { - otelglobal.SetTraceProvider(&mocktrace.Provider{}) + otelglobal.SetTracerProvider(&mocktrace.TracerProvider{}) m := macaron.Classic() m.Use(Middleware("foobar")) @@ -125,7 +126,7 @@ func TestGetSpanNotInstrumented(t *testing.T) { m := macaron.Classic() m.Get("/user/:id", func(ctx *macaron.Context) { span := oteltrace.SpanFromContext(ctx.Req.Request.Context()) - _, ok := span.(oteltrace.NoopSpan) + ok := !span.SpanContext().IsValid() assert.True(t, ok) ctx.Resp.WriteHeader(http.StatusOK) }) @@ -161,7 +162,7 @@ func TestPropagationWithGlobalPropagators(t *testing.T) { func TestPropagationWithCustomPropagators(t *testing.T) { tracer := mocktrace.NewTracer("test-tracer") - b3 := oteltrace.B3{} + b3 := b3prop.B3{} props := otelpropagation.New( otelpropagation.WithExtractors(b3), otelpropagation.WithInjectors(b3), diff --git a/instrumentation/host/go.mod b/instrumentation/host/go.mod index 1d3b9288642..bdc70e1dabf 100644 --- a/instrumentation/host/go.mod +++ b/instrumentation/host/go.mod @@ -9,8 +9,8 @@ require ( github.com/go-ole/go-ole v1.2.4 // indirect github.com/shirou/gopsutil v2.20.8+incompatible github.com/stretchr/testify v1.6.1 - go.opentelemetry.io/contrib v0.11.0 - go.opentelemetry.io/otel v0.11.0 - go.opentelemetry.io/otel/exporters/stdout v0.11.0 - go.opentelemetry.io/otel/sdk v0.11.0 + go.opentelemetry.io/contrib v0.12.0 + go.opentelemetry.io/otel v0.12.0 + go.opentelemetry.io/otel/exporters/stdout v0.12.0 + go.opentelemetry.io/otel/sdk v0.12.0 ) diff --git a/instrumentation/host/go.sum b/instrumentation/host/go.sum index 7c81ce1f81b..23518d88aa1 100644 --- a/instrumentation/host/go.sum +++ b/instrumentation/host/go.sum @@ -25,8 +25,8 @@ github.com/golang/protobuf v1.3.3 h1:gyjaxf+svBWX08ZjK86iN9geUJF0H6gp2IRKX6Nf6/I github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw= github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.1 h1:JFrFEBb2xKufg6XkJsJr+WbKb4FQlURi5RUcBveYu9k= -github.com/google/go-cmp v0.5.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.2 h1:X2ev0eStA3AbceY54o37/0PQ/UWqKEiiO2dKL5OPaFM= +github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/gofuzz v1.1.0 h1:Hsa8mG0dQ46ij8Sl2AYJDUv1oA9/d6Vk+3LG99Oe02g= github.com/google/gofuzz v1.1.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI= @@ -42,12 +42,12 @@ github.com/shirou/gopsutil v2.20.8+incompatible/go.mod h1:5b4v6he4MtMOwMlS0TUMTu github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/testify v1.6.1 h1:hDPOHmpOpP40lSULcqw7IrRb/u7w6RpDC9399XyoNd0= github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -go.opentelemetry.io/otel v0.11.0 h1:IN2tzQa9Gc4ZVKnTaMbPVcHjvzOdg5n9QfnmlqiET7E= -go.opentelemetry.io/otel v0.11.0/go.mod h1:G8UCk+KooF2HLkgo8RHX9epABH/aRGYET7gQOqBVdB0= -go.opentelemetry.io/otel/exporters/stdout v0.11.0 h1:5Hn/XKgq7aCJQWGacF093Ts1VpJuiJkwC75c1PqHTPE= -go.opentelemetry.io/otel/exporters/stdout v0.11.0/go.mod h1:XP4gbV2Ikc7/ZyTGtwrA7/FzrhWJr3nfRU+LRvhxY24= -go.opentelemetry.io/otel/sdk v0.11.0 h1:bkDMymVj6gIkPfgC5ci5atq0OYbfUHSn8NvsmyfyMq4= -go.opentelemetry.io/otel/sdk v0.11.0/go.mod h1:XbZ6MrzIZ+d+qr7pH0FwHIbCnANMvXYgkq4afL/IUMQ= +go.opentelemetry.io/otel v0.12.0 h1:bwWaPd/h2q+U6KdKaAiOS5GLwOMd1LDt9iNaeyIoAI8= +go.opentelemetry.io/otel v0.12.0/go.mod h1:dlSNewoRYikTkotEnxdmuBHgzT+k/idJSfDv/FxEnOY= +go.opentelemetry.io/otel/exporters/stdout v0.12.0 h1:ji9VVPmKg+oONcqwULcO0AHZseGU6CFOIdvwKCxNZ9Y= +go.opentelemetry.io/otel/exporters/stdout v0.12.0/go.mod h1:IGUi+IGDXlxXo7nYuPrxfAEpqTcKsWqFtflwFMGGPZQ= +go.opentelemetry.io/otel/sdk v0.12.0 h1:YVUyDXsGvFWjhJxGXT4kBcGdfoTbo1vSGjbGRUdRh5U= +go.opentelemetry.io/otel/sdk v0.12.0/go.mod h1:u3joRdxhrS1hUf9xSFH8vgdXdujQ3jxXxZl3loZFSqs= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= @@ -79,8 +79,8 @@ google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY= -google.golang.org/grpc v1.31.0 h1:T7P4R73V3SSDPhH7WW7ATbfViLtmamH0DKrP3f9AuDI= -google.golang.org/grpc v1.31.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= +google.golang.org/grpc v1.32.0 h1:zWTV+LMdc3kaiJMSTOFz2UgSBgx8RNQoTGiZu3fR9S0= +google.golang.org/grpc v1.32.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo= gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= diff --git a/instrumentation/host/host.go b/instrumentation/host/host.go index b0fbd6d30c9..65d939b97f7 100644 --- a/instrumentation/host/host.go +++ b/instrumentation/host/host.go @@ -28,8 +28,8 @@ import ( "go.opentelemetry.io/contrib" "go.opentelemetry.io/otel/api/global" "go.opentelemetry.io/otel/api/metric" - "go.opentelemetry.io/otel/api/unit" "go.opentelemetry.io/otel/label" + "go.opentelemetry.io/otel/unit" ) // Host reports the work-in-progress conventional host metrics specified by OpenTelemetry @@ -40,9 +40,9 @@ type host struct { // config contains optional settings for reporting host metrics. type config struct { - // MeterProvider sets the metric.Provider. If nil, the global + // MeterProvider sets the metric.MeterProvider. If nil, the global // Provider will be used. - MeterProvider metric.Provider + MeterProvider metric.MeterProvider } // Option supports configuring optional settings for host metrics. @@ -52,17 +52,17 @@ type Option interface { } // WithMeterProvider sets the Metric implementation to use for -// reporting. If this option is not used, the global metric.Provider +// reporting. If this option is not used, the global metric.MeterProvider // will be used. `provider` must be non-nil. -func WithMeterProvider(provider metric.Provider) Option { +func WithMeterProvider(provider metric.MeterProvider) Option { return metricProviderOption{provider} } -type metricProviderOption struct{ metric.Provider } +type metricProviderOption struct{ metric.MeterProvider } // ApplyHost implements Option. func (o metricProviderOption) ApplyHost(c *config) { - c.MeterProvider = o.Provider + c.MeterProvider = o.MeterProvider } var ( diff --git a/instrumentation/host/host_test.go b/instrumentation/host/host_test.go index 736339ad75f..21794a6832a 100644 --- a/instrumentation/host/host_test.go +++ b/instrumentation/host/host_test.go @@ -61,7 +61,7 @@ func getMetric(impl *metric.MeterImpl, name string, lbl label.KeyValue) float64 } func TestHostCPU(t *testing.T) { - impl, provider := metric.NewProvider() + impl, provider := metric.NewMeterProvider() err := host.Start( host.WithMeterProvider(provider), ) @@ -135,7 +135,7 @@ func TestHostCPU(t *testing.T) { } func TestHostMemory(t *testing.T) { - impl, provider := metric.NewProvider() + impl, provider := metric.NewMeterProvider() err := host.Start( host.WithMeterProvider(provider), ) @@ -220,7 +220,7 @@ func sendBytes(t *testing.T, count int) error { } func TestHostNetwork(t *testing.T) { - impl, provider := metric.NewProvider() + impl, provider := metric.NewMeterProvider() err := host.Start( host.WithMeterProvider(provider), ) diff --git a/instrumentation/net/http/httptrace/otelhttptrace/clienttrace_test.go b/instrumentation/net/http/httptrace/otelhttptrace/clienttrace_test.go index 0ccbe403e70..e096e5bc5c7 100644 --- a/instrumentation/net/http/httptrace/otelhttptrace/clienttrace_test.go +++ b/instrumentation/net/http/httptrace/otelhttptrace/clienttrace_test.go @@ -36,8 +36,8 @@ func (sr *SpanRecorder) OnEnd(span *tracetest.Span) { (*sr)[span.Name()] = spa func TestHTTPRequestWithClientTrace(t *testing.T) { sr := SpanRecorder{} - tp := tracetest.NewProvider(tracetest.WithSpanRecorder(&sr)) - global.SetTraceProvider(tp) + tp := tracetest.NewTracerProvider(tracetest.WithSpanRecorder(&sr)) + global.SetTracerProvider(tp) tr := tp.Tracer("httptrace/client") // Mock http server @@ -136,8 +136,8 @@ func (sr *MultiSpanRecorder) OnEnd(span *tracetest.Span) { func TestConcurrentConnectionStart(t *testing.T) { sr := MultiSpanRecorder{} - global.SetTraceProvider( - tracetest.NewProvider(tracetest.WithSpanRecorder(&sr)), + global.SetTracerProvider( + tracetest.NewTracerProvider(tracetest.WithSpanRecorder(&sr)), ) ct := otelhttptrace.NewClientTrace(context.Background()) tts := []struct { @@ -224,8 +224,8 @@ func TestConcurrentConnectionStart(t *testing.T) { func TestEndBeforeStartCreatesSpan(t *testing.T) { sr := MultiSpanRecorder{} - global.SetTraceProvider( - tracetest.NewProvider(tracetest.WithSpanRecorder(&sr)), + global.SetTracerProvider( + tracetest.NewTracerProvider(tracetest.WithSpanRecorder(&sr)), ) ct := otelhttptrace.NewClientTrace(context.Background()) diff --git a/instrumentation/net/http/httptrace/otelhttptrace/example/client/client.go b/instrumentation/net/http/httptrace/otelhttptrace/example/client/client.go index 5a8c94cb19b..93d171117d1 100644 --- a/instrumentation/net/http/httptrace/otelhttptrace/example/client/client.go +++ b/instrumentation/net/http/httptrace/otelhttptrace/example/client/client.go @@ -28,7 +28,7 @@ import ( "go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace" "go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp" - "go.opentelemetry.io/otel/api/correlation" + "go.opentelemetry.io/otel/api/baggage" "go.opentelemetry.io/otel/api/global" "go.opentelemetry.io/otel/api/trace" "go.opentelemetry.io/otel/exporters/stdout" @@ -47,12 +47,12 @@ func initTracer() { // For the demonstration, use sdktrace.AlwaysSample sampler to sample all traces. // In a production application, use sdktrace.ProbabilitySampler with a desired probability. - tp, err := sdktrace.NewProvider(sdktrace.WithConfig(sdktrace.Config{DefaultSampler: sdktrace.AlwaysSample()}), + tp := sdktrace.NewTracerProvider(sdktrace.WithConfig(sdktrace.Config{DefaultSampler: sdktrace.AlwaysSample()}), sdktrace.WithSyncer(exporter)) if err != nil { log.Fatal(err) } - global.SetTraceProvider(tp) + global.SetTracerProvider(tp) } func main() { @@ -62,7 +62,7 @@ func main() { client := http.Client{Transport: otelhttp.NewTransport(http.DefaultTransport)} - ctx := correlation.NewContext(context.Background(), + ctx := baggage.NewContext(context.Background(), label.String("username", "donuts"), ) diff --git a/instrumentation/net/http/httptrace/otelhttptrace/example/go.mod b/instrumentation/net/http/httptrace/otelhttptrace/example/go.mod index 7e7d18b1cb2..b030aada8d5 100644 --- a/instrumentation/net/http/httptrace/otelhttptrace/example/go.mod +++ b/instrumentation/net/http/httptrace/otelhttptrace/example/go.mod @@ -9,9 +9,9 @@ replace ( ) require ( - go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace v0.11.0 - go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.11.0 - go.opentelemetry.io/otel v0.11.0 - go.opentelemetry.io/otel/exporters/stdout v0.11.0 - go.opentelemetry.io/otel/sdk v0.11.0 + go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace v0.12.0 + go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.12.0 + go.opentelemetry.io/otel v0.12.0 + go.opentelemetry.io/otel/exporters/stdout v0.12.0 + go.opentelemetry.io/otel/sdk v0.12.0 ) diff --git a/instrumentation/net/http/httptrace/otelhttptrace/example/go.sum b/instrumentation/net/http/httptrace/otelhttptrace/example/go.sum index 4078113f137..5b84893e729 100644 --- a/instrumentation/net/http/httptrace/otelhttptrace/example/go.sum +++ b/instrumentation/net/http/httptrace/otelhttptrace/example/go.sum @@ -25,8 +25,6 @@ github.com/golang/protobuf v1.3.3 h1:gyjaxf+svBWX08ZjK86iN9geUJF0H6gp2IRKX6Nf6/I github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw= github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.1 h1:JFrFEBb2xKufg6XkJsJr+WbKb4FQlURi5RUcBveYu9k= -github.com/google/go-cmp v0.5.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.2 h1:X2ev0eStA3AbceY54o37/0PQ/UWqKEiiO2dKL5OPaFM= github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/gofuzz v1.1.0 h1:Hsa8mG0dQ46ij8Sl2AYJDUv1oA9/d6Vk+3LG99Oe02g= @@ -42,12 +40,12 @@ github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1: github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/testify v1.6.1 h1:hDPOHmpOpP40lSULcqw7IrRb/u7w6RpDC9399XyoNd0= github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -go.opentelemetry.io/otel v0.11.0 h1:IN2tzQa9Gc4ZVKnTaMbPVcHjvzOdg5n9QfnmlqiET7E= -go.opentelemetry.io/otel v0.11.0/go.mod h1:G8UCk+KooF2HLkgo8RHX9epABH/aRGYET7gQOqBVdB0= -go.opentelemetry.io/otel/exporters/stdout v0.11.0 h1:5Hn/XKgq7aCJQWGacF093Ts1VpJuiJkwC75c1PqHTPE= -go.opentelemetry.io/otel/exporters/stdout v0.11.0/go.mod h1:XP4gbV2Ikc7/ZyTGtwrA7/FzrhWJr3nfRU+LRvhxY24= -go.opentelemetry.io/otel/sdk v0.11.0 h1:bkDMymVj6gIkPfgC5ci5atq0OYbfUHSn8NvsmyfyMq4= -go.opentelemetry.io/otel/sdk v0.11.0/go.mod h1:XbZ6MrzIZ+d+qr7pH0FwHIbCnANMvXYgkq4afL/IUMQ= +go.opentelemetry.io/otel v0.12.0 h1:bwWaPd/h2q+U6KdKaAiOS5GLwOMd1LDt9iNaeyIoAI8= +go.opentelemetry.io/otel v0.12.0/go.mod h1:dlSNewoRYikTkotEnxdmuBHgzT+k/idJSfDv/FxEnOY= +go.opentelemetry.io/otel/exporters/stdout v0.12.0 h1:ji9VVPmKg+oONcqwULcO0AHZseGU6CFOIdvwKCxNZ9Y= +go.opentelemetry.io/otel/exporters/stdout v0.12.0/go.mod h1:IGUi+IGDXlxXo7nYuPrxfAEpqTcKsWqFtflwFMGGPZQ= +go.opentelemetry.io/otel/sdk v0.12.0 h1:YVUyDXsGvFWjhJxGXT4kBcGdfoTbo1vSGjbGRUdRh5U= +go.opentelemetry.io/otel/sdk v0.12.0/go.mod h1:u3joRdxhrS1hUf9xSFH8vgdXdujQ3jxXxZl3loZFSqs= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= @@ -78,8 +76,8 @@ google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY= -google.golang.org/grpc v1.31.0 h1:T7P4R73V3SSDPhH7WW7ATbfViLtmamH0DKrP3f9AuDI= -google.golang.org/grpc v1.31.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= +google.golang.org/grpc v1.32.0 h1:zWTV+LMdc3kaiJMSTOFz2UgSBgx8RNQoTGiZu3fR9S0= +google.golang.org/grpc v1.32.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo= gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= diff --git a/instrumentation/net/http/httptrace/otelhttptrace/example/server/server.go b/instrumentation/net/http/httptrace/otelhttptrace/example/server/server.go index f5240218e99..6bf02ae1d51 100644 --- a/instrumentation/net/http/httptrace/otelhttptrace/example/server/server.go +++ b/instrumentation/net/http/httptrace/otelhttptrace/example/server/server.go @@ -39,13 +39,13 @@ func initTracer() { // For the demonstration, use sdktrace.AlwaysSample sampler to sample all traces. // In a production application, use sdktrace.ProbabilitySampler with a desired probability. - tp, err := sdktrace.NewProvider(sdktrace.WithConfig(sdktrace.Config{DefaultSampler: sdktrace.AlwaysSample()}), + tp := sdktrace.NewTracerProvider(sdktrace.WithConfig(sdktrace.Config{DefaultSampler: sdktrace.AlwaysSample()}), sdktrace.WithSyncer(exporter), sdktrace.WithResource(resource.New(semconv.ServiceNameKey.String("ExampleService")))) if err != nil { log.Fatal(err) } - global.SetTraceProvider(tp) + global.SetTracerProvider(tp) } func main() { diff --git a/instrumentation/net/http/httptrace/otelhttptrace/go.mod b/instrumentation/net/http/httptrace/otelhttptrace/go.mod index 6ed3f5480a3..6c02bf1e931 100644 --- a/instrumentation/net/http/httptrace/otelhttptrace/go.mod +++ b/instrumentation/net/http/httptrace/otelhttptrace/go.mod @@ -7,5 +7,5 @@ replace go.opentelemetry.io/contrib => ../../../../.. require ( github.com/google/go-cmp v0.5.2 github.com/stretchr/testify v1.6.1 - go.opentelemetry.io/otel v0.11.0 + go.opentelemetry.io/otel v0.12.0 ) diff --git a/instrumentation/net/http/httptrace/otelhttptrace/go.sum b/instrumentation/net/http/httptrace/otelhttptrace/go.sum index e26b4687052..de18ff70187 100644 --- a/instrumentation/net/http/httptrace/otelhttptrace/go.sum +++ b/instrumentation/net/http/httptrace/otelhttptrace/go.sum @@ -1,7 +1,5 @@ github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/google/go-cmp v0.5.1 h1:JFrFEBb2xKufg6XkJsJr+WbKb4FQlURi5RUcBveYu9k= -github.com/google/go-cmp v0.5.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.2 h1:X2ev0eStA3AbceY54o37/0PQ/UWqKEiiO2dKL5OPaFM= github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= @@ -9,8 +7,8 @@ github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZN github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/testify v1.6.1 h1:hDPOHmpOpP40lSULcqw7IrRb/u7w6RpDC9399XyoNd0= github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -go.opentelemetry.io/otel v0.11.0 h1:IN2tzQa9Gc4ZVKnTaMbPVcHjvzOdg5n9QfnmlqiET7E= -go.opentelemetry.io/otel v0.11.0/go.mod h1:G8UCk+KooF2HLkgo8RHX9epABH/aRGYET7gQOqBVdB0= +go.opentelemetry.io/otel v0.12.0 h1:bwWaPd/h2q+U6KdKaAiOS5GLwOMd1LDt9iNaeyIoAI8= +go.opentelemetry.io/otel v0.12.0/go.mod h1:dlSNewoRYikTkotEnxdmuBHgzT+k/idJSfDv/FxEnOY= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= diff --git a/instrumentation/net/http/httptrace/otelhttptrace/httptrace.go b/instrumentation/net/http/httptrace/otelhttptrace/httptrace.go index 1e010565cc5..9c3b5961f00 100644 --- a/instrumentation/net/http/httptrace/otelhttptrace/httptrace.go +++ b/instrumentation/net/http/httptrace/otelhttptrace/httptrace.go @@ -18,7 +18,7 @@ import ( "context" "net/http" - "go.opentelemetry.io/otel/api/correlation" + "go.opentelemetry.io/otel/api/baggage" "go.opentelemetry.io/otel/api/global" "go.opentelemetry.io/otel/api/propagation" "go.opentelemetry.io/otel/api/trace" @@ -60,7 +60,7 @@ func Extract(ctx context.Context, req *http.Request, opts ...Option) ([]label.Ke ) var correlationCtxLabels []label.KeyValue - correlation.MapFromContext(ctx).Foreach(func(lbl label.KeyValue) bool { + baggage.MapFromContext(ctx).Foreach(func(lbl label.KeyValue) bool { correlationCtxLabels = append(correlationCtxLabels, lbl) return true }) diff --git a/instrumentation/net/http/httptrace/otelhttptrace/httptrace_test.go b/instrumentation/net/http/httptrace/otelhttptrace/httptrace_test.go index 9aacf8310c0..36fc470bf7f 100644 --- a/instrumentation/net/http/httptrace/otelhttptrace/httptrace_test.go +++ b/instrumentation/net/http/httptrace/otelhttptrace/httptrace_test.go @@ -24,7 +24,7 @@ import ( "github.com/google/go-cmp/cmp" "go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace" - "go.opentelemetry.io/otel/api/correlation" + "go.opentelemetry.io/otel/api/baggage" "go.opentelemetry.io/otel/api/propagation" "go.opentelemetry.io/otel/api/trace/tracetest" "go.opentelemetry.io/otel/label" @@ -32,7 +32,7 @@ import ( ) func TestRoundtrip(t *testing.T) { - tr := tracetest.NewProvider().Tracer("httptrace/client") + tr := tracetest.NewTracerProvider().Tracer("httptrace/client") var expectedAttrs map[label.Key]string expectedCorrs := map[label.Key]string{label.Key("foo"): "bar"} @@ -96,7 +96,7 @@ func TestRoundtrip(t *testing.T) { err := func(ctx context.Context) error { ctx, span := tr.Start(ctx, "test") defer span.End() - ctx = correlation.ContextWithMap(ctx, correlation.NewMap(correlation.MapUpdate{SingleKV: label.Key("foo").String("bar")})) + ctx = baggage.ContextWithMap(ctx, baggage.NewMap(baggage.MapUpdate{SingleKV: label.Key("foo").String("bar")})) req, _ := http.NewRequest("GET", ts.URL, strings.NewReader("foo")) otelhttptrace.Inject(ctx, req) @@ -114,14 +114,14 @@ func TestRoundtrip(t *testing.T) { } func TestSpecifyPropagators(t *testing.T) { - tr := tracetest.NewProvider().Tracer("httptrace/client") + tr := tracetest.NewTracerProvider().Tracer("httptrace/client") expectedCorrs := map[label.Key]string{label.Key("foo"): "bar"} // Mock http server ts := httptest.NewServer( http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { - _, corrs, span := otelhttptrace.Extract(r.Context(), r, otelhttptrace.WithPropagators(propagation.New(propagation.WithExtractors(correlation.DefaultHTTPPropagator())))) + _, corrs, span := otelhttptrace.Extract(r.Context(), r, otelhttptrace.WithPropagators(propagation.New(propagation.WithExtractors(baggage.DefaultHTTPPropagator())))) actualCorrs := make(map[label.Key]string) for _, corr := range corrs { @@ -148,9 +148,9 @@ func TestSpecifyPropagators(t *testing.T) { err := func(ctx context.Context) error { ctx, span := tr.Start(ctx, "test") defer span.End() - ctx = correlation.ContextWithMap(ctx, correlation.NewMap(correlation.MapUpdate{SingleKV: label.Key("foo").String("bar")})) + ctx = baggage.ContextWithMap(ctx, baggage.NewMap(baggage.MapUpdate{SingleKV: label.Key("foo").String("bar")})) req, _ := http.NewRequest("GET", ts.URL, nil) - otelhttptrace.Inject(ctx, req, otelhttptrace.WithPropagators(propagation.New(propagation.WithInjectors(correlation.DefaultHTTPPropagator())))) + otelhttptrace.Inject(ctx, req, otelhttptrace.WithPropagators(propagation.New(propagation.WithInjectors(baggage.DefaultHTTPPropagator())))) res, err := client.Do(req) if err != nil { diff --git a/instrumentation/net/http/otelhttp/config.go b/instrumentation/net/http/otelhttp/config.go index 396482e0dd9..cb8dc94305f 100644 --- a/instrumentation/net/http/otelhttp/config.go +++ b/instrumentation/net/http/otelhttp/config.go @@ -33,14 +33,14 @@ type config struct { Tracer trace.Tracer Meter metric.Meter Propagators propagation.Propagators - SpanStartOptions []trace.StartOption + SpanStartOptions []trace.SpanOption ReadEvent bool WriteEvent bool Filters []Filter SpanNameFormatter func(string, *http.Request) string - TracerProvider trace.Provider - MeterProvider metric.Provider + TracerProvider trace.TracerProvider + MeterProvider metric.MeterProvider } // Option Interface used for setting *optional* config properties @@ -60,7 +60,7 @@ func (o OptionFunc) Apply(c *config) { func newConfig(opts ...Option) *config { c := &config{ Propagators: global.Propagators(), - TracerProvider: global.TraceProvider(), + TracerProvider: global.TracerProvider(), MeterProvider: global.MeterProvider(), } for _, opt := range opts { @@ -75,7 +75,7 @@ func newConfig(opts ...Option) *config { // WithTracerProvider specifies a tracer provider to use for creating a tracer. // If none is specified, the global provider is used. -func WithTracerProvider(provider trace.Provider) Option { +func WithTracerProvider(provider trace.TracerProvider) Option { return OptionFunc(func(cfg *config) { cfg.TracerProvider = provider }) @@ -83,7 +83,7 @@ func WithTracerProvider(provider trace.Provider) Option { // WithMeterProvider specifies a meter provider to use for creating a meter. // If none is specified, the global provider is used. -func WithMeterProvider(provider metric.Provider) Option { +func WithMeterProvider(provider metric.MeterProvider) Option { return OptionFunc(func(cfg *config) { cfg.MeterProvider = provider }) @@ -108,8 +108,8 @@ func WithPropagators(ps propagation.Propagators) Option { } // WithSpanOptions configures an additional set of -// trace.StartOptions, which are applied to each new span. -func WithSpanOptions(opts ...trace.StartOption) Option { +// trace.SpanOptions, which are applied to each new span. +func WithSpanOptions(opts ...trace.SpanOption) Option { return OptionFunc(func(c *config) { c.SpanStartOptions = append(c.SpanStartOptions, opts...) }) diff --git a/instrumentation/net/http/otelhttp/config_test.go b/instrumentation/net/http/otelhttp/config_test.go index aa637c7925d..1b3d81a0329 100644 --- a/instrumentation/net/http/otelhttp/config_test.go +++ b/instrumentation/net/http/otelhttp/config_test.go @@ -29,7 +29,7 @@ import ( func TestBasicFilter(t *testing.T) { rr := httptest.NewRecorder() - provider, tracer := mocktrace.NewProviderAndTracer(instrumentationName) + provider, tracer := mocktrace.NewTracerProviderAndTracer(instrumentationName) h := NewHandler( http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { @@ -98,7 +98,7 @@ func TestSpanNameFormatter(t *testing.T) { t.Run(tc.name, func(t *testing.T) { rr := httptest.NewRecorder() - provider, tracer := mocktrace.NewProviderAndTracer(instrumentationName) + provider, tracer := mocktrace.NewTracerProviderAndTracer(instrumentationName) handler := http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { if _, err := io.WriteString(w, "hello world"); err != nil { t.Fatal(err) diff --git a/instrumentation/net/http/otelhttp/example/client/client.go b/instrumentation/net/http/otelhttp/example/client/client.go index 6150284ea38..c5264dab84a 100644 --- a/instrumentation/net/http/otelhttp/example/client/client.go +++ b/instrumentation/net/http/otelhttp/example/client/client.go @@ -26,7 +26,7 @@ import ( "go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp" - "go.opentelemetry.io/otel/api/correlation" + "go.opentelemetry.io/otel/api/baggage" "go.opentelemetry.io/otel/api/global" "go.opentelemetry.io/otel/api/trace" "go.opentelemetry.io/otel/exporters/stdout" @@ -45,12 +45,12 @@ func initTracer() { // For the demonstration, use sdktrace.AlwaysSample sampler to sample all traces. // In a production application, use sdktrace.ProbabilitySampler with a desired probability. - tp, err := sdktrace.NewProvider(sdktrace.WithConfig(sdktrace.Config{DefaultSampler: sdktrace.AlwaysSample()}), + tp := sdktrace.NewTracerProvider(sdktrace.WithConfig(sdktrace.Config{DefaultSampler: sdktrace.AlwaysSample()}), sdktrace.WithSyncer(exporter)) if err != nil { log.Fatal(err) } - global.SetTraceProvider(tp) + global.SetTracerProvider(tp) } func main() { @@ -60,7 +60,7 @@ func main() { client := http.Client{Transport: otelhttp.NewTransport(http.DefaultTransport)} - ctx := correlation.NewContext(context.Background(), + ctx := baggage.NewContext(context.Background(), label.String("username", "donuts"), ) diff --git a/instrumentation/net/http/otelhttp/example/go.mod b/instrumentation/net/http/otelhttp/example/go.mod index e0066606e15..9227faa97a9 100644 --- a/instrumentation/net/http/otelhttp/example/go.mod +++ b/instrumentation/net/http/otelhttp/example/go.mod @@ -8,8 +8,8 @@ replace ( ) require ( - go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.11.0 - go.opentelemetry.io/otel v0.11.0 - go.opentelemetry.io/otel/exporters/stdout v0.11.0 - go.opentelemetry.io/otel/sdk v0.11.0 + go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.12.0 + go.opentelemetry.io/otel v0.12.0 + go.opentelemetry.io/otel/exporters/stdout v0.12.0 + go.opentelemetry.io/otel/sdk v0.12.0 ) diff --git a/instrumentation/net/http/otelhttp/example/go.sum b/instrumentation/net/http/otelhttp/example/go.sum index 39dde9d56fa..5b84893e729 100644 --- a/instrumentation/net/http/otelhttp/example/go.sum +++ b/instrumentation/net/http/otelhttp/example/go.sum @@ -25,8 +25,8 @@ github.com/golang/protobuf v1.3.3 h1:gyjaxf+svBWX08ZjK86iN9geUJF0H6gp2IRKX6Nf6/I github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw= github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.1 h1:JFrFEBb2xKufg6XkJsJr+WbKb4FQlURi5RUcBveYu9k= -github.com/google/go-cmp v0.5.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.2 h1:X2ev0eStA3AbceY54o37/0PQ/UWqKEiiO2dKL5OPaFM= +github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/gofuzz v1.1.0 h1:Hsa8mG0dQ46ij8Sl2AYJDUv1oA9/d6Vk+3LG99Oe02g= github.com/google/gofuzz v1.1.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI= @@ -40,12 +40,12 @@ github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1: github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/testify v1.6.1 h1:hDPOHmpOpP40lSULcqw7IrRb/u7w6RpDC9399XyoNd0= github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -go.opentelemetry.io/otel v0.11.0 h1:IN2tzQa9Gc4ZVKnTaMbPVcHjvzOdg5n9QfnmlqiET7E= -go.opentelemetry.io/otel v0.11.0/go.mod h1:G8UCk+KooF2HLkgo8RHX9epABH/aRGYET7gQOqBVdB0= -go.opentelemetry.io/otel/exporters/stdout v0.11.0 h1:5Hn/XKgq7aCJQWGacF093Ts1VpJuiJkwC75c1PqHTPE= -go.opentelemetry.io/otel/exporters/stdout v0.11.0/go.mod h1:XP4gbV2Ikc7/ZyTGtwrA7/FzrhWJr3nfRU+LRvhxY24= -go.opentelemetry.io/otel/sdk v0.11.0 h1:bkDMymVj6gIkPfgC5ci5atq0OYbfUHSn8NvsmyfyMq4= -go.opentelemetry.io/otel/sdk v0.11.0/go.mod h1:XbZ6MrzIZ+d+qr7pH0FwHIbCnANMvXYgkq4afL/IUMQ= +go.opentelemetry.io/otel v0.12.0 h1:bwWaPd/h2q+U6KdKaAiOS5GLwOMd1LDt9iNaeyIoAI8= +go.opentelemetry.io/otel v0.12.0/go.mod h1:dlSNewoRYikTkotEnxdmuBHgzT+k/idJSfDv/FxEnOY= +go.opentelemetry.io/otel/exporters/stdout v0.12.0 h1:ji9VVPmKg+oONcqwULcO0AHZseGU6CFOIdvwKCxNZ9Y= +go.opentelemetry.io/otel/exporters/stdout v0.12.0/go.mod h1:IGUi+IGDXlxXo7nYuPrxfAEpqTcKsWqFtflwFMGGPZQ= +go.opentelemetry.io/otel/sdk v0.12.0 h1:YVUyDXsGvFWjhJxGXT4kBcGdfoTbo1vSGjbGRUdRh5U= +go.opentelemetry.io/otel/sdk v0.12.0/go.mod h1:u3joRdxhrS1hUf9xSFH8vgdXdujQ3jxXxZl3loZFSqs= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= @@ -76,8 +76,8 @@ google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY= -google.golang.org/grpc v1.31.0 h1:T7P4R73V3SSDPhH7WW7ATbfViLtmamH0DKrP3f9AuDI= -google.golang.org/grpc v1.31.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= +google.golang.org/grpc v1.32.0 h1:zWTV+LMdc3kaiJMSTOFz2UgSBgx8RNQoTGiZu3fR9S0= +google.golang.org/grpc v1.32.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo= gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= diff --git a/instrumentation/net/http/otelhttp/example/server/server.go b/instrumentation/net/http/otelhttp/example/server/server.go index f5240218e99..6bf02ae1d51 100644 --- a/instrumentation/net/http/otelhttp/example/server/server.go +++ b/instrumentation/net/http/otelhttp/example/server/server.go @@ -39,13 +39,13 @@ func initTracer() { // For the demonstration, use sdktrace.AlwaysSample sampler to sample all traces. // In a production application, use sdktrace.ProbabilitySampler with a desired probability. - tp, err := sdktrace.NewProvider(sdktrace.WithConfig(sdktrace.Config{DefaultSampler: sdktrace.AlwaysSample()}), + tp := sdktrace.NewTracerProvider(sdktrace.WithConfig(sdktrace.Config{DefaultSampler: sdktrace.AlwaysSample()}), sdktrace.WithSyncer(exporter), sdktrace.WithResource(resource.New(semconv.ServiceNameKey.String("ExampleService")))) if err != nil { log.Fatal(err) } - global.SetTraceProvider(tp) + global.SetTracerProvider(tp) } func main() { diff --git a/instrumentation/net/http/otelhttp/go.mod b/instrumentation/net/http/otelhttp/go.mod index ace5e7eeeee..6b444a672b9 100644 --- a/instrumentation/net/http/otelhttp/go.mod +++ b/instrumentation/net/http/otelhttp/go.mod @@ -7,6 +7,6 @@ replace go.opentelemetry.io/contrib => ../../../.. require ( github.com/felixge/httpsnoop v1.0.1 github.com/stretchr/testify v1.6.1 - go.opentelemetry.io/contrib v0.11.0 - go.opentelemetry.io/otel v0.11.0 + go.opentelemetry.io/contrib v0.12.0 + go.opentelemetry.io/otel v0.12.0 ) diff --git a/instrumentation/net/http/otelhttp/go.sum b/instrumentation/net/http/otelhttp/go.sum index f0882993e14..14f53cb7e35 100644 --- a/instrumentation/net/http/otelhttp/go.sum +++ b/instrumentation/net/http/otelhttp/go.sum @@ -3,8 +3,8 @@ 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/felixge/httpsnoop v1.0.1 h1:lvB5Jl89CsZtGIWuTcDM1E/vkVs49/Ml7JJe07l8SPQ= github.com/felixge/httpsnoop v1.0.1/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U= -github.com/google/go-cmp v0.5.1 h1:JFrFEBb2xKufg6XkJsJr+WbKb4FQlURi5RUcBveYu9k= -github.com/google/go-cmp v0.5.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.2 h1:X2ev0eStA3AbceY54o37/0PQ/UWqKEiiO2dKL5OPaFM= +github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= @@ -15,8 +15,8 @@ github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZN github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/testify v1.6.1 h1:hDPOHmpOpP40lSULcqw7IrRb/u7w6RpDC9399XyoNd0= github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -go.opentelemetry.io/otel v0.11.0 h1:IN2tzQa9Gc4ZVKnTaMbPVcHjvzOdg5n9QfnmlqiET7E= -go.opentelemetry.io/otel v0.11.0/go.mod h1:G8UCk+KooF2HLkgo8RHX9epABH/aRGYET7gQOqBVdB0= +go.opentelemetry.io/otel v0.12.0 h1:bwWaPd/h2q+U6KdKaAiOS5GLwOMd1LDt9iNaeyIoAI8= +go.opentelemetry.io/otel v0.12.0/go.mod h1:dlSNewoRYikTkotEnxdmuBHgzT+k/idJSfDv/FxEnOY= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= diff --git a/instrumentation/net/http/otelhttp/handler.go b/instrumentation/net/http/otelhttp/handler.go index d34fa5b4e7b..78646537c35 100644 --- a/instrumentation/net/http/otelhttp/handler.go +++ b/instrumentation/net/http/otelhttp/handler.go @@ -42,7 +42,7 @@ type Handler struct { tracer trace.Tracer meter metric.Meter propagators propagation.Propagators - spanStartOptions []trace.StartOption + spanStartOptions []trace.SpanOption readEvent bool writeEvent bool filters []Filter @@ -121,7 +121,7 @@ func (h *Handler) ServeHTTP(w http.ResponseWriter, r *http.Request) { } } - opts := append([]trace.StartOption{ + opts := append([]trace.SpanOption{ trace.WithAttributes(semconv.NetAttributesFromHTTPRequest("tcp", r)...), trace.WithAttributes(semconv.EndUserAttributesFromHTTPRequest(r)...), trace.WithAttributes(semconv.HTTPServerAttributesFromHTTPRequest(h.operation, "", r)...), diff --git a/instrumentation/net/http/otelhttp/handler_test.go b/instrumentation/net/http/otelhttp/handler_test.go index 93d0a340be0..e479b646489 100644 --- a/instrumentation/net/http/otelhttp/handler_test.go +++ b/instrumentation/net/http/otelhttp/handler_test.go @@ -43,8 +43,8 @@ func assertMetricLabels(t *testing.T, expectedLabels []label.KeyValue, measureme func TestHandlerBasics(t *testing.T) { rr := httptest.NewRecorder() - tracerProvider, tracer := mocktrace.NewProviderAndTracer(instrumentationName) - meterimpl, meterProvider := mockmeter.NewProvider() + tracerProvider, tracer := mocktrace.NewTracerProviderAndTracer(instrumentationName) + meterimpl, meterProvider := mockmeter.NewMeterProvider() operation := "test_handler" @@ -102,7 +102,7 @@ func TestHandlerBasics(t *testing.T) { func TestHandlerNoWrite(t *testing.T) { rr := httptest.NewRecorder() - tracerProvider, tracer := mocktrace.NewProviderAndTracer(instrumentationName) + tracerProvider, tracer := mocktrace.NewTracerProviderAndTracer(instrumentationName) operation := "test_handler" var span trace.Span @@ -141,7 +141,7 @@ func TestHandlerNoWrite(t *testing.T) { func TestResponseWriterOptionalInterfaces(t *testing.T) { rr := httptest.NewRecorder() - tracerProvider, _ := mocktrace.NewProviderAndTracer(instrumentationName) + tracerProvider, _ := mocktrace.NewTracerProviderAndTracer(instrumentationName) // ResponseRecorder implements the Flusher interface. Make sure the // wrapped ResponseWriter passed to the handler still implements diff --git a/instrumentation/net/http/otelhttp/transport.go b/instrumentation/net/http/otelhttp/transport.go index 55fc06e0d6b..378508d7cdc 100644 --- a/instrumentation/net/http/otelhttp/transport.go +++ b/instrumentation/net/http/otelhttp/transport.go @@ -33,7 +33,7 @@ type Transport struct { tracer trace.Tracer propagators propagation.Propagators - spanStartOptions []trace.StartOption + spanStartOptions []trace.SpanOption filters []Filter spanNameFormatter func(string, *http.Request) string } @@ -81,7 +81,7 @@ func (t *Transport) RoundTrip(r *http.Request) (*http.Response, error) { } } - opts := append([]trace.StartOption{}, t.spanStartOptions...) // start with the configured options + opts := append([]trace.SpanOption{}, t.spanStartOptions...) // start with the configured options ctx, span := t.tracer.Start(r.Context(), t.spanNameFormatter("", r), opts...) diff --git a/instrumentation/net/http/otelhttp/transport_test.go b/instrumentation/net/http/otelhttp/transport_test.go index 8f7475f93be..fdce388f43e 100644 --- a/instrumentation/net/http/otelhttp/transport_test.go +++ b/instrumentation/net/http/otelhttp/transport_test.go @@ -30,7 +30,7 @@ import ( ) func TestTransportBasics(t *testing.T) { - provider, tracer := mocktrace.NewProviderAndTracer(instrumentationName) + provider, tracer := mocktrace.NewTracerProviderAndTracer(instrumentationName) content := []byte("Hello, world!") ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { diff --git a/instrumentation/runtime/go.mod b/instrumentation/runtime/go.mod index f274bc1a434..38f7b49649c 100644 --- a/instrumentation/runtime/go.mod +++ b/instrumentation/runtime/go.mod @@ -6,8 +6,8 @@ replace go.opentelemetry.io/contrib => ../.. require ( github.com/stretchr/testify v1.6.1 - go.opentelemetry.io/contrib v0.11.0 - go.opentelemetry.io/otel v0.11.0 - go.opentelemetry.io/otel/exporters/stdout v0.11.0 - go.opentelemetry.io/otel/sdk v0.11.0 + go.opentelemetry.io/contrib v0.12.0 + go.opentelemetry.io/otel v0.12.0 + go.opentelemetry.io/otel/exporters/stdout v0.12.0 + go.opentelemetry.io/otel/sdk v0.12.0 ) diff --git a/instrumentation/runtime/go.sum b/instrumentation/runtime/go.sum index 16217d70066..989dbac4564 100644 --- a/instrumentation/runtime/go.sum +++ b/instrumentation/runtime/go.sum @@ -23,8 +23,8 @@ github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaW github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= github.com/google/go-cmp v0.4.0 h1:xsAVV57WRhGj6kEIi8ReJzQlHHqcBYCElAvkovg3B/4= github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.1 h1:JFrFEBb2xKufg6XkJsJr+WbKb4FQlURi5RUcBveYu9k= -github.com/google/go-cmp v0.5.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.2 h1:X2ev0eStA3AbceY54o37/0PQ/UWqKEiiO2dKL5OPaFM= +github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/gofuzz v1.1.0 h1:Hsa8mG0dQ46ij8Sl2AYJDUv1oA9/d6Vk+3LG99Oe02g= github.com/google/gofuzz v1.1.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI= @@ -39,12 +39,12 @@ github.com/stretchr/objx v0.1.0 h1:4G4v2dO3VZwixGIRoQ5Lfboy6nUhCyYzaqnIAPPhYs4= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/testify v1.6.1 h1:hDPOHmpOpP40lSULcqw7IrRb/u7w6RpDC9399XyoNd0= github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -go.opentelemetry.io/otel v0.11.0 h1:IN2tzQa9Gc4ZVKnTaMbPVcHjvzOdg5n9QfnmlqiET7E= -go.opentelemetry.io/otel v0.11.0/go.mod h1:G8UCk+KooF2HLkgo8RHX9epABH/aRGYET7gQOqBVdB0= -go.opentelemetry.io/otel/exporters/stdout v0.11.0 h1:5Hn/XKgq7aCJQWGacF093Ts1VpJuiJkwC75c1PqHTPE= -go.opentelemetry.io/otel/exporters/stdout v0.11.0/go.mod h1:XP4gbV2Ikc7/ZyTGtwrA7/FzrhWJr3nfRU+LRvhxY24= -go.opentelemetry.io/otel/sdk v0.11.0 h1:bkDMymVj6gIkPfgC5ci5atq0OYbfUHSn8NvsmyfyMq4= -go.opentelemetry.io/otel/sdk v0.11.0/go.mod h1:XbZ6MrzIZ+d+qr7pH0FwHIbCnANMvXYgkq4afL/IUMQ= +go.opentelemetry.io/otel v0.12.0 h1:bwWaPd/h2q+U6KdKaAiOS5GLwOMd1LDt9iNaeyIoAI8= +go.opentelemetry.io/otel v0.12.0/go.mod h1:dlSNewoRYikTkotEnxdmuBHgzT+k/idJSfDv/FxEnOY= +go.opentelemetry.io/otel/exporters/stdout v0.12.0 h1:ji9VVPmKg+oONcqwULcO0AHZseGU6CFOIdvwKCxNZ9Y= +go.opentelemetry.io/otel/exporters/stdout v0.12.0/go.mod h1:IGUi+IGDXlxXo7nYuPrxfAEpqTcKsWqFtflwFMGGPZQ= +go.opentelemetry.io/otel/sdk v0.12.0 h1:YVUyDXsGvFWjhJxGXT4kBcGdfoTbo1vSGjbGRUdRh5U= +go.opentelemetry.io/otel/sdk v0.12.0/go.mod h1:u3joRdxhrS1hUf9xSFH8vgdXdujQ3jxXxZl3loZFSqs= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= @@ -75,8 +75,8 @@ google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY= -google.golang.org/grpc v1.31.0 h1:T7P4R73V3SSDPhH7WW7ATbfViLtmamH0DKrP3f9AuDI= -google.golang.org/grpc v1.31.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= +google.golang.org/grpc v1.32.0 h1:zWTV+LMdc3kaiJMSTOFz2UgSBgx8RNQoTGiZu3fR9S0= +google.golang.org/grpc v1.32.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo= gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= diff --git a/instrumentation/runtime/runtime.go b/instrumentation/runtime/runtime.go index 9d78ad63b7d..d563d58187b 100644 --- a/instrumentation/runtime/runtime.go +++ b/instrumentation/runtime/runtime.go @@ -23,7 +23,7 @@ import ( "go.opentelemetry.io/contrib" "go.opentelemetry.io/otel/api/global" "go.opentelemetry.io/otel/api/metric" - "go.opentelemetry.io/otel/api/unit" + "go.opentelemetry.io/otel/unit" ) // Runtime reports the work-in-progress conventional runtime metrics specified by OpenTelemetry @@ -39,9 +39,9 @@ type config struct { // are ignored. MinimumReadMemStatsInterval time.Duration - // MeterProvider sets the metric.Provider. If nil, the global + // MeterProvider sets the metric.MeterProvider. If nil, the global // Provider will be used. - MeterProvider metric.Provider + MeterProvider metric.MeterProvider } // Option supports configuring optional settings for runtime metrics. @@ -73,17 +73,17 @@ func (o minimumReadMemStatsIntervalOption) ApplyRuntime(c *config) { } // WithMeterProvider sets the Metric implementation to use for -// reporting. If this option is not used, the global metric.Provider +// reporting. If this option is not used, the global metric.MeterProvider // will be used. `provider` must be non-nil. -func WithMeterProvider(provider metric.Provider) Option { +func WithMeterProvider(provider metric.MeterProvider) Option { return metricProviderOption{provider} } -type metricProviderOption struct{ metric.Provider } +type metricProviderOption struct{ metric.MeterProvider } // ApplyRuntime implements Option. func (o metricProviderOption) ApplyRuntime(c *config) { - c.MeterProvider = o.Provider + c.MeterProvider = o.MeterProvider } // newConfig computes a config from the supplied Options. diff --git a/instrumentation/runtime/runtime_test.go b/instrumentation/runtime/runtime_test.go index 1657e6c148a..f11fe2e2271 100644 --- a/instrumentation/runtime/runtime_test.go +++ b/instrumentation/runtime/runtime_test.go @@ -52,7 +52,7 @@ func testMinimumInterval(t *testing.T, shouldHappen bool, opts ...runtime.Option goruntime.ReadMemStats(&mstats0) baseline := int(mstats0.NumGC) - impl, provider := metric.NewProvider() + impl, provider := metric.NewMeterProvider() err := runtime.Start( append( diff --git a/internal/metric/mock.go b/internal/metric/mock.go index 2fc24dd429c..ef8743a6857 100644 --- a/internal/metric/mock.go +++ b/internal/metric/mock.go @@ -112,15 +112,15 @@ func (m *MeterImpl) doRecordSingle(ctx context.Context, labels []label.KeyValue, }}) } -func NewProvider() (*MeterImpl, apimetric.Provider) { +func NewMeterProvider() (*MeterImpl, apimetric.MeterProvider) { impl := &MeterImpl{ asyncInstruments: NewAsyncInstrumentState(), } - return impl, registry.NewProvider(impl) + return impl, registry.NewMeterProvider(impl) } func NewMeter() (*MeterImpl, apimetric.Meter) { - impl, p := NewProvider() + impl, p := NewMeterProvider() return impl, p.Meter("mock") } diff --git a/internal/trace/mock_span.go b/internal/trace/mock_span.go index 945cf4ef1bf..68b0725b3a2 100644 --- a/internal/trace/mock_span.go +++ b/internal/trace/mock_span.go @@ -76,7 +76,7 @@ func (ms *Span) SetAttributes(attributes ...label.KeyValue) { } // End puts the span into tracers ended spans. -func (ms *Span) End(options ...oteltrace.EndOption) { +func (ms *Span) End(options ...oteltrace.SpanOption) { ms.tracer.addEndedSpan(ms) } diff --git a/internal/trace/mock_tracer.go b/internal/trace/mock_tracer.go index 6963bd5f400..18d20ba1ce2 100644 --- a/internal/trace/mock_tracer.go +++ b/internal/trace/mock_tracer.go @@ -27,14 +27,14 @@ import ( "go.opentelemetry.io/contrib/internal/trace/parent" ) -type Provider struct { +type TracerProvider struct { tracersLock sync.Mutex tracers map[string]*Tracer } -var _ oteltrace.Provider = &Provider{} +var _ oteltrace.TracerProvider = &TracerProvider{} -func (p *Provider) Tracer(name string, _ ...oteltrace.TracerOption) oteltrace.Tracer { +func (p *TracerProvider) Tracer(name string, _ ...oteltrace.TracerOption) oteltrace.Tracer { p.tracersLock.Lock() defer p.tracersLock.Unlock() if p.tracers == nil { @@ -94,15 +94,6 @@ func (mt *Tracer) addEndedSpan(span *Span) { mt.endedSpansLock.Unlock() } -// WithSpan does nothing except creating a new span and executing the -// body. -func (mt *Tracer) WithSpan(ctx context.Context, name string, body func(context.Context) error, opts ...oteltrace.StartOption) error { - ctx, span := mt.Start(ctx, name, opts...) - defer span.End() - - return body(ctx) -} - // Start starts a new Span and puts it into the context. // // The function generates a new random TraceID if either there is no @@ -111,10 +102,10 @@ func (mt *Tracer) WithSpan(ctx context.Context, name string, body func(context.C // parent SpanContext. // // Currently no other StartOption has any effect here. -func (mt *Tracer) Start(ctx context.Context, name string, o ...oteltrace.StartOption) (context.Context, oteltrace.Span) { - var opts oteltrace.StartConfig +func (mt *Tracer) Start(ctx context.Context, name string, o ...oteltrace.SpanOption) (context.Context, oteltrace.Span) { + var opts oteltrace.SpanConfig for _, op := range o { - op(&opts) + op.Apply(&opts) } var span *Span var sc oteltrace.SpanContext @@ -159,9 +150,9 @@ func (mt *Tracer) Start(ctx context.Context, name string, o ...oteltrace.StartOp return oteltrace.ContextWithSpan(ctx, span), span } -// NewProviderAndTracer return mock provider and tracer. -func NewProviderAndTracer(tracerName string) (*Provider, *Tracer) { - var provider Provider +// NewTracerProviderAndTracer return mock provider and tracer. +func NewTracerProviderAndTracer(tracerName string) (*TracerProvider, *Tracer) { + var provider TracerProvider tracer := provider.Tracer(tracerName) return &provider, tracer.(*Tracer) diff --git a/propagators/go.mod b/propagators/go.mod index fde70acc6ec..774630d4def 100644 --- a/propagators/go.mod +++ b/propagators/go.mod @@ -7,6 +7,6 @@ replace go.opentelemetry.io/contrib => ./.. require ( github.com/google/go-cmp v0.5.2 github.com/stretchr/testify v1.6.1 - go.opentelemetry.io/contrib v0.11.0 - go.opentelemetry.io/otel v0.11.0 + go.opentelemetry.io/contrib v0.12.0 + go.opentelemetry.io/otel v0.12.0 ) diff --git a/propagators/go.sum b/propagators/go.sum index b2b4dd09f9e..d09a68edd2e 100644 --- a/propagators/go.sum +++ b/propagators/go.sum @@ -2,8 +2,6 @@ github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8 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/google/go-cmp v0.5.1 h1:JFrFEBb2xKufg6XkJsJr+WbKb4FQlURi5RUcBveYu9k= -github.com/google/go-cmp v0.5.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.2 h1:X2ev0eStA3AbceY54o37/0PQ/UWqKEiiO2dKL5OPaFM= github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI= @@ -16,8 +14,8 @@ github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZN github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/testify v1.6.1 h1:hDPOHmpOpP40lSULcqw7IrRb/u7w6RpDC9399XyoNd0= github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -go.opentelemetry.io/otel v0.11.0 h1:IN2tzQa9Gc4ZVKnTaMbPVcHjvzOdg5n9QfnmlqiET7E= -go.opentelemetry.io/otel v0.11.0/go.mod h1:G8UCk+KooF2HLkgo8RHX9epABH/aRGYET7gQOqBVdB0= +go.opentelemetry.io/otel v0.12.0 h1:bwWaPd/h2q+U6KdKaAiOS5GLwOMd1LDt9iNaeyIoAI8= +go.opentelemetry.io/otel v0.12.0/go.mod h1:dlSNewoRYikTkotEnxdmuBHgzT+k/idJSfDv/FxEnOY= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=