From 4436196d37aaffe894ae857a90a3e0a5e7195f3a Mon Sep 17 00:00:00 2001 From: Jina Jain Date: Thu, 25 Jan 2024 10:49:12 -0800 Subject: [PATCH 1/4] update jmx-metric-gatherer jar --- internal/buildscripts/packaging/jmx-metric-gatherer-release.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/buildscripts/packaging/jmx-metric-gatherer-release.txt b/internal/buildscripts/packaging/jmx-metric-gatherer-release.txt index 72f3c1dacc..860251185a 100644 --- a/internal/buildscripts/packaging/jmx-metric-gatherer-release.txt +++ b/internal/buildscripts/packaging/jmx-metric-gatherer-release.txt @@ -1 +1 @@ -1.29.0 \ No newline at end of file +1.32.0 \ No newline at end of file From 171baa0d6fe94a283b32a61c99e43ad9c2bf13c5 Mon Sep 17 00:00:00 2001 From: Jina Jain Date: Thu, 25 Jan 2024 10:54:54 -0800 Subject: [PATCH 2/4] changelog --- CHANGELOG.md | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9880b43b06..2df094d553 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,10 @@ ## Unreleased +### 💡 Enhancements 💡 + +- (Splunk) Update opentelemetry-jmx-metrics version to 1.32.0 ([#4201](https://github.com/signalfx/splunk-otel-collector/pull/4201)) + ### 🛑 Breaking changes 🛑 - (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 - (Core) `confignet`: Add `dialer_timeout` config option. ([#9066](https://github.com/open-telemetry/opentelemetry-collector/pull/9066)) - (Core) `processor/memory_limiter`: Update config validation errors ([#9059](https://github.com/open-telemetry/opentelemetry-collector/pull/9059)) - Fix names of the config fields that are validated in the error messages - - Move the validation from start to the initialization phrase + - Move the validation from start to the initialization phrase - (Core) `exporterhelper`: Add config Validate for TimeoutSettings ([#9104](https://github.com/open-telemetry/opentelemetry-collector/pull/9104)) ### 🧰 Bug fixes 🧰 @@ -99,7 +103,7 @@ This Splunk OpenTelemetry Collector release includes changes from the [opentelem - (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)) - (Splunk) Removes `collectd/disk` monitor ([#3998](https://github.com/signalfx/splunk-otel-collector/pull/3998)) This monitor has been deprecated in favor of the `disk-io` monitor. - Note that the `disk-io` monitor has a different dimension (`disk` + Note that the `disk-io` monitor has a different dimension (`disk` instead of `plugin_instance`) to specify the disk. - (Splunk) Removes `collectd/df` monitor ([#3996](https://github.com/signalfx/splunk-otel-collector/pull/3996)) 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 ### 🛑 Breaking changes 🛑 -- (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)) +- (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)) 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. -- (Contrib) `processor/k8sattributes`: Graduate "k8sattr.rfc3339" feature gate to Beta. ([#28817](https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/28817)) +- (Contrib) `processor/k8sattributes`: Graduate "k8sattr.rfc3339" feature gate to Beta. ([#28817](https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/28817)) Time format of `k8s.pod.start_time` attribute value migrated from RFC3339: Before: 2023-07-10 12:34:39.740638 -0700 PDT m=+0.020184946 After: 2023-07-10T12:39:53.112485-07:00 The feature gate can be temporary reverted back by adding `--feature-gate=-k8sattr.rfc3339` to the command line. -- (Contrib) `receiver/filelogreceiver`: Change "Started watching file" log behavior ([#28491](https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/28491)) +- (Contrib) `receiver/filelogreceiver`: Change "Started watching file" log behavior ([#28491](https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/28491)) Previously, every unique file path which was found by the receiver would be remembered indefinitely. This list was kept independently of the uniqueness / checkpointing mechanism (which does not rely on the file path). The purpose of this list was to allow us to emit a log whenever a path was seen for the first time. From 52ff17936559e071bae418567cbe4ae8e81d72d7 Mon Sep 17 00:00:00 2001 From: Jina Jain Date: Thu, 25 Jan 2024 11:42:45 -0800 Subject: [PATCH 3/4] run test workflows on jmx-metric change --- .github/workflows/linux-package-test.yml | 1 + .github/workflows/win-package-test.yml | 1 + 2 files changed, 2 insertions(+) diff --git a/.github/workflows/linux-package-test.yml b/.github/workflows/linux-package-test.yml index 4a0bd0656b..f2901fe783 100644 --- a/.github/workflows/linux-package-test.yml +++ b/.github/workflows/linux-package-test.yml @@ -11,6 +11,7 @@ on: - 'internal/buildscripts/packaging/collect-libs.sh' - 'internal/buildscripts/packaging/fpm/**' - 'internal/buildscripts/packaging/installer/install.sh' + - 'internal/buildscripts/packaging/jmx-metric-gatherer-release.txt' - 'internal/buildscripts/packaging/tests/helpers/**' - 'internal/buildscripts/packaging/tests/images/**' - 'internal/buildscripts/packaging/tests/package_test.py' diff --git a/.github/workflows/win-package-test.yml b/.github/workflows/win-package-test.yml index 4fdebd9afb..4fc0abe692 100644 --- a/.github/workflows/win-package-test.yml +++ b/.github/workflows/win-package-test.yml @@ -11,6 +11,7 @@ on: - 'cmd/otelcol/**' - 'internal/buildscripts/packaging/choco/**' - 'internal/buildscripts/packaging/installer/install.ps1' + - 'internal/buildscripts/packaging/jmx-metric-gatherer-release.txt' - 'internal/buildscripts/packaging/msi/**' - 'internal/signalfx-agent/bundle/**' - 'Makefile' From 63fab4a913b818cb605b2afdd7dff1eabb33d5c0 Mon Sep 17 00:00:00 2001 From: Jina Jain Date: Thu, 25 Jan 2024 13:13:35 -0800 Subject: [PATCH 4/4] update msi build --- internal/buildscripts/packaging/msi/build.sh | 7 +++++-- internal/buildscripts/packaging/msi/msi-builder/Dockerfile | 4 +++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/internal/buildscripts/packaging/msi/build.sh b/internal/buildscripts/packaging/msi/build.sh index 78f354e477..bbd57eab81 100755 --- a/internal/buildscripts/packaging/msi/build.sh +++ b/internal/buildscripts/packaging/msi/build.sh @@ -46,11 +46,14 @@ if [ -z "$VERSION" ]; then VERSION="$( get_version )" fi -docker build -t msi-builder --build-arg DOCKER_REPO="$DOCKER_REPO" -f "${SCRIPT_DIR}/msi-builder/Dockerfile" "$REPO_DIR" +docker build -t msi-builder \ + --build-arg JMX_METRIC_GATHERER_RELEASE="${JMX_METRIC_GATHERER_RELEASE}" \ + --build-arg DOCKER_REPO="$DOCKER_REPO" \ + -f "${SCRIPT_DIR}/msi-builder/Dockerfile" \ + "$REPO_DIR" 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 diff --git a/internal/buildscripts/packaging/msi/msi-builder/Dockerfile b/internal/buildscripts/packaging/msi/msi-builder/Dockerfile index 6ad166de84..78a38b53d7 100644 --- a/internal/buildscripts/packaging/msi/msi-builder/Dockerfile +++ b/internal/buildscripts/packaging/msi/msi-builder/Dockerfile @@ -38,6 +38,8 @@ RUN wine wineboot && \ FROM wix as msi-builder +ARG JMX_METRIC_GATHERER_RELEASE + USER root RUN apt-get update -y RUN apt-get install -y curl unzip @@ -52,7 +54,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.29.0 +ENV JMX_METRIC_GATHERER_RELEASE=${JMX_METRIC_GATHERER_RELEASE} ENV VERSION="" WORKDIR /work