diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 43f1818508d..82f71448fa6 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -73,3 +73,7 @@ updates: directory: "/instrumentation/net/http/httptrace" # Location of package manifests schedule: interval: "daily" + - package-ecosystem: "gomod" # See documentation for possible values + directory: "/instrumentation/github.com/bradfitz/gomemcache" # Location of package manifests + schedule: + interval: "daily" diff --git a/CHANGELOG.md b/CHANGELOG.md index 33c06ecfbcc..a2cc4e46aa8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,14 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm - Top-level `Version()` and `SemVersion()` functions defining the current version of the contrib package. (#225) +### Changed + +- Switch to use common top-level module `SemVersion()` when creating versioned tracer in `bradfitz/gomemcache`. + +### Fixed + +- Update dependabot configuration to include newly added `bradfitz/gomemcache` package. + ## [0.10.1] - 2020-08-13 ### Added diff --git a/instrumentation/github.com/bradfitz/gomemcache/go.mod b/instrumentation/github.com/bradfitz/gomemcache/go.mod index c802bd9dfe4..f355a6d3c53 100644 --- a/instrumentation/github.com/bradfitz/gomemcache/go.mod +++ b/instrumentation/github.com/bradfitz/gomemcache/go.mod @@ -2,13 +2,15 @@ module go.opentelemetry.io/contrib/instrumentation/github.com/bradfitz/gomemcach go 1.14 +replace go.opentelemetry.io/contrib => ../../../.. + require ( github.com/bradfitz/gomemcache v0.0.0-20190913173617-a41fca850d0b github.com/stretchr/testify v1.6.1 - go.opentelemetry.io/contrib v0.10.0 + go.opentelemetry.io/contrib v0.10.1 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/genproto v0.0.0-20200331122359-1ee6d9798940 // indirect - google.golang.org/grpc v1.30.0 + google.golang.org/grpc v1.31.0 ) diff --git a/instrumentation/github.com/bradfitz/gomemcache/go.sum b/instrumentation/github.com/bradfitz/gomemcache/go.sum index cfd558123bf..fd173a057e3 100644 --- a/instrumentation/github.com/bradfitz/gomemcache/go.sum +++ b/instrumentation/github.com/bradfitz/gomemcache/go.sum @@ -50,8 +50,6 @@ 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.10.0 h1:CHjiqjg05TunvunWuD9/um/Pu0+diZKUPmLk1OWQFao= -go.opentelemetry.io/contrib v0.10.0/go.mod h1:6nh1DNXCBhj0wxTCjh4kQV9Hf+L0Sd7UL5swCOhtrms= 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= @@ -101,6 +99,8 @@ google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQ google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= google.golang.org/grpc v1.30.0 h1:M5a8xTlYTxwMn5ZFkwhRabsygDY5G8TYLyQDBxJNAxE= google.golang.org/grpc v1.30.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= +google.golang.org/grpc v1.31.0 h1:T7P4R73V3SSDPhH7WW7ATbfViLtmamH0DKrP3f9AuDI= +google.golang.org/grpc v1.31.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= diff --git a/instrumentation/github.com/bradfitz/gomemcache/gomemcache.go b/instrumentation/github.com/bradfitz/gomemcache/gomemcache.go index 17f193d38d1..5aee19b4b72 100644 --- a/instrumentation/github.com/bradfitz/gomemcache/gomemcache.go +++ b/instrumentation/github.com/bradfitz/gomemcache/gomemcache.go @@ -19,6 +19,7 @@ import ( "github.com/bradfitz/gomemcache/memcache" + "go.opentelemetry.io/contrib" otelglobal "go.opentelemetry.io/otel/api/global" "go.opentelemetry.io/otel/api/kv" "go.opentelemetry.io/otel/api/standard" @@ -26,9 +27,7 @@ import ( ) const ( - defaultTracerName = "go.opentelemetry.io/contrib/instrumentation/github.com/bradfitz/gomemcache" - tracerVersion = "semver:0.1.0" - + defaultTracerName = "go.opentelemetry.io/contrib/instrumentation/github.com/bradfitz/gomemcache" defaultServiceName = "memcached" ) @@ -68,7 +67,7 @@ func NewClientWithTracing(client *memcache.Client, opts ...Option) *Client { cfg, cfg.traceProvider.Tracer( defaultTracerName, - oteltrace.WithInstrumentationVersion(tracerVersion), + oteltrace.WithInstrumentationVersion(contrib.SemVersion()), ), context.Background(), }