[receiver/jmx] Add metric gatherer to artifacts

.github/workflows/win-package-test.yml

@@ -195,8 +195,9 @@ jobs:
           Start-Sleep -s 30
           & ${{ github.workspace }}\.github\workflows\scripts\win-test-services.ps1 -mode "${{ matrix.MODE }}" -access_token "${{ env.token }}" -realm "${{ env.realm }}" -memory "${{ env.memory }}" -with_fluentd "${{ matrix.WITH_FLUENTD }}"
           & ${{ github.workspace }}\.github\workflows\scripts\win-test-support-bundle.ps1 -mode "${{ matrix.MODE }}" -with_fluentd "${{ matrix.WITH_FLUENTD }}"
-          Test-Path -Path "$env:ProgramFiles\Splunk\OpenTelemetry Collector\agent-bundle\python\python.exe"
-          Test-Path -Path "$env:ProgramFiles\Splunk\OpenTelemetry Collector\agent-bundle\collectd-python"
+          Resolve-Path -Path "$env:ProgramFiles\Splunk\OpenTelemetry Collector\agent-bundle\python\python.exe"
+          Resolve-Path -Path "$env:ProgramFiles\Splunk\OpenTelemetry Collector\agent-bundle\collectd-python"
+          Resolve-Path -Path "$env:SYSTEMDRIVE\opt\opentelemetry-java-contrib-jmx-metrics.jar"
 
       - name: splunk-otel-collector logs
         if: ${{ always() }}
@@ -351,9 +352,9 @@ jobs:
           Copy-Item .\bin\translatesfx_windows_amd64.exe .\cmd\otelcol\translatesfx.exe
           Copy-Item .\dist\agent-bundle_windows_amd64.zip .\cmd\otelcol\agent-bundle_windows_amd64.zip
           if ("${{ matrix.OS }}" -eq "windows-2019") {
-            docker build -t otelcol-windows --build-arg BASE_IMAGE=mcr.microsoft.com/windows/servercore:1809 -f .\cmd\otelcol\Dockerfile.windows .\cmd\otelcol\
+            docker build -t otelcol-windows --build-arg BASE_IMAGE=mcr.microsoft.com/windows/servercore:1809 --build-arg JMX_METRIC_GATHERER_RELEASE=$(Get-Content internal\buildscripts\packaging\jmx-metric-gatherer-release.txt) -f .\cmd\otelcol\Dockerfile.windows .\cmd\otelcol\
           } else {
-            docker build -t otelcol-windows --build-arg BASE_IMAGE=mcr.microsoft.com/windows/servercore:ltsc2022 -f .\cmd\otelcol\Dockerfile.windows .\cmd\otelcol\
+            docker build -t otelcol-windows --build-arg BASE_IMAGE=mcr.microsoft.com/windows/servercore:ltsc2022 --build-arg JMX_METRIC_GATHERER_RELEASE=$(Get-Content internal\buildscripts\packaging\jmx-metric-gatherer-release.txt) -f .\cmd\otelcol\Dockerfile.windows .\cmd\otelcol\
           }
           Remove-Item .\cmd\otelcol\otelcol.exe
           Remove-Item .\cmd\otelcol\translatesfx.exe

.gitlab-ci.yml

@@ -656,8 +656,9 @@ build-push-windows-image:
         $IMAGE_NAME = "quay.io/signalfx/splunk-otel-collector-windows-dev"
         $IMAGE_TAG = $env:CI_COMMIT_SHA
       }
+      $JMX_METRIC_GATHERER_RELEASE = $(Get-Content internal\buildscripts\packaging\jmx-metric-gatherer-release.txt)
       echo "Building ${IMAGE_NAME}:${IMAGE_TAG}"
