support dynamic qualifier

Author: v1v

.buildkite/scripts/package.sh

@@ -10,11 +10,6 @@ set -eo pipefail
 TYPE="$1"
 PLATFORM_TYPE=$(uname -m)
 
-if [ -z ${ELASTIC_QUALIFIER+x} ]; then
-  QUALIFIER="${ELASTIC_QUALIFIER}"
-  export QUALIFIER
-fi
-
 MAKE_GOAL=package
 if [[ ${PLATFORM_TYPE} == "arm" || ${PLATFORM_TYPE} == "aarch64" ]]; then
   MAKE_GOAL=package-docker

Makefile

@@ -19,6 +19,9 @@ PYTHON_BIN:=$(PYTHON_VENV_DIR)/bin
 PYTHON=$(PYTHON_BIN)/python
 CURRENT_DIR=$(shell dirname $(shell readlink -f $(firstword $(MAKEFILE_LIST))))
 
+# Support DRA qualifier with the following environment variable.
+ELASTIC_QUALIFIER?=
+
 # Create a local config.mk file to override configuration.
 -include config.mk
 
@@ -38,7 +41,8 @@ APM_SERVER_BINARIES:= \
 # Strip binary and inject the Git commit hash and timestamp.
 LDFLAGS := \
 	-s \
-	-X github.com/elastic/beats/v7/libbeat/version.commit=$(GITCOMMIT) \
+	-X github.com/elastic/apm-server/internal/version.qualifier=$(ELASTIC_QUALIFIER) \
+	-X github.com/elastic/beats/v7/libbeat/version.commit=$(ELASTIC_QUALIFIER) \
 	-X github.com/elastic/beats/v7/libbeat/version.buildTime=$(GITCOMMITTIMESTAMP)
 
 # Rule to build apm-server binaries, using Go's native cross-compilation.

go.mk

@@ -8,5 +8,11 @@ GITROOT ?= $(shell git rev-parse --show-toplevel)
 GOLANG_VERSION=$(shell cat $(GITROOT)/.go-version)
 GOARCH:=$(shell go env GOARCH)
 
-APM_SERVER_VERSION=$(shell grep "const Version" $(GITROOT)/internal/version/version.go | cut -d'=' -f2 | tr -d '" ')
+APM_SERVER_ONLY_VERSION=$(shell grep "const Version" $(GITROOT)/internal/version/version.go | cut -d'=' -f2 | tr -d '" ')
+# DRA uses a qualifier to annotate the type of release (alpha, rc, etc)
+ifdef ELASTIC_QUALIFIER
+	APM_SERVER_VERSION=$(APM_SERVER_ONLY_VERSION)-$(ELASTIC_QUALIFIER)
+else
+	APM_SERVER_VERSION=$(APM_SERVER_ONLY_VERSION)
+endif
 APM_SERVER_VERSION_MAJORMINOR=$(shell echo $(APM_SERVER_VERSION) | sed 's/\(.*\..*\)\..*/\1/')

internal/version/settings.go

@@ -19,7 +19,6 @@ package version
 
 import (
 	"fmt"
-	"os"
 	"runtime/debug"
 	"time"
 )
@@ -44,11 +43,6 @@ func init() {
 			}
 		}
 	}
-
-	// DRA supports --qualifier, let's use it to set the qualifier
-	if envQualifier := os.Getenv("QUALIFIER"); envQualifier != "" {
-		qualifier = envQualifier
-	}
 }
 
 // CommitHash returns the hash of the git commit used for the build.
@@ -69,5 +63,8 @@ func VCSModified() bool {
 
 // VersionWithSuffix returns the version and the qualifier.
 func VersionWithQualifier() string {
-	return fmt.Sprintf("%s%s", Version, qualifier)
+	if qualifier == "" {
+		return Version
+	}
+	return fmt.Sprintf("%s-%s", Version, qualifier)
 }