Prepare release 2.0.0-alpha (#1625)

* Prepare release 2.0.0-alpha

* support release 2.0.0-alpha build processes

* fix regex

---------

Co-authored-by: Jason Plumb <[email protected]>

.gitlab-ci.yml

@@ -51,7 +51,7 @@ release:
     paths:
       - dist/
   rules:
-    - if: '$CI_COMMIT_TAG =~ /^v[0-9]+\.[0-9]+\.[0-9]+.*/'
+    - if: '$CI_COMMIT_TAG =~ /^v[0-9]+\.[0-9]+\.[0-9]+(-alpha)?.*/'
   before_script:
     - ./scripts/install-gh-deps.sh
   script:
@@ -60,7 +60,7 @@ release:
 publish-docker-image:
   stage: post-release
   rules:
-    - if: '$CI_COMMIT_TAG =~ /^v[0-9]+\.[0-9]+\.[0-9]+.*/'
+    - if: '$CI_COMMIT_TAG =~ /^v[0-9]+\.[0-9]+\.[0-9]+(-alpha)?.*/'
   before_script:
     - ./scripts/install-docker-deps.sh
     - ./scripts/install-gh-deps.sh
@@ -70,7 +70,7 @@ publish-docker-image:
 propagate-version:
   stage: post-release
   rules:
-    - if: '$CI_COMMIT_TAG =~ /^v[0-9]+\.[0-9]+\.[0-9]+.*/'
+    - if: '$CI_COMMIT_TAG =~ /^v[0-9]+\.[0-9]+\.[0-9]+(-alpha)?.*/'
   before_script:
     - ./scripts/install-gh-deps.sh
   script:

CHANGELOG.md

@@ -8,6 +8,8 @@ and this repository adheres to [Semantic Versioning](https://semver.org/spec/v2.
 
 ## Unreleased
 
+## v2.0.0-alpha - 2024-02-08
+
 The 2.0.0-alpha release contains significant breaking changes that will most likely affect all users,
 please be sure to read the breaking changes below carefully.
 

README.md

@@ -12,8 +12,8 @@
 
 <p align="center">
   <img alt="Stable" src="https://img.shields.io/badge/status-stable-informational?style=for-the-badge">
-  <a href="https://github.com/open-telemetry/opentelemetry-java-instrumentation/releases/tag/v1.32.0">
-    <img alt="OpenTelemetry Instrumentation for Java Version" src="https://img.shields.io/badge/otel-1.32.0-blueviolet?style=for-the-badge">
+  <a href="https://github.com/open-telemetry/opentelemetry-java-instrumentation/releases/tag/v2.0.0">
+    <img alt="OpenTelemetry Instrumentation for Java Version" src="https://img.shields.io/badge/otel-2.0.0-blueviolet?style=for-the-badge">
   </a>
   <a href="https://github.com/signalfx/gdi-specification/releases/tag/v1.6.0">
     <img alt="Splunk GDI specification" src="https://img.shields.io/badge/GDI-1.6.0-blueviolet?style=for-the-badge">
@@ -73,11 +73,6 @@ see [Migrate from the SignalFx Java Agent](https://quickdraw.splunk.com/redirect
 
 <!-- Comments, spacing, empty and new lines in the section below are intentional, please do not modify them! -->
 <!--DEV_DOCS_WARNING-->
-<!--DEV_DOCS_WARNING_START-->
-The following documentation refers to the in-development version of `splunk-otel-java`. Docs for the latest version ([v1.30.0](https://github.com/signalfx/splunk-otel-java/releases/latest)) can be found [here](https://github.com/signalfx/splunk-otel-java/blob/v1.30.0/README.md).
-
----
-<!--DEV_DOCS_WARNING_END-->
 
 ## Requirements
 
@@ -109,12 +104,11 @@ To extend the instrumentation with the OpenTelemetry Instrumentation for Java,
 you have to use a compatible API version.
 
 <!-- IMPORTANT: do not change comments or break those lines below -->
-The Splunk Distribution of OpenTelemetry Java version <!--SPLUNK_VERSION-->1.30.0<!--SPLUNK_VERSION--> is compatible
+The Splunk Distribution of OpenTelemetry Java version <!--SPLUNK_VERSION-->2.0.0-alpha<!--SPLUNK_VERSION--> is compatible
 with:
 
-* OpenTelemetry API version <!--OTEL_VERSION-->1.32.0<!--OTEL_VERSION-->
-* OpenTelemetry Instrumentation for Java version <!--OTEL_INSTRUMENTATION_VERSION-->1.32.0<!--OTEL_INSTRUMENTATION_VERSION-->
-* Micrometer version 1.11.0
+* OpenTelemetry API version <!--OTEL_VERSION-->1.34.1<!--OTEL_VERSION-->
+* OpenTelemetry Instrumentation for Java version <!--OTEL_INSTRUMENTATION_VERSION-->2.0.0<!--OTEL_INSTRUMENTATION_VERSION-->
 
 ## Snapshot builds
 

dependencyManagement/build.gradle.kts

@@ -8,7 +8,7 @@ val otelInstrumentationVersion = "2.0.0"
 val otelInstrumentationAlphaVersion =  otelInstrumentationVersion.replaceFirst("(-SNAPSHOT)?$".toRegex(), "-alpha$1")
 val otelContribAlphaVersion = "1.32.0-alpha"
 
-val autoValueVersion = "1.10.4";
+val autoValueVersion = "1.10.4"
 val dockerJavaVersion = "3.3.4"
 val mockitoVersion = "5.10.0"
 val protobufVersion = "3.25.2"

deployments/cloudfoundry/buildpack/README.md

@@ -40,7 +40,7 @@ If you want to use a specific version of the Java agent in your application, you
 environment variable before application deployment, either using `cf set-env` or the `manifest.yml` file:
 
 ```sh
-$ cf set-env SPLUNK_OTEL_JAVA_VERSION 1.30.0
+$ cf set-env SPLUNK_OTEL_JAVA_VERSION 2.0.0-alpha
 ```
 
 By default, the [latest](https://github.com/signalfx/splunk-otel-java/releases/latest) available agent version is used.

scripts/common.sh

@@ -41,7 +41,8 @@ setup_git() {
   git config --global user.signingKey "$GITHUB_BOT_GPG_KEY_ID"
 }
 
-# without the starting 'v'
+# input must include starting 'v'.
+# this strips it and returns version minus leading v.
 get_release_version() {
   local release_tag="$1"
   echo "$release_tag" | cut -c2-
@@ -58,12 +59,12 @@ get_minor_version() {
 }
 get_patch_version() {
   local release_tag="$1"
-  get_release_version "$release_tag" | awk -F'.' '{print $3}'
+  get_release_version "$release_tag" | awk -F'[.-]' '{print $3}'
 }
 
 validate_version() {
   local version="$1"
-  if [[ ! $version =~ ^[0-9]+\.[0-9]+\.[0-9]+$ ]]
+  if [[ ! $version =~ ^[0-9]+\.[0-9]+\.[0-9]+(-.*)?$ ]]
   then
     echo "Invalid release version: $version"
     echo "Release version must follow the pattern major.minor.patch, e.g. 1.2.3"

version.gradle.kts

@@ -1,5 +1,5 @@
 // do NOT update that variable manually - it is managed by the pre/post release scripts
-val distroVersion = "1.31.0-SNAPSHOT"
+val distroVersion = "2.0.0-alpha"
 
 allprojects {
   version = distroVersion