-      docker build -t ${IMAGE_NAME}:${IMAGE_TAG} --build-arg BASE_IMAGE=mcr.microsoft.com/windows/servercore:1809 -f .\cmd\otelcol\Dockerfile.windows .\cmd\otelcol\
+      docker build -t ${IMAGE_NAME}:${IMAGE_TAG} --build-arg BASE_IMAGE=mcr.microsoft.com/windows/servercore:1809 --build-arg JMX_METRIC_GATHERER_RELEASE=${JMX_METRIC_GATHERER_RELEASE} -f .\cmd\otelcol\Dockerfile.windows .\cmd\otelcol\
       echo "Pushing ${IMAGE_NAME}:${IMAGE_TAG}"
       docker push ${IMAGE_NAME}:${IMAGE_TAG}
       if ($env:CI_COMMIT_BRANCH -eq "main" -or $env:CI_COMMIT_TAG -match '^v\d+\.\d+\.\d+$') {
@@ -698,8 +699,9 @@ build-push-windows2022-image:
         $IMAGE_NAME = "quay.io/signalfx/splunk-otel-collector-windows-dev"
         $IMAGE_TAG = "${env:CI_COMMIT_SHA}-2022"
       }
+      $JMX_METRIC_GATHERER_RELEASE = $(Get-Content internal\buildscripts\packaging\jmx-metric-gatherer-release.txt)
       echo "Building ${IMAGE_NAME}:${IMAGE_TAG}"
