Use top-level common SemVersion() in creation of versioned tracer for…

… bradfitz/gomemcache (#226)

* Introduce a top-level `Version()` and `SemVersion()` function.

These are intended to be used by submodules within the repo that need
to specify an "instrumentation version" when creating a tracer or meter.

* Included PR number in CHANGELOG

* Add contrib.SemVersion() to tracer creation.

* Add bradfitz/gomemcache to dependabot directory list

* Add CHANGELOG entries.

.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"

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

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
 )

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=

instrumentation/github.com/bradfitz/gomemcache/gomemcache.go

@@ -19,16 +19,15 @@ 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"
 	oteltrace "go.opentelemetry.io/otel/api/trace"
 )
 
 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(),
 	}