diff --git a/CHANGELOG.md b/CHANGELOG.md index b80a7fa25a9..99ff1938f79 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,13 +8,23 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm ## [Unreleased] +## [0.10.0] - 2020-07-31 + +This release upgrades its [go.opentelemetry.io/otel](https://github.com/open-telemetry/opentelemetry-go/releases/tag/v0.10.0) dependency to v0.10.0 and includes new instrumentation for popular Kafka and Cassandra clients. + ### Added -- Create a detector that collects resources from GKE machines. (#139) -- Create a detector that collects resources from GCE machines. (#132) -- Add instrumentation for Kafka (github.com/Shopify/sarama). (#134, #153) -- Add links and status message for mock span. (#134) +- A detector that generate resources from GCE instance. (#132) +- A detector that generate resources from AWS instances. (#139) +- Instrumentation for the Kafka client github.com/Shopify/sarama. (#134, #153) +- Links and status message for mock span in the internal testing library. (#134) +- Instrumentation for the Cassandra client github.com/gocql/gocql. (#137) +- A detector that generate resources from GKE clusters. (#154) +### Fixed + +- Bump github.com/aws/aws-sdk-go from 1.33.8 to 1.33.15 in /detectors/aws. (#155, #157, #159, #162) +- Bump github.com/golangci/golangci-lint from 1.28.3 to 1.29.0 in /tools. (#146) ## [0.9.0] - 2020-07-20 @@ -31,11 +41,10 @@ This release upgrades its [go.opentelemetry.io/otel](https://github.com/open-tel This release upgrades its [go.opentelemetry.io/otel](https://github.com/open-telemetry/opentelemetry-go/releases/tag/v0.8.0) dependency to v0.8.0, includes minor fixes, and new instrumentation. -### Additions +### Added - Create this `CHANGELOG.md`. (#114) - Add `emicklei/go-restful/v3` trace instrumentation. (#115) -- Create a detector that collects resources from AWS machines. (#139) ### Changed @@ -97,7 +106,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.9.0...HEAD +[Unreleased]: https://github.com/open-telemetry/opentelemetry-go-contrib/compare/v0.10.0...HEAD +[0.10.0]: https://github.com/open-telemetry/opentelemetry-go-contrib/releases/tag/v0.10.0 [0.9.0]: https://github.com/open-telemetry/opentelemetry-go-contrib/releases/tag/v0.9.0 [0.8.0]: https://github.com/open-telemetry/opentelemetry-go-contrib/releases/tag/v0.8.0 [0.7.0]: https://github.com/open-telemetry/opentelemetry-go-contrib/releases/tag/v0.7.0 diff --git a/detectors/aws/go.mod b/detectors/aws/go.mod index 61fdebb0080..45deecb00bd 100644 --- a/detectors/aws/go.mod +++ b/detectors/aws/go.mod @@ -4,5 +4,6 @@ go 1.14 require ( github.com/aws/aws-sdk-go v1.33.15 - go.opentelemetry.io/otel v0.9.0 + go.opentelemetry.io/otel v0.10.0 + go.opentelemetry.io/otel/sdk v0.10.0 ) diff --git a/detectors/aws/go.sum b/detectors/aws/go.sum index 582b2eddc30..d0b7f5ffa21 100644 --- a/detectors/aws/go.sum +++ b/detectors/aws/go.sum @@ -1,7 +1,6 @@ cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= -github.com/DataDog/sketches-go v0.0.0-20190923095040-43f19ad77ff7 h1:qELHH0AWCvf98Yf+CNIJx9vOZOfHFDDzgDRYsnNk/vs= -github.com/DataDog/sketches-go v0.0.0-20190923095040-43f19ad77ff7/go.mod h1:Q5DbzQ+3AkgGwymQO7aZFNP7ns2lZKGtvRBzRXfdi60= +github.com/DataDog/sketches-go v0.0.1/go.mod h1:Q5DbzQ+3AkgGwymQO7aZFNP7ns2lZKGtvRBzRXfdi60= github.com/aws/aws-sdk-go v1.33.15 h1:JiYid0lBDcM12HNOND5EcaBd1namBuB5BJ4Iex0DFMw= github.com/aws/aws-sdk-go v1.33.15/go.mod h1:5zCpMtNQVjRREroY7sYe8lOMRSxkhG6MZveU8YkpAk0= github.com/benbjohnson/clock v1.0.3 h1:vkLuvpK4fmtSCuo60+yC63p7y0BmQ8gm5ZXGuBCJyXg= @@ -32,10 +31,9 @@ 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.0 h1:/QaMHBdZ26BB3SSst0Iwl10Epc+xhTquomWX0oZEB6w= -github.com/google/go-cmp v0.5.0/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/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/gofuzz v1.1.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/jmespath/go-jmespath v0.3.0 h1:OS12ieG61fsCg5+qLJ+SsW9NicxNkg3b25OyT2yCeUc= github.com/jmespath/go-jmespath v0.3.0/go.mod h1:9QtRXoHjLGCJ5IBSaohpXITPlowMeeYCZ7fLUTSywik= github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI= @@ -53,8 +51,10 @@ github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UV github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= 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.9.0 h1:nsdCDHzQx1Yv8E2nwCPcMXMfg+EMIlx1LBOXNC8qSQ8= -go.opentelemetry.io/otel v0.9.0/go.mod h1:ckxzUEfk7tAkTwEMVdkllBM+YOfE/K9iwg6zYntFYSg= +go.opentelemetry.io/otel v0.10.0 h1:2y/HYj1dIfG1nPh0Z15X4se8WwYWuTyKHLSgRb/mbQ0= +go.opentelemetry.io/otel v0.10.0/go.mod h1:n3v1JGUBpn5DafiF1UeoDs5fr5XZMG+43kigDtFB8Vk= +go.opentelemetry.io/otel/sdk v0.10.0 h1:iQWVDfmGB+5TjbrO9yFlezGCWBaJ73vxJTHB+ttdTQk= +go.opentelemetry.io/otel/sdk v0.10.0/go.mod h1:T5752PMr00aUHAVEbaDAYU5tzM2PWOmyy7Lc5OzSrs8= 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/detectors/gcp/go.mod b/detectors/gcp/go.mod index 7f178ceb845..3b7b3d87248 100644 --- a/detectors/gcp/go.mod +++ b/detectors/gcp/go.mod @@ -4,5 +4,6 @@ go 1.14 require ( cloud.google.com/go v0.61.0 - go.opentelemetry.io/otel v0.9.0 + go.opentelemetry.io/otel v0.10.0 + go.opentelemetry.io/otel/sdk v0.10.0 ) diff --git a/detectors/gcp/go.sum b/detectors/gcp/go.sum index 980d8f1f66b..576a53d5dfc 100644 --- a/detectors/gcp/go.sum +++ b/detectors/gcp/go.sum @@ -33,8 +33,7 @@ cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9 dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= -github.com/DataDog/sketches-go v0.0.0-20190923095040-43f19ad77ff7 h1:qELHH0AWCvf98Yf+CNIJx9vOZOfHFDDzgDRYsnNk/vs= -github.com/DataDog/sketches-go v0.0.0-20190923095040-43f19ad77ff7/go.mod h1:Q5DbzQ+3AkgGwymQO7aZFNP7ns2lZKGtvRBzRXfdi60= +github.com/DataDog/sketches-go v0.0.1/go.mod h1:Q5DbzQ+3AkgGwymQO7aZFNP7ns2lZKGtvRBzRXfdi60= github.com/benbjohnson/clock v1.0.3 h1:vkLuvpK4fmtSCuo60+yC63p7y0BmQ8gm5ZXGuBCJyXg= github.com/benbjohnson/clock v1.0.3/go.mod h1:bGMdMPoPVvcYyt1gHDf4J2KE153Yf9BuiUKYMaxlTDM= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= @@ -86,8 +85,9 @@ github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.4.1/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/gofuzz v1.0.0 h1:A8PeW59pxE9IoFRqBp37U+mSNaQoZ46F1f0f863XSXw= -github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= +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/gofuzz v1.1.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs= github.com/google/martian/v3 v3.0.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0= github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= @@ -129,8 +129,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.9.0 h1:nsdCDHzQx1Yv8E2nwCPcMXMfg+EMIlx1LBOXNC8qSQ8= -go.opentelemetry.io/otel v0.9.0/go.mod h1:ckxzUEfk7tAkTwEMVdkllBM+YOfE/K9iwg6zYntFYSg= +go.opentelemetry.io/otel v0.10.0 h1:2y/HYj1dIfG1nPh0Z15X4se8WwYWuTyKHLSgRb/mbQ0= +go.opentelemetry.io/otel v0.10.0/go.mod h1:n3v1JGUBpn5DafiF1UeoDs5fr5XZMG+43kigDtFB8Vk= +go.opentelemetry.io/otel/sdk v0.10.0 h1:iQWVDfmGB+5TjbrO9yFlezGCWBaJ73vxJTHB+ttdTQk= +go.opentelemetry.io/otel/sdk v0.10.0/go.mod h1:T5752PMr00aUHAVEbaDAYU5tzM2PWOmyy7Lc5OzSrs8= 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= diff --git a/exporters/metric/datadog/go.mod b/exporters/metric/datadog/go.mod index 0f3953b8812..ee0911f8686 100644 --- a/exporters/metric/datadog/go.mod +++ b/exporters/metric/datadog/go.mod @@ -4,6 +4,7 @@ go 1.14 require ( github.com/DataDog/datadog-go v3.7.2+incompatible - github.com/DataDog/sketches-go v0.0.0-20190923095040-43f19ad77ff7 - go.opentelemetry.io/otel v0.9.0 + github.com/DataDog/sketches-go v0.0.1 + go.opentelemetry.io/otel v0.10.0 + go.opentelemetry.io/otel/sdk v0.10.0 ) diff --git a/exporters/metric/datadog/go.sum b/exporters/metric/datadog/go.sum index bd5a2463d11..1f6fdbc2654 100644 --- a/exporters/metric/datadog/go.sum +++ b/exporters/metric/datadog/go.sum @@ -2,8 +2,8 @@ cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMT github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/DataDog/datadog-go v3.7.2+incompatible h1:o4QtYjBU/rG58VPh8Ne6F65YiMY5/v5q4WdY/HvRYMQ= github.com/DataDog/datadog-go v3.7.2+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ= -github.com/DataDog/sketches-go v0.0.0-20190923095040-43f19ad77ff7 h1:qELHH0AWCvf98Yf+CNIJx9vOZOfHFDDzgDRYsnNk/vs= -github.com/DataDog/sketches-go v0.0.0-20190923095040-43f19ad77ff7/go.mod h1:Q5DbzQ+3AkgGwymQO7aZFNP7ns2lZKGtvRBzRXfdi60= +github.com/DataDog/sketches-go v0.0.1 h1:RtG+76WKgZuz6FIaGsjoPePmadDBkuD/KC6+ZWu78b8= +github.com/DataDog/sketches-go v0.0.1/go.mod h1:Q5DbzQ+3AkgGwymQO7aZFNP7ns2lZKGtvRBzRXfdi60= github.com/benbjohnson/clock v1.0.3 h1:vkLuvpK4fmtSCuo60+yC63p7y0BmQ8gm5ZXGuBCJyXg= github.com/benbjohnson/clock v1.0.3/go.mod h1:bGMdMPoPVvcYyt1gHDf4J2KE153Yf9BuiUKYMaxlTDM= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= @@ -33,10 +33,10 @@ 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 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.0 h1:/QaMHBdZ26BB3SSst0Iwl10Epc+xhTquomWX0oZEB6w= -github.com/google/go-cmp v0.5.0/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/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/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= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= @@ -51,8 +51,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.9.0 h1:nsdCDHzQx1Yv8E2nwCPcMXMfg+EMIlx1LBOXNC8qSQ8= -go.opentelemetry.io/otel v0.9.0/go.mod h1:ckxzUEfk7tAkTwEMVdkllBM+YOfE/K9iwg6zYntFYSg= +go.opentelemetry.io/otel v0.10.0 h1:2y/HYj1dIfG1nPh0Z15X4se8WwYWuTyKHLSgRb/mbQ0= +go.opentelemetry.io/otel v0.10.0/go.mod h1:n3v1JGUBpn5DafiF1UeoDs5fr5XZMG+43kigDtFB8Vk= +go.opentelemetry.io/otel/sdk v0.10.0 h1:iQWVDfmGB+5TjbrO9yFlezGCWBaJ73vxJTHB+ttdTQk= +go.opentelemetry.io/otel/sdk v0.10.0/go.mod h1:T5752PMr00aUHAVEbaDAYU5tzM2PWOmyy7Lc5OzSrs8= 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/exporters/metric/dogstatsd/dogstatsd_test.go b/exporters/metric/dogstatsd/dogstatsd_test.go index 283f2cec048..26bd5f166f9 100644 --- a/exporters/metric/dogstatsd/dogstatsd_test.go +++ b/exporters/metric/dogstatsd/dogstatsd_test.go @@ -24,7 +24,7 @@ import ( "go.opentelemetry.io/contrib/exporters/metric/dogstatsd" "go.opentelemetry.io/otel/api/kv" "go.opentelemetry.io/otel/api/metric" - "go.opentelemetry.io/otel/exporters/metric/test" + "go.opentelemetry.io/otel/sdk/export/metric/metrictest" "go.opentelemetry.io/otel/sdk/metric/aggregator/sum" "go.opentelemetry.io/otel/sdk/resource" ) @@ -76,10 +76,10 @@ func TestDogstatsLabels(t *testing.T) { t.Run(tc.name, func(t *testing.T) { res := resource.New(tc.resources...) ctx := context.Background() - checkpointSet := test.NewCheckpointSet(res) + checkpointSet := metrictest.NewCheckpointSet(res) desc := metric.NewDescriptor("test.name", metric.CounterKind, metric.Int64NumberKind) - cagg, cckpt := test.Unslice2(sum.New(2)) + cagg, cckpt := metrictest.Unslice2(sum.New(2)) require.NoError(t, cagg.Update(ctx, metric.NewInt64Number(123), &desc)) require.NoError(t, cagg.SynchronizedMove(cckpt, &desc)) diff --git a/exporters/metric/dogstatsd/go.mod b/exporters/metric/dogstatsd/go.mod index 090dca19829..8b546b3d725 100644 --- a/exporters/metric/dogstatsd/go.mod +++ b/exporters/metric/dogstatsd/go.mod @@ -4,5 +4,6 @@ go 1.14 require ( github.com/stretchr/testify v1.6.1 - go.opentelemetry.io/otel v0.9.0 + go.opentelemetry.io/otel v0.10.0 + go.opentelemetry.io/otel/sdk v0.10.0 ) diff --git a/exporters/metric/dogstatsd/go.sum b/exporters/metric/dogstatsd/go.sum index ac0d5842850..14f9bb38c15 100644 --- a/exporters/metric/dogstatsd/go.sum +++ b/exporters/metric/dogstatsd/go.sum @@ -1,7 +1,7 @@ cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= -github.com/DataDog/sketches-go v0.0.0-20190923095040-43f19ad77ff7 h1:qELHH0AWCvf98Yf+CNIJx9vOZOfHFDDzgDRYsnNk/vs= -github.com/DataDog/sketches-go v0.0.0-20190923095040-43f19ad77ff7/go.mod h1:Q5DbzQ+3AkgGwymQO7aZFNP7ns2lZKGtvRBzRXfdi60= +github.com/DataDog/sketches-go v0.0.1 h1:RtG+76WKgZuz6FIaGsjoPePmadDBkuD/KC6+ZWu78b8= +github.com/DataDog/sketches-go v0.0.1/go.mod h1:Q5DbzQ+3AkgGwymQO7aZFNP7ns2lZKGtvRBzRXfdi60= github.com/benbjohnson/clock v1.0.3 h1:vkLuvpK4fmtSCuo60+yC63p7y0BmQ8gm5ZXGuBCJyXg= github.com/benbjohnson/clock v1.0.3/go.mod h1:bGMdMPoPVvcYyt1gHDf4J2KE153Yf9BuiUKYMaxlTDM= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= @@ -31,10 +31,10 @@ 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 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.0 h1:/QaMHBdZ26BB3SSst0Iwl10Epc+xhTquomWX0oZEB6w= -github.com/google/go-cmp v0.5.0/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/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/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= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= @@ -49,8 +49,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.9.0 h1:nsdCDHzQx1Yv8E2nwCPcMXMfg+EMIlx1LBOXNC8qSQ8= -go.opentelemetry.io/otel v0.9.0/go.mod h1:ckxzUEfk7tAkTwEMVdkllBM+YOfE/K9iwg6zYntFYSg= +go.opentelemetry.io/otel v0.10.0 h1:2y/HYj1dIfG1nPh0Z15X4se8WwYWuTyKHLSgRb/mbQ0= +go.opentelemetry.io/otel v0.10.0/go.mod h1:n3v1JGUBpn5DafiF1UeoDs5fr5XZMG+43kigDtFB8Vk= +go.opentelemetry.io/otel/sdk v0.10.0 h1:iQWVDfmGB+5TjbrO9yFlezGCWBaJ73vxJTHB+ttdTQk= +go.opentelemetry.io/otel/sdk v0.10.0/go.mod h1:T5752PMr00aUHAVEbaDAYU5tzM2PWOmyy7Lc5OzSrs8= 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/exporters/metric/dogstatsd/internal/statsd/conn_test.go b/exporters/metric/dogstatsd/internal/statsd/conn_test.go index 5dc562d0729..b8a8c27c1c9 100644 --- a/exporters/metric/dogstatsd/internal/statsd/conn_test.go +++ b/exporters/metric/dogstatsd/internal/statsd/conn_test.go @@ -29,12 +29,12 @@ import ( "go.opentelemetry.io/otel/api/label" "go.opentelemetry.io/otel/api/metric" "go.opentelemetry.io/otel/api/unit" - "go.opentelemetry.io/otel/exporters/metric/test" export "go.opentelemetry.io/otel/sdk/export/metric" + "go.opentelemetry.io/otel/sdk/export/metric/metrictest" + aggtest "go.opentelemetry.io/otel/sdk/metric/aggregator/aggregatortest" "go.opentelemetry.io/otel/sdk/metric/aggregator/array" "go.opentelemetry.io/otel/sdk/metric/aggregator/lastvalue" "go.opentelemetry.io/otel/sdk/metric/aggregator/sum" - aggtest "go.opentelemetry.io/otel/sdk/metric/aggregator/test" "go.opentelemetry.io/otel/sdk/resource" ) @@ -132,7 +132,7 @@ timer.B.D:%s|ms t.Fatal("New error: ", err) } - checkpointSet := test.NewCheckpointSet(testResource) + checkpointSet := metrictest.NewCheckpointSet(testResource) cdesc := metric.NewDescriptor( "counter", metric.CounterKind, nkind) gdesc := metric.NewDescriptor( @@ -149,10 +149,10 @@ timer.B.D:%s|ms const value = 123.456 val := number(t, nkind, value) - cagg, cckpt := test.Unslice2(sum.New(2)) - gagg, gckpt := test.Unslice2(lastvalue.New(2)) - magg, mckpt := test.Unslice2(array.New(2)) - tagg, tckpt := test.Unslice2(array.New(2)) + cagg, cckpt := metrictest.Unslice2(sum.New(2)) + gagg, gckpt := metrictest.Unslice2(lastvalue.New(2)) + magg, mckpt := metrictest.Unslice2(array.New(2)) + tagg, tckpt := metrictest.Unslice2(array.New(2)) aggtest.CheckedUpdate(t, cagg, val, &cdesc) aggtest.CheckedUpdate(t, gagg, val, &gdesc) @@ -321,7 +321,7 @@ func TestPacketSplit(t *testing.T) { t.Fatal("New error: ", err) } - checkpointSet := test.NewCheckpointSet(testResource) + checkpointSet := metrictest.NewCheckpointSet(testResource) desc := metric.NewDescriptor("counter", metric.CounterKind, metric.Int64NumberKind) var expected []string @@ -334,7 +334,7 @@ func TestPacketSplit(t *testing.T) { encoded := adapter.Encoder.Encode(elabels.Iter()) expect := fmt.Sprint("counter:100|c|#", encoded, "\n") expected = append(expected, expect) - agg, ckpt := test.Unslice2(sum.New(2)) + agg, ckpt := metrictest.Unslice2(sum.New(2)) aggtest.CheckedUpdate(t, agg, metric.NewInt64Number(100), &desc) require.NoError(t, agg.SynchronizedMove(ckpt, &desc)) checkpointSet.Add(&desc, ckpt, labels...) @@ -361,10 +361,10 @@ func TestArraySplit(t *testing.T) { t.Fatal("New error: ", err) } - checkpointSet := test.NewCheckpointSet(testResource) + checkpointSet := metrictest.NewCheckpointSet(testResource) desc := metric.NewDescriptor("measure", metric.ValueRecorderKind, metric.Int64NumberKind) - agg, ckpt := test.Unslice2(array.New(2)) + agg, ckpt := metrictest.Unslice2(array.New(2)) for i := 0; i < 1024; i++ { aggtest.CheckedUpdate(t, agg, metric.NewInt64Number(100), &desc) @@ -396,10 +396,10 @@ func TestPrefix(t *testing.T) { t.Fatal("New error: ", err) } - checkpointSet := test.NewCheckpointSet(testResource) + checkpointSet := metrictest.NewCheckpointSet(testResource) desc := metric.NewDescriptor("measure", metric.ValueRecorderKind, metric.Int64NumberKind) - agg, ckpt := test.Unslice2(array.New(2)) + agg, ckpt := metrictest.Unslice2(array.New(2)) aggtest.CheckedUpdate(t, agg, metric.NewInt64Number(100), &desc) require.NoError(t, agg.SynchronizedMove(ckpt, &desc)) checkpointSet.Add(&desc, ckpt) diff --git a/go.mod b/go.mod index 5af29ab819d..ed0f4a64c3e 100644 --- a/go.mod +++ b/go.mod @@ -3,6 +3,6 @@ module go.opentelemetry.io/contrib go 1.14 require ( - go.opentelemetry.io/otel v0.9.0 + go.opentelemetry.io/otel v0.10.0 google.golang.org/grpc v1.30.0 ) diff --git a/go.sum b/go.sum index 257cd265b12..ced2bfc2444 100644 --- a/go.sum +++ b/go.sum @@ -1,9 +1,5 @@ cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= -github.com/DataDog/sketches-go v0.0.0-20190923095040-43f19ad77ff7 h1:qELHH0AWCvf98Yf+CNIJx9vOZOfHFDDzgDRYsnNk/vs= -github.com/DataDog/sketches-go v0.0.0-20190923095040-43f19ad77ff7/go.mod h1:Q5DbzQ+3AkgGwymQO7aZFNP7ns2lZKGtvRBzRXfdi60= -github.com/benbjohnson/clock v1.0.3 h1:vkLuvpK4fmtSCuo60+yC63p7y0BmQ8gm5ZXGuBCJyXg= -github.com/benbjohnson/clock v1.0.3/go.mod h1:bGMdMPoPVvcYyt1gHDf4J2KE153Yf9BuiUKYMaxlTDM= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= @@ -31,10 +27,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 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.0 h1:/QaMHBdZ26BB3SSst0Iwl10Epc+xhTquomWX0oZEB6w= -github.com/google/go-cmp v0.5.0/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/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/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= @@ -49,8 +43,8 @@ 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.9.0 h1:nsdCDHzQx1Yv8E2nwCPcMXMfg+EMIlx1LBOXNC8qSQ8= -go.opentelemetry.io/otel v0.9.0/go.mod h1:ckxzUEfk7tAkTwEMVdkllBM+YOfE/K9iwg6zYntFYSg= +go.opentelemetry.io/otel v0.10.0 h1:2y/HYj1dIfG1nPh0Z15X4se8WwYWuTyKHLSgRb/mbQ0= +go.opentelemetry.io/otel v0.10.0/go.mod h1:n3v1JGUBpn5DafiF1UeoDs5fr5XZMG+43kigDtFB8Vk= 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/github.com/Shopify/sarama/example/go.mod b/instrumentation/github.com/Shopify/sarama/example/go.mod index 65189a0e024..e4246d4eae4 100644 --- a/instrumentation/github.com/Shopify/sarama/example/go.mod +++ b/instrumentation/github.com/Shopify/sarama/example/go.mod @@ -8,7 +8,9 @@ replace go.opentelemetry.io/contrib/instrumentation/github.com/Shopify/sarama => require ( github.com/Shopify/sarama v1.26.4 - go.opentelemetry.io/contrib/instrumentation/github.com/Shopify/sarama v0.0.0-00010101000000-000000000000 - go.opentelemetry.io/otel v0.9.0 + go.opentelemetry.io/contrib/instrumentation/github.com/Shopify/sarama v0.10.0 + go.opentelemetry.io/otel v0.10.0 + go.opentelemetry.io/otel/exporters/stdout v0.10.0 + go.opentelemetry.io/otel/sdk v0.10.0 google.golang.org/grpc v1.30.0 ) diff --git a/instrumentation/github.com/Shopify/sarama/example/go.sum b/instrumentation/github.com/Shopify/sarama/example/go.sum index 7ea537d6fff..2b551cac1cb 100644 --- a/instrumentation/github.com/Shopify/sarama/example/go.sum +++ b/instrumentation/github.com/Shopify/sarama/example/go.sum @@ -1,7 +1,7 @@ cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= -github.com/DataDog/sketches-go v0.0.0-20190923095040-43f19ad77ff7 h1:qELHH0AWCvf98Yf+CNIJx9vOZOfHFDDzgDRYsnNk/vs= -github.com/DataDog/sketches-go v0.0.0-20190923095040-43f19ad77ff7/go.mod h1:Q5DbzQ+3AkgGwymQO7aZFNP7ns2lZKGtvRBzRXfdi60= +github.com/DataDog/sketches-go v0.0.1 h1:RtG+76WKgZuz6FIaGsjoPePmadDBkuD/KC6+ZWu78b8= +github.com/DataDog/sketches-go v0.0.1/go.mod h1:Q5DbzQ+3AkgGwymQO7aZFNP7ns2lZKGtvRBzRXfdi60= github.com/Shopify/sarama v1.26.4 h1:+17TxUq/PJEAfZAll0T7XJjSgQWCpaQSoki/x5yN8o8= github.com/Shopify/sarama v1.26.4/go.mod h1:NbSGBSSndYaIhRcBtY9V0U7AyH+x71bG668AuWys/yU= github.com/Shopify/toxiproxy v2.1.4+incompatible h1:TKdv8HiTLgE5wdJuEML90aBgNWsokNbMijUGhmcoBJc= @@ -45,10 +45,10 @@ 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.0 h1:/QaMHBdZ26BB3SSst0Iwl10Epc+xhTquomWX0oZEB6w= -github.com/google/go-cmp v0.5.0/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/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/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= 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= @@ -76,8 +76,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.9.0 h1:nsdCDHzQx1Yv8E2nwCPcMXMfg+EMIlx1LBOXNC8qSQ8= -go.opentelemetry.io/otel v0.9.0/go.mod h1:ckxzUEfk7tAkTwEMVdkllBM+YOfE/K9iwg6zYntFYSg= +go.opentelemetry.io/otel v0.10.0 h1:2y/HYj1dIfG1nPh0Z15X4se8WwYWuTyKHLSgRb/mbQ0= +go.opentelemetry.io/otel v0.10.0/go.mod h1:n3v1JGUBpn5DafiF1UeoDs5fr5XZMG+43kigDtFB8Vk= +go.opentelemetry.io/otel/exporters/stdout v0.10.0 h1:5dhUv/AMKF+9p2igV0pAmS7sWQvX0r+eimf7uiEDWd8= +go.opentelemetry.io/otel/exporters/stdout v0.10.0/go.mod h1:c7hVyiDzqbxgcerYbLreBNI0+MNE8x/hbekVx3lu+gM= +go.opentelemetry.io/otel/sdk v0.10.0 h1:iQWVDfmGB+5TjbrO9yFlezGCWBaJ73vxJTHB+ttdTQk= +go.opentelemetry.io/otel/sdk v0.10.0/go.mod h1:T5752PMr00aUHAVEbaDAYU5tzM2PWOmyy7Lc5OzSrs8= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20200204104054-c9f3fb736b72 h1:+ELyKg6m8UBf0nPFSqD0mi7zUfwPyXo23HNjMnXPz7w= golang.org/x/crypto v0.0.0-20200204104054-c9f3fb736b72/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= diff --git a/instrumentation/github.com/Shopify/sarama/example/init.go b/instrumentation/github.com/Shopify/sarama/example/init.go index e2c71fba8e0..9c65ee00dff 100644 --- a/instrumentation/github.com/Shopify/sarama/example/init.go +++ b/instrumentation/github.com/Shopify/sarama/example/init.go @@ -18,7 +18,7 @@ import ( "log" otelglobal "go.opentelemetry.io/otel/api/global" - oteltracestdout "go.opentelemetry.io/otel/exporters/trace/stdout" + "go.opentelemetry.io/otel/exporters/stdout" sdktrace "go.opentelemetry.io/otel/sdk/trace" ) @@ -27,7 +27,7 @@ const ( ) func InitTracer() { - exporter, err := oteltracestdout.NewExporter(oteltracestdout.Options{PrettyPrint: true}) + exporter, err := stdout.NewExporter(stdout.WithPrettyPrint()) if err != nil { log.Fatal(err) } diff --git a/instrumentation/github.com/Shopify/sarama/go.mod b/instrumentation/github.com/Shopify/sarama/go.mod index 9c3db97a33b..0759d339fe0 100644 --- a/instrumentation/github.com/Shopify/sarama/go.mod +++ b/instrumentation/github.com/Shopify/sarama/go.mod @@ -7,7 +7,7 @@ replace go.opentelemetry.io/contrib => ../../../.. require ( github.com/Shopify/sarama v1.26.4 github.com/stretchr/testify v1.6.1 - go.opentelemetry.io/contrib v0.9.0 - go.opentelemetry.io/otel v0.9.0 + go.opentelemetry.io/contrib v0.10.0 + go.opentelemetry.io/otel v0.10.0 google.golang.org/grpc v1.30.0 ) diff --git a/instrumentation/github.com/Shopify/sarama/go.sum b/instrumentation/github.com/Shopify/sarama/go.sum index 57735a300ca..b869bc6cb39 100644 --- a/instrumentation/github.com/Shopify/sarama/go.sum +++ b/instrumentation/github.com/Shopify/sarama/go.sum @@ -1,13 +1,9 @@ cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= -github.com/DataDog/sketches-go v0.0.0-20190923095040-43f19ad77ff7 h1:qELHH0AWCvf98Yf+CNIJx9vOZOfHFDDzgDRYsnNk/vs= -github.com/DataDog/sketches-go v0.0.0-20190923095040-43f19ad77ff7/go.mod h1:Q5DbzQ+3AkgGwymQO7aZFNP7ns2lZKGtvRBzRXfdi60= github.com/Shopify/sarama v1.26.4 h1:+17TxUq/PJEAfZAll0T7XJjSgQWCpaQSoki/x5yN8o8= github.com/Shopify/sarama v1.26.4/go.mod h1:NbSGBSSndYaIhRcBtY9V0U7AyH+x71bG668AuWys/yU= github.com/Shopify/toxiproxy v2.1.4+incompatible h1:TKdv8HiTLgE5wdJuEML90aBgNWsokNbMijUGhmcoBJc= github.com/Shopify/toxiproxy v2.1.4+incompatible/go.mod h1:OXgGpZ6Cli1/URJOF1DMxUHB2q5Ap20/P/eIdh4G0pI= -github.com/benbjohnson/clock v1.0.3 h1:vkLuvpK4fmtSCuo60+yC63p7y0BmQ8gm5ZXGuBCJyXg= -github.com/benbjohnson/clock v1.0.3/go.mod h1:bGMdMPoPVvcYyt1gHDf4J2KE153Yf9BuiUKYMaxlTDM= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= @@ -46,10 +42,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 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.0 h1:/QaMHBdZ26BB3SSst0Iwl10Epc+xhTquomWX0oZEB6w= -github.com/google/go-cmp v0.5.0/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/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/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= @@ -77,8 +71,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.9.0 h1:nsdCDHzQx1Yv8E2nwCPcMXMfg+EMIlx1LBOXNC8qSQ8= -go.opentelemetry.io/otel v0.9.0/go.mod h1:ckxzUEfk7tAkTwEMVdkllBM+YOfE/K9iwg6zYntFYSg= +go.opentelemetry.io/otel v0.10.0 h1:2y/HYj1dIfG1nPh0Z15X4se8WwYWuTyKHLSgRb/mbQ0= +go.opentelemetry.io/otel v0.10.0/go.mod h1:n3v1JGUBpn5DafiF1UeoDs5fr5XZMG+43kigDtFB8Vk= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20200204104054-c9f3fb736b72 h1:+ELyKg6m8UBf0nPFSqD0mi7zUfwPyXo23HNjMnXPz7w= golang.org/x/crypto v0.0.0-20200204104054-c9f3fb736b72/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= diff --git a/instrumentation/github.com/emicklei/go-restful/example/server.go b/instrumentation/github.com/emicklei/go-restful/example/server.go index 54df950fd03..9031472f4c4 100644 --- a/instrumentation/github.com/emicklei/go-restful/example/server.go +++ b/instrumentation/github.com/emicklei/go-restful/example/server.go @@ -25,7 +25,7 @@ import ( otelglobal "go.opentelemetry.io/otel/api/global" otelkv "go.opentelemetry.io/otel/api/kv" oteltrace "go.opentelemetry.io/otel/api/trace" - oteltracestdout "go.opentelemetry.io/otel/exporters/trace/stdout" + "go.opentelemetry.io/otel/exporters/stdout" sdktrace "go.opentelemetry.io/otel/sdk/trace" ) @@ -61,7 +61,7 @@ func main() { } func initTracer() { - exporter, err := oteltracestdout.NewExporter(oteltracestdout.Options{PrettyPrint: true}) + exporter, err := stdout.NewExporter(stdout.WithPrettyPrint()) if err != nil { log.Fatal(err) } diff --git a/instrumentation/github.com/emicklei/go-restful/go.mod b/instrumentation/github.com/emicklei/go-restful/go.mod index 1484af7ba79..fb7eb86cab7 100644 --- a/instrumentation/github.com/emicklei/go-restful/go.mod +++ b/instrumentation/github.com/emicklei/go-restful/go.mod @@ -8,6 +8,8 @@ require ( github.com/emicklei/go-restful/v3 v3.2.0 github.com/json-iterator/go v1.1.10 // indirect github.com/stretchr/testify v1.6.1 - go.opentelemetry.io/contrib v0.9.0 - go.opentelemetry.io/otel v0.9.0 + go.opentelemetry.io/contrib v0.10.0 + go.opentelemetry.io/otel v0.10.0 + go.opentelemetry.io/otel/exporters/stdout v0.10.0 + go.opentelemetry.io/otel/sdk v0.10.0 ) diff --git a/instrumentation/github.com/emicklei/go-restful/go.sum b/instrumentation/github.com/emicklei/go-restful/go.sum index f8e481543d6..c375cc497df 100644 --- a/instrumentation/github.com/emicklei/go-restful/go.sum +++ b/instrumentation/github.com/emicklei/go-restful/go.sum @@ -1,7 +1,7 @@ cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= -github.com/DataDog/sketches-go v0.0.0-20190923095040-43f19ad77ff7 h1:qELHH0AWCvf98Yf+CNIJx9vOZOfHFDDzgDRYsnNk/vs= -github.com/DataDog/sketches-go v0.0.0-20190923095040-43f19ad77ff7/go.mod h1:Q5DbzQ+3AkgGwymQO7aZFNP7ns2lZKGtvRBzRXfdi60= +github.com/DataDog/sketches-go v0.0.1 h1:RtG+76WKgZuz6FIaGsjoPePmadDBkuD/KC6+ZWu78b8= +github.com/DataDog/sketches-go v0.0.1/go.mod h1:Q5DbzQ+3AkgGwymQO7aZFNP7ns2lZKGtvRBzRXfdi60= github.com/benbjohnson/clock v1.0.3 h1:vkLuvpK4fmtSCuo60+yC63p7y0BmQ8gm5ZXGuBCJyXg= github.com/benbjohnson/clock v1.0.3/go.mod h1:bGMdMPoPVvcYyt1gHDf4J2KE153Yf9BuiUKYMaxlTDM= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= @@ -31,10 +31,12 @@ 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.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/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= +github.com/google/gofuzz v1.1.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/json-iterator/go v1.1.10 h1:Kz6Cvnvv2wGdaG/V8yMvfkmNiXq9Ya2KUv4rouJJr68= github.com/json-iterator/go v1.1.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI= @@ -54,8 +56,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.9.0 h1:nsdCDHzQx1Yv8E2nwCPcMXMfg+EMIlx1LBOXNC8qSQ8= -go.opentelemetry.io/otel v0.9.0/go.mod h1:ckxzUEfk7tAkTwEMVdkllBM+YOfE/K9iwg6zYntFYSg= +go.opentelemetry.io/otel v0.10.0 h1:2y/HYj1dIfG1nPh0Z15X4se8WwYWuTyKHLSgRb/mbQ0= +go.opentelemetry.io/otel v0.10.0/go.mod h1:n3v1JGUBpn5DafiF1UeoDs5fr5XZMG+43kigDtFB8Vk= +go.opentelemetry.io/otel/exporters/stdout v0.10.0 h1:5dhUv/AMKF+9p2igV0pAmS7sWQvX0r+eimf7uiEDWd8= +go.opentelemetry.io/otel/exporters/stdout v0.10.0/go.mod h1:c7hVyiDzqbxgcerYbLreBNI0+MNE8x/hbekVx3lu+gM= +go.opentelemetry.io/otel/sdk v0.10.0 h1:iQWVDfmGB+5TjbrO9yFlezGCWBaJ73vxJTHB+ttdTQk= +go.opentelemetry.io/otel/sdk v0.10.0/go.mod h1:T5752PMr00aUHAVEbaDAYU5tzM2PWOmyy7Lc5OzSrs8= 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/github.com/emicklei/go-restful/restful_test.go b/instrumentation/github.com/emicklei/go-restful/restful_test.go index 3b922925fb2..796322b85a7 100644 --- a/instrumentation/github.com/emicklei/go-restful/restful_test.go +++ b/instrumentation/github.com/emicklei/go-restful/restful_test.go @@ -28,7 +28,7 @@ import ( mocktrace "go.opentelemetry.io/contrib/internal/trace" otelglobal "go.opentelemetry.io/otel/api/global" - otelvalue "go.opentelemetry.io/otel/api/kv/value" + otelkv "go.opentelemetry.io/otel/api/kv" otelpropagation "go.opentelemetry.io/otel/api/propagation" oteltrace "go.opentelemetry.io/otel/api/trace" ) @@ -112,11 +112,11 @@ func TestChildSpanNames(t *testing.T) { span := spans[0] assert.Equal(t, "/user/{id:[0-9]+}", span.Name) assert.Equal(t, oteltrace.SpanKindServer, span.Kind) - assert.Equal(t, otelvalue.String("foobar"), span.Attributes["http.server_name"]) - assert.Equal(t, otelvalue.Int(http.StatusOK), span.Attributes["http.status_code"]) - assert.Equal(t, otelvalue.String("GET"), span.Attributes["http.method"]) - assert.Equal(t, otelvalue.String("/user/123"), span.Attributes["http.target"]) - assert.Equal(t, otelvalue.String("/user/{id:[0-9]+}"), span.Attributes["http.route"]) + assert.Equal(t, otelkv.StringValue("foobar"), span.Attributes["http.server_name"]) + assert.Equal(t, otelkv.IntValue(http.StatusOK), span.Attributes["http.status_code"]) + assert.Equal(t, otelkv.StringValue("GET"), span.Attributes["http.method"]) + assert.Equal(t, otelkv.StringValue("/user/123"), span.Attributes["http.target"]) + assert.Equal(t, otelkv.StringValue("/user/{id:[0-9]+}"), span.Attributes["http.route"]) r = httptest.NewRequest("GET", "/book/foo", nil) w = httptest.NewRecorder() @@ -126,11 +126,11 @@ func TestChildSpanNames(t *testing.T) { span = spans[0] assert.Equal(t, "/book/{title}", span.Name) assert.Equal(t, oteltrace.SpanKindServer, span.Kind) - assert.Equal(t, otelvalue.String("foobar"), span.Attributes["http.server_name"]) - assert.Equal(t, otelvalue.Int(http.StatusOK), span.Attributes["http.status_code"]) - assert.Equal(t, otelvalue.String("GET"), span.Attributes["http.method"]) - assert.Equal(t, otelvalue.String("/book/foo"), span.Attributes["http.target"]) - assert.Equal(t, otelvalue.String("/book/{title}"), span.Attributes["http.route"]) + assert.Equal(t, otelkv.StringValue("foobar"), span.Attributes["http.server_name"]) + assert.Equal(t, otelkv.IntValue(http.StatusOK), span.Attributes["http.status_code"]) + assert.Equal(t, otelkv.StringValue("GET"), span.Attributes["http.method"]) + assert.Equal(t, otelkv.StringValue("/book/foo"), span.Attributes["http.target"]) + assert.Equal(t, otelkv.StringValue("/book/{title}"), span.Attributes["http.route"]) } func TestGetSpanNotInstrumented(t *testing.T) { diff --git a/instrumentation/github.com/gin-gonic/gin/example/server.go b/instrumentation/github.com/gin-gonic/gin/example/server.go index d53083c7611..a6f91f423bd 100644 --- a/instrumentation/github.com/gin-gonic/gin/example/server.go +++ b/instrumentation/github.com/gin-gonic/gin/example/server.go @@ -26,7 +26,7 @@ import ( otelglobal "go.opentelemetry.io/otel/api/global" "go.opentelemetry.io/otel/api/kv" oteltrace "go.opentelemetry.io/otel/api/trace" - oteltracestdout "go.opentelemetry.io/otel/exporters/trace/stdout" + "go.opentelemetry.io/otel/exporters/stdout" sdktrace "go.opentelemetry.io/otel/sdk/trace" ) @@ -52,7 +52,7 @@ func main() { } func initTracer() { - exporter, err := oteltracestdout.NewExporter(oteltracestdout.Options{PrettyPrint: true}) + exporter, err := stdout.NewExporter(stdout.WithPrettyPrint()) if err != nil { log.Fatal(err) } diff --git a/instrumentation/github.com/gin-gonic/gin/gintrace_test.go b/instrumentation/github.com/gin-gonic/gin/gintrace_test.go index 6cac53b7647..bd5028f791b 100644 --- a/instrumentation/github.com/gin-gonic/gin/gintrace_test.go +++ b/instrumentation/github.com/gin-gonic/gin/gintrace_test.go @@ -31,7 +31,7 @@ import ( mocktrace "go.opentelemetry.io/contrib/internal/trace" otelglobal "go.opentelemetry.io/otel/api/global" - "go.opentelemetry.io/otel/api/kv/value" + "go.opentelemetry.io/otel/api/kv" otelpropagation "go.opentelemetry.io/otel/api/propagation" oteltrace "go.opentelemetry.io/otel/api/trace" ) @@ -91,7 +91,7 @@ func TestTrace200(t *testing.T) { span := oteltrace.SpanFromContext(c.Request.Context()) mspan, ok := span.(*mocktrace.Span) require.True(t, ok) - assert.Equal(t, value.String("foobar"), mspan.Attributes["http.server_name"]) + assert.Equal(t, kv.StringValue("foobar"), mspan.Attributes["http.server_name"]) id := c.Param("id") _, _ = c.Writer.Write([]byte(id)) }) @@ -110,11 +110,11 @@ func TestTrace200(t *testing.T) { span := spans[0] assert.Equal(t, "/user/:id", span.Name) assert.Equal(t, oteltrace.SpanKindServer, span.Kind) - assert.Equal(t, value.String("foobar"), span.Attributes["http.server_name"]) - assert.Equal(t, value.Int(http.StatusOK), span.Attributes["http.status_code"]) - assert.Equal(t, value.String("GET"), span.Attributes["http.method"]) - assert.Equal(t, value.String("/user/123"), span.Attributes["http.target"]) - assert.Equal(t, value.String("/user/:id"), span.Attributes["http.route"]) + assert.Equal(t, kv.StringValue("foobar"), span.Attributes["http.server_name"]) + assert.Equal(t, kv.IntValue(http.StatusOK), span.Attributes["http.status_code"]) + assert.Equal(t, kv.StringValue("GET"), span.Attributes["http.method"]) + assert.Equal(t, kv.StringValue("/user/123"), span.Attributes["http.target"]) + assert.Equal(t, kv.StringValue("/user/:id"), span.Attributes["http.route"]) } func TestError(t *testing.T) { @@ -140,9 +140,9 @@ func TestError(t *testing.T) { require.Len(t, spans, 1) span := spans[0] assert.Equal(t, "/server_err", span.Name) - assert.Equal(t, value.String("foobar"), span.Attributes["http.server_name"]) - assert.Equal(t, value.Int(http.StatusInternalServerError), span.Attributes["http.status_code"]) - assert.Equal(t, value.String("Error #01: oh no\n"), span.Attributes["gin.errors"]) + assert.Equal(t, kv.StringValue("foobar"), span.Attributes["http.server_name"]) + assert.Equal(t, kv.IntValue(http.StatusInternalServerError), span.Attributes["http.status_code"]) + assert.Equal(t, kv.StringValue("Error #01: oh no\n"), span.Attributes["gin.errors"]) // server errors set the status assert.Equal(t, codes.Internal, span.Status) } @@ -182,7 +182,7 @@ func TestHTML(t *testing.T) { } } require.NotNil(t, tspan) - assert.Equal(t, value.String("hello"), tspan.Attributes["go.template"]) + assert.Equal(t, kv.StringValue("hello"), tspan.Attributes["go.template"]) } func TestGetSpanNotInstrumented(t *testing.T) { diff --git a/instrumentation/github.com/gin-gonic/gin/go.mod b/instrumentation/github.com/gin-gonic/gin/go.mod index 173aaebf291..85e5a59c3af 100644 --- a/instrumentation/github.com/gin-gonic/gin/go.mod +++ b/instrumentation/github.com/gin-gonic/gin/go.mod @@ -7,7 +7,9 @@ replace go.opentelemetry.io/contrib => ../../../.. require ( github.com/gin-gonic/gin v1.6.3 github.com/stretchr/testify v1.6.1 - go.opentelemetry.io/contrib v0.9.0 - go.opentelemetry.io/otel v0.9.0 + go.opentelemetry.io/contrib v0.10.0 + go.opentelemetry.io/otel v0.10.0 + go.opentelemetry.io/otel/exporters/stdout v0.10.0 + go.opentelemetry.io/otel/sdk v0.10.0 google.golang.org/grpc v1.30.0 ) diff --git a/instrumentation/github.com/gin-gonic/gin/go.sum b/instrumentation/github.com/gin-gonic/gin/go.sum index 805aaf3aa72..0940ade7698 100644 --- a/instrumentation/github.com/gin-gonic/gin/go.sum +++ b/instrumentation/github.com/gin-gonic/gin/go.sum @@ -1,7 +1,7 @@ cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= -github.com/DataDog/sketches-go v0.0.0-20190923095040-43f19ad77ff7 h1:qELHH0AWCvf98Yf+CNIJx9vOZOfHFDDzgDRYsnNk/vs= -github.com/DataDog/sketches-go v0.0.0-20190923095040-43f19ad77ff7/go.mod h1:Q5DbzQ+3AkgGwymQO7aZFNP7ns2lZKGtvRBzRXfdi60= +github.com/DataDog/sketches-go v0.0.1 h1:RtG+76WKgZuz6FIaGsjoPePmadDBkuD/KC6+ZWu78b8= +github.com/DataDog/sketches-go v0.0.1/go.mod h1:Q5DbzQ+3AkgGwymQO7aZFNP7ns2lZKGtvRBzRXfdi60= github.com/benbjohnson/clock v1.0.3 h1:vkLuvpK4fmtSCuo60+yC63p7y0BmQ8gm5ZXGuBCJyXg= github.com/benbjohnson/clock v1.0.3/go.mod h1:bGMdMPoPVvcYyt1gHDf4J2KE153Yf9BuiUKYMaxlTDM= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= @@ -43,10 +43,12 @@ 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 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.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/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= +github.com/google/gofuzz v1.1.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/json-iterator/go v1.1.9 h1:9yzud/Ht36ygwatGx56VwCZtlI/2AD15T1X2sjSuGns= github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI= @@ -77,8 +79,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.9.0 h1:nsdCDHzQx1Yv8E2nwCPcMXMfg+EMIlx1LBOXNC8qSQ8= -go.opentelemetry.io/otel v0.9.0/go.mod h1:ckxzUEfk7tAkTwEMVdkllBM+YOfE/K9iwg6zYntFYSg= +go.opentelemetry.io/otel v0.10.0 h1:2y/HYj1dIfG1nPh0Z15X4se8WwYWuTyKHLSgRb/mbQ0= +go.opentelemetry.io/otel v0.10.0/go.mod h1:n3v1JGUBpn5DafiF1UeoDs5fr5XZMG+43kigDtFB8Vk= +go.opentelemetry.io/otel/exporters/stdout v0.10.0 h1:5dhUv/AMKF+9p2igV0pAmS7sWQvX0r+eimf7uiEDWd8= +go.opentelemetry.io/otel/exporters/stdout v0.10.0/go.mod h1:c7hVyiDzqbxgcerYbLreBNI0+MNE8x/hbekVx3lu+gM= +go.opentelemetry.io/otel/sdk v0.10.0 h1:iQWVDfmGB+5TjbrO9yFlezGCWBaJ73vxJTHB+ttdTQk= +go.opentelemetry.io/otel/sdk v0.10.0/go.mod h1:T5752PMr00aUHAVEbaDAYU5tzM2PWOmyy7Lc5OzSrs8= 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/github.com/gocql/gocql/example/client.go b/instrumentation/github.com/gocql/gocql/example/client.go index 4c89dff68f8..4a296a73db3 100644 --- a/instrumentation/github.com/gocql/gocql/example/client.go +++ b/instrumentation/github.com/gocql/gocql/example/client.go @@ -42,7 +42,6 @@ import ( "go.opentelemetry.io/otel/api/global" "go.opentelemetry.io/otel/exporters/metric/prometheus" zipkintrace "go.opentelemetry.io/otel/exporters/trace/zipkin" - sdktrace "go.opentelemetry.io/otel/sdk/trace" ) const keyspace = "gocql_integration_example" @@ -139,27 +138,12 @@ func initMetrics() { } func initTracer() { - traceExporter, err := zipkintrace.NewExporter( + if err := zipkintrace.InstallNewPipeline( "http://localhost:9411/api/v2/spans", "zipkin-example", - ) - if err != nil { + ); err != nil { log.Fatalf("failed to create span traceExporter, %v", err) } - - provider, err := sdktrace.NewProvider( - sdktrace.WithBatcher( - traceExporter, - sdktrace.WithBatchTimeout(5), - sdktrace.WithMaxExportBatchSize(10), - ), - sdktrace.WithConfig(sdktrace.Config{DefaultSampler: sdktrace.AlwaysSample()}), - ) - if err != nil { - log.Fatalf("failed to create trace provider, %v", err) - } - - global.SetTraceProvider(provider) } func initDb() { diff --git a/instrumentation/github.com/gocql/gocql/example/go.mod b/instrumentation/github.com/gocql/gocql/example/go.mod index 4e9858fcd44..15c08593c56 100644 --- a/instrumentation/github.com/gocql/gocql/example/go.mod +++ b/instrumentation/github.com/gocql/gocql/example/go.mod @@ -2,15 +2,17 @@ module go.opentelemetry.io/contrib/instrumentation/github.com/gocql/gocql/exampl go 1.14 +replace ( + go.opentelemetry.io/contrib => ../../../../../ + go.opentelemetry.io/contrib/instrumentation/github.com/gocql/gocql => ../ +) + require ( - github.com/DataDog/sketches-go v0.0.1 // indirect github.com/gocql/gocql v0.0.0-20200624222514-34081eda590e - go.opentelemetry.io/contrib/instrumentation/github.com/gocql/gocql v0.0.0 - go.opentelemetry.io/otel v0.9.0 - go.opentelemetry.io/otel/exporters/metric/prometheus v0.9.0 - go.opentelemetry.io/otel/exporters/trace/zipkin v0.9.0 + go.opentelemetry.io/contrib/instrumentation/github.com/gocql/gocql v0.10.0 + go.opentelemetry.io/otel v0.10.0 + go.opentelemetry.io/otel/exporters/metric/prometheus v0.10.0 + go.opentelemetry.io/otel/exporters/trace/zipkin v0.10.0 golang.org/x/sys v0.0.0-20200722175500-76b94024e4b6 // indirect google.golang.org/protobuf v1.25.0 // indirect ) - -replace go.opentelemetry.io/contrib/instrumentation/github.com/gocql/gocql => ../ diff --git a/instrumentation/github.com/gocql/gocql/example/go.sum b/instrumentation/github.com/gocql/gocql/example/go.sum index b072602d8f7..b617441b68f 100644 --- a/instrumentation/github.com/gocql/gocql/example/go.sum +++ b/instrumentation/github.com/gocql/gocql/example/go.sum @@ -1,7 +1,5 @@ cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= -github.com/DataDog/sketches-go v0.0.0-20190923095040-43f19ad77ff7 h1:qELHH0AWCvf98Yf+CNIJx9vOZOfHFDDzgDRYsnNk/vs= -github.com/DataDog/sketches-go v0.0.0-20190923095040-43f19ad77ff7/go.mod h1:Q5DbzQ+3AkgGwymQO7aZFNP7ns2lZKGtvRBzRXfdi60= github.com/DataDog/sketches-go v0.0.1 h1:RtG+76WKgZuz6FIaGsjoPePmadDBkuD/KC6+ZWu78b8= github.com/DataDog/sketches-go v0.0.1/go.mod h1:Q5DbzQ+3AkgGwymQO7aZFNP7ns2lZKGtvRBzRXfdi60= github.com/Shopify/sarama v1.19.0/go.mod h1:FVkBWblsNy7DGZRfXLU0O9RCGt5g3g3yEuWXgklEdEo= @@ -73,8 +71,12 @@ 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/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= +github.com/google/gofuzz v1.1.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/gorilla/context v1.1.1/go.mod h1:kBGZzfjB9CEq2AlWe17Uuf7NDRt0dE0s8S51q0aT7Yg= github.com/gorilla/mux v1.6.2/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs= github.com/hailocab/go-hostpool v0.0.0-20160125115350-e80d13ce29ed h1:5upAirOpQc1Q53c0bnx2ufif5kANL7bfZWcc6VJWJd8= @@ -137,14 +139,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/contrib v0.9.0 h1:4FgJizPVyLabjo4BDy9yJC8NvVbSYjqEHwHBRz3u2vQ= -go.opentelemetry.io/contrib v0.9.0/go.mod h1:LGBQF/ydvt3WgH9NbFNzsFFwIkzTBFcJNiVkEQ165/Q= -go.opentelemetry.io/otel v0.9.0 h1:nsdCDHzQx1Yv8E2nwCPcMXMfg+EMIlx1LBOXNC8qSQ8= -go.opentelemetry.io/otel v0.9.0/go.mod h1:ckxzUEfk7tAkTwEMVdkllBM+YOfE/K9iwg6zYntFYSg= -go.opentelemetry.io/otel/exporters/metric/prometheus v0.9.0 h1:Q06RcQzoI7eeXOsdUROTx71TktUNdpCJT0FJJJAq9cQ= -go.opentelemetry.io/otel/exporters/metric/prometheus v0.9.0/go.mod h1:za3FCvOkKCM3H9RpkseWpKVF3RApyQj4WNnpaBjB3Mc= -go.opentelemetry.io/otel/exporters/trace/zipkin v0.9.0 h1:Ndk6Ajf2fLEq9/yCxwlVPG8DiARTJMp4D2gkVGB9vUw= -go.opentelemetry.io/otel/exporters/trace/zipkin v0.9.0/go.mod h1:dZhgw4MjVLIWEgKZZVNw6FyE0FhLPTB2QgqXWi1bjxM= +go.opentelemetry.io/otel v0.10.0 h1:2y/HYj1dIfG1nPh0Z15X4se8WwYWuTyKHLSgRb/mbQ0= +go.opentelemetry.io/otel v0.10.0/go.mod h1:n3v1JGUBpn5DafiF1UeoDs5fr5XZMG+43kigDtFB8Vk= +go.opentelemetry.io/otel/exporters/metric/prometheus v0.10.0 h1:D9fMBZIYnRV4PiJd8q4DIMO85iiG2LH136Mcz2B8xf4= +go.opentelemetry.io/otel/exporters/metric/prometheus v0.10.0/go.mod h1:4uaYNzF8RF7pUVlOztROygMBLBxPwj/LufwtrByTNc0= +go.opentelemetry.io/otel/exporters/trace/zipkin v0.10.0 h1:TBl++TF+51CpOQyrkoB2V7UgBi9ly0tHdULfmMCggbs= +go.opentelemetry.io/otel/exporters/trace/zipkin v0.10.0/go.mod h1:KO6sGbL5beR/UBzvc8YnaW4iUFXL6tRoznrfRSzOv2E= +go.opentelemetry.io/otel/sdk v0.10.0 h1:iQWVDfmGB+5TjbrO9yFlezGCWBaJ73vxJTHB+ttdTQk= +go.opentelemetry.io/otel/sdk v0.10.0/go.mod h1:T5752PMr00aUHAVEbaDAYU5tzM2PWOmyy7Lc5OzSrs8= 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= diff --git a/instrumentation/github.com/gocql/gocql/go.mod b/instrumentation/github.com/gocql/gocql/go.mod index ce71beee7a1..e6d75cfb2de 100644 --- a/instrumentation/github.com/gocql/gocql/go.mod +++ b/instrumentation/github.com/gocql/gocql/go.mod @@ -2,11 +2,14 @@ module go.opentelemetry.io/contrib/instrumentation/github.com/gocql/gocql go 1.14 +replace go.opentelemetry.io/contrib => ../../../../ + 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.9.0 - go.opentelemetry.io/otel v0.9.0 + go.opentelemetry.io/contrib v0.10.0 + go.opentelemetry.io/otel v0.10.0 + go.opentelemetry.io/otel/sdk v0.10.0 google.golang.org/genproto v0.0.0-20200331122359-1ee6d9798940 // indirect ) diff --git a/instrumentation/github.com/gocql/gocql/go.sum b/instrumentation/github.com/gocql/gocql/go.sum index 6e795f3ffec..0a0b6d6eab3 100644 --- a/instrumentation/github.com/gocql/gocql/go.sum +++ b/instrumentation/github.com/gocql/gocql/go.sum @@ -1,8 +1,8 @@ cloud.google.com/go v0.26.0 h1:e0WKqKTd5BnrG8aKH3J3h+QvEIQtSUcf2n5UZ5ZgLtQ= cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= -github.com/DataDog/sketches-go v0.0.0-20190923095040-43f19ad77ff7 h1:qELHH0AWCvf98Yf+CNIJx9vOZOfHFDDzgDRYsnNk/vs= -github.com/DataDog/sketches-go v0.0.0-20190923095040-43f19ad77ff7/go.mod h1:Q5DbzQ+3AkgGwymQO7aZFNP7ns2lZKGtvRBzRXfdi60= +github.com/DataDog/sketches-go v0.0.1 h1:RtG+76WKgZuz6FIaGsjoPePmadDBkuD/KC6+ZWu78b8= +github.com/DataDog/sketches-go v0.0.1/go.mod h1:Q5DbzQ+3AkgGwymQO7aZFNP7ns2lZKGtvRBzRXfdi60= github.com/benbjohnson/clock v1.0.3 h1:vkLuvpK4fmtSCuo60+yC63p7y0BmQ8gm5ZXGuBCJyXg= github.com/benbjohnson/clock v1.0.3/go.mod h1:bGMdMPoPVvcYyt1gHDf4J2KE153Yf9BuiUKYMaxlTDM= github.com/bitly/go-hostpool v0.0.0-20171023180738-a3a6125de932 h1:mXoPYz/Ul5HYEDvkta6I8/rnYM5gSdSV2tJ6XbZuEtY= @@ -41,10 +41,10 @@ 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.0 h1:/QaMHBdZ26BB3SSst0Iwl10Epc+xhTquomWX0oZEB6w= -github.com/google/go-cmp v0.5.0/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/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/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= github.com/hailocab/go-hostpool v0.0.0-20160125115350-e80d13ce29ed/go.mod h1:tMWxXQ9wFIaZeTI9F+hmhFiGpFmhOHzyShyFUhRm0H4= github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI= @@ -61,10 +61,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/contrib v0.9.0 h1:4FgJizPVyLabjo4BDy9yJC8NvVbSYjqEHwHBRz3u2vQ= -go.opentelemetry.io/contrib v0.9.0/go.mod h1:LGBQF/ydvt3WgH9NbFNzsFFwIkzTBFcJNiVkEQ165/Q= -go.opentelemetry.io/otel v0.9.0 h1:nsdCDHzQx1Yv8E2nwCPcMXMfg+EMIlx1LBOXNC8qSQ8= -go.opentelemetry.io/otel v0.9.0/go.mod h1:ckxzUEfk7tAkTwEMVdkllBM+YOfE/K9iwg6zYntFYSg= +go.opentelemetry.io/otel v0.10.0 h1:2y/HYj1dIfG1nPh0Z15X4se8WwYWuTyKHLSgRb/mbQ0= +go.opentelemetry.io/otel v0.10.0/go.mod h1:n3v1JGUBpn5DafiF1UeoDs5fr5XZMG+43kigDtFB8Vk= +go.opentelemetry.io/otel/sdk v0.10.0 h1:iQWVDfmGB+5TjbrO9yFlezGCWBaJ73vxJTHB+ttdTQk= +go.opentelemetry.io/otel/sdk v0.10.0/go.mod h1:T5752PMr00aUHAVEbaDAYU5tzM2PWOmyy7Lc5OzSrs8= 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/github.com/gorilla/mux/example/server.go b/instrumentation/github.com/gorilla/mux/example/server.go index 24ce5ed5cb4..a5f697719db 100644 --- a/instrumentation/github.com/gorilla/mux/example/server.go +++ b/instrumentation/github.com/gorilla/mux/example/server.go @@ -26,7 +26,7 @@ import ( otelglobal "go.opentelemetry.io/otel/api/global" otelkv "go.opentelemetry.io/otel/api/kv" oteltrace "go.opentelemetry.io/otel/api/trace" - oteltracestdout "go.opentelemetry.io/otel/exporters/trace/stdout" + "go.opentelemetry.io/otel/exporters/stdout" sdktrace "go.opentelemetry.io/otel/sdk/trace" ) @@ -48,7 +48,7 @@ func main() { } func initTracer() { - exporter, err := oteltracestdout.NewExporter(oteltracestdout.Options{PrettyPrint: true}) + exporter, err := stdout.NewExporter(stdout.WithPrettyPrint()) if err != nil { log.Fatal(err) } diff --git a/instrumentation/github.com/gorilla/mux/go.mod b/instrumentation/github.com/gorilla/mux/go.mod index a434e182971..6019f6ac0e2 100644 --- a/instrumentation/github.com/gorilla/mux/go.mod +++ b/instrumentation/github.com/gorilla/mux/go.mod @@ -7,6 +7,8 @@ replace go.opentelemetry.io/contrib => ../../../.. require ( github.com/gorilla/mux v1.7.4 github.com/stretchr/testify v1.6.1 - go.opentelemetry.io/contrib v0.9.0 - go.opentelemetry.io/otel v0.9.0 + go.opentelemetry.io/contrib v0.10.0 + go.opentelemetry.io/otel v0.10.0 + go.opentelemetry.io/otel/exporters/stdout v0.10.0 + go.opentelemetry.io/otel/sdk v0.10.0 ) diff --git a/instrumentation/github.com/gorilla/mux/go.sum b/instrumentation/github.com/gorilla/mux/go.sum index 7b5c8d6a36b..0fec0aca56a 100644 --- a/instrumentation/github.com/gorilla/mux/go.sum +++ b/instrumentation/github.com/gorilla/mux/go.sum @@ -1,7 +1,7 @@ cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= -github.com/DataDog/sketches-go v0.0.0-20190923095040-43f19ad77ff7 h1:qELHH0AWCvf98Yf+CNIJx9vOZOfHFDDzgDRYsnNk/vs= -github.com/DataDog/sketches-go v0.0.0-20190923095040-43f19ad77ff7/go.mod h1:Q5DbzQ+3AkgGwymQO7aZFNP7ns2lZKGtvRBzRXfdi60= +github.com/DataDog/sketches-go v0.0.1 h1:RtG+76WKgZuz6FIaGsjoPePmadDBkuD/KC6+ZWu78b8= +github.com/DataDog/sketches-go v0.0.1/go.mod h1:Q5DbzQ+3AkgGwymQO7aZFNP7ns2lZKGtvRBzRXfdi60= github.com/benbjohnson/clock v1.0.3 h1:vkLuvpK4fmtSCuo60+yC63p7y0BmQ8gm5ZXGuBCJyXg= github.com/benbjohnson/clock v1.0.3/go.mod h1:bGMdMPoPVvcYyt1gHDf4J2KE153Yf9BuiUKYMaxlTDM= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= @@ -31,10 +31,10 @@ 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 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.0 h1:/QaMHBdZ26BB3SSst0Iwl10Epc+xhTquomWX0oZEB6w= -github.com/google/go-cmp v0.5.0/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/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/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.7.4 h1:VuZ8uybHlWmqV03+zRzdwKL4tUnIp1MAQtp1mIFE1bc= github.com/gorilla/mux v1.7.4/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So= github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI= @@ -51,8 +51,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.9.0 h1:nsdCDHzQx1Yv8E2nwCPcMXMfg+EMIlx1LBOXNC8qSQ8= -go.opentelemetry.io/otel v0.9.0/go.mod h1:ckxzUEfk7tAkTwEMVdkllBM+YOfE/K9iwg6zYntFYSg= +go.opentelemetry.io/otel v0.10.0 h1:2y/HYj1dIfG1nPh0Z15X4se8WwYWuTyKHLSgRb/mbQ0= +go.opentelemetry.io/otel v0.10.0/go.mod h1:n3v1JGUBpn5DafiF1UeoDs5fr5XZMG+43kigDtFB8Vk= +go.opentelemetry.io/otel/exporters/stdout v0.10.0 h1:5dhUv/AMKF+9p2igV0pAmS7sWQvX0r+eimf7uiEDWd8= +go.opentelemetry.io/otel/exporters/stdout v0.10.0/go.mod h1:c7hVyiDzqbxgcerYbLreBNI0+MNE8x/hbekVx3lu+gM= +go.opentelemetry.io/otel/sdk v0.10.0 h1:iQWVDfmGB+5TjbrO9yFlezGCWBaJ73vxJTHB+ttdTQk= +go.opentelemetry.io/otel/sdk v0.10.0/go.mod h1:T5752PMr00aUHAVEbaDAYU5tzM2PWOmyy7Lc5OzSrs8= 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/github.com/gorilla/mux/mux_test.go b/instrumentation/github.com/gorilla/mux/mux_test.go index 03d22aa7d06..64a22e8da8d 100644 --- a/instrumentation/github.com/gorilla/mux/mux_test.go +++ b/instrumentation/github.com/gorilla/mux/mux_test.go @@ -26,7 +26,7 @@ import ( mocktrace "go.opentelemetry.io/contrib/internal/trace" otelglobal "go.opentelemetry.io/otel/api/global" - otelvalue "go.opentelemetry.io/otel/api/kv/value" + "go.opentelemetry.io/otel/api/kv" otelpropagation "go.opentelemetry.io/otel/api/propagation" oteltrace "go.opentelemetry.io/otel/api/trace" ) @@ -95,11 +95,11 @@ func TestChildSpanNames(t *testing.T) { span := spans[0] assert.Equal(t, "/user/{id:[0-9]+}", span.Name) assert.Equal(t, oteltrace.SpanKindServer, span.Kind) - assert.Equal(t, otelvalue.String("foobar"), span.Attributes["http.server_name"]) - assert.Equal(t, otelvalue.Int(http.StatusOK), span.Attributes["http.status_code"]) - assert.Equal(t, otelvalue.String("GET"), span.Attributes["http.method"]) - assert.Equal(t, otelvalue.String("/user/123"), span.Attributes["http.target"]) - assert.Equal(t, otelvalue.String("/user/{id:[0-9]+}"), span.Attributes["http.route"]) + assert.Equal(t, kv.StringValue("foobar"), span.Attributes["http.server_name"]) + assert.Equal(t, kv.IntValue(http.StatusOK), span.Attributes["http.status_code"]) + assert.Equal(t, kv.StringValue("GET"), span.Attributes["http.method"]) + assert.Equal(t, kv.StringValue("/user/123"), span.Attributes["http.target"]) + assert.Equal(t, kv.StringValue("/user/{id:[0-9]+}"), span.Attributes["http.route"]) r = httptest.NewRequest("GET", "/book/foo", nil) w = httptest.NewRecorder() @@ -109,11 +109,11 @@ func TestChildSpanNames(t *testing.T) { span = spans[0] assert.Equal(t, "/book/{title}", span.Name) assert.Equal(t, oteltrace.SpanKindServer, span.Kind) - assert.Equal(t, otelvalue.String("foobar"), span.Attributes["http.server_name"]) - assert.Equal(t, otelvalue.Int(http.StatusOK), span.Attributes["http.status_code"]) - assert.Equal(t, otelvalue.String("GET"), span.Attributes["http.method"]) - assert.Equal(t, otelvalue.String("/book/foo"), span.Attributes["http.target"]) - assert.Equal(t, otelvalue.String("/book/{title}"), span.Attributes["http.route"]) + assert.Equal(t, kv.StringValue("foobar"), span.Attributes["http.server_name"]) + assert.Equal(t, kv.IntValue(http.StatusOK), span.Attributes["http.status_code"]) + assert.Equal(t, kv.StringValue("GET"), span.Attributes["http.method"]) + assert.Equal(t, kv.StringValue("/book/foo"), span.Attributes["http.target"]) + assert.Equal(t, kv.StringValue("/book/{title}"), span.Attributes["http.route"]) } func TestGetSpanNotInstrumented(t *testing.T) { diff --git a/instrumentation/github.com/labstack/echo/echo_test.go b/instrumentation/github.com/labstack/echo/echo_test.go index 690add180f4..de09549c671 100644 --- a/instrumentation/github.com/labstack/echo/echo_test.go +++ b/instrumentation/github.com/labstack/echo/echo_test.go @@ -31,7 +31,7 @@ import ( mocktrace "go.opentelemetry.io/contrib/internal/trace" otelglobal "go.opentelemetry.io/otel/api/global" - "go.opentelemetry.io/otel/api/kv/value" + "go.opentelemetry.io/otel/api/kv" otelpropagation "go.opentelemetry.io/otel/api/propagation" oteltrace "go.opentelemetry.io/otel/api/trace" ) @@ -89,7 +89,7 @@ func TestTrace200(t *testing.T) { span := oteltrace.SpanFromContext(c.Request().Context()) mspan, ok := span.(*mocktrace.Span) require.True(t, ok) - assert.Equal(t, value.String("foobar"), mspan.Attributes["http.server_name"]) + assert.Equal(t, kv.StringValue("foobar"), mspan.Attributes["http.server_name"]) id := c.Param("id") return c.String(200, id) }) @@ -108,11 +108,11 @@ func TestTrace200(t *testing.T) { span := spans[0] assert.Equal(t, "/user/:id", span.Name) assert.Equal(t, oteltrace.SpanKindServer, span.Kind) - assert.Equal(t, value.String("foobar"), span.Attributes["http.server_name"]) - assert.Equal(t, value.Int(http.StatusOK), span.Attributes["http.status_code"]) - assert.Equal(t, value.String("GET"), span.Attributes["http.method"]) - assert.Equal(t, value.String("/user/123"), span.Attributes["http.target"]) - assert.Equal(t, value.String("/user/:id"), span.Attributes["http.route"]) + assert.Equal(t, kv.StringValue("foobar"), span.Attributes["http.server_name"]) + assert.Equal(t, kv.IntValue(http.StatusOK), span.Attributes["http.status_code"]) + assert.Equal(t, kv.StringValue("GET"), span.Attributes["http.method"]) + assert.Equal(t, kv.StringValue("/user/123"), span.Attributes["http.target"]) + assert.Equal(t, kv.StringValue("/user/:id"), span.Attributes["http.route"]) } func TestError(t *testing.T) { @@ -138,9 +138,9 @@ func TestError(t *testing.T) { require.Len(t, spans, 1) span := spans[0] assert.Equal(t, "/server_err", span.Name) - assert.Equal(t, value.String("foobar"), span.Attributes["http.server_name"]) - assert.Equal(t, value.Int(http.StatusInternalServerError), span.Attributes["http.status_code"]) - assert.Equal(t, value.String("oh no"), span.Attributes["echo.error"]) + assert.Equal(t, kv.StringValue("foobar"), span.Attributes["http.server_name"]) + assert.Equal(t, kv.IntValue(http.StatusInternalServerError), span.Attributes["http.status_code"]) + assert.Equal(t, kv.StringValue("oh no"), span.Attributes["echo.error"]) // server errors set the status assert.Equal(t, codes.Internal, span.Status) } diff --git a/instrumentation/github.com/labstack/echo/example/server.go b/instrumentation/github.com/labstack/echo/example/server.go index 6b5abab6be3..46a9d46e808 100644 --- a/instrumentation/github.com/labstack/echo/example/server.go +++ b/instrumentation/github.com/labstack/echo/example/server.go @@ -25,7 +25,7 @@ import ( otelglobal "go.opentelemetry.io/otel/api/global" "go.opentelemetry.io/otel/api/kv" oteltrace "go.opentelemetry.io/otel/api/trace" - oteltracestdout "go.opentelemetry.io/otel/exporters/trace/stdout" + "go.opentelemetry.io/otel/exporters/stdout" sdktrace "go.opentelemetry.io/otel/sdk/trace" ) @@ -51,7 +51,7 @@ func main() { } func initTracer() { - exporter, err := oteltracestdout.NewExporter(oteltracestdout.Options{PrettyPrint: true}) + exporter, err := stdout.NewExporter(stdout.WithPrettyPrint()) if err != nil { log.Fatal(err) } diff --git a/instrumentation/github.com/labstack/echo/go.mod b/instrumentation/github.com/labstack/echo/go.mod index 5877ac8fa3b..af2bf1161f6 100644 --- a/instrumentation/github.com/labstack/echo/go.mod +++ b/instrumentation/github.com/labstack/echo/go.mod @@ -7,7 +7,9 @@ replace go.opentelemetry.io/contrib => ../../../.. require ( github.com/labstack/echo/v4 v4.1.16 github.com/stretchr/testify v1.6.1 - go.opentelemetry.io/contrib v0.9.0 - go.opentelemetry.io/otel v0.9.0 + go.opentelemetry.io/contrib v0.10.0 + go.opentelemetry.io/otel v0.10.0 + go.opentelemetry.io/otel/exporters/stdout v0.10.0 + go.opentelemetry.io/otel/sdk v0.10.0 google.golang.org/grpc v1.30.0 ) diff --git a/instrumentation/github.com/labstack/echo/go.sum b/instrumentation/github.com/labstack/echo/go.sum index b72bc93ebe4..cc219360401 100644 --- a/instrumentation/github.com/labstack/echo/go.sum +++ b/instrumentation/github.com/labstack/echo/go.sum @@ -1,7 +1,7 @@ cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= -github.com/DataDog/sketches-go v0.0.0-20190923095040-43f19ad77ff7 h1:qELHH0AWCvf98Yf+CNIJx9vOZOfHFDDzgDRYsnNk/vs= -github.com/DataDog/sketches-go v0.0.0-20190923095040-43f19ad77ff7/go.mod h1:Q5DbzQ+3AkgGwymQO7aZFNP7ns2lZKGtvRBzRXfdi60= +github.com/DataDog/sketches-go v0.0.1 h1:RtG+76WKgZuz6FIaGsjoPePmadDBkuD/KC6+ZWu78b8= +github.com/DataDog/sketches-go v0.0.1/go.mod h1:Q5DbzQ+3AkgGwymQO7aZFNP7ns2lZKGtvRBzRXfdi60= github.com/benbjohnson/clock v1.0.3 h1:vkLuvpK4fmtSCuo60+yC63p7y0BmQ8gm5ZXGuBCJyXg= github.com/benbjohnson/clock v1.0.3/go.mod h1:bGMdMPoPVvcYyt1gHDf4J2KE153Yf9BuiUKYMaxlTDM= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= @@ -33,10 +33,10 @@ 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 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.0 h1:/QaMHBdZ26BB3SSst0Iwl10Epc+xhTquomWX0oZEB6w= -github.com/google/go-cmp v0.5.0/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/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/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= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= @@ -69,8 +69,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.1.0 h1:RZqt0yGBsps8NGvLSGW804QQqCUYYLsaOjTVHy1Ocw4= github.com/valyala/fasttemplate v1.1.0/go.mod h1:UQGH1tvbgY+Nz5t2n7tXsz52dQxojPUpymEIMZ47gx8= -go.opentelemetry.io/otel v0.9.0 h1:nsdCDHzQx1Yv8E2nwCPcMXMfg+EMIlx1LBOXNC8qSQ8= -go.opentelemetry.io/otel v0.9.0/go.mod h1:ckxzUEfk7tAkTwEMVdkllBM+YOfE/K9iwg6zYntFYSg= +go.opentelemetry.io/otel v0.10.0 h1:2y/HYj1dIfG1nPh0Z15X4se8WwYWuTyKHLSgRb/mbQ0= +go.opentelemetry.io/otel v0.10.0/go.mod h1:n3v1JGUBpn5DafiF1UeoDs5fr5XZMG+43kigDtFB8Vk= +go.opentelemetry.io/otel/exporters/stdout v0.10.0 h1:5dhUv/AMKF+9p2igV0pAmS7sWQvX0r+eimf7uiEDWd8= +go.opentelemetry.io/otel/exporters/stdout v0.10.0/go.mod h1:c7hVyiDzqbxgcerYbLreBNI0+MNE8x/hbekVx3lu+gM= +go.opentelemetry.io/otel/sdk v0.10.0 h1:iQWVDfmGB+5TjbrO9yFlezGCWBaJ73vxJTHB+ttdTQk= +go.opentelemetry.io/otel/sdk v0.10.0/go.mod h1:T5752PMr00aUHAVEbaDAYU5tzM2PWOmyy7Lc5OzSrs8= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20200221231518-2aa609cf4a9d h1:1ZiEyfaQIg3Qh0EoqpwAakHVhecoE5wlSg5GjnafJGw= golang.org/x/crypto v0.0.0-20200221231518-2aa609cf4a9d/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= diff --git a/instrumentation/go.mongodb.org/mongo-driver/go.mod b/instrumentation/go.mongodb.org/mongo-driver/go.mod index 6b0869f229c..0effe99bebc 100644 --- a/instrumentation/go.mongodb.org/mongo-driver/go.mod +++ b/instrumentation/go.mongodb.org/mongo-driver/go.mod @@ -8,8 +8,8 @@ require ( github.com/stretchr/testify v1.6.1 github.com/xdg/stringprep v1.0.0 // indirect go.mongodb.org/mongo-driver v1.3.5 - go.opentelemetry.io/contrib v0.9.0 - go.opentelemetry.io/otel v0.9.0 + go.opentelemetry.io/contrib v0.10.0 + go.opentelemetry.io/otel v0.10.0 golang.org/x/crypto v0.0.0-20191105034135-c7e5f84aec59 // indirect golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e // indirect ) diff --git a/instrumentation/go.mongodb.org/mongo-driver/go.sum b/instrumentation/go.mongodb.org/mongo-driver/go.sum index edd8fd87742..7df1a16bea0 100644 --- a/instrumentation/go.mongodb.org/mongo-driver/go.sum +++ b/instrumentation/go.mongodb.org/mongo-driver/go.sum @@ -1,10 +1,6 @@ cloud.google.com/go v0.26.0 h1:e0WKqKTd5BnrG8aKH3J3h+QvEIQtSUcf2n5UZ5ZgLtQ= cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= -github.com/DataDog/sketches-go v0.0.0-20190923095040-43f19ad77ff7 h1:qELHH0AWCvf98Yf+CNIJx9vOZOfHFDDzgDRYsnNk/vs= -github.com/DataDog/sketches-go v0.0.0-20190923095040-43f19ad77ff7/go.mod h1:Q5DbzQ+3AkgGwymQO7aZFNP7ns2lZKGtvRBzRXfdi60= -github.com/benbjohnson/clock v1.0.3 h1:vkLuvpK4fmtSCuo60+yC63p7y0BmQ8gm5ZXGuBCJyXg= -github.com/benbjohnson/clock v1.0.3/go.mod h1:bGMdMPoPVvcYyt1gHDf4J2KE153Yf9BuiUKYMaxlTDM= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= @@ -64,10 +60,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 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.0 h1:/QaMHBdZ26BB3SSst0Iwl10Epc+xhTquomWX0oZEB6w= -github.com/google/go-cmp v0.5.0/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/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/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= github.com/joho/godotenv v1.3.0/go.mod h1:7hK45KPybAkOC6peb+G5yklZfMxEjkZhHbwpqxOKXbg= github.com/karrick/godirwalk v1.8.0/go.mod h1:H5KPZjojv4lE+QYImBI8xVtrBRgYrIVsaRPx4tDPEn4= @@ -116,8 +110,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.3.5 h1:S0ZOruh4YGHjD7JoN7mIsTrNjnQbOjrmgrx6l6pZN7I= go.mongodb.org/mongo-driver v1.3.5/go.mod h1:Ual6Gkco7ZGQw8wE1t4tLnvBsf6yVSM60qW6TgOeJ5c= -go.opentelemetry.io/otel v0.9.0 h1:nsdCDHzQx1Yv8E2nwCPcMXMfg+EMIlx1LBOXNC8qSQ8= -go.opentelemetry.io/otel v0.9.0/go.mod h1:ckxzUEfk7tAkTwEMVdkllBM+YOfE/K9iwg6zYntFYSg= +go.opentelemetry.io/otel v0.10.0 h1:2y/HYj1dIfG1nPh0Z15X4se8WwYWuTyKHLSgRb/mbQ0= +go.opentelemetry.io/otel v0.10.0/go.mod h1:n3v1JGUBpn5DafiF1UeoDs5fr5XZMG+43kigDtFB8Vk= 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/gopkg.in/macaron.v1/example/server.go b/instrumentation/gopkg.in/macaron.v1/example/server.go index 059aee45623..a8a655d4407 100644 --- a/instrumentation/gopkg.in/macaron.v1/example/server.go +++ b/instrumentation/gopkg.in/macaron.v1/example/server.go @@ -25,7 +25,7 @@ import ( otelglobal "go.opentelemetry.io/otel/api/global" otelkv "go.opentelemetry.io/otel/api/kv" oteltrace "go.opentelemetry.io/otel/api/trace" - oteltracestdout "go.opentelemetry.io/otel/exporters/trace/stdout" + "go.opentelemetry.io/otel/exporters/stdout" sdktrace "go.opentelemetry.io/otel/sdk/trace" ) @@ -44,7 +44,7 @@ func main() { } func initTracer() { - exporter, err := oteltracestdout.NewExporter(oteltracestdout.Options{PrettyPrint: true}) + exporter, err := stdout.NewExporter(stdout.WithPrettyPrint()) if err != nil { log.Fatal(err) } diff --git a/instrumentation/gopkg.in/macaron.v1/go.mod b/instrumentation/gopkg.in/macaron.v1/go.mod index e8386c28a9c..f5bd1b6a4e7 100644 --- a/instrumentation/gopkg.in/macaron.v1/go.mod +++ b/instrumentation/gopkg.in/macaron.v1/go.mod @@ -6,7 +6,9 @@ replace go.opentelemetry.io/contrib => ../../.. require ( github.com/stretchr/testify v1.6.1 - go.opentelemetry.io/contrib v0.9.0 - go.opentelemetry.io/otel v0.9.0 + go.opentelemetry.io/contrib v0.10.0 + go.opentelemetry.io/otel v0.10.0 + go.opentelemetry.io/otel/exporters/stdout v0.10.0 + go.opentelemetry.io/otel/sdk v0.10.0 gopkg.in/macaron.v1 v1.3.9 ) diff --git a/instrumentation/gopkg.in/macaron.v1/go.sum b/instrumentation/gopkg.in/macaron.v1/go.sum index 7a6ec16ec32..467aabd8d17 100644 --- a/instrumentation/gopkg.in/macaron.v1/go.sum +++ b/instrumentation/gopkg.in/macaron.v1/go.sum @@ -1,7 +1,7 @@ cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= -github.com/DataDog/sketches-go v0.0.0-20190923095040-43f19ad77ff7 h1:qELHH0AWCvf98Yf+CNIJx9vOZOfHFDDzgDRYsnNk/vs= -github.com/DataDog/sketches-go v0.0.0-20190923095040-43f19ad77ff7/go.mod h1:Q5DbzQ+3AkgGwymQO7aZFNP7ns2lZKGtvRBzRXfdi60= +github.com/DataDog/sketches-go v0.0.1 h1:RtG+76WKgZuz6FIaGsjoPePmadDBkuD/KC6+ZWu78b8= +github.com/DataDog/sketches-go v0.0.1/go.mod h1:Q5DbzQ+3AkgGwymQO7aZFNP7ns2lZKGtvRBzRXfdi60= github.com/benbjohnson/clock v1.0.3 h1:vkLuvpK4fmtSCuo60+yC63p7y0BmQ8gm5ZXGuBCJyXg= github.com/benbjohnson/clock v1.0.3/go.mod h1:bGMdMPoPVvcYyt1gHDf4J2KE153Yf9BuiUKYMaxlTDM= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= @@ -33,10 +33,10 @@ 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 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.0 h1:/QaMHBdZ26BB3SSst0Iwl10Epc+xhTquomWX0oZEB6w= -github.com/google/go-cmp v0.5.0/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/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/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= github.com/gopherjs/gopherjs v0.0.0-20181103185306-d547d1d9531e/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= github.com/gopherjs/gopherjs v0.0.0-20190430165422-3e4dfb77656c h1:7lF+Vz0LqiRidnzC1Oq86fpX1q/iEv2KJdrCtttYjT4= @@ -67,8 +67,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.9.0 h1:nsdCDHzQx1Yv8E2nwCPcMXMfg+EMIlx1LBOXNC8qSQ8= -go.opentelemetry.io/otel v0.9.0/go.mod h1:ckxzUEfk7tAkTwEMVdkllBM+YOfE/K9iwg6zYntFYSg= +go.opentelemetry.io/otel v0.10.0 h1:2y/HYj1dIfG1nPh0Z15X4se8WwYWuTyKHLSgRb/mbQ0= +go.opentelemetry.io/otel v0.10.0/go.mod h1:n3v1JGUBpn5DafiF1UeoDs5fr5XZMG+43kigDtFB8Vk= +go.opentelemetry.io/otel/exporters/stdout v0.10.0 h1:5dhUv/AMKF+9p2igV0pAmS7sWQvX0r+eimf7uiEDWd8= +go.opentelemetry.io/otel/exporters/stdout v0.10.0/go.mod h1:c7hVyiDzqbxgcerYbLreBNI0+MNE8x/hbekVx3lu+gM= +go.opentelemetry.io/otel/sdk v0.10.0 h1:iQWVDfmGB+5TjbrO9yFlezGCWBaJ73vxJTHB+ttdTQk= +go.opentelemetry.io/otel/sdk v0.10.0/go.mod h1:T5752PMr00aUHAVEbaDAYU5tzM2PWOmyy7Lc5OzSrs8= 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= diff --git a/instrumentation/gopkg.in/macaron.v1/macaron_test.go b/instrumentation/gopkg.in/macaron.v1/macaron_test.go index 33519115242..13a5d6f7e6a 100644 --- a/instrumentation/gopkg.in/macaron.v1/macaron_test.go +++ b/instrumentation/gopkg.in/macaron.v1/macaron_test.go @@ -26,7 +26,7 @@ import ( mocktrace "go.opentelemetry.io/contrib/internal/trace" otelglobal "go.opentelemetry.io/otel/api/global" - otelvalue "go.opentelemetry.io/otel/api/kv/value" + "go.opentelemetry.io/otel/api/kv" otelpropagation "go.opentelemetry.io/otel/api/propagation" oteltrace "go.opentelemetry.io/otel/api/trace" ) @@ -98,12 +98,12 @@ func TestChildSpanNames(t *testing.T) { span := spans[0] assert.Equal(t, "/user/123", span.Name) // TODO: span name should show router template, eg /user/:id assert.Equal(t, oteltrace.SpanKindServer, span.Kind) - assert.Equal(t, otelvalue.String("foobar"), span.Attributes["http.server_name"]) - assert.Equal(t, otelvalue.Int(http.StatusOK), span.Attributes["http.status_code"]) - assert.Equal(t, otelvalue.String("GET"), span.Attributes["http.method"]) - assert.Equal(t, otelvalue.String("/user/123"), span.Attributes["http.target"]) + assert.Equal(t, kv.StringValue("foobar"), span.Attributes["http.server_name"]) + assert.Equal(t, kv.IntValue(http.StatusOK), span.Attributes["http.status_code"]) + assert.Equal(t, kv.StringValue("GET"), span.Attributes["http.method"]) + assert.Equal(t, kv.StringValue("/user/123"), span.Attributes["http.target"]) // TODO: span name should show router template, eg /user/:id - //assert.Equal(t, otelvalue.String("/user/:id"), span.Attributes["http.route"]) + //assert.Equal(t, kv.StringValue("/user/:id"), span.Attributes["http.route"]) r = httptest.NewRequest("GET", "/book/foo", nil) w = httptest.NewRecorder() @@ -113,12 +113,12 @@ func TestChildSpanNames(t *testing.T) { span = spans[0] assert.Equal(t, "/book/foo", span.Name) // TODO: span name should show router template, eg /book/:title assert.Equal(t, oteltrace.SpanKindServer, span.Kind) - assert.Equal(t, otelvalue.String("foobar"), span.Attributes["http.server_name"]) - assert.Equal(t, otelvalue.Int(http.StatusOK), span.Attributes["http.status_code"]) - assert.Equal(t, otelvalue.String("GET"), span.Attributes["http.method"]) - assert.Equal(t, otelvalue.String("/book/foo"), span.Attributes["http.target"]) + assert.Equal(t, kv.StringValue("foobar"), span.Attributes["http.server_name"]) + assert.Equal(t, kv.IntValue(http.StatusOK), span.Attributes["http.status_code"]) + assert.Equal(t, kv.StringValue("GET"), span.Attributes["http.method"]) + assert.Equal(t, kv.StringValue("/book/foo"), span.Attributes["http.target"]) // TODO: span name should show router template, eg /book/:title - //assert.Equal(t, otelvalue.String("/book/:title"), span.Attributes["http.route"]) + //assert.Equal(t, kv.StringValue("/book/:title"), span.Attributes["http.route"]) } func TestGetSpanNotInstrumented(t *testing.T) { diff --git a/instrumentation/runtime/example/main.go b/instrumentation/runtime/example/main.go index 25f81e538fd..abd187f3481 100644 --- a/instrumentation/runtime/example/main.go +++ b/instrumentation/runtime/example/main.go @@ -22,21 +22,20 @@ import ( "time" "go.opentelemetry.io/otel/api/global" - metricstdout "go.opentelemetry.io/otel/exporters/metric/stdout" + "go.opentelemetry.io/otel/exporters/stdout" "go.opentelemetry.io/otel/sdk/metric/controller/push" "go.opentelemetry.io/contrib/instrumentation/runtime" ) func initMeter() *push.Controller { - pusher, err := metricstdout.NewExportPipeline(metricstdout.Config{ - Quantiles: []float64{0.5}, - PrettyPrint: true, - }) + pusher, err := stdout.InstallNewPipeline([]stdout.Option{ + stdout.WithQuantiles([]float64{0.5}), + stdout.WithPrettyPrint(), + }, nil) if err != nil { log.Panicf("failed to initialize metric stdout exporter %v", err) } - global.SetMeterProvider(pusher.Provider()) return pusher } diff --git a/instrumentation/runtime/go.mod b/instrumentation/runtime/go.mod index 2b4598df6b2..39936ff9b19 100644 --- a/instrumentation/runtime/go.mod +++ b/instrumentation/runtime/go.mod @@ -6,5 +6,7 @@ replace go.opentelemetry.io/contrib => ../.. require ( github.com/stretchr/testify v1.6.1 - go.opentelemetry.io/otel v0.9.0 + go.opentelemetry.io/otel v0.10.0 + go.opentelemetry.io/otel/exporters/stdout v0.10.0 + go.opentelemetry.io/otel/sdk v0.10.0 ) diff --git a/instrumentation/runtime/go.sum b/instrumentation/runtime/go.sum index ac0d5842850..cef2a937797 100644 --- a/instrumentation/runtime/go.sum +++ b/instrumentation/runtime/go.sum @@ -1,7 +1,7 @@ cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= -github.com/DataDog/sketches-go v0.0.0-20190923095040-43f19ad77ff7 h1:qELHH0AWCvf98Yf+CNIJx9vOZOfHFDDzgDRYsnNk/vs= -github.com/DataDog/sketches-go v0.0.0-20190923095040-43f19ad77ff7/go.mod h1:Q5DbzQ+3AkgGwymQO7aZFNP7ns2lZKGtvRBzRXfdi60= +github.com/DataDog/sketches-go v0.0.1 h1:RtG+76WKgZuz6FIaGsjoPePmadDBkuD/KC6+ZWu78b8= +github.com/DataDog/sketches-go v0.0.1/go.mod h1:Q5DbzQ+3AkgGwymQO7aZFNP7ns2lZKGtvRBzRXfdi60= github.com/benbjohnson/clock v1.0.3 h1:vkLuvpK4fmtSCuo60+yC63p7y0BmQ8gm5ZXGuBCJyXg= github.com/benbjohnson/clock v1.0.3/go.mod h1:bGMdMPoPVvcYyt1gHDf4J2KE153Yf9BuiUKYMaxlTDM= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= @@ -31,10 +31,10 @@ 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 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.0 h1:/QaMHBdZ26BB3SSst0Iwl10Epc+xhTquomWX0oZEB6w= -github.com/google/go-cmp v0.5.0/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/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/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= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= @@ -49,8 +49,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.9.0 h1:nsdCDHzQx1Yv8E2nwCPcMXMfg+EMIlx1LBOXNC8qSQ8= -go.opentelemetry.io/otel v0.9.0/go.mod h1:ckxzUEfk7tAkTwEMVdkllBM+YOfE/K9iwg6zYntFYSg= +go.opentelemetry.io/otel v0.10.0 h1:2y/HYj1dIfG1nPh0Z15X4se8WwYWuTyKHLSgRb/mbQ0= +go.opentelemetry.io/otel v0.10.0/go.mod h1:n3v1JGUBpn5DafiF1UeoDs5fr5XZMG+43kigDtFB8Vk= +go.opentelemetry.io/otel/exporters/stdout v0.10.0 h1:5dhUv/AMKF+9p2igV0pAmS7sWQvX0r+eimf7uiEDWd8= +go.opentelemetry.io/otel/exporters/stdout v0.10.0/go.mod h1:c7hVyiDzqbxgcerYbLreBNI0+MNE8x/hbekVx3lu+gM= +go.opentelemetry.io/otel/sdk v0.10.0 h1:iQWVDfmGB+5TjbrO9yFlezGCWBaJ73vxJTHB+ttdTQk= +go.opentelemetry.io/otel/sdk v0.10.0/go.mod h1:T5752PMr00aUHAVEbaDAYU5tzM2PWOmyy7Lc5OzSrs8= 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/internal/trace/mock_span.go b/internal/trace/mock_span.go index f9807592309..3e511211509 100644 --- a/internal/trace/mock_span.go +++ b/internal/trace/mock_span.go @@ -21,7 +21,6 @@ import ( "google.golang.org/grpc/codes" otelkv "go.opentelemetry.io/otel/api/kv" - otelvalue "go.opentelemetry.io/otel/api/kv/value" oteltrace "go.opentelemetry.io/otel/api/trace" ) @@ -31,7 +30,7 @@ type Span struct { sc oteltrace.SpanContext tracer *Tracer Name string - Attributes map[otelkv.Key]otelvalue.Value + Attributes map[otelkv.Key]otelkv.Value Kind oteltrace.SpanKind Status codes.Code StatusMessage string @@ -64,13 +63,13 @@ func (ms *Span) SetStatus(status codes.Code, msg string) { // SetAttribute adds a single inferred attribute. func (ms *Span) SetAttribute(key string, value interface{}) { - ms.SetAttributes(otelkv.Infer(key, value)) + ms.SetAttributes(otelkv.Any(key, value)) } // SetAttributes adds an attribute to Attributes member. func (ms *Span) SetAttributes(attributes ...otelkv.KeyValue) { if ms.Attributes == nil { - ms.Attributes = make(map[otelkv.Key]otelvalue.Value) + ms.Attributes = make(map[otelkv.Key]otelkv.Value) } for _, kv := range attributes { ms.Attributes[kv.Key] = kv.Value