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

contrib.go

@@ -13,12 +13,13 @@
 // limitations under the License.
 
 // Package contrib contains common values used across all
-// instrumentation, exporter, and detector contributions
+// instrumentation, exporter, and detector contributions.
 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"
+	// This string is updated by the pre_release.sh script during release
 }
 
 // SemVersion is the semantic version to be supplied to tracer/meter creation.

pre_release.sh

@@ -89,7 +89,7 @@ else
 fi
 
 # Get version for contrib.go
-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}")
 # Strip leading v
 OTEL_CONTRIB_VERSION="${OTEL_CONTRIB_VERSION#v}"