Merge remote-tracking branch 'origin/master' into fitzcache-semversion

CHANGELOG.md

@@ -12,6 +12,7 @@ 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)
 
+<<<<<<< HEAD
 ### Changed
 
 - Switch to use common top-level module `SemVersion()` when creating versioned tracer in `bradfitz/gomemcache`.
@@ -20,6 +21,8 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
 
 - Update dependabot configuration to include newly added `bradfitz/gomemcache` package.
 
+=======
+>>>>>>> origin/master
 ## [0.10.1] - 2020-08-13
 
 ### Added

contrib.go

@@ -13,12 +13,20 @@
 // limitations under the License.
 
 // Package contrib contains common values used across all
+<<<<<<< HEAD
 // instrumentation, exporter, and detector contributions
+=======
+// instrumentation, exporter, and detector contributions.
+>>>>>>> origin/master
 package contrib // import "go.opentelemetry.io/contrib"
 
 // Version is the current release version of OpenTelemetry Contrib in use.
 func Version() string {
 	return "0.10.1"
+<<<<<<< HEAD
+=======
+	// This string is updated by the pre_release.sh script during release
+>>>>>>> origin/master
 }
 
 // SemVersion is the semantic version to be supplied to tracer/meter creation.

pre_release.sh

@@ -89,7 +89,11 @@ else
 fi
 
 # Get version for contrib.go
+<<<<<<< HEAD
 OTEL_CONTRIB_VERSION=$(echo "${CONTRIB_TAG}" | grep -o '^v[0-9]\+\.[0-9]\+\.[0-9]\+')
+=======
+OTEL_CONTRIB_VERSION=$(echo "${CONTRIB_TAG}" | egrep -o "${SEMVER_REGEX}")
+>>>>>>> origin/master
 # Strip leading v
 OTEL_CONTRIB_VERSION="${OTEL_CONTRIB_VERSION#v}"