Skip to content

Commit 70ee441

Browse files
Update jmx-metric-gatherer to latest (#4851)
* Update jmx-metric-gatherer to latest * strip v from url as it is present in the tag name --------- Co-authored-by: Antoine Toulme <[email protected]>
1 parent 9202225 commit 70ee441

File tree

5 files changed

+5
-5
lines changed

5 files changed

+5
-5
lines changed

cmd/otelcol/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ RUN if [[ "$ARCH" = "amd64" || "$ARCH" = "arm64" ]]; then \
3838
FROM ${DOCKER_REPO}/alpine:3.17.0 AS jmx
3939
ARG JMX_METRIC_GATHERER_RELEASE
4040
RUN JMX_METRICS_JAR=opentelemetry-jmx-metrics.jar && \
41-
URL=https://github.com/open-telemetry/opentelemetry-java-contrib/releases/download/v${JMX_METRIC_GATHERER_RELEASE}/${JMX_METRICS_JAR} && \
41+
URL=https://github.com/open-telemetry/opentelemetry-java-contrib/releases/download/${JMX_METRIC_GATHERER_RELEASE}/${JMX_METRICS_JAR} && \
4242
cd /tmp && wget "$URL";
4343

4444
FROM ${DOCKER_REPO}/debian:11.5 as journalctl

cmd/otelcol/Dockerfile.windows

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ RUN Remove-Item agent-bundle_windows_amd64.zip -force
2828
# Download JMX Metric Gatherer
2929
ARG JMX_METRIC_GATHERER_RELEASE
3030
RUN New-Item -Path "C:\\" -Name "opt" -ItemType "directory"
31-
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"
31+
RUN Invoke-WebRequest -Uri "https://github.com/open-telemetry/opentelemetry-java-contrib/releases/download/${env:JMX_METRIC_GATHERER_RELEASE}/opentelemetry-jmx-metrics.jar" -Outfile "c:\opt\opentelemetry-java-contrib-jmx-metrics.jar"
3232

3333
ARG JDK_VERSION="11.0.23_9"
3434
ARG OPENJDK_BASE_URL="https://github.com/adoptium/temurin11-binaries/releases/download"

internal/buildscripts/packaging/fpm/common.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ download_jmx_metric_gatherer() {
7171
local version="$1"
7272
local buildroot="$2"
7373

74-
JMX_METRIC_GATHERER_RELEASE_DL_URL="https://github.com/open-telemetry/opentelemetry-java-contrib/releases/download/v$version/opentelemetry-jmx-metrics.jar"
74+
JMX_METRIC_GATHERER_RELEASE_DL_URL="https://github.com/open-telemetry/opentelemetry-java-contrib/releases/download/$version/opentelemetry-jmx-metrics.jar"
7575
mkdir -p "$buildroot/opt"
7676

7777
echo "Downloading ${JMX_METRIC_GATHERER_RELEASE_DL_URL}"
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.32.0
1+
v1.35.0

internal/buildscripts/packaging/msi/msi-builder/build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@ download_jmx_metric_gatherer() {
198198
local version="$1"
199199
local build_dir="$2"
200200
jmx_filename="opentelemetry-java-contrib-jmx-metrics.jar"
201-
JMX_METRIC_GATHERER_RELEASE_DL_URL="https://github.com/open-telemetry/opentelemetry-java-contrib/releases/download/v$version/opentelemetry-jmx-metrics.jar"
201+
JMX_METRIC_GATHERER_RELEASE_DL_URL="https://github.com/open-telemetry/opentelemetry-java-contrib/releases/download/$version/opentelemetry-jmx-metrics.jar"
202202
echo "Downloading ${JMX_METRIC_GATHERER_RELEASE_DL_URL}"
203203

204204
mkdir -p "${build_dir}"

0 commit comments

Comments
 (0)