Skip to content

Commit 9d27d9e

Browse files
authored
Update jmx-metric-gatherer jar (#4201)
* update jmx-metric-gatherer jar * changelog * run test workflows on jmx-metric change * update msi build
1 parent ab82a7e commit 9d27d9e

File tree

6 files changed

+20
-9
lines changed

6 files changed

+20
-9
lines changed

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ on:
1111
- 'internal/buildscripts/packaging/collect-libs.sh'
1212
- 'internal/buildscripts/packaging/fpm/**'
1313
- 'internal/buildscripts/packaging/installer/install.sh'
14+
- 'internal/buildscripts/packaging/jmx-metric-gatherer-release.txt'
1415
- 'internal/buildscripts/packaging/tests/helpers/**'
1516
- 'internal/buildscripts/packaging/tests/images/**'
1617
- 'internal/buildscripts/packaging/tests/package_test.py'

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ on:
1111
- 'cmd/otelcol/**'
1212
- 'internal/buildscripts/packaging/choco/**'
1313
- 'internal/buildscripts/packaging/installer/install.ps1'
14+
- 'internal/buildscripts/packaging/jmx-metric-gatherer-release.txt'
1415
- 'internal/buildscripts/packaging/msi/**'
1516
- 'internal/signalfx-agent/bundle/**'
1617
- 'Makefile'

CHANGELOG.md

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@
22

33
## Unreleased
44

5+
### 💡 Enhancements 💡
6+
7+
- (Splunk) Update opentelemetry-jmx-metrics version to 1.32.0 ([#4201](https://github.com/signalfx/splunk-otel-collector/pull/4201))
8+
59
### 🛑 Breaking changes 🛑
610

711
- (Splunk) On Windows the `SPLUNK_*` environment variables were moved from the machine scope to the collector service scope. This avoids collisions with other agents and instrumentation. If any of these environment variables are required by your apps, please adopt them directly. ([#3930](https://github.com/signalfx/splunk-otel-collector/pull/3930))
@@ -67,7 +71,7 @@ This Splunk OpenTelemetry Collector release includes changes from the [opentelem
6771
- (Core) `confignet`: Add `dialer_timeout` config option. ([#9066](https://github.com/open-telemetry/opentelemetry-collector/pull/9066))
6872
- (Core) `processor/memory_limiter`: Update config validation errors ([#9059](https://github.com/open-telemetry/opentelemetry-collector/pull/9059))
6973
- Fix names of the config fields that are validated in the error messages
70-
- Move the validation from start to the initialization phrase
74+
- Move the validation from start to the initialization phrase
7175
- (Core) `exporterhelper`: Add config Validate for TimeoutSettings ([#9104](https://github.com/open-telemetry/opentelemetry-collector/pull/9104))
7276

7377
### 🧰 Bug fixes 🧰
@@ -99,7 +103,7 @@ This Splunk OpenTelemetry Collector release includes changes from the [opentelem
99103
- (Splunk) - `ecs-metadata` sync the `known_status` property on the `container_id` dimension instead of lower cardinality `container_name`. This can be prevented by configuring `dimensionToUpdate` to `container_name` ([#4091](https://github.com/signalfx/splunk-otel-collector/pull/4091))
100104
- (Splunk) Removes `collectd/disk` monitor ([#3998](https://github.com/signalfx/splunk-otel-collector/pull/3998))
101105
This monitor has been deprecated in favor of the `disk-io` monitor.
102-
Note that the `disk-io` monitor has a different dimension (`disk`
106+
Note that the `disk-io` monitor has a different dimension (`disk`
103107
instead of `plugin_instance`) to specify the disk.
104108
- (Splunk) Removes `collectd/df` monitor ([#3996](https://github.com/signalfx/splunk-otel-collector/pull/3996))
105109
The monitor is deprecated and the filesystems monitor should be used instead.
@@ -240,16 +244,16 @@ This Splunk OpenTelemetry Collector release includes changes from the [opentelem
240244

241245
### 🛑 Breaking changes 🛑
242246

243-
- (Contrib) `pkg/stanza`/`receiver/windowseventlog`: Improve parsing of Windows Event XML by handling anonymous `Data` elements. ([#21491](https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/21491))
247+
- (Contrib) `pkg/stanza`/`receiver/windowseventlog`: Improve parsing of Windows Event XML by handling anonymous `Data` elements. ([#21491](https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/21491))
244248
This improves the contents of Windows log events for which the publisher manifest is unavailable. Previously, anonymous `Data` elements were ignored. This is a breaking change for users who were relying on the previous data format.
245249

246-
- (Contrib) `processor/k8sattributes`: Graduate "k8sattr.rfc3339" feature gate to Beta. ([#28817](https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/28817))
250+
- (Contrib) `processor/k8sattributes`: Graduate "k8sattr.rfc3339" feature gate to Beta. ([#28817](https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/28817))
247251
Time format of `k8s.pod.start_time` attribute value migrated from RFC3339:
248252
Before: 2023-07-10 12:34:39.740638 -0700 PDT m=+0.020184946
249253
After: 2023-07-10T12:39:53.112485-07:00
250254
The feature gate can be temporary reverted back by adding `--feature-gate=-k8sattr.rfc3339` to the command line.
251255

252-
- (Contrib) `receiver/filelogreceiver`: Change "Started watching file" log behavior ([#28491](https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/28491))
256+
- (Contrib) `receiver/filelogreceiver`: Change "Started watching file" log behavior ([#28491](https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/28491))
253257
Previously, every unique file path which was found by the receiver would be remembered indefinitely.
254258
This list was kept independently of the uniqueness / checkpointing mechanism (which does not rely on the file path).
255259
The purpose of this list was to allow us to emit a log whenever a path was seen for the first time.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.29.0
1+
1.32.0

internal/buildscripts/packaging/msi/build.sh

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,11 +46,14 @@ if [ -z "$VERSION" ]; then
4646
VERSION="$( get_version )"
4747
fi
4848

49-
docker build -t msi-builder --build-arg DOCKER_REPO="$DOCKER_REPO" -f "${SCRIPT_DIR}/msi-builder/Dockerfile" "$REPO_DIR"
49+
docker build -t msi-builder \
50+
--build-arg JMX_METRIC_GATHERER_RELEASE="${JMX_METRIC_GATHERER_RELEASE}" \
51+
--build-arg DOCKER_REPO="$DOCKER_REPO" \
52+
-f "${SCRIPT_DIR}/msi-builder/Dockerfile" \
53+
"$REPO_DIR"
5054
docker rm -fv msi-builder 2>/dev/null || true
5155
docker run -d --name msi-builder msi-builder sleep inf
5256
docker exec \
53-
-e JMX_METRIC_GATHERER_RELEASE="${JMX_METRIC_GATHERER_RELEASE}" \
5457
-e OUTPUT_DIR=/project/dist \
5558
-e VERSION="${VERSION#v}" \
5659
msi-builder /docker-entrypoint.sh

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,8 @@ RUN wine wineboot && \
3838

3939
FROM wix as msi-builder
4040

41+
ARG JMX_METRIC_GATHERER_RELEASE
42+
4143
USER root
4244
RUN apt-get update -y
4345
RUN apt-get install -y curl unzip
@@ -52,7 +54,7 @@ RUN cp /project/internal/buildscripts/packaging/msi/msi-builder/docker-entrypoin
5254
chmod a+x /docker-entrypoint.sh
5355

5456
ENV OUTPUT_DIR=/project/dist
55-
ENV JMX_METRIC_GATHERER_RELEASE=1.29.0
57+
ENV JMX_METRIC_GATHERER_RELEASE=${JMX_METRIC_GATHERER_RELEASE}
5658
ENV VERSION=""
5759

5860
WORKDIR /work

0 commit comments

Comments
 (0)