-      docker build -t ${IMAGE_NAME}:${IMAGE_TAG} --build-arg BASE_IMAGE=mcr.microsoft.com/windows/servercore:ltsc2022 -f .\cmd\otelcol\Dockerfile.windows .\cmd\otelcol\
+      docker build -t ${IMAGE_NAME}:${IMAGE_TAG} --build-arg BASE_IMAGE=mcr.microsoft.com/windows/servercore:ltsc2022 --build-arg JMX_METRIC_GATHERER_RELEASE=${JMX_METRIC_GATHERER_RELEASE} -f .\cmd\otelcol\Dockerfile.windows .\cmd\otelcol\
       echo "Pushing ${IMAGE_NAME}:${IMAGE_TAG}"
       docker push ${IMAGE_NAME}:${IMAGE_TAG}
       if ($env:CI_COMMIT_BRANCH -eq "main" -or $env:CI_COMMIT_TAG -match '^v\d+\.\d+\.\d+$') {

.gitlab/update-openjdk.sh

@@ -31,6 +31,7 @@ create_collector_pr() {
     if [[ -n "$version" ]]; then
       echo ">>> Updating openjdk version to $version ..."
       sed -i "s|^ARG JDK_VERSION=.*|ARG JDK_VERSION=${version}|" internal/signalfx-agent/bundle/Dockerfile
+      sed -i "s|^ARG JDK_VERSION=.*|ARG JDK_VERSION=${version}|" cmd/otelcol/Dockerfile.windows
     else
       echo "ERROR: Failed to get version from tag name '${tag}'!" >&2
       exit 1

CHANGELOG.md

@@ -4,6 +4,7 @@
 
 ### 💡 Enhancements 💡
 
+- (Splunk) `jmxreceiver`: Bundle latest [JMX Metric Gatherer](https://github.com/open-telemetry/opentelemetry-java-contrib/tree/main/jmx-metrics) in installer packages and images for Windows and Linux ([#3262](https://github.com/signalfx/splunk-otel-collector/pull/3262))
 - (Splunk) `receiver/smartagent`: Use `Leases` instead of `ConfigMapLeases` for leader-election in k8s. ([#3521](https://github.com/signalfx/splunk-otel-collector/pull/3521))
 
 ## v0.83.0

Makefile

@@ -31,6 +31,7 @@ BUILD_X2=-X $(BUILD_INFO_IMPORT_PATH_CORE).Version=$(VERSION)
 BUILD_INFO=-ldflags "${BUILD_X1} ${BUILD_X2}"
 BUILD_INFO_TESTS=-ldflags "-X $(BUILD_INFO_IMPORT_PATH_TESTS).Version=$(VERSION)"
 
+JMX_METRIC_GATHERER_RELEASE=$(shell cat internal/buildscripts/packaging/jmx-metric-gatherer-release.txt)
 SKIP_COMPILE=false
 ARCH=amd64
 BUNDLE_SUPPORTED_ARCHS := amd64 arm64
@@ -167,7 +168,7 @@ endif
 ifneq ($(filter $(ARCH), $(BUNDLE_SUPPORTED_ARCHS)),)
 	cp ./dist/agent-bundle_linux_$(ARCH).tar.gz ./cmd/otelcol/dist/agent-bundle.tar.gz
 endif
-	docker buildx build --platform linux/$(ARCH) -o type=image,name=otelcol:$(ARCH),push=false --build-arg ARCH=$(ARCH) --build-arg DOCKER_REPO=$(DOCKER_REPO) ./cmd/otelcol/
+	docker buildx build --platform linux/$(ARCH) -o type=image,name=otelcol:$(ARCH),push=false --build-arg ARCH=$(ARCH) --build-arg DOCKER_REPO=$(DOCKER_REPO) --build-arg JMX_METRIC_GATHERER_RELEASE=$(JMX_METRIC_GATHERER_RELEASE) ./cmd/otelcol/
 	docker tag otelcol:$(ARCH) otelcol:latest
 	rm -rf ./cmd/otelcol/dist
 
@@ -221,15 +222,15 @@ ifneq ($(SKIP_BUNDLE), true)
 endif
 endif
 	docker build -t otelcol-fpm internal/buildscripts/packaging/fpm
-	docker run --rm -v $(CURDIR):/repo -e PACKAGE=$* -e VERSION=$(VERSION) -e ARCH=$(ARCH) otelcol-fpm
+	docker run --rm -v $(CURDIR):/repo -e PACKAGE=$* -e VERSION=$(VERSION) -e ARCH=$(ARCH) -e JMX_METRIC_GATHERER_RELEASE=$(JMX_METRIC_GATHERER_RELEASE) otelcol-fpm
 
 .PHONY: msi
 msi:
 ifneq ($(SKIP_COMPILE), true)
 	$(MAKE) binaries-windows_amd64
 endif
 	test -f ./dist/agent-bundle_windows_amd64.zip || (echo "./dist/agent-bundle_windows_amd64.zip not found! Either download a pre-built bundle to ./dist/, or run './internal/signalfx-agent/bundle/scripts/windows/make.ps1 bundle' on a windows host and copy it to ./dist/." && exit 1)
-	./internal/buildscripts/packaging/msi/build.sh "$(VERSION)" "$(DOCKER_REPO)"
+	./internal/buildscripts/packaging/msi/build.sh "$(VERSION)" "$(DOCKER_REPO)" "$(JMX_METRIC_GATHERER_RELEASE)"
 
 .PHONY: update-examples
 update-examples:

cmd/otelcol/Dockerfile

@@ -14,7 +14,9 @@ RUN chmod 755 /translatesfx
 RUN chmod 755 /migratecheckpoint
 RUN echo "splunk-otel-collector:x:999:999::/:" > /etc_passwd
 # create base dirs since we cannot chown in scratch image except via COPY
-RUN mkdir -p /otel/collector /splunk-otel-collector
+RUN mkdir -p /otel/collector /splunk-otel-collector /tmp/tmp
+# used by jmx receiver to pass tmp properties. Nested to avoid inheriting existing tmp files.
+RUN chmod 755 /tmp/tmp
 
 FROM ${DOCKER_REPO}/alpine:3.17.0 AS agent-bundle
 ARG ARCH="amd64"
@@ -35,6 +37,12 @@ RUN if [[ "$ARCH" = "amd64" || "$ARCH" = "arm64" ]]; then \
         mkdir -p /usr/lib/splunk-otel-collector/agent-bundle; \
     fi
 
+FROM alpine:3.17.0 AS jmx
+ARG JMX_METRIC_GATHERER_RELEASE
+RUN JMX_METRICS_JAR=opentelemetry-jmx-metrics.jar && \
+URL=https://github.com/open-telemetry/opentelemetry-java-contrib/releases/download/v${JMX_METRIC_GATHERER_RELEASE}/${JMX_METRICS_JAR} && \
+cd /tmp && wget "$URL";
+
 FROM ${DOCKER_REPO}/debian:11.5 as journalctl
 RUN apt update
 RUN apt install -y systemd
@@ -45,14 +53,22 @@ FROM scratch
 ENV SPLUNK_BUNDLE_DIR=/usr/lib/splunk-otel-collector/agent-bundle
 ENV SPLUNK_COLLECTD_DIR=${SPLUNK_BUNDLE_DIR}/run/collectd
 ENV PATH=${PATH}:${SPLUNK_BUNDLE_DIR}/bin
+ENV PATH=${PATH}:${SPLUNK_BUNDLE_DIR}/jre/bin
+# avoid otel-java/autoconfigure default env vars for jmx receiver
+ENV OTEL_TRACES_EXPORTER=none
+ENV OTEL_LOGS_EXPORTER=none
+
 COPY --from=certs /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt
 COPY --from=otelcol /etc_passwd /etc/passwd
 COPY --from=otelcol --chown=999 /otelcol /
 COPY --from=otelcol --chown=999 /translatesfx /
 COPY --from=otelcol --chown=999 /migratecheckpoint /
 COPY --from=otelcol --chown=999 /otel /etc/otel
 COPY --from=otelcol --chown=999 /otel/collector /etc/otel/collector
+COPY --from=otelcol --chown=999 /tmp/tmp /tmp
 COPY --from=agent-bundle --chown=999 /usr/lib/splunk-otel-collector /usr/lib/splunk-otel-collector
+COPY --from=jmx --chown=999 /tmp/opentelemetry-jmx-metrics.jar /opt/opentelemetry-java-contrib-jmx-metrics.jar
+
 
 COPY --from=journalctl --chown=999 /bin/journalctl /bin/journalctl
 COPY --from=journalctl --chown=999 /opt/journalctl /

cmd/otelcol/Dockerfile.windows

@@ -27,6 +27,25 @@ RUN Add-Type -AssemblyName System.IO.Compression.FileSystem ;\
     [System.IO.Compression.ZipFile]::ExtractToDirectory('agent-bundle_windows_amd64.zip', '.')
 RUN Remove-Item agent-bundle_windows_amd64.zip -force
 
+# Download JMX Metric Gatherer
+ARG JMX_METRIC_GATHERER_RELEASE
+RUN New-Item -Path "C:\\" -Name "opt" -ItemType "directory"
+RUN Invoke-WebRequest -Uri "https://github.com/open-telemetry/opentelemetry-java-contrib/releases/download/v${env:JMX_METRIC_GATHERER_RELEASE}/opentelemetry-jmx-metrics.jar" -Outfile "c:\opt\opentelemetry-java-contrib-jmx-metrics.jar"
+
+ARG JDK_VERSION="11.0.20_8"
+ARG OPENJDK_BASE_URL="https://github.com/adoptium/temurin11-binaries/releases/download"
+ENV JAVA_HOME="C:\java\jre"
+ENV JAVA_PATH="$JAVA_HOME\bin"
+RUN Set-Variable -Name "ENCODED_VER" -Value "\"$env:JDK_VERSION\".replace(\"_\", \"%2B\")"; \
+    Invoke-WebRequest -Uri "${env:OPENJDK_BASE_URL}/jdk-${ENCODED_VER}/OpenJDK11U-jre_x64_windows_hotspot_${env:JDK_VERSION}.zip" -OutFile "openjdk_jre.zip" ; \
+    Expand-Archive "openjdk_jre.zip" -DestinationPath "C:\java" ;
+RUN Move-Item -Path C:\java\jdk-* -Destination ${Env:JAVA_HOME}
+RUN Remove-Item "openjdk_jre.zip" -force
+RUN setx /M PATH $(${Env:PATH} + \";${Env:JAVA_PATH}\")
+# update otel-java/autoconfigure defaults to prevent undesired telemetry
+RUN setx /M OTEL_TRACES_EXPORTER "none"
+RUN setx /M OTEL_LOGS_EXPORTER "none"
+
 # Setting environment variables
 ENV SPLUNK_BUNDLE_DIR="C:\Program Files\Splunk\OpenTelemetry Collector\agent-bundle"
 ENV SPLUNK_CONFIG="C:\ProgramData\Splunk\OpenTelemetry Collector\gateway_config.yaml"

go.mod

@@ -57,7 +57,7 @@ require (
 	github.com/open-telemetry/opentelemetry-collector-contrib/receiver/fluentforwardreceiver v0.83.0
 	github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver v0.83.0
 	github.com/open-telemetry/opentelemetry-collector-contrib/receiver/jaegerreceiver v0.83.0
-	github.com/open-telemetry/opentelemetry-collector-contrib/receiver/jmxreceiver v0.83.0
+	github.com/open-telemetry/opentelemetry-collector-contrib/receiver/jmxreceiver v0.83.1-0.20230824192551-2c559459cf6c
 	github.com/open-telemetry/opentelemetry-collector-contrib/receiver/journaldreceiver v0.83.0
 	github.com/open-telemetry/opentelemetry-collector-contrib/receiver/k8sclusterreceiver v0.83.0
 	github.com/open-telemetry/opentelemetry-collector-contrib/receiver/k8seventsreceiver v0.83.0
@@ -306,7 +306,7 @@ require (
 	github.com/google/go-cmp v0.5.9
 	github.com/google/go-querystring v1.1.0 // indirect
 	github.com/google/gofuzz v1.2.0 // indirect
-	github.com/google/uuid v1.3.0 // indirect
+	github.com/google/uuid v1.3.1 // indirect
 	github.com/googleapis/enterprise-certificate-proxy v0.2.5 // indirect
 	github.com/googleapis/gax-go/v2 v2.12.0 // indirect
 	github.com/gophercloud/gophercloud v1.5.0 // indirect

go.sum

@@ -633,8 +633,8 @@ github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm4
 github.com/google/s2a-go v0.1.4 h1:1kZ/sQM3srePvKs3tXAvQzo66XfcReoqFpIpIccE7Oc=
 github.com/google/s2a-go v0.1.4/go.mod h1:Ej+mSEMGRnqRzjc7VtF+jdBwYG5fuJfiZ8ELkjEwM0A=
 github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
-github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I=
-github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/google/uuid v1.3.1 h1:KjJaJ9iWZ3jOFZIf1Lqf4laDRCasjl0BCmnEGxkdLb4=
+github.com/google/uuid v1.3.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/googleapis/enterprise-certificate-proxy v0.2.5 h1:UR4rDjcgpgEnqpIEvkiqTYKBCKLNmlge2eVjoZfySzM=
 github.com/googleapis/enterprise-certificate-proxy v0.2.5/go.mod h1:RxW0N9901Cko1VOCW3SXCpWP+mlIEkk2tP7jnHy9a3w=
 github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg=
@@ -1246,8 +1246,8 @@ github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsre
 github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver v0.83.0/go.mod h1:BtoPj2YDHhWy8LRxlWWjK+vOu3MJ6r8pRW56eJ7fk+g=
 github.com/open-telemetry/opentelemetry-collector-contrib/receiver/jaegerreceiver v0.83.0 h1:wu0ZdOTDqjl0Ug6J7rAO43GIe7nW/hvPXZ/Kcs7Hmis=
 github.com/open-telemetry/opentelemetry-collector-contrib/receiver/jaegerreceiver v0.83.0/go.mod h1:qhWK3ADYGvYaS54XbaH6yK8/iPGQLtimdtIcXevTLkw=
-github.com/open-telemetry/opentelemetry-collector-contrib/receiver/jmxreceiver v0.83.0 h1:5ix9FlAdeMWdGcWgoXoDswZj6UknsVi4aner2igA/+s=
-github.com/open-telemetry/opentelemetry-collector-contrib/receiver/jmxreceiver v0.83.0/go.mod h1:rZVBP7d3WfsXWv47HsG0zF97WBkcHseJpnIsNPq/cIA=
+github.com/open-telemetry/opentelemetry-collector-contrib/receiver/jmxreceiver v0.83.1-0.20230824192551-2c559459cf6c h1:DBhqI71lEBTLbejLNshua+5C3zDE8lMbIGhFXMH+qAM=
+github.com/open-telemetry/opentelemetry-collector-contrib/receiver/jmxreceiver v0.83.1-0.20230824192551-2c559459cf6c/go.mod h1:MSmgdhxc1dbbMQq6/cW/YPPfxd/92L03feKoqigR1nA=
 github.com/open-telemetry/opentelemetry-collector-contrib/receiver/journaldreceiver v0.83.0 h1:e2P2HmEgHf81QIVllRitiueDxxVj3C7Ph++hxXBodmY=
 github.com/open-telemetry/opentelemetry-collector-contrib/receiver/journaldreceiver v0.83.0/go.mod h1:Ota92x/vC7FBTvP6l6gCe5Ftq1YTP0yg/mp2nrNFyv0=
 github.com/open-telemetry/opentelemetry-collector-contrib/receiver/k8sclusterreceiver v0.83.0 h1:NSW1bxQ1J48dnT5MZvRqZMWsZi/cYCQUekp4nB8SJ4I=

internal/buildscripts/packaging/fpm/Dockerfile

@@ -14,4 +14,4 @@ RUN /install-deps.sh
 
 RUN git config --global --add safe.directory /repo
 
-CMD ./internal/buildscripts/packaging/fpm/$PACKAGE/build.sh "$VERSION" "$ARCH" "$OUTPUT_DIR"
+CMD ./internal/buildscripts/packaging/fpm/$PACKAGE/build.sh "$VERSION" "$ARCH" "$OUTPUT_DIR" "$JMX_METRIC_GATHERER_RELEASE"

internal/buildscripts/packaging/fpm/common.sh

@@ -41,6 +41,7 @@ SERVICE_INSTALL_PATH="/lib/systemd/system/$SERVICE_NAME.service"
 
 FLUENTD_CONFIG_INSTALL_DIR="/etc/otel/collector/fluentd"
 
+JMX_METRIC_GATHERER_RELEASE_PATH="${FPM_DIR}/../jmx-metric-gatherer-release.txt"
 BUNDLE_BASE_DIR="/usr/lib/splunk-otel-collector"
 AGENT_BUNDLE_INSTALL_DIR="$BUNDLE_BASE_DIR/agent-bundle"
 
@@ -67,6 +68,17 @@ create_user_group() {
         sudo useradd --system --user-group --no-create-home --shell /sbin/nologin $SERVICE_USER
 }
 
+download_jmx_metric_gatherer() {
+    local version="$1"
+    local buildroot="$2"
+
+    JMX_METRIC_GATHERER_RELEASE_DL_URL="https://github.com/open-telemetry/opentelemetry-java-contrib/releases/download/v$version/opentelemetry-jmx-metrics.jar"
+    mkdir -p "$buildroot/opt"
+
+    echo "Downloading ${JMX_METRIC_GATHERER_RELEASE_DL_URL}"
+    curl -sL "$JMX_METRIC_GATHERER_RELEASE_DL_URL" -o "$buildroot/opt/opentelemetry-java-contrib-jmx-metrics.jar"
+}
+
 setup_files_and_permissions() {
     local otelcol="$1"
     local translatesfx="$2"
@@ -104,4 +116,10 @@ setup_files_and_permissions() {
         sudo chown -R $SERVICE_USER:$SERVICE_GROUP "$buildroot/$BUNDLE_BASE_DIR"
         sudo chmod -R 755 "$buildroot/$BUNDLE_BASE_DIR"
     fi
+
+    JMX_INSTALL_PATH="$buildroot/opt/opentelemetry-java-contrib-jmx-metrics.jar"
+    if [[ -e "$JMX_INSTALL_PATH" ]]; then
+        sudo chown root:root "$JMX_INSTALL_PATH"
+        sudo chmod 755 "$JMX_INSTALL_PATH"
+    fi
 }

internal/buildscripts/packaging/fpm/deb/build.sh

@@ -22,18 +22,25 @@ SCRIPT_DIR="$( cd "$( dirname ${BASH_SOURCE[0]} )" && pwd )"
 VERSION="${1:-}"
 ARCH="${2:-amd64}"
 OUTPUT_DIR="${3:-$REPO_DIR/dist}"
+JMX_METRIC_GATHERER_RELEASE="${4:-}"
 
 if [[ -z "$VERSION" ]]; then
     VERSION="$( get_version )"
 fi
 VERSION="${VERSION#v}"
 
+if [[ -z "$JMX_METRIC_GATHERER_RELEASE" ]]; then
+    JMX_METRIC_GATHERER_RELEASE="$(cat $JMX_METRIC_GATHERER_RELEASE_PATH)"
+fi
+
 otelcol_path="$REPO_DIR/bin/otelcol_linux_${ARCH}"
 translatesfx_path="$REPO_DIR/bin/translatesfx_linux_${ARCH}"
 agent_bundle_path="$REPO_DIR/dist/agent-bundle_linux_${ARCH}.tar.gz"
 
 buildroot="$(mktemp -d)"
 
+download_jmx_metric_gatherer "$JMX_METRIC_GATHERER_RELEASE" "$buildroot"
+
 setup_files_and_permissions "$otelcol_path" "$translatesfx_path" "$buildroot" "$agent_bundle_path"
 
 mkdir -p "$OUTPUT_DIR"

internal/buildscripts/packaging/fpm/rpm/build.sh

@@ -22,6 +22,7 @@ SCRIPT_DIR="$( cd "$( dirname ${BASH_SOURCE[0]} )" && pwd )"
 VERSION="${1:-}"
 ARCH="${2:-amd64}"
 OUTPUT_DIR="${3:-$REPO_DIR/dist}"
+JMX_METRIC_GATHERER_RELEASE="${4:-}"
 
 if [[ -z "$VERSION" ]]; then
     VERSION="$( get_version )"
@@ -31,6 +32,10 @@ fi
 VERSION="${VERSION/'-'/'~'}"
 VERSION="${VERSION#v}"
 
+if [[ -z "$JMX_METRIC_GATHERER_RELEASE" ]]; then
+    JMX_METRIC_GATHERER_RELEASE="$(cat $JMX_METRIC_GATHERER_RELEASE_PATH)"
+fi
+
 otelcol_path="$REPO_DIR/bin/otelcol_linux_${ARCH}"
 translatesfx_path="$REPO_DIR/bin/translatesfx_linux_${ARCH}"
 agent_bundle_path="$REPO_DIR/dist/agent-bundle_linux_${ARCH}.tar.gz"
@@ -43,6 +48,8 @@ elif [[ "$ARCH" = "amd64" ]]; then
     ARCH="x86_64"
 fi
 
+download_jmx_metric_gatherer "$JMX_METRIC_GATHERER_RELEASE" "$buildroot"
+
 setup_files_and_permissions "$otelcol_path" "$translatesfx_path" "$buildroot" "$agent_bundle_path"
 
 mkdir -p "$OUTPUT_DIR"

internal/buildscripts/packaging/jmx-metric-gatherer-release.txt

@@ -0,0 +1 @@
+1.29.0

internal/buildscripts/packaging/msi/build.sh

@@ -18,9 +18,11 @@ set -euxo pipefail
 
 SCRIPT_DIR="$( cd "$( dirname ${BASH_SOURCE[0]} )" && pwd )"
 REPO_DIR="$( cd "$SCRIPT_DIR/../../../../" && pwd )"
+JMX_METRIC_GATHERER_RELEASE_PATH="${SCRIPT_DIR}/../jmx-metric-gatherer-release.txt"
 
 VERSION="${1:-}"
 DOCKER_REPO="${2:-docker.io}"
+JMX_METRIC_GATHERER_RELEASE="${3:-}"
 
 get_version() {
     commit_tag="$( git -C "$REPO_DIR" describe --abbrev=0 --tags --exact-match --match 'v[0-9]*' 2>/dev/null || true )"
@@ -36,6 +38,10 @@ get_version() {
     fi
 }
 
+if [ -z "$JMX_METRIC_GATHERER_RELEASE" ]; then
+    JMX_METRIC_GATHERER_RELEASE=$(cat "$JMX_METRIC_GATHERER_RELEASE_PATH")
+fi
+
 if [ -z "$VERSION" ]; then
     VERSION="$( get_version )"
 fi
@@ -44,6 +50,7 @@ docker build -t msi-builder --build-arg DOCKER_REPO="$DOCKER_REPO" -f "${SCRIPT_
 docker rm -fv msi-builder 2>/dev/null || true
 docker run -d --name msi-builder msi-builder sleep inf
 docker exec \
+    -e JMX_METRIC_GATHERER_RELEASE="${JMX_METRIC_GATHERER_RELEASE}" \
     -e OUTPUT_DIR=/project/dist \
     -e VERSION="${VERSION#v}" \
     msi-builder /docker-entrypoint.sh

internal/buildscripts/packaging/msi/msi-builder/Dockerfile

@@ -53,6 +53,7 @@ RUN cp /project/internal/buildscripts/packaging/msi/msi-builder/docker-entrypoin
     chmod a+x /docker-entrypoint.sh
 
 ENV OUTPUT_DIR=/project/dist
+ENV JMX_METRIC_GATHERER_RELEASE=1.28.0
 ENV VERSION=""
 
 WORKDIR /work