diff --git a/.github/workflows/auto-instrumentation.yml b/.github/workflows/auto-instrumentation.yml index db8f39e44f..20133af796 100644 --- a/.github/workflows/auto-instrumentation.yml +++ b/.github/workflows/auto-instrumentation.yml @@ -26,8 +26,7 @@ env: jobs: cross-compile: - # Use 20.04.5 until https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/16450 is resolved - runs-on: ubuntu-20.04 + runs-on: ubuntu-24.04 strategy: matrix: SYS_BINARIES: [ "binaries-linux_amd64", "binaries-linux_arm64" ] @@ -53,7 +52,7 @@ jobs: ./bin/* build-package: - runs-on: ubuntu-20.04 + runs-on: ubuntu-24.04 strategy: matrix: SYS_PACKAGE: [ "deb", "rpm" ] @@ -83,7 +82,7 @@ jobs: path: ./instrumentation/dist/*.${{ matrix.SYS_PACKAGE }} test-package-matrix: - runs-on: ubuntu-20.04 + runs-on: ubuntu-24.04 steps: - name: Check out code uses: actions/checkout@v4 diff --git a/.github/workflows/bosh-release.yml b/.github/workflows/bosh-release.yml index 0bd46027fe..bb60cfd78a 100644 --- a/.github/workflows/bosh-release.yml +++ b/.github/workflows/bosh-release.yml @@ -19,8 +19,7 @@ jobs: test: name: Test Bosh Release Creation - # Use 20.04.5 until https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/16450 is resolved - runs-on: ubuntu-20.04 + runs-on: ubuntu-24.04 steps: - name: Check out the codebase. uses: actions/checkout@v4 diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index 7bd4349e37..9eef3b97f4 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -30,8 +30,7 @@ env: jobs: setup-environment: name: setup-environment - # Use 20.04.5 until https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/16450 is resolved - runs-on: ubuntu-20.04 + runs-on: ubuntu-24.04 steps: - name: Check out the codebase. uses: actions/checkout@v4 @@ -48,8 +47,7 @@ jobs: tidy: name: tidy - # Use 20.04.5 until https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/16450 is resolved - runs-on: ubuntu-20.04 + runs-on: ubuntu-24.04 needs: [setup-environment] steps: - name: Check out the codebase. @@ -72,8 +70,7 @@ jobs: gofmt: name: gofmt - # Use 20.04.5 until https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/16450 is resolved - runs-on: ubuntu-20.04 + runs-on: ubuntu-24.04 needs: [setup-environment] steps: - name: Check out the codebase. @@ -96,8 +93,7 @@ jobs: generate-metrics: name: generate-metrics - # Use 20.04.5 until https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/16450 is resolved - runs-on: ubuntu-20.04 + runs-on: ubuntu-24.04 needs: [setup-environment] steps: - name: Check out the codebase. @@ -122,8 +118,7 @@ jobs: lint: name: lint - # Use 20.04.5 until https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/16450 is resolved - runs-on: ubuntu-20.04 + runs-on: ubuntu-24.04 needs: [setup-environment] steps: - name: Check out the codebase. @@ -149,8 +144,7 @@ jobs: test: name: test - # Use 20.04.5 until https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/16450 is resolved - runs-on: ubuntu-20.04 + runs-on: ubuntu-24.04 needs: [setup-environment] steps: - name: Check out the codebase. @@ -186,8 +180,7 @@ jobs: coverage: name: coverage - # Use 20.04.5 until https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/16450 is resolved - runs-on: ubuntu-20.04 + runs-on: ubuntu-24.04 needs: [setup-environment] steps: - name: Check out the codebase. @@ -212,8 +205,7 @@ jobs: cross-compile: name: cross-compile - # Use 20.04.5 until https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/16450 is resolved - runs-on: ubuntu-20.04 + runs-on: ubuntu-24.04 needs: [setup-environment] strategy: matrix: diff --git a/.github/workflows/cloudfoundry_buildpack.yml b/.github/workflows/cloudfoundry_buildpack.yml index 1d8a00d03d..9848b1a44f 100644 --- a/.github/workflows/cloudfoundry_buildpack.yml +++ b/.github/workflows/cloudfoundry_buildpack.yml @@ -19,8 +19,7 @@ jobs: test: name: Test buildpack supplies required dependencies - # Use 20.04.5 until https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/16450 is resolved - runs-on: ubuntu-20.04 + runs-on: ubuntu-24.04 steps: - name: Check out the codebase. uses: actions/checkout@v4 diff --git a/.github/workflows/gendependabot.yml b/.github/workflows/gendependabot.yml index bed53d72c7..870b804e6d 100644 --- a/.github/workflows/gendependabot.yml +++ b/.github/workflows/gendependabot.yml @@ -12,7 +12,7 @@ env: jobs: gendependabot: - runs-on: ubuntu-20.04 + runs-on: ubuntu-24.04 steps: - uses: actions/checkout@v4 - uses: actions/setup-go@v5 diff --git a/.github/workflows/installer-script-test.yml b/.github/workflows/installer-script-test.yml index cee0f89723..1adf92dadf 100644 --- a/.github/workflows/installer-script-test.yml +++ b/.github/workflows/installer-script-test.yml @@ -21,7 +21,7 @@ concurrency: jobs: installer-test-matrix: - runs-on: ubuntu-20.04 + runs-on: ubuntu-24.04 steps: - name: Check out code uses: actions/checkout@v4 diff --git a/.github/workflows/integration-test.yml b/.github/workflows/integration-test.yml index 0ed724073b..b18b4a0e97 100644 --- a/.github/workflows/integration-test.yml +++ b/.github/workflows/integration-test.yml @@ -30,7 +30,7 @@ env: GO_VERSION: "1.22.7" jobs: agent-bundle-linux: - runs-on: ${{ fromJSON('["ubuntu-20.04", "otel-arm64"]')[matrix.ARCH == 'arm64'] }} + runs-on: ${{ fromJSON('["ubuntu-24.04", "otel-arm64"]')[matrix.ARCH == 'arm64'] }} strategy: matrix: ARCH: [ "amd64", "arm64" ] @@ -53,7 +53,7 @@ jobs: path: ./dist/agent-bundle_linux_${{ matrix.ARCH }}.tar.gz otelcol: - runs-on: ubuntu-20.04 + runs-on: ubuntu-24.04 strategy: matrix: ARCH: [ "amd64", "arm64", "ppc64le" ] @@ -74,8 +74,7 @@ jobs: docker-otelcol: name: docker-otelcol - # Use 20.04.5 until https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/16450 is resolved - runs-on: ubuntu-20.04 + runs-on: ubuntu-24.04 needs: [ "agent-bundle-linux", "otelcol" ] services: # Start a local registry for pushing the multiarch manifest and images @@ -139,8 +138,7 @@ jobs: integration-vet: name: integration-vet - # Use 20.04.5 until https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/16450 is resolved - runs-on: ubuntu-20.04 + runs-on: ubuntu-24.04 strategy: matrix: ARCH: [ "amd64", "arm64" ] @@ -175,8 +173,7 @@ jobs: SPLUNK_OTEL_COLLECTOR_IMAGE: 'otelcol:latest' integration-test-docker: - # Use 20.04.5 until https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/16450 is resolved - runs-on: ubuntu-20.04 + runs-on: ubuntu-24.04 needs: [ "docker-otelcol", "otelcol" ] strategy: matrix: @@ -333,7 +330,7 @@ jobs: retention-days: 5 integration-test-discovery-matrix: - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 outputs: matrix: ${{ steps.get-matrix.outputs.matrix }} steps: @@ -359,7 +356,7 @@ jobs: integration-test-discovery: name: integration-test-discovery - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 needs: [ "docker-otelcol", "otelcol", "integration-test-discovery-matrix" ] strategy: matrix: ${{ fromJSON(needs.integration-test-discovery-matrix.outputs.matrix) }} diff --git a/.github/workflows/lint-examples.yml b/.github/workflows/lint-examples.yml index 4052e6dc12..480a01a95a 100644 --- a/.github/workflows/lint-examples.yml +++ b/.github/workflows/lint-examples.yml @@ -19,8 +19,7 @@ env: jobs: lint: name: lint - # Use 20.04.5 until https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/16450 is resolved - runs-on: ubuntu-20.04 + runs-on: ubuntu-24.04 steps: - name: Check out the codebase. uses: actions/checkout@v4 diff --git a/.github/workflows/linux-package-test.yml b/.github/workflows/linux-package-test.yml index 8ad05e6aab..ff7a5cbd01 100644 --- a/.github/workflows/linux-package-test.yml +++ b/.github/workflows/linux-package-test.yml @@ -26,8 +26,7 @@ env: jobs: setup-environment: - # Use 20.04.5 until https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/16450 is resolved - runs-on: ubuntu-20.04 + runs-on: ubuntu-24.04 steps: - name: Check out the codebase. uses: actions/checkout@v4 @@ -43,8 +42,7 @@ jobs: make install-tools cross-compile: - # Use 20.04.5 until https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/16450 is resolved - runs-on: ubuntu-20.04 + runs-on: ubuntu-24.04 needs: [setup-environment] strategy: matrix: @@ -97,8 +95,7 @@ jobs: path: ./dist/agent-bundle_linux_${{ matrix.ARCH }}.tar.gz build-package: - # Use 20.04.5 until https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/16450 is resolved - runs-on: ubuntu-20.04 + runs-on: ubuntu-24.04 needs: [cross-compile, agent-bundle-linux] strategy: matrix: @@ -138,7 +135,7 @@ jobs: path: ./dist/splunk-otel-collector* test-package-matrix: - runs-on: ubuntu-20.04 + runs-on: ubuntu-24.04 steps: - name: Check out code uses: actions/checkout@v4 @@ -239,8 +236,7 @@ jobs: packaging/tests/package_test.py docker-otelcol: - # Use 20.04.5 until https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/16450 is resolved - runs-on: ubuntu-20.04 + runs-on: ubuntu-24.04 needs: [cross-compile, agent-bundle-linux] steps: # Multiarch images require more disk space @@ -312,8 +308,7 @@ jobs: path: ./docker-otelcol docker-otelcol-verify: - # Use 20.04.5 until https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/16450 is resolved - runs-on: ubuntu-20.04 + runs-on: ubuntu-24.04 needs: [docker-otelcol] strategy: matrix: diff --git a/.github/workflows/lychee.yml b/.github/workflows/lychee.yml index d97381e256..3e87ee106f 100644 --- a/.github/workflows/lychee.yml +++ b/.github/workflows/lychee.yml @@ -16,8 +16,7 @@ on: jobs: linkChecker: - # Use 20.04.5 until https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/16450 is resolved - runs-on: ubuntu-20.04 + runs-on: ubuntu-24.04 steps: - uses: actions/checkout@v4 - name: lychee Link Checker diff --git a/.github/workflows/puppet-test.yml b/.github/workflows/puppet-test.yml index cba51b6ae8..f567868923 100644 --- a/.github/workflows/puppet-test.yml +++ b/.github/workflows/puppet-test.yml @@ -34,8 +34,7 @@ env: jobs: puppet-lint: name: puppet-lint - # Use 20.04.5 until https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/16450 is resolved - runs-on: ubuntu-20.04 + runs-on: ubuntu-24.04 steps: - name: Check out the codebase. uses: actions/checkout@v4 @@ -46,8 +45,7 @@ jobs: puppet-rake-spec: name: puppet-rake-spec - # Use 20.04.5 until https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/16450 is resolved - runs-on: ubuntu-20.04 + runs-on: ubuntu-24.04 steps: - name: Check out the codebase. uses: actions/checkout@v4 @@ -57,7 +55,7 @@ jobs: make -C deployments/puppet rake-spec puppet-test-matrix: - runs-on: ubuntu-20.04 + runs-on: ubuntu-24.04 steps: - name: Check out code uses: actions/checkout@v4 diff --git a/.github/workflows/puppet.yml b/.github/workflows/puppet.yml index 60559eb8b9..7c289675c1 100644 --- a/.github/workflows/puppet.yml +++ b/.github/workflows/puppet.yml @@ -17,8 +17,7 @@ permissions: jobs: push-release-tag: name: Push Release Tag - # Use 20.04.5 until https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/16450 is resolved - runs-on: ubuntu-20.04 + runs-on: ubuntu-24.04 if: github.ref == 'refs/heads/main' steps: - name: Checkout diff --git a/.github/workflows/release-requirements.yml b/.github/workflows/release-requirements.yml index 61ae9ae4be..18f0b1a545 100644 --- a/.github/workflows/release-requirements.yml +++ b/.github/workflows/release-requirements.yml @@ -12,7 +12,7 @@ concurrency: jobs: install-requirements: - runs-on: ubuntu-20.04 + runs-on: ubuntu-24.04 steps: - name: Check out the codebase. uses: actions/checkout@v4 diff --git a/.github/workflows/salt-test.yml b/.github/workflows/salt-test.yml index 81a9b7fd2b..a50139b224 100644 --- a/.github/workflows/salt-test.yml +++ b/.github/workflows/salt-test.yml @@ -32,8 +32,7 @@ env: jobs: salt-lint-test: name: salt-lint-test - # Use 20.04.5 until https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/16450 is resolved - runs-on: ubuntu-20.04 + runs-on: ubuntu-24.04 steps: - name: Check out the codebase. uses: actions/checkout@v4 @@ -43,7 +42,7 @@ jobs: make -C deployments/salt lint salt-test-matrix: - runs-on: ubuntu-20.04 + runs-on: ubuntu-24.04 steps: - name: Check out code uses: actions/checkout@v4 diff --git a/.github/workflows/tanzu-tile.yml b/.github/workflows/tanzu-tile.yml index 3574c128aa..90d57d6d2c 100644 --- a/.github/workflows/tanzu-tile.yml +++ b/.github/workflows/tanzu-tile.yml @@ -20,8 +20,7 @@ jobs: test: name: Test Tanzu Tile creation - # Use 20.04.5 until https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/16450 is resolved - runs-on: ubuntu-20.04 + runs-on: ubuntu-24.04 steps: - name: Check out the codebase. uses: actions/checkout@v4 diff --git a/.github/workflows/vuln-scans.yml b/.github/workflows/vuln-scans.yml index ccf8200e4e..a0b4e9d9e4 100644 --- a/.github/workflows/vuln-scans.yml +++ b/.github/workflows/vuln-scans.yml @@ -22,12 +22,11 @@ concurrency: jobs: trivy-fs-scan: - # Use 20.04.5 until https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/16450 is resolved - runs-on: ubuntu-20.04 + runs-on: ubuntu-24.04 steps: - uses: actions/checkout@v4 - name: Run trivy filesystem scan - uses: aquasecurity/trivy-action@0.28.0 + uses: aquasecurity/trivy-action@0.29.0 with: version: v0.57.1 scan-type: 'fs' @@ -39,7 +38,7 @@ jobs: ignore-unfixed: true anchore-fs-scan: - runs-on: ubuntu-20.04 + runs-on: ubuntu-24.04 steps: - uses: actions/checkout@v4 - uses: anchore/scan-action@v5 @@ -82,7 +81,7 @@ jobs: path: ./dist binaries-windows_amd64: - runs-on: ubuntu-20.04 + runs-on: ubuntu-24.04 steps: - name: Check out the codebase. uses: actions/checkout@v4 @@ -99,8 +98,7 @@ jobs: ./bin/* trivy-image-scan: - # Use 20.04.5 until https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/16450 is resolved - runs-on: ubuntu-20.04 + runs-on: ubuntu-24.04 needs: docker-otelcol strategy: matrix: @@ -120,7 +118,7 @@ jobs: path: ./dist - run: docker load -i ./dist/image.tar - name: Run trivy image scan - uses: aquasecurity/trivy-action@0.28.0 + uses: aquasecurity/trivy-action@0.29.0 with: version: v0.57.1 scan-type: 'image' @@ -131,7 +129,7 @@ jobs: ignore-unfixed: true anchore-image-scan: - runs-on: ubuntu-20.04 + runs-on: ubuntu-24.04 needs: docker-otelcol strategy: matrix: diff --git a/.github/workflows/win-package-test.yml b/.github/workflows/win-package-test.yml index 25b7445fa3..b37a20d6ca 100644 --- a/.github/workflows/win-package-test.yml +++ b/.github/workflows/win-package-test.yml @@ -25,8 +25,7 @@ env: jobs: setup-environment: - # Use 20.04.5 until https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/16450 is resolved - runs-on: ubuntu-20.04 + runs-on: ubuntu-24.04 steps: - name: Check out the codebase. uses: actions/checkout@v4 @@ -42,8 +41,7 @@ jobs: make install-tools cross-compile: - # Use 20.04.5 until https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/16450 is resolved - runs-on: ubuntu-20.04 + runs-on: ubuntu-24.04 needs: [setup-environment] strategy: matrix: @@ -125,8 +123,7 @@ jobs: path: ./dist/SplunkCustomActions.CA.dll msi-build: - # Use 20.04.5 until https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/16450 is resolved - runs-on: ubuntu-20.04 + runs-on: ubuntu-24.04 needs: [cross-compile, agent-bundle-windows, msi-custom-actions] steps: - name: Check out the codebase. diff --git a/CHANGELOG.md b/CHANGELOG.md index b198c61851..42f1cf976b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,77 @@ # Changelog + ## Unreleased +### 🧰 Bug fixes 🧰 + +- (Splunk) `receiver/journald`: Upgrade journald client libraries in the Collector docker image by taking them from latest Debian image. + This fixes journald receiver on kubernetes nodes with recent versions of systemd ([#5664](https://github.com/signalfx/splunk-otel-collector/pull/5664)). + +## v0.113.0 + +This Splunk OpenTelemetry Collector release includes changes from the opentelemetry-collector v0.113.0 and the opentelemetry-collector-contrib v0.113.0 releases where appropriate. + +### 🛑 Breaking changes 🛑 + +- (Contrib) `sapmreceiver`: Remove the deprecated access_token_passthrough from SAPM receiver. ([#35972](https://github.com/open-telemetry/opentelemetry-collector-contrib/pull/35972)) + Please use `include_metadata` instead with the following config option applied to the batch processor: + batch: + metadata_keys: [X-Sf-Token] + +- (Contrib) `pkg/ottl`: Promote `processor.transform.ConvertBetweenSumAndGaugeMetricContext` feature gate to Stable ([#36216](https://github.com/open-telemetry/opentelemetry-collector-contrib/pull/36216)) + This gate can no longer be disabled. The `convert_sum_to_gauge` and `convert_gauge_to_sum` may now only be used with the `metric` context. + + +### 💡 Enhancements 💡 + +- (Contrib) `splunkenterprisereceiver`: Add telemetry around the Splunk Enterprise kv-store. ([#35445](https://github.com/open-telemetry/opentelemetry-collector-contrib/pull/35445)) +- (Contrib) `journaldreceiver`: adds ability to parse journald's MESSAGE field as a string if desired ([#36005](https://github.com/open-telemetry/opentelemetry-collector-contrib/pull/36005)) +- (Contrib) `journaldreceiver`: allows querying a journald namespace ([#36031](https://github.com/open-telemetry/opentelemetry-collector-contrib/pull/36031)) +- (Contrib) `hostmetricsreceiver`: Add the system.uptime metric in the hostmetrics receiver ([#31627](https://github.com/open-telemetry/opentelemetry-collector-contrib/pull/31627)) + This metric is provided by the new `system` scraper. + +- (Contrib) `hostmetrics`: Adjust scraper creation to make it so the scraper name is reported with hostmetrics scraper errors. ([#35814](https://github.com/open-telemetry/opentelemetry-collector-contrib/pull/35814)) +- (Contrib) `pkg/ottl`: Add SliceToMap function ([#35256](https://github.com/open-telemetry/opentelemetry-collector-contrib/pull/35256)) +- (Contrib) `journaldreceiver`: Restart journalctl if it exits unexpectedly ([#35635](https://github.com/open-telemetry/opentelemetry-collector-contrib/pull/35635)) +- (Contrib) `routingconnector`: Add ability to route by request metadata. ([#19738](https://github.com/open-telemetry/opentelemetry-collector-contrib/pull/19738)) +- (Contrib) `exporter/signalfx`: Enabling retrying for dimension properties update without tags in case of 400 response error. ([#36044](https://github.com/open-telemetry/opentelemetry-collector-contrib/pull/36044)) + Property and tag updates are done using the same API call. After this change, the exporter will retry once to sync + properties in case of 400 response error. + +- (Contrib) `signalfxexporter`: Add more default metrics related to Kubernetes cronjobs, jobs, statefulset, and hpa ([#36026](https://github.com/open-telemetry/opentelemetry-collector-contrib/pull/36026)) +- (Contrib) `simpleprometheusreceiver`: Support to set `job_name` in config ([#31502](https://github.com/open-telemetry/opentelemetry-collector-contrib/pull/31502)) +- (Contrib) `solacereceiver`: Add support to the Solace Receiver to convert the new `Move to Dead Message Queue` and new `Delete` spans generated by Solace Event Broker to OTLP. ([#36071](https://github.com/open-telemetry/opentelemetry-collector-contrib/pull/36071)) +- (Contrib) `routingconnector`: Add ability to route log records individually using OTTL log record context. ([#35939](https://github.com/open-telemetry/opentelemetry-collector-contrib/pull/35939)) +- (Contrib) `splunkenterprisereceiver`: Add new metrics for Splunk Enterprise dispatch artifacts ([#35950](https://github.com/open-telemetry/opentelemetry-collector-contrib/pull/35950)) +- (Core) `batchprocessor`: Move single shard batcher creation to the constructor ([#11594](https://github.com/open-telemetry/opentelemetry-collector/issues/11594)) +- (Core) `service`: add support for using the otelzap bridge and emit logs using the OTel Go SDK ([#10544](https://github.com/open-telemetry/opentelemetry-collector/issues/10544)) + +### 🧰 Bug fixes 🧰 + +- (Contrib) `receiver/windowseventlog`: Fix panic when rendering long event messages. ([#36179](https://github.com/open-telemetry/opentelemetry-collector-contrib/pull/36179)) +- (Contrib) `hostmetricsreceiver`: Do not set the default value of HOST_PROC_MOUNTINFO to respect root_path ([#35990](https://github.com/open-telemetry/opentelemetry-collector-contrib/pull/35990)) +- (Contrib) `prometheusexporter`: Fixes an issue where the prometheus exporter would not shut down the server when the collector was stopped. ([#35464](https://github.com/open-telemetry/opentelemetry-collector-contrib/pull/35464)) +- (Contrib) `k8sobserver`: Enable observation of ingress objects if the `ObserveIngresses` config option is set to true ([#35324](https://github.com/open-telemetry/opentelemetry-collector-contrib/pull/35324)) +- (Contrib) `pkg/stanza`: Fixed bug causing Operators with DropOnErrorQuiet to send log entries to the next operator. ([#35010](https://github.com/open-telemetry/opentelemetry-collector-contrib/pull/35010)) + This issue was introduced by a bug fix meant to ensure Silent Operators are not logging errors ([#35010](https://github.com/open-telemetry/opentelemetry-collector-contrib/pull/35010)). With this fix, + this side effect bug has been resolved. + +- (Contrib) `splunkhecreceiver`: Avoid a memory leak by changing how we record obsreports for logs and metrics. ([#35294](https://github.com/open-telemetry/opentelemetry-collector-contrib/pull/35294)) +- (Contrib) `receiver/filelog`: fix record counting with header ([#35869](https://github.com/open-telemetry/opentelemetry-collector-contrib/pull/35869)) +- (Contrib) `connector/routing`: Fix detection of duplicate conditions in routing table. ([#35962](https://github.com/open-telemetry/opentelemetry-collector-contrib/pull/35962)) +- (Contrib) `solacereceiver`: The Solace receiver may unexpectedly terminate on reporting traces when used with a memory limiter processor and under high load ([#35958](https://github.com/open-telemetry/opentelemetry-collector-contrib/pull/35958)) +- (Contrib) `pkg/stanza/operator`: Retain Operator should propagate the severity field ([#35832](https://github.com/open-telemetry/opentelemetry-collector-contrib/pull/35832)) + The retain operator should propagate the severity field like it does with timestamps. + +- (Contrib) `pkg/stanza`: Handle error of callback function of `ParserOperator.ProcessWithCallback` ([#35769](https://github.com/open-telemetry/opentelemetry-collector-contrib/pull/35769)) + `ProcessWithCallback` of `ParserOperator` first calls the `ParseWith` method + which properly handles errors with `HandleEntryError`. + Then the callback function is called and its returned error should also + be handled by the `HandleEntryError` ensuring a consistent experience. + +- (Core) `service`: ensure traces and logs emitted by the otel go SDK use the same resource information ([#11578](https://github.com/open-telemetry/opentelemetry-collector/issues/11578)) +- (Core) `config/configgrpc`: Patch for bug in the grpc-go NewClient that makes the way the hostname is resolved incompatible with the way proxy setting are applied. ([#11537](https://github.com/open-telemetry/opentelemetry-collector/issues/11537)) + ## v0.112.0 This Splunk OpenTelemetry Collector release includes changes from the opentelemetry-collector v0.112.0 and the opentelemetry-collector-contrib v0.112.0 releases where appropriate. @@ -175,8 +246,8 @@ Additionally, updates `splunk-otel-javaagent` to [`v2.8.1`](https://github.com/s - (Contrib) `prometheusreceiver`: Fix the retrieval of scrape configurations by also considering scrape config files ([#34786](https://github.com/open-telemetry/opentelemetry-collector-contrib/pull/34786)) - (Contrib) `redactionprocessor`: Fix panic when using the redaction processor in a logs pipeline ([#35331](https://github.com/open-telemetry/opentelemetry-collector-contrib/pull/35331)) - (Contrib) `exporter/splunkhec`: Fix incorrect claim that the exporter doesn't mutate data when batching is enabled. The bug lead to runtime panics when the exporter was used with the batcher enabled in a fanout scenario. ([#35306](https://github.com/open-telemetry/opentelemetry-collector-contrib/pull/35306)) -- (Splunk) Choco upgrade should preserve collector service custom env vars ([#5386](https://github.com/signalfx/splunk-otel-collector/pull/5386)) -- (Splunk) `discoveryreceiver` with `splunk.continuousDiscovery` feature gate enabled: Remove redundant discovery.receiver.rule attribute ([#5403](https://github.com/signalfx/splunk-otel-collector/pull/5403)) +- (Splunk) Choco upgrade should preserve collector service custom env vars ([#5386](https://github.com/signalfx/splunk-otel-collector/pull/5386)) +- (Splunk) `discoveryreceiver` with `splunk.continuousDiscovery` feature gate enabled: Remove redundant discovery.receiver.rule attribute ([#5403](https://github.com/signalfx/splunk-otel-collector/pull/5403)) - (Splunk) `discoveryreceiver` with `splunk.continuousDiscovery` feature gate enabled: Remove redundant resource attributes ([#5409](https://github.com/signalfx/splunk-otel-collector/pull/5409)) ## v0.109.0 @@ -199,9 +270,9 @@ Additionally, updates `splunk-otel-javaagent` to [`v2.8.1`](https://github.com/s If the collector is running as a process on the host OS and the Apache Web Server is in a Docker container add `--set=splunk.discovery.extensions.docker_observer.config.use_host_bindings=true` to the command-line arguments for the discovery to create the correct endpoint. - (Splunk) Introduce continuous service discovery mode. This mode can be enabled with a feature gate by adding `--feature-gates=splunk.continuousDiscovery` command line argument. ([#5363](https://github.com/signalfx/splunk-otel-collector/pull/5363)) The new mode does the following: - - It allows discovering new services that were not available at the time of the collector startup. If discovery is + - It allows discovering new services that were not available at the time of the collector startup. If discovery is successful, the metrics collection will be started. - - Information about discovered services is being sent to Splunk Observability Cloud. The information will include + - Information about discovered services is being sent to Splunk Observability Cloud. The information will include instructions to complete discovery for particular services if the discovery was not successful out of the box. - (Core) `service`: move `useOtelWithSDKConfigurationForInternalTelemetry` gate to beta ([#11091](https://github.com/open-telemetry/opentelemetry-collector/issues/11091)) - (Core) `service`: implement a no-op tracer provider that doesn't propagate the context ([#11026](https://github.com/open-telemetry/opentelemetry-collector/issues/11026)) @@ -406,11 +477,11 @@ This release fixes CVE-2024-42368 on the `bearerauthtokenextension` ([#34516](ht - vcenter.vm.vsan.operations - vcenter.vm.vsan.latency.avg - (Contrib) `vcenterreceiver`: Several host performance metrics now return 1 data point per time series instead of 5. ([#34708](https://github.com/open-telemetry/opentelemetry-collector-contrib/pull/34708)) - The 5 data points previously sent represented consecutive 20s sampling periods. Depending on the collection interval + The 5 data points previously sent represented consecutive 20s sampling periods. Depending on the collection interval these could easily overlap. Sending just the latest of these data points is more in line with other performance metrics. - + This change also fixes an issue with the googlecloud exporter seeing these datapoints as duplicates. - + Following is the list of affected metrics which will now only report a single datapoint per set of unique attribute values. - vcenter.host.cpu.reserved - vcenter.host.disk.latency.avg @@ -421,7 +492,7 @@ This release fixes CVE-2024-42368 on the `bearerauthtokenextension` ([#34516](ht - vcenter.host.network.packet.rate - vcenter.host.network.throughput - vcenter.host.network.usage - + - (Splunk) Remove converters helping with old breaking changes. If those changes were not addressed, the collector will fail to start. ([#5267](https://github.com/signalfx/splunk-otel-collector/pull/5267)) - Moving TLS config options in HEC exporter under tls group - Moving TLS insecure option in OTLP exporter under tls group diff --git a/cmd/otelcol/Dockerfile b/cmd/otelcol/Dockerfile index 7105f45180..653d0ec4c9 100644 --- a/cmd/otelcol/Dockerfile +++ b/cmd/otelcol/Dockerfile @@ -39,7 +39,7 @@ RUN JMX_METRICS_JAR=opentelemetry-jmx-metrics.jar && \ URL=https://github.com/open-telemetry/opentelemetry-java-contrib/releases/download/${JMX_METRIC_GATHERER_RELEASE}/${JMX_METRICS_JAR} && \ cd /tmp && wget "$URL"; -FROM ${DOCKER_REPO}/debian:11.5 as journalctl +FROM ${DOCKER_REPO}/debian:12.8 as journalctl RUN apt update RUN apt install -y systemd COPY dist/collect-libs.sh /collect-libs.sh diff --git a/docker/nginx/Dockerfile b/docker/nginx/Dockerfile index 458cf84bcc..f3618fb02f 100644 --- a/docker/nginx/Dockerfile +++ b/docker/nginx/Dockerfile @@ -1,4 +1,4 @@ -FROM nginx:1.27.2 +FROM nginx:1.27.3 RUN rm /etc/nginx/conf.d/default.conf COPY status.conf /etc/nginx/conf.d/status.conf diff --git a/internal/tools/go.mod b/internal/tools/go.mod index 983db50e73..7c0c849b54 100644 --- a/internal/tools/go.mod +++ b/internal/tools/go.mod @@ -6,7 +6,7 @@ toolchain go1.22.7 require ( github.com/client9/misspell v0.3.4 - github.com/golangci/golangci-lint v1.62.0 + github.com/golangci/golangci-lint v1.62.2 github.com/google/addlicense v1.1.1 github.com/jstemmer/go-junit-report v1.0.0 github.com/ory/go-acc v0.2.8 @@ -24,9 +24,9 @@ require ( github.com/Abirdcfly/dupword v0.1.3 // indirect github.com/Antonboom/errname v1.0.0 // indirect github.com/Antonboom/nilnil v1.0.0 // indirect - github.com/Antonboom/testifylint v1.5.0 // indirect + github.com/Antonboom/testifylint v1.5.2 // indirect github.com/BurntSushi/toml v1.4.1-0.20240526193622-a339e1f7089c // indirect - github.com/Crocmagnon/fatcontext v0.5.2 // indirect + github.com/Crocmagnon/fatcontext v0.5.3 // indirect github.com/Djarvur/go-err113 v0.0.0-20210108212216-aea10b59be24 // indirect github.com/GaijinEntertainment/go-exhaustruct/v3 v3.3.0 // indirect github.com/Masterminds/semver/v3 v3.3.0 // indirect @@ -127,7 +127,7 @@ require ( github.com/mattn/go-colorable v0.1.13 // indirect github.com/mattn/go-isatty v0.0.20 // indirect github.com/mattn/go-runewidth v0.0.16 // indirect - github.com/mgechev/revive v1.5.0 // indirect + github.com/mgechev/revive v1.5.1 // indirect github.com/mitchellh/colorstring v0.0.0-20190213212951-d06e56a500db // indirect github.com/mitchellh/copystructure v1.2.0 // indirect github.com/mitchellh/go-homedir v1.1.0 // indirect @@ -140,14 +140,14 @@ require ( github.com/nakabonne/nestif v0.3.1 // indirect github.com/nishanths/exhaustive v0.12.0 // indirect github.com/nishanths/predeclared v0.2.2 // indirect - github.com/nunnatsa/ginkgolinter v0.18.0 // indirect + github.com/nunnatsa/ginkgolinter v0.18.3 // indirect github.com/olekukonko/tablewriter v0.0.5 // indirect github.com/ory/viper v1.7.5 // indirect github.com/pborman/uuid v1.2.0 // indirect github.com/pelletier/go-toml v1.9.5 // indirect github.com/pelletier/go-toml/v2 v2.2.3 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect - github.com/polyfloyd/go-errorlint v1.6.0 // indirect + github.com/polyfloyd/go-errorlint v1.7.0 // indirect github.com/prometheus/client_golang v1.20.2 // indirect github.com/prometheus/client_model v0.6.1 // indirect github.com/prometheus/common v0.57.0 // indirect @@ -182,7 +182,7 @@ require ( github.com/ssgreg/nlreturn/v2 v2.2.1 // indirect github.com/stbenjam/no-sprintf-host-port v0.1.1 // indirect github.com/stretchr/objx v0.5.2 // indirect - github.com/stretchr/testify v1.9.0 // indirect + github.com/stretchr/testify v1.10.0 // indirect github.com/subosito/gotenv v1.4.1 // indirect github.com/tcnksm/go-gitconfig v0.1.2 // indirect github.com/tcnksm/go-latest v0.0.0-20170313132115-e3007ae9052e // indirect @@ -195,7 +195,7 @@ require ( github.com/ultraware/funlen v0.1.0 // indirect github.com/ultraware/whitespace v0.1.1 // indirect github.com/uudashr/gocognit v1.1.3 // indirect - github.com/uudashr/iface v1.2.0 // indirect + github.com/uudashr/iface v1.2.1 // indirect github.com/xen0n/gosmopolitan v1.2.2 // indirect github.com/yagipy/maintidx v1.0.0 // indirect github.com/yeya24/promlinter v0.3.0 // indirect @@ -217,7 +217,7 @@ require ( go.uber.org/zap v1.27.0 // indirect golang.org/x/crypto v0.29.0 // indirect golang.org/x/exp v0.0.0-20240909161429-701f63a606c0 // indirect - golang.org/x/exp/typeparams v0.0.0-20240909161429-701f63a606c0 // indirect + golang.org/x/exp/typeparams v0.0.0-20241108190413-2d47ceb2692f // indirect golang.org/x/mod v0.22.0 // indirect golang.org/x/net v0.31.0 // indirect golang.org/x/oauth2 v0.23.0 // indirect diff --git a/internal/tools/go.sum b/internal/tools/go.sum index 9b47632ccb..38cb2734b7 100644 --- a/internal/tools/go.sum +++ b/internal/tools/go.sum @@ -12,13 +12,13 @@ github.com/Antonboom/errname v1.0.0 h1:oJOOWR07vS1kRusl6YRSlat7HFnb3mSfMl6sDMRoT github.com/Antonboom/errname v1.0.0/go.mod h1:gMOBFzK/vrTiXN9Oh+HFs+e6Ndl0eTFbtsRTSRdXyGI= github.com/Antonboom/nilnil v1.0.0 h1:n+v+B12dsE5tbAqRODXmEKfZv9j2KcTBrp+LkoM4HZk= github.com/Antonboom/nilnil v1.0.0/go.mod h1:fDJ1FSFoLN6yoG65ANb1WihItf6qt9PJVTn/s2IrcII= -github.com/Antonboom/testifylint v1.5.0 h1:dlUIsDMtCrZWUnvkaCz3quJCoIjaGi41GzjPBGkkJ8A= -github.com/Antonboom/testifylint v1.5.0/go.mod h1:wqaJbu0Blb5Wag2wv7Z5xt+CIV+eVLxtGZrlK13z3AE= +github.com/Antonboom/testifylint v1.5.2 h1:4s3Xhuv5AvdIgbd8wOOEeo0uZG7PbDKQyKY5lGoQazk= +github.com/Antonboom/testifylint v1.5.2/go.mod h1:vxy8VJ0bc6NavlYqjZfmp6EfqXMtBgQ4+mhCojwC1P8= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/BurntSushi/toml v1.4.1-0.20240526193622-a339e1f7089c h1:pxW6RcqyfI9/kWtOwnv/G+AzdKuy2ZrqINhenH4HyNs= github.com/BurntSushi/toml v1.4.1-0.20240526193622-a339e1f7089c/go.mod h1:ukJfTF/6rtPPRCnwkur4qwRxa8vTRFBF0uk2lLoLwho= -github.com/Crocmagnon/fatcontext v0.5.2 h1:vhSEg8Gqng8awhPju2w7MKHqMlg4/NI+gSDHtR3xgwA= -github.com/Crocmagnon/fatcontext v0.5.2/go.mod h1:87XhRMaInHP44Q7Tlc7jkgKKB7kZAOPiDkFMdKCC+74= +github.com/Crocmagnon/fatcontext v0.5.3 h1:zCh/wjc9oyeF+Gmp+V60wetm8ph2tlsxocgg/J0hOps= +github.com/Crocmagnon/fatcontext v0.5.3/go.mod h1:XoCQYY1J+XTfyv74qLXvNw4xFunr3L1wkopIIKG7wGM= github.com/Djarvur/go-err113 v0.0.0-20210108212216-aea10b59be24 h1:sHglBQTwgx+rWPdisA5ynNEsoARbiCBOyGcJM4/OzsM= github.com/Djarvur/go-err113 v0.0.0-20210108212216-aea10b59be24/go.mod h1:4UJr5HIiMZrwgkSPdsjy2uOQExX/WEILpIrO9UPGuXs= github.com/GaijinEntertainment/go-exhaustruct/v3 v3.3.0 h1:/fTUt5vmbkAcMBt4YQiuC23cV0kEsN1MVMNqeOW43cU= @@ -238,8 +238,8 @@ github.com/golangci/go-printf-func-name v0.1.0 h1:dVokQP+NMTO7jwO4bwsRwLWeudOVUP github.com/golangci/go-printf-func-name v0.1.0/go.mod h1:wqhWFH5mUdJQhweRnldEywnR5021wTdZSNgwYceV14s= github.com/golangci/gofmt v0.0.0-20240816233607-d8596aa466a9 h1:/1322Qns6BtQxUZDTAT4SdcoxknUki7IAoK4SAXr8ME= github.com/golangci/gofmt v0.0.0-20240816233607-d8596aa466a9/go.mod h1:Oesb/0uFAyWoaw1U1qS5zyjCg5NP9C9iwjnI4tIsXEE= -github.com/golangci/golangci-lint v1.62.0 h1:/G0g+bi1BhmGJqLdNQkKBWjcim8HjOPc4tsKuHDOhcI= -github.com/golangci/golangci-lint v1.62.0/go.mod h1:jtoOhQcKTz8B6dGNFyfQV3WZkQk+YvBDewDtNpiAJts= +github.com/golangci/golangci-lint v1.62.2 h1:b8K5K9PN+rZN1+mKLtsZHz2XXS9aYKzQ9i25x3Qnxxw= +github.com/golangci/golangci-lint v1.62.2/go.mod h1:ILWWyeFUrctpHVGMa1dg2xZPKoMUTc5OIMgW7HZr34g= github.com/golangci/misspell v0.6.0 h1:JCle2HUTNWirNlDIAUO44hUsKhOFqGPoC4LZxlaSXDs= github.com/golangci/misspell v0.6.0/go.mod h1:keMNyY6R9isGaSAu+4Q8NMBwMPkh15Gtc8UCVoDtAWo= github.com/golangci/modinfo v0.3.4 h1:oU5huX3fbxqQXdfspamej74DFX0kyGLkw1ppvXoJ8GA= @@ -444,8 +444,8 @@ github.com/mattn/go-runewidth v0.0.9/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m github.com/mattn/go-runewidth v0.0.16 h1:E5ScNMtiwvlvB5paMFdw9p4kSQzbXFikJ5SQO6TULQc= github.com/mattn/go-runewidth v0.0.16/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w= github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= -github.com/mgechev/revive v1.5.0 h1:oaSmjA7rP8+HyoRuCgC531VHwnLH1AlJdjj+1AnQceQ= -github.com/mgechev/revive v1.5.0/go.mod h1:L6T3H8EoerRO86c7WuGpvohIUmiploGiyoYbtIWFmV8= +github.com/mgechev/revive v1.5.1 h1:hE+QPeq0/wIzJwOphdVyUJ82njdd8Khp4fUIHGZHW3M= +github.com/mgechev/revive v1.5.1/go.mod h1:lC9AhkJIBs5zwx8wkudyHrU+IJkrEKmpCmGMnIJPk4o= github.com/miekg/dns v1.1.26/go.mod h1:bPDLeHnStXmXAq1m/Ch/hvfNHr14JKNPMBo3VZKjuso= github.com/miekg/dns v1.1.41/go.mod h1:p6aan82bvRIyn+zDIv9xYNUpwa73JcSh9BKwknJysuI= github.com/mitchellh/cli v1.0.0/go.mod h1:hNIlj7HEI86fIcpObd7a0FcrxTWetlwJDGcceTlRvqc= @@ -489,8 +489,8 @@ github.com/nishanths/exhaustive v0.12.0/go.mod h1:mEZ95wPIZW+x8kC4TgC+9YCUgiST7e github.com/nishanths/predeclared v0.2.2 h1:V2EPdZPliZymNAn79T8RkNApBjMmVKh5XRpLm/w98Vk= github.com/nishanths/predeclared v0.2.2/go.mod h1:RROzoN6TnGQupbC+lqggsOlcgysk3LMK/HI84Mp280c= github.com/npillmayer/nestext v0.1.3/go.mod h1:h2lrijH8jpicr25dFY+oAJLyzlya6jhnuG+zWp9L0Uk= -github.com/nunnatsa/ginkgolinter v0.18.0 h1:ZXO1wKhPg3A6LpbN5dMuqwhfOjN5c3ous8YdKOuqk9k= -github.com/nunnatsa/ginkgolinter v0.18.0/go.mod h1:vPrWafSULmjMGCMsfGA908if95VnHQNAahvSBOjTuWs= +github.com/nunnatsa/ginkgolinter v0.18.3 h1:WgS7X3zzmni3vwHSBhvSgqrRgUecN6PQUcfB0j1noDw= +github.com/nunnatsa/ginkgolinter v0.18.3/go.mod h1:BE1xyB/PNtXXG1azrvrqJW5eFH0hSRylNzFy8QHPwzs= github.com/oklog/run v1.0.0/go.mod h1:dlhp/R75TPv97u0XWUtDeV/lRKWPKSdTuV0TZvrmrQA= github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U= github.com/olekukonko/tablewriter v0.0.5 h1:P2Ga83D34wi1o9J6Wh1mRuqd4mF/x/lgBS7N7AbDhec= @@ -529,8 +529,8 @@ github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINE github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/polyfloyd/go-errorlint v1.6.0 h1:tftWV9DE7txiFzPpztTAwyoRLKNj9gpVm2cg8/OwcYY= -github.com/polyfloyd/go-errorlint v1.6.0/go.mod h1:HR7u8wuP1kb1NeN1zqTd1ZMlqUKPPHF+Id4vIPvDqVw= +github.com/polyfloyd/go-errorlint v1.7.0 h1:Zp6lzCK4hpBDj8y8a237YK4EPrMXQWvOe3nGoH4pFrU= +github.com/polyfloyd/go-errorlint v1.7.0/go.mod h1:dGWKu85mGHnegQ2SWpEybFityCg3j7ZbwsVUxAOk9gY= github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI= github.com/posener/complete v1.2.3/go.mod h1:WZIdtGGp+qx0sLrYKtIRAruyNpv6hFCicSgv7Sy7s/s= github.com/prashantv/gostub v1.1.0 h1:BTyx3RfQjRHnUWaGF9oQos79AlQ5k8WNktv7VGvVH4g= @@ -664,8 +664,8 @@ github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/ github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= -github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= -github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= +github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA= +github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw= github.com/subosito/gotenv v1.4.1 h1:jyEFiXpy21Wm81FBN71l9VoMMV8H8jG+qIK3GCpY6Qs= github.com/subosito/gotenv v1.4.1/go.mod h1:ayKnFf/c6rvx/2iiLrJUk1e6plDbT3edrFNGqEflhK0= @@ -699,8 +699,8 @@ github.com/ultraware/whitespace v0.1.1 h1:bTPOGejYFulW3PkcrqkeQwOd6NKOOXvmGD9bo/ github.com/ultraware/whitespace v0.1.1/go.mod h1:XcP1RLD81eV4BW8UhQlpaR+SDc2givTvyI8a586WjW8= github.com/uudashr/gocognit v1.1.3 h1:l+a111VcDbKfynh+airAy/DJQKaXh2m9vkoysMPSZyM= github.com/uudashr/gocognit v1.1.3/go.mod h1:aKH8/e8xbTRBwjbCkwZ8qt4l2EpKXl31KMHgSS+lZ2U= -github.com/uudashr/iface v1.2.0 h1:ECJjh5q/1Zmnv/2yFpWV6H3oMg5+Mo+vL0aqw9Gjazo= -github.com/uudashr/iface v1.2.0/go.mod h1:Ux/7d/rAF3owK4m53cTVXL4YoVHKNqnoOeQHn2xrlp0= +github.com/uudashr/iface v1.2.1 h1:vHHyzAUmWZ64Olq6NZT3vg/z1Ws56kyPdBOd5kTXDF8= +github.com/uudashr/iface v1.2.1/go.mod h1:4QvspiRd3JLPAEXBQ9AiZpLbJlrWWgRChOKDJEuQTdg= github.com/xen0n/gosmopolitan v1.2.2 h1:/p2KTnMzwRexIW8GlKawsTWOxn7UHA+jCMF/V8HHtvU= github.com/xen0n/gosmopolitan v1.2.2/go.mod h1:7XX7Mj61uLYrj0qmeN0zi7XDon9JRAEhYQqAPLVNTeg= github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU= @@ -779,8 +779,8 @@ golang.org/x/exp v0.0.0-20240909161429-701f63a606c0 h1:e66Fs6Z+fZTbFBAxKfP3PALWB golang.org/x/exp v0.0.0-20240909161429-701f63a606c0/go.mod h1:2TbTHSBQa924w8M6Xs1QcRcFwyucIwBGpK1p2f1YFFY= golang.org/x/exp/typeparams v0.0.0-20220428152302-39d4317da171/go.mod h1:AbB0pIl9nAr9wVwH+Z2ZpaocVmF5I4GyWCDIsVjR0bk= golang.org/x/exp/typeparams v0.0.0-20230203172020-98cc5a0785f9/go.mod h1:AbB0pIl9nAr9wVwH+Z2ZpaocVmF5I4GyWCDIsVjR0bk= -golang.org/x/exp/typeparams v0.0.0-20240909161429-701f63a606c0 h1:bVwtbF629Xlyxk6xLQq2TDYmqP0uiWaet5LwRebuY0k= -golang.org/x/exp/typeparams v0.0.0-20240909161429-701f63a606c0/go.mod h1:AbB0pIl9nAr9wVwH+Z2ZpaocVmF5I4GyWCDIsVjR0bk= +golang.org/x/exp/typeparams v0.0.0-20241108190413-2d47ceb2692f h1:WTyX8eCCyfdqiPYkRGm0MqElSfYFH3yR1+rl/mct9sA= +golang.org/x/exp/typeparams v0.0.0-20241108190413-2d47ceb2692f/go.mod h1:AbB0pIl9nAr9wVwH+Z2ZpaocVmF5I4GyWCDIsVjR0bk= golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= diff --git a/packaging/msi/SplunkCustomActions/test/SplunkCustomActionsTests.csproj b/packaging/msi/SplunkCustomActions/test/SplunkCustomActionsTests.csproj index 6f6b7bea44..92764cabd9 100644 --- a/packaging/msi/SplunkCustomActions/test/SplunkCustomActionsTests.csproj +++ b/packaging/msi/SplunkCustomActions/test/SplunkCustomActionsTests.csproj @@ -11,7 +11,7 @@ - + diff --git a/packaging/release/requirements.txt b/packaging/release/requirements.txt index 628476ee3a..12cf9e0ba1 100644 --- a/packaging/release/requirements.txt +++ b/packaging/release/requirements.txt @@ -1,4 +1,4 @@ PyGithub==2.5.0 -boto3==1.35.64 +boto3==1.35.71 docker==7.1.0 requests==2.32.3 diff --git a/packaging/tests/requirements.txt b/packaging/tests/requirements.txt index c77c83256a..14083742b5 100644 --- a/packaging/tests/requirements.txt +++ b/packaging/tests/requirements.txt @@ -1,7 +1,7 @@ docker==7.1.0 iterators==0.2.0 psutil==6.1.0 -pytest==8.3.3 +pytest==8.3.4 pytest-html==4.1.1 pytest-xdist==3.6.1 py>=1.8.2 diff --git a/tests/receivers/smartagent/telegraf-exec/testdata/exec/Dockerfile b/tests/receivers/smartagent/telegraf-exec/testdata/exec/Dockerfile index 42740f1333..caa3a0649a 100644 --- a/tests/receivers/smartagent/telegraf-exec/testdata/exec/Dockerfile +++ b/tests/receivers/smartagent/telegraf-exec/testdata/exec/Dockerfile @@ -1,16 +1,9 @@ ARG SPLUNK_OTEL_COLLECTOR_IMAGE ARG IMAGE_PLATFORM -FROM --platform=${IMAGE_PLATFORM} golang:1.19 as golang -RUN mkdir -p /some/path +FROM --platform=${IMAGE_PLATFORM} golang:1.23 as golang +COPY telegraf-exec.go /opt/telegraf-exec.go +RUN go build -o /opt/telegraf-exec /opt/telegraf-exec.go FROM ${SPLUNK_OTEL_COLLECTOR_IMAGE} - -ENV PATH=/some/path/go/bin:$PATH -ENV GOROOT=/some/path/go -ENV GOCACHE=/some/path/go/.cache/go-build - -COPY telegraf-exec.go /opt/telegraf-exec.go -COPY config.yaml /etc/config.yaml -COPY --from=golang --chown=999 /some/path /some/path -COPY --from=golang --chown=999 /usr/local/go /some/path/go \ No newline at end of file +COPY --from=golang /opt/telegraf-exec /opt/telegraf-exec diff --git a/tests/receivers/smartagent/telegraf-exec/testdata/exec/config.yaml b/tests/receivers/smartagent/telegraf-exec/testdata/exec/config.yaml index 8de237279f..23754528c2 100644 --- a/tests/receivers/smartagent/telegraf-exec/testdata/exec/config.yaml +++ b/tests/receivers/smartagent/telegraf-exec/testdata/exec/config.yaml @@ -1,7 +1,7 @@ receivers: smartagent/exec: type: telegraf/exec - command: 'go run /opt/telegraf-exec.go' + command: /opt/telegraf-exec intervalSeconds: 1 telegrafParser: metricName: some.metric