From 14427c002af1ab599bbfeecf2acbc176f2cbf954 Mon Sep 17 00:00:00 2001 From: Piotr <17101802+thampiotr@users.noreply.github.com> Date: Fri, 24 Oct 2025 14:48:54 +0100 Subject: [PATCH 1/4] Reapply "Upgrade Prometheus to v3.7.1 and resolve issues (#4636)" (#4667) This reverts commit f01a0c210d207d2d12c282e19cc65988f32a4b8d. --- .github/workflows/build.yml | 12 +- .github/workflows/fuzz-go.yml | 2 +- .github/workflows/test_full.yml | 2 +- .github/workflows/test_mac.yml | 2 +- .github/workflows/test_pr.yml | 2 +- .github/workflows/test_pyroscope_pr.yml | 2 +- .github/workflows/test_windows.yml | 2 +- .golangci.yml | 3 + Dockerfile | 2 +- Dockerfile.windows | 2 +- Makefile | 5 +- go.mod | 248 +++++---- go.sum | 470 +++++++++--------- .../prometheus_rule_group_diff_test.go | 3 +- .../common/loki/client/copy_labels.go | 17 + .../common/loki/client/copy_slicelabels.go | 21 + .../common/loki/client/queue_client.go | 3 +- internal/component/common/loki/wal/writer.go | 3 +- internal/component/common/relabel/relabel.go | 15 +- .../component/loki/rules/kubernetes/events.go | 4 +- .../api/internal/lokipush/push_api_server.go | 2 + .../aws_firehose/internal/handler_test.go | 33 +- .../internal/parser/parser_test.go | 11 +- .../internal/gcplogtarget/formatter_test.go | 52 +- .../internal/gcplogtarget/push_target_test.go | 88 ++-- .../gcplogtarget/push_translation_test.go | 11 +- .../internal/herokutarget/target_test.go | 88 ++-- .../internal/kafkatarget/kafkatarget_test.go | 44 +- .../kafkatarget/target_syncer_test.go | 11 +- .../syslogtarget/syslogtarget_test.go | 5 + .../operator/configgen/config_gen.go | 4 + .../configgen/config_gen_podmonitor_test.go | 58 ++- .../configgen/config_gen_probe_test.go | 80 +-- .../configgen/config_gen_scrapeconfig_test.go | 74 +-- .../config_gen_servicemonitor_test.go | 148 +++--- .../component/prometheus/operator/types.go | 12 +- .../component/prometheus/relabel/relabel.go | 6 +- .../prometheus/remotewrite/remote_write.go | 3 +- .../prometheus/remotewrite/types_test.go | 1 + .../component/prometheus/scrape/scrape.go | 21 +- .../prometheusconvert/component/scrape.go | 8 +- .../internal/build/builder_integrations.go | 4 +- .../testdata/prom_remote_write.alloy | 4 +- internal/mimir/client/types.go | 4 +- internal/service/labelstore/service_test.go | 54 +- .../static/agentctl/waltools/cardinality.go | 5 +- internal/static/agentctl/waltools/samples.go | 6 +- internal/static/agentctl/waltools/walstats.go | 4 +- .../static/agentctl/waltools/walstats_test.go | 2 +- internal/static/config/config_test.go | 6 +- .../node_exporter/node_exporter_test.go | 2 +- .../redis_exporter/redis_exporter_test.go | 2 +- internal/static/metrics/instance/global.go | 3 +- internal/static/metrics/instance/instance.go | 3 +- internal/static/metrics/wal/util.go | 4 +- internal/static/metrics/wal/wal.go | 4 +- tools/ci/docker-containers-windows | 4 +- tools/make/packaging.mk | 22 +- 58 files changed, 898 insertions(+), 815 deletions(-) create mode 100644 internal/component/common/loki/client/copy_labels.go create mode 100644 internal/component/common/loki/client/copy_slicelabels.go diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index cef9764521..85d9bb854b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -37,7 +37,7 @@ jobs: # TODO: Try enabling caching later. It might use up too much disk space on runners so needs extra testing. cache: false - run: make generate-ui - - run: GO_TAGS="builtinassets promtail_journal_enabled" GOOS=${{ matrix.os }} GOARCH=${{ matrix.arch }} GOARM= make alloy + - run: GO_TAGS="builtinassets promtail_journal_enabled slicelabels" GOOS=${{ matrix.os }} GOARCH=${{ matrix.arch }} GOARM= make alloy build_linux_boringcrypto: name: Build on Linux (boringcrypto) @@ -64,7 +64,7 @@ jobs: # TODO: Try enabling caching later. It might use up too much disk space on runners so needs extra testing. cache: false - run: make generate-ui - - run: GO_TAGS="builtinassets promtail_journal_enabled" GOOS=${{ matrix.os }} GOARCH=${{ matrix.arch }} GOARM= GOEXPERIMENT=boringcrypto make alloy + - run: GO_TAGS="builtinassets promtail_journal_enabled slicelabels" GOOS=${{ matrix.os }} GOARCH=${{ matrix.arch }} GOARM= GOEXPERIMENT=boringcrypto make alloy build_mac_intel: name: Build on MacOS (Intel) @@ -81,7 +81,7 @@ jobs: # TODO: Try enabling caching later. It might use up too much disk space on runners so needs extra testing. cache: false - run: make generate-ui - - run: GO_TAGS="builtinassets" GOOS=darwin GOARCH=amd64 GOARM= make alloy + - run: GO_TAGS="builtinassets slicelabels" GOOS=darwin GOARCH=amd64 GOARM= make alloy build_mac_arm: name: Build on MacOS (ARM) @@ -98,7 +98,7 @@ jobs: # TODO: Try enabling caching later. It might use up too much disk space on runners so needs extra testing. cache: false - run: make generate-ui - - run: CGO_LDFLAGS="-ld_classic $CGO_LDFLAGS" GO_TAGS="builtinassets" GOOS=darwin GOARCH=arm64 GOARM= make alloy + - run: CGO_LDFLAGS="-ld_classic $CGO_LDFLAGS" GO_TAGS="builtinassets slicelabels" GOOS=darwin GOARCH=arm64 GOARM= make alloy build_windows: name: Build on Windows (AMD64) @@ -115,7 +115,7 @@ jobs: # TODO: Try enabling caching later. It might use up too much disk space on runners so needs extra testing. cache: false - run: make generate-ui - - run: echo "GO_TAGS=builtinassets" | Out-File -FilePath $env:GITHUB_ENV -Append + - run: echo "GO_TAGS=builtinassets slicelabels" | Out-File -FilePath $env:GITHUB_ENV -Append - run: echo "GOOS=windows" | Out-File -FilePath $env:GITHUB_ENV -Append - run: echo "GOARCH=amd64" | Out-File -FilePath $env:GITHUB_ENV -Append - run: make alloy @@ -141,4 +141,4 @@ jobs: # TODO: Try enabling caching later. It might use up too much disk space on runners so needs extra testing. cache: false - run: make generate-ui - - run: GO_TAGS="builtinassets" GOOS=freebsd GOARCH=amd64 GOARM= make alloy + - run: GO_TAGS="builtinassets slicelabels" GOOS=freebsd GOARCH=amd64 GOARM= make alloy diff --git a/.github/workflows/fuzz-go.yml b/.github/workflows/fuzz-go.yml index f028b15910..f7067ef293 100644 --- a/.github/workflows/fuzz-go.yml +++ b/.github/workflows/fuzz-go.yml @@ -107,7 +107,7 @@ jobs: # a different module. cd "${{ matrix.package }}" # Note: -parallel=1 is required to avoid race conditions in the fuzzer until https://github.com/golang/go/issues/56238 is fixed. - go test -parallel=1 -fuzz="${{ matrix.function }}\$" -run="${{ matrix.function }}\$" -fuzztime="${FUZZ_TIME}" . + go test -tags=slicelabels -parallel=1 -fuzz="${{ matrix.function }}\$" -run="${{ matrix.function }}\$" -fuzztime="${FUZZ_TIME}" . env: FUZZ_TIME: ${{ inputs.fuzz-time }} diff --git a/.github/workflows/test_full.yml b/.github/workflows/test_full.yml index 90956dbea5..8c6dc0cd35 100644 --- a/.github/workflows/test_full.yml +++ b/.github/workflows/test_full.yml @@ -34,4 +34,4 @@ jobs: go-version-file: go.mod # TODO: Enable caching later. cache: false - - run: K8S_USE_DOCKER_NETWORK=1 make test + - run: K8S_USE_DOCKER_NETWORK=1 GO_TAGS="slicelabels" make test diff --git a/.github/workflows/test_mac.yml b/.github/workflows/test_mac.yml index e683637236..97f0c97ab8 100644 --- a/.github/workflows/test_mac.yml +++ b/.github/workflows/test_mac.yml @@ -29,4 +29,4 @@ jobs: go-version-file: go.mod cache: true - name: Test - run: CGO_LDFLAGS="-ld_classic $CGO_LDFLAGS" make GO_TAGS="nodocker" test + run: CGO_LDFLAGS="-ld_classic $CGO_LDFLAGS" make GO_TAGS="nodocker,slicelabels" test diff --git a/.github/workflows/test_pr.yml b/.github/workflows/test_pr.yml index 04db8ba9d9..430841e32a 100644 --- a/.github/workflows/test_pr.yml +++ b/.github/workflows/test_pr.yml @@ -24,5 +24,5 @@ jobs: go-version-file: go.mod cache: false - - run: make GO_TAGS="nodocker" test + - run: make GO_TAGS="nodocker,slicelabels" test diff --git a/.github/workflows/test_pyroscope_pr.yml b/.github/workflows/test_pyroscope_pr.yml index 8606937e3e..5ccd72fe2f 100644 --- a/.github/workflows/test_pyroscope_pr.yml +++ b/.github/workflows/test_pyroscope_pr.yml @@ -26,4 +26,4 @@ jobs: go-version-file: go.mod cache: false - - run: sudo make test-pyroscope + - run: sudo GO_TAGS="slicelabels" make test-pyroscope diff --git a/.github/workflows/test_windows.yml b/.github/workflows/test_windows.yml index 1a5b3deeb6..b5fb08bf75 100644 --- a/.github/workflows/test_windows.yml +++ b/.github/workflows/test_windows.yml @@ -31,5 +31,5 @@ jobs: # We'll need to make sure the same cache is reused by the workflow to build Windows binaries. cache: false - name: Test - run: '& "C:/Program Files/git/bin/bash.exe" -c ''go test -tags="nodocker,nonetwork" + run: '& "C:/Program Files/git/bin/bash.exe" -c ''go test -tags="nodocker,nonetwork,slicelabels" $(go list ./... | grep -v /integration-tests/)''' diff --git a/.golangci.yml b/.golangci.yml index 231448877c..ad82cbc979 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -1,4 +1,7 @@ version: "2" +run: + build-tags: + - slicelabels linters: enable: - depguard # Allow/denylist specific imports diff --git a/Dockerfile b/Dockerfile index dd02bd498a..923afb9ea7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -32,7 +32,7 @@ RUN --mount=type=cache,target=/root/.cache/go-build \ --mount=type=cache,target=/go/pkg/mod \ GOOS="$TARGETOS" GOARCH="$TARGETARCH" GOARM=${TARGETVARIANT#v} \ RELEASE_BUILD=${RELEASE_BUILD} VERSION=${VERSION} \ - GO_TAGS="netgo builtinassets promtail_journal_enabled" \ + GO_TAGS="netgo builtinassets promtail_journal_enabled slicelabels" \ GOEXPERIMENT=${GOEXPERIMENT} \ make alloy diff --git a/Dockerfile.windows b/Dockerfile.windows index 65d9e5d249..dade8352b4 100644 --- a/Dockerfile.windows +++ b/Dockerfile.windows @@ -79,7 +79,7 @@ SHELL ["cmd", "/S", "/C"] # we can before moving on to the next step. RUN ""C:\Program Files\git\bin\bash.exe" -c "RELEASE_BUILD=${RELEASE_BUILD} VERSION=${VERSION} make generate-ui && rm -rf web/ui/node_modules && yarn cache clean --all"" -RUN ""C:\Program Files\git\bin\bash.exe" -c "RELEASE_BUILD=${RELEASE_BUILD} VERSION=${VERSION} GO_TAGS=\"builtinassets ${GO_TAGS}\" make alloy"" +RUN ""C:\Program Files\git\bin\bash.exe" -c "RELEASE_BUILD=${RELEASE_BUILD} VERSION=${VERSION} GO_TAGS=\"builtinassets slicelabels ${GO_TAGS}\" make alloy"" # In this case, we're separating the clean command from make alloy to avoid an issue where access to some mod cache # files is denied immediately after make alloy, for example: # "go: remove C:\go\pkg\mod\golang.org\toolchain@v0.0.1-go1.22.3.windows-amd64\bin\go.exe: Access is denied." diff --git a/Makefile b/Makefile index 3e2d72b2fd..f5ac92ebb5 100644 --- a/Makefile +++ b/Makefile @@ -88,6 +88,7 @@ GOARM ?= $(shell go env GOARM) CGO_ENABLED ?= 1 RELEASE_BUILD ?= 0 GOEXPERIMENT ?= $(shell go env GOEXPERIMENT) +GO_TAGS ?= slicelabels # Determine the golangci-lint binary path using Make functions where possible. # Priority: GOBIN, GOPATH/bin, PATH (via shell), Fallback Name. @@ -146,11 +147,11 @@ endif .PHONY: lint lint: alloylint find . -name go.mod | xargs dirname | xargs -I __dir__ $(GOLANGCI_LINT_BINARY) run -v --timeout=10m - $(ALLOYLINT_BINARY) ./... + GOFLAGS="-tags=$(GO_TAGS)" $(ALLOYLINT_BINARY) ./... .PHONY: run-alloylint run-alloylint: alloylint - $(ALLOYLINT_BINARY) ./... + GOFLAGS="-tags=$(GO_TAGS)" $(ALLOYLINT_BINARY) ./... .PHONY: test # We have to run test twice: once for all packages with -race and then once diff --git a/go.mod b/go.mod index a712d9088f..24a1e181f3 100644 --- a/go.mod +++ b/go.mod @@ -6,15 +6,15 @@ require ( cloud.google.com/go/pubsub v1.50.0 cloud.google.com/go/pubsub/v2 v2.0.0 connectrpc.com/connect v1.18.1 - github.com/Azure/azure-sdk-for-go/sdk/azcore v1.18.2 - github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.11.0 + github.com/Azure/azure-sdk-for-go/sdk/azcore v1.19.1 + github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.12.0 github.com/Azure/go-autorest/autorest v0.11.30 github.com/BurntSushi/toml v1.5.0 github.com/DATA-DOG/go-sqlmock v1.5.2 github.com/DataDog/go-sqllexer v0.1.6 github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector v0.53.0 - github.com/IBM/sarama v1.46.0 - github.com/KimMachineGun/automemlimit v0.7.1 + github.com/IBM/sarama v1.46.1 + github.com/KimMachineGun/automemlimit v0.7.4 github.com/Lusitaniae/apache_exporter v0.11.1-0.20220518131644-f9522724dab4 github.com/Masterminds/goutils v1.1.1 github.com/Masterminds/sprig/v3 v3.3.0 @@ -22,7 +22,7 @@ require ( github.com/alecthomas/kingpin/v2 v2.4.0 github.com/alecthomas/units v0.0.0-20240927000941-0f3dac36c52b github.com/aws/aws-sdk-go-v2 v1.39.2 - github.com/aws/aws-sdk-go-v2/config v1.31.11 + github.com/aws/aws-sdk-go-v2/config v1.31.12 github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.9 github.com/aws/aws-sdk-go-v2/service/s3 v1.87.3 github.com/aws/aws-sdk-go-v2/service/servicediscovery v1.37.0 @@ -35,7 +35,7 @@ require ( github.com/coreos/go-systemd v0.0.0-20191104093116-d3cd4ed1dbcf github.com/coreos/go-systemd/v22 v22.6.0 github.com/dimchansky/utfbom v1.1.1 - github.com/docker/docker v28.3.3+incompatible + github.com/docker/docker v28.5.1+incompatible github.com/docker/go-connections v0.6.0 github.com/drone/envsubst/v2 v2.0.0-20210730161058-179042472c46 github.com/elastic/go-freelru v0.16.0 // indirect @@ -47,7 +47,7 @@ require ( github.com/go-git/go-git/v5 v5.16.2 github.com/go-kit/kit v0.13.0 github.com/go-kit/log v0.2.1 - github.com/go-logfmt/logfmt v0.6.0 + github.com/go-logfmt/logfmt v0.6.1 github.com/go-logr/logr v1.4.3 github.com/go-sourcemap/sourcemap v2.1.4+incompatible github.com/go-sql-driver/mysql v1.9.3 @@ -57,7 +57,7 @@ require ( github.com/google/cadvisor v0.47.0 github.com/google/dnsmasq_exporter v0.2.1-0.20230620100026-44b14480804a github.com/google/go-cmp v0.7.0 - github.com/google/pprof v0.0.0-20250403155104-27863c87afa6 + github.com/google/pprof v0.0.0-20250923004556-9e5a51aed1e8 github.com/google/renameio/v2 v2.0.0 github.com/google/uuid v1.6.0 github.com/gorilla/mux v1.8.1 @@ -65,19 +65,19 @@ require ( github.com/grafana/alloy/syntax v0.1.0 github.com/grafana/beyla/v2 v2.7.4 github.com/grafana/catchpoint-prometheus-exporter v0.0.0-20250218151502-6e97feaee761 - github.com/grafana/ckit v0.0.0-20250514165824-dd4adf36ad34 + github.com/grafana/ckit v0.0.0-20250825110114-3ee952343746 github.com/grafana/cloudflare-go v0.0.0-20230110200409-c627cf6792f2 - github.com/grafana/dskit v0.0.0-20250703125411-00229f5b510c + github.com/grafana/dskit v0.0.0-20250828173137-de14cf923eeb github.com/grafana/go-gelf/v2 v2.0.1 github.com/grafana/jfr-parser/pprof v0.0.4 github.com/grafana/jsonparser v0.0.0-20241004153430-023329977675 github.com/grafana/kafka_exporter v0.0.0-20240409084445-5e3488ad9f9a - github.com/grafana/loki/pkg/push v0.0.0-20250630063055-0ee8e76ba280 - github.com/grafana/loki/v3 v3.0.0-20250630063055-0ee8e76ba280 // a commit from main branch. TODO: update to official release once there is one available with https://github.com/grafana/loki/commit/bd6db586182e90f5f2d781e540c023c2b2733186. + github.com/grafana/loki/pkg/push v0.0.0-20251021174646-053429db2124 + github.com/grafana/loki/v3 v3.0.0-20251021174646-053429db2124 // main branch (commit 053429db212405966051e8410ccf786db26065f1) - replace once there is a release that upgrades Loki's Prometheus. github.com/grafana/pyroscope-go/godeltaprof v0.1.8 github.com/grafana/pyroscope/api v1.2.0 github.com/grafana/pyroscope/ebpf v0.4.11 - github.com/grafana/regexp v0.0.0-20240607082908-2cb410fa05da + github.com/grafana/regexp v0.0.0-20250905093917-f7b3be9d1853 github.com/grafana/snowflake-prometheus-exporter v0.0.0-20251023151319-9baba332b98a github.com/grafana/tail v0.0.0-20230510142333-77b18831edf0 github.com/grafana/vmware_exporter v0.0.5-beta.0.20250218170317-73398ba08329 @@ -95,7 +95,7 @@ require ( github.com/hashicorp/vault/api/auth/kubernetes v0.2.0 github.com/hashicorp/vault/api/auth/ldap v0.2.0 github.com/hashicorp/vault/api/auth/userpass v0.9.0 - github.com/heroku/x v0.4.3 + github.com/heroku/x v0.5.2 github.com/influxdata/influxdb-client-go/v2 v2.14.0 github.com/influxdata/influxdb1-client v0.0.0-20220302092344-a9ab5670611c github.com/jaegertracing/jaeger-idl v0.6.0 @@ -136,19 +136,19 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/extension/storage/filestorage v0.134.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/datadog v0.134.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/kafka/configkafka v0.134.0 - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl v0.135.0 - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.136.0 - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.136.0 + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl v0.134.0 + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.138.0 + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.138.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza v0.134.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/loki v0.130.0 // TODO: Upgrade this when we can use a new version of otlptranslator github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/prometheus v0.134.0 github.com/open-telemetry/opentelemetry-collector-contrib/processor/attributesprocessor v0.134.0 github.com/open-telemetry/opentelemetry-collector-contrib/processor/cumulativetodeltaprocessor v0.134.0 - github.com/open-telemetry/opentelemetry-collector-contrib/processor/deltatocumulativeprocessor v0.134.0 + github.com/open-telemetry/opentelemetry-collector-contrib/processor/deltatocumulativeprocessor v0.136.0 github.com/open-telemetry/opentelemetry-collector-contrib/processor/filterprocessor v0.134.0 github.com/open-telemetry/opentelemetry-collector-contrib/processor/groupbyattrsprocessor v0.134.0 github.com/open-telemetry/opentelemetry-collector-contrib/processor/intervalprocessor v0.134.0 - github.com/open-telemetry/opentelemetry-collector-contrib/processor/k8sattributesprocessor v0.134.0 + github.com/open-telemetry/opentelemetry-collector-contrib/processor/k8sattributesprocessor v0.138.0 github.com/open-telemetry/opentelemetry-collector-contrib/processor/probabilisticsamplerprocessor v0.134.0 github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourcedetectionprocessor v0.134.0 github.com/open-telemetry/opentelemetry-collector-contrib/processor/spanprocessor v0.134.0 @@ -197,15 +197,15 @@ require ( github.com/prometheus/mysqld_exporter v0.17.2 github.com/prometheus/node_exporter v1.9.1 github.com/prometheus/procfs v0.17.0 - github.com/prometheus/prometheus v0.304.3-0.20250703114031-419d436a447a // replaced by a fork of v3.4.2 further down this file - github.com/prometheus/sigv4 v0.2.0 + github.com/prometheus/prometheus v0.305.1-0.20250806170547-208187eaa19b // replaced by a fork of v3.7.1 further down this file + github.com/prometheus/sigv4 v0.2.1 github.com/prometheus/snmp_exporter v0.29.0 // if you update the snmp_exporter version, make sure to update the SNMP_VERSION in _index github.com/prometheus/statsd_exporter v0.28.0 github.com/richardartoul/molecule v1.0.1-0.20240531184615-7ca0df43c0b3 github.com/rogpeppe/go-internal v1.14.1 github.com/rs/cors v1.11.1 github.com/samber/lo v1.51.0 - github.com/scaleway/scaleway-sdk-go v1.0.0-beta.34 + github.com/scaleway/scaleway-sdk-go v1.0.0-beta.35 github.com/shirou/gopsutil/v3 v3.24.5 github.com/sijms/go-ora/v2 v2.9.0 github.com/sirupsen/logrus v1.9.3 @@ -213,7 +213,7 @@ require ( github.com/spf13/cobra v1.9.1 github.com/spf13/pflag v1.0.10 github.com/stretchr/testify v1.11.1 - github.com/testcontainers/testcontainers-go v0.38.0 + github.com/testcontainers/testcontainers-go v0.39.0 github.com/tilinna/clock v1.1.0 github.com/uber/jaeger-client-go v2.30.0+incompatible github.com/vincent-petithory/dataurl v1.0.0 @@ -223,47 +223,47 @@ require ( github.com/xdg-go/scram v1.1.2 github.com/xwb1989/sqlparser v0.0.0-20180606152119-120387863bf2 // indirect github.com/zeebo/xxh3 v1.0.2 - go.opentelemetry.io/collector/client v1.42.0 - go.opentelemetry.io/collector/component v1.42.0 - go.opentelemetry.io/collector/component/componentstatus v0.134.0 - go.opentelemetry.io/collector/component/componenttest v0.136.0 - go.opentelemetry.io/collector/config/configauth v0.136.0 - go.opentelemetry.io/collector/config/configcompression v1.42.0 - go.opentelemetry.io/collector/config/configgrpc v0.136.0 - go.opentelemetry.io/collector/config/confighttp v0.136.0 - go.opentelemetry.io/collector/config/confignet v1.42.0 - go.opentelemetry.io/collector/config/configopaque v1.42.0 - go.opentelemetry.io/collector/config/configoptional v0.136.0 + go.opentelemetry.io/collector/client v1.44.0 + go.opentelemetry.io/collector/component v1.44.0 + go.opentelemetry.io/collector/component/componentstatus v0.138.0 + go.opentelemetry.io/collector/component/componenttest v0.138.0 + go.opentelemetry.io/collector/config/configauth v1.44.0 + go.opentelemetry.io/collector/config/configcompression v1.44.0 + go.opentelemetry.io/collector/config/configgrpc v0.138.0 + go.opentelemetry.io/collector/config/confighttp v0.138.0 + go.opentelemetry.io/collector/config/confignet v1.44.0 + go.opentelemetry.io/collector/config/configopaque v1.44.0 + go.opentelemetry.io/collector/config/configoptional v1.44.0 go.opentelemetry.io/collector/config/configretry v1.42.0 - go.opentelemetry.io/collector/config/configtelemetry v0.136.0 - go.opentelemetry.io/collector/config/configtls v1.42.0 - go.opentelemetry.io/collector/confmap v1.42.0 + go.opentelemetry.io/collector/config/configtelemetry v0.134.0 + go.opentelemetry.io/collector/config/configtls v1.44.0 + go.opentelemetry.io/collector/confmap v1.44.0 go.opentelemetry.io/collector/confmap/provider/yamlprovider v1.40.0 - go.opentelemetry.io/collector/confmap/xconfmap v0.136.0 + go.opentelemetry.io/collector/confmap/xconfmap v0.138.0 go.opentelemetry.io/collector/connector v0.134.0 go.opentelemetry.io/collector/connector/connectortest v0.134.0 - go.opentelemetry.io/collector/consumer v1.42.0 - go.opentelemetry.io/collector/consumer/consumertest v0.136.0 + go.opentelemetry.io/collector/consumer v1.44.0 + go.opentelemetry.io/collector/consumer/consumertest v0.138.0 go.opentelemetry.io/collector/exporter v1.42.0 - go.opentelemetry.io/collector/exporter/debugexporter v0.135.0 + go.opentelemetry.io/collector/exporter/debugexporter v0.134.0 go.opentelemetry.io/collector/exporter/exporterhelper v0.136.0 go.opentelemetry.io/collector/exporter/otlpexporter v0.136.0 go.opentelemetry.io/collector/exporter/otlphttpexporter v0.136.0 - go.opentelemetry.io/collector/extension v1.42.0 - go.opentelemetry.io/collector/extension/extensionauth v1.42.0 + go.opentelemetry.io/collector/extension v1.44.0 + go.opentelemetry.io/collector/extension/extensionauth v1.44.0 go.opentelemetry.io/collector/extension/extensiontest v0.136.0 go.opentelemetry.io/collector/extension/xextension v0.136.0 - go.opentelemetry.io/collector/featuregate v1.42.0 + go.opentelemetry.io/collector/featuregate v1.44.0 go.opentelemetry.io/collector/otelcol v0.134.0 - go.opentelemetry.io/collector/pdata v1.42.0 - go.opentelemetry.io/collector/pipeline v1.42.0 - go.opentelemetry.io/collector/processor v1.40.0 + go.opentelemetry.io/collector/pdata v1.44.0 + go.opentelemetry.io/collector/pipeline v1.44.0 + go.opentelemetry.io/collector/processor v1.44.0 go.opentelemetry.io/collector/processor/batchprocessor v0.134.0 go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.134.0 - go.opentelemetry.io/collector/receiver v1.42.0 - go.opentelemetry.io/collector/receiver/otlpreceiver v0.134.0 - go.opentelemetry.io/collector/receiver/receiverhelper v0.134.0 - go.opentelemetry.io/collector/receiver/receivertest v0.136.0 + go.opentelemetry.io/collector/receiver v1.44.0 + go.opentelemetry.io/collector/receiver/otlpreceiver v0.138.0 + go.opentelemetry.io/collector/receiver/receiverhelper v0.138.0 + go.opentelemetry.io/collector/receiver/receivertest v0.138.0 go.opentelemetry.io/collector/scraper/scraperhelper v0.134.0 go.opentelemetry.io/collector/service v0.134.0 go.opentelemetry.io/contrib/instrumentation/github.com/gorilla/mux/otelmux v0.45.0 @@ -286,15 +286,15 @@ require ( golang.org/x/crypto v0.42.0 golang.org/x/crypto/x509roots/fallback v0.0.0-20240208163226-62c9f1799c91 golang.org/x/exp v0.0.0-20250819193227-8b4c13bb791b - golang.org/x/net v0.44.0 + golang.org/x/net v0.45.0 golang.org/x/oauth2 v0.31.0 golang.org/x/sync v0.17.0 golang.org/x/sys v0.36.0 golang.org/x/text v0.29.0 golang.org/x/time v0.13.0 golang.org/x/tools v0.36.0 - google.golang.org/api v0.248.0 - google.golang.org/grpc v1.75.1 + google.golang.org/api v0.252.0 + google.golang.org/grpc v1.76.0 google.golang.org/protobuf v1.36.10 gopkg.in/yaml.v2 v2.4.0 gopkg.in/yaml.v3 v3.0.1 @@ -310,8 +310,8 @@ require ( ) require ( - cloud.google.com/go v0.121.4 // indirect - cloud.google.com/go/auth v0.16.5 // indirect + cloud.google.com/go v0.121.6 // indirect + cloud.google.com/go/auth v0.17.0 // indirect cloud.google.com/go/auth/oauth2adapt v0.2.8 // indirect cloud.google.com/go/compute/metadata v0.9.0 // indirect cloud.google.com/go/iam v1.5.2 // indirect @@ -347,7 +347,7 @@ require ( github.com/Azure/go-autorest/autorest/validation v0.3.1 // indirect github.com/Azure/go-autorest/logger v0.2.1 // indirect github.com/Azure/go-autorest/tracing v0.6.0 // indirect - github.com/AzureAD/microsoft-authentication-library-for-go v1.4.2 // indirect + github.com/AzureAD/microsoft-authentication-library-for-go v1.5.0 // indirect github.com/ClickHouse/clickhouse-go v1.5.4 // indirect github.com/Code-Hex/go-generics-cache v1.5.1 // indirect github.com/DataDog/agent-payload/v5 v5.0.163 // indirect @@ -457,13 +457,13 @@ require ( github.com/ProtonMail/go-crypto v1.1.6 // indirect github.com/Shopify/sarama v1.38.1 // indirect github.com/Showmax/go-fqdn v1.0.0 // indirect - github.com/Workiva/go-datastructures v1.1.5 // indirect + github.com/Workiva/go-datastructures v1.1.6 // indirect github.com/alecthomas/participle/v2 v2.1.4 // indirect github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751 // indirect - github.com/andybalholm/brotli v1.1.1 // indirect + github.com/andybalholm/brotli v1.2.0 // indirect github.com/antchfx/xmlquery v1.4.4 // indirect github.com/antchfx/xpath v1.3.5 // indirect - github.com/apache/arrow-go/v18 v18.3.1 // indirect + github.com/apache/arrow-go/v18 v18.4.0 // indirect github.com/apache/thrift v0.22.0 // indirect github.com/apapsch/go-jsonmerge/v2 v2.0.0 // indirect github.com/armon/go-metrics v0.4.1 // indirect @@ -471,7 +471,7 @@ require ( github.com/aws/aws-msk-iam-sasl-signer-go v1.0.4 // indirect github.com/aws/aws-sdk-go v1.55.7 // indirect github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.1 // indirect - github.com/aws/aws-sdk-go-v2/credentials v1.18.15 // indirect + github.com/aws/aws-sdk-go-v2/credentials v1.18.16 // indirect github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.18.1 // indirect github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.9 // indirect github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.9 // indirect @@ -484,17 +484,18 @@ require ( github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.45.3 // indirect github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.54.0 // indirect github.com/aws/aws-sdk-go-v2/service/databasemigrationservice v1.45.1 // indirect - github.com/aws/aws-sdk-go-v2/service/ec2 v1.237.0 // indirect + github.com/aws/aws-sdk-go-v2/service/ec2 v1.254.1 // indirect github.com/aws/aws-sdk-go-v2/service/ecs v1.53.8 // indirect github.com/aws/aws-sdk-go-v2/service/iam v1.38.3 // indirect github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.1 // indirect github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.8.6 // indirect github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.9 // indirect github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.6 // indirect + github.com/aws/aws-sdk-go-v2/service/lightsail v1.49.1 // indirect github.com/aws/aws-sdk-go-v2/service/resourcegroupstaggingapi v1.25.8 // indirect github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.27.0 // indirect github.com/aws/aws-sdk-go-v2/service/shield v1.29.8 // indirect - github.com/aws/aws-sdk-go-v2/service/sso v1.29.5 // indirect + github.com/aws/aws-sdk-go-v2/service/sso v1.29.6 // indirect github.com/aws/aws-sdk-go-v2/service/ssooidc v1.35.1 // indirect github.com/aws/aws-sdk-go-v2/service/storagegateway v1.34.8 // indirect github.com/aws/aws-sdk-go-v2/service/sts v1.38.6 // indirect @@ -505,7 +506,7 @@ require ( github.com/beevik/ntp v1.3.0 // indirect github.com/benbjohnson/clock v1.3.5 // indirect github.com/beorn7/perks v1.0.1 // indirect - github.com/bits-and-blooms/bitset v1.10.0 // indirect + github.com/bits-and-blooms/bitset v1.22.0 // indirect github.com/bits-and-blooms/bloom/v3 v3.7.0 // indirect github.com/bmatcuk/doublestar/v4 v4.9.1 // indirect github.com/briandowns/spinner v1.23.0 // indirect @@ -522,7 +523,7 @@ require ( github.com/cloudflare/circl v1.6.1 // indirect github.com/cloudflare/golz4 v0.0.0-20150217214814-ef862a3cdc58 // indirect github.com/cncf/xds/go v0.0.0-20250501225837-2ac532fd4443 // indirect - github.com/containerd/console v1.0.4 // indirect + github.com/containerd/console v1.0.5 // indirect github.com/containerd/continuity v0.4.5 // indirect github.com/containerd/errdefs v1.0.0 // indirect github.com/containerd/errdefs/pkg v0.3.0 // indirect @@ -544,7 +545,7 @@ require ( github.com/denverdino/aliyungo v0.0.0-20190125010748-a747050bb1ba // indirect github.com/dgryski/go-metro v0.0.0-20180109044635-280f6062b5bc // indirect github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect - github.com/digitalocean/godo v1.152.0 // indirect + github.com/digitalocean/godo v1.165.1 // indirect github.com/distribution/reference v0.6.0 // indirect github.com/docker/cli v28.1.1+incompatible // indirect github.com/docker/go-units v0.5.0 // indirect @@ -554,7 +555,7 @@ require ( github.com/eapache/go-resiliency v1.7.0 // indirect github.com/eapache/go-xerial-snappy v0.0.0-20230731223053-c322873962e3 // indirect github.com/eapache/queue v1.1.0 // indirect - github.com/ebitengine/purego v0.8.4 // indirect + github.com/ebitengine/purego v0.9.0 // indirect github.com/edsrzf/mmap-go v1.2.0 // indirect github.com/efficientgo/core v1.0.0-rc.3 // indirect github.com/elastic/go-grok v0.3.1 // indirect @@ -565,7 +566,7 @@ require ( github.com/ema/qdisc v1.0.0 // indirect github.com/emicklei/go-restful/v3 v3.13.0 // indirect github.com/emirpasic/gods v1.18.1 // indirect - github.com/envoyproxy/go-control-plane/envoy v1.32.4 // indirect + github.com/envoyproxy/go-control-plane/envoy v1.35.0 // indirect github.com/envoyproxy/protoc-gen-validate v1.2.1 // indirect github.com/euank/go-kmsg-parser v2.0.0+incompatible // indirect github.com/evanphx/json-patch/v5 v5.9.11 // indirect @@ -580,20 +581,19 @@ require ( github.com/gavv/monotime v0.0.0-20190418164738-30dba4353424 // indirect github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect github.com/go-git/go-billy/v5 v5.6.2 // indirect - github.com/go-jose/go-jose/v4 v4.1.1 // indirect + github.com/go-jose/go-jose/v4 v4.1.2 // indirect github.com/go-logr/stdr v1.2.2 // indirect github.com/go-ole/go-ole v1.3.0 // indirect github.com/go-openapi/analysis v0.23.0 // indirect - github.com/go-openapi/errors v0.22.1 // indirect + github.com/go-openapi/errors v0.22.3 // indirect github.com/go-openapi/jsonpointer v0.22.1 // indirect github.com/go-openapi/jsonreference v0.21.2 // indirect github.com/go-openapi/loads v0.22.0 // indirect github.com/go-openapi/runtime v0.28.0 // indirect github.com/go-openapi/spec v0.21.0 // indirect - github.com/go-openapi/strfmt v0.23.0 // indirect + github.com/go-openapi/strfmt v0.24.0 // indirect github.com/go-openapi/swag v0.25.1 // indirect github.com/go-openapi/validate v0.24.0 // indirect - github.com/go-redsync/redsync/v4 v4.13.0 // indirect github.com/go-resty/resty/v2 v2.16.5 // indirect github.com/go-viper/mapstructure/v2 v2.4.0 // indirect github.com/go-zookeeper/zk v1.0.4 // indirect @@ -623,12 +623,12 @@ require ( github.com/googleapis/enterprise-certificate-proxy v0.3.6 // indirect github.com/googleapis/gax-go/v2 v2.15.0 // indirect github.com/gophercloud/gophercloud v1.14.1 // indirect - github.com/gophercloud/gophercloud/v2 v2.7.0 // indirect + github.com/gophercloud/gophercloud/v2 v2.8.0 // indirect github.com/gorilla/websocket v1.5.4-0.20250319132907-e064f32e3674 // indirect github.com/gosnmp/gosnmp v1.41.0 // indirect github.com/grafana/faro/pkg/go v0.0.0-20250314155512-06a06da3b8bc // indirect github.com/grafana/go-offsets-tracker v0.1.7 // indirect - github.com/grafana/gomemcache v0.0.0-20250318131618-74242eea118d // indirect + github.com/grafana/gomemcache v0.0.0-20250828162811-a96f6acee2fe // indirect github.com/grafana/jfr-parser v0.9.3 // indirect github.com/grafana/jvmtools v0.0.3 // indirect github.com/grafana/otel-profiling-go v0.5.1 // indirect @@ -636,7 +636,7 @@ require ( github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.3.2 // indirect github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.2 // indirect github.com/gsterjov/go-libsecret v0.0.0-20161001094733-a6f4afe4910c // indirect - github.com/hashicorp/cronexpr v1.1.2 // indirect + github.com/hashicorp/cronexpr v1.1.3 // indirect github.com/hashicorp/errwrap v1.1.0 // indirect github.com/hashicorp/go-cleanhttp v0.5.2 // indirect github.com/hashicorp/go-discover/provider/gce v0.0.0-20250625044749-2961509ab243 // indirect @@ -656,11 +656,11 @@ require ( github.com/hashicorp/hcl v1.0.1-vault-7 // indirect github.com/hashicorp/mdns v1.0.5 // indirect github.com/hashicorp/memberlist v0.5.3 // indirect - github.com/hashicorp/nomad/api v0.0.0-20241218080744-e3ac00f30eec // indirect + github.com/hashicorp/nomad/api v0.0.0-20250930071859-eaa0fe0e27af // indirect github.com/hashicorp/serf v0.10.2 // indirect github.com/hashicorp/vic v1.5.1-0.20190403131502-bbfe86ec9443 // indirect github.com/hectane/go-acl v0.0.0-20230122075934-ca0b05cb1adb // indirect - github.com/hetznercloud/hcloud-go/v2 v2.21.1 // indirect + github.com/hetznercloud/hcloud-go/v2 v2.25.1 // indirect github.com/hodgesds/perf-utils v0.7.0 // indirect github.com/huandu/xstrings v1.5.0 // indirect github.com/iancoleman/strcase v0.3.0 // indirect @@ -712,7 +712,7 @@ require ( github.com/kylelemons/godebug v1.1.0 // indirect github.com/leodido/ragel-machinery v0.0.0-20190525184631-5f46317e436b // indirect github.com/lightstep/go-expohisto v1.0.0 // indirect - github.com/linode/linodego v1.52.1 // indirect + github.com/linode/linodego v1.59.0 // indirect github.com/lufia/iostat v1.2.1 // indirect github.com/lufia/plan9stats v0.0.0-20250827001030-24949be3fa54 // indirect github.com/magefile/mage v1.15.0 // indirect @@ -766,12 +766,12 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/extension/ackextension v0.134.0 // indirect github.com/open-telemetry/opentelemetry-collector-contrib/extension/encoding v0.134.0 // indirect; indirect) github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/ecsutil v0.134.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.134.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.136.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.138.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.138.0 // indirect github.com/open-telemetry/opentelemetry-collector-contrib/internal/datadog v0.134.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/internal/exp/metrics v0.134.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/internal/exp/metrics v0.136.0 // indirect github.com/open-telemetry/opentelemetry-collector-contrib/internal/filter v0.134.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig v0.134.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig v0.138.0 // indirect github.com/open-telemetry/opentelemetry-collector-contrib/internal/kafka v0.134.0 // indirect github.com/open-telemetry/opentelemetry-collector-contrib/internal/metadataproviders v0.134.0 // indirect github.com/open-telemetry/opentelemetry-collector-contrib/internal/pdatautil v0.134.0 // indirect @@ -794,19 +794,20 @@ require ( github.com/opencontainers/runtime-spec v1.2.1 // indirect github.com/opencontainers/selinux v1.12.0 // indirect github.com/openshift/api v3.9.0+incompatible // indirect - github.com/openshift/client-go v0.0.0-20241203091221-452dfb8fa071 // indirect + github.com/openshift/client-go v0.0.0-20251015124057-db0dee36e235 // indirect github.com/opentracing-contrib/go-grpc v0.1.2 // indirect github.com/opentracing-contrib/go-stdlib v1.1.0 // indirect github.com/opentracing/opentracing-go v1.2.1-0.20220228012449-10b1cf09e00b // indirect github.com/openzipkin/zipkin-go v0.4.3 // indirect github.com/oracle/oci-go-sdk/v65 v65.89.3 // indirect github.com/outcaste-io/ristretto v0.2.3 // indirect - github.com/ovh/go-ovh v1.8.0 // indirect + github.com/ovh/go-ovh v1.9.0 // indirect github.com/packethost/packngo v0.1.1-0.20180711074735-b9cb5096f54c // indirect github.com/patrickmn/go-cache v2.1.0+incompatible // indirect github.com/pbnjay/memory v0.0.0-20210728143218-7b4eea64cf58 // indirect github.com/pelletier/go-toml v1.9.5 // indirect github.com/percona/percona-backup-mongodb v1.8.1-0.20250218045950-7e9f38fe06ab // indirect + github.com/peterbourgon/ff/v3 v3.4.0 // indirect github.com/philhofer/fwd v1.2.0 // indirect github.com/pierrec/lz4 v2.6.1+incompatible // indirect github.com/pierrec/lz4/v4 v4.1.22 // indirect @@ -822,7 +823,7 @@ require ( github.com/prometheus-community/prom-label-proxy v0.11.0 // indirect github.com/prometheus/alertmanager v0.28.1 // indirect github.com/prometheus/exporter-toolkit v0.14.1 // indirect - github.com/prometheus/otlptranslator v0.0.0-20250620074007-94f535e0c588 // indirect + github.com/prometheus/otlptranslator v1.0.0 // indirect github.com/puzpuzpuz/xsync/v3 v3.5.1 // indirect github.com/rcrowley/go-metrics v0.0.0-20250401214520-65e299d6c5c9 // indirect github.com/redis/go-redis/v9 v9.11.0 // indirect @@ -838,7 +839,7 @@ require ( github.com/secure-systems-lab/go-securesystemslib v0.9.0 // indirect github.com/sercand/kuberesolver/v6 v6.0.0 // indirect github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 // indirect - github.com/shirou/gopsutil/v4 v4.25.8-0.20250809033336-ffcdc2b7662f // indirect + github.com/shirou/gopsutil/v4 v4.25.9 // indirect github.com/shoenig/go-m1cpu v0.1.7 // indirect github.com/shopspring/decimal v1.4.0 // indirect github.com/shurcooL/httpfs v0.0.0-20230704072500-f1e31cf0ba5c // indirect @@ -848,10 +849,11 @@ require ( github.com/softlayer/softlayer-go v0.0.0-20180806151055-260589d94c7d // indirect github.com/soheilhy/cmux v0.1.5 // indirect github.com/sony/gobreaker v0.5.0 // indirect - github.com/sony/gobreaker/v2 v2.1.0 // indirect - github.com/spf13/afero v1.14.0 // indirect + github.com/sony/gobreaker/v2 v2.3.0 // indirect + github.com/spf13/afero v1.15.0 // indirect github.com/spf13/cast v1.9.2 // indirect github.com/spf13/jwalterweatherman v1.1.0 // indirect + github.com/stackitcloud/stackit-sdk-go/core v0.17.3 // indirect github.com/stormcat24/protodep v0.1.8 // indirect github.com/stretchr/objx v0.5.2 // indirect github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635 // indirect @@ -904,31 +906,31 @@ require ( go.mongodb.org/mongo-driver/v2 v2.3.0 // indirect go.opencensus.io v0.24.0 // indirect go.opentelemetry.io/auto/sdk v1.2.1 // indirect - go.opentelemetry.io/collector v0.136.0 // indirect - go.opentelemetry.io/collector/config/configmiddleware v1.42.0 // indirect + go.opentelemetry.io/collector v0.138.0 // indirect + go.opentelemetry.io/collector/config/configmiddleware v1.44.0 // indirect go.opentelemetry.io/collector/connector/xconnector v0.134.0 // indirect - go.opentelemetry.io/collector/consumer/consumererror v0.136.0 // indirect + go.opentelemetry.io/collector/consumer/consumererror v0.138.0 // indirect go.opentelemetry.io/collector/consumer/consumererror/xconsumererror v0.136.0 // indirect - go.opentelemetry.io/collector/consumer/xconsumer v0.136.0 // indirect + go.opentelemetry.io/collector/consumer/xconsumer v0.138.0 // indirect go.opentelemetry.io/collector/exporter/exporterhelper/xexporterhelper v0.136.0 // indirect go.opentelemetry.io/collector/exporter/exportertest v0.136.0 // indirect go.opentelemetry.io/collector/exporter/xexporter v0.136.0 // indirect go.opentelemetry.io/collector/extension/extensioncapabilities v0.134.0 // indirect - go.opentelemetry.io/collector/extension/extensionmiddleware v0.136.0 // indirect + go.opentelemetry.io/collector/extension/extensionmiddleware v0.138.0 // indirect go.opentelemetry.io/collector/filter v0.134.0 // indirect go.opentelemetry.io/collector/internal/fanoutconsumer v0.134.0 // indirect go.opentelemetry.io/collector/internal/memorylimiter v0.134.0 // indirect - go.opentelemetry.io/collector/internal/sharedcomponent v0.134.0 // indirect - go.opentelemetry.io/collector/internal/telemetry v0.136.0 // indirect - go.opentelemetry.io/collector/pdata/pprofile v0.136.0 // indirect - go.opentelemetry.io/collector/pdata/testdata v0.136.0 // indirect + go.opentelemetry.io/collector/internal/sharedcomponent v0.138.0 // indirect + go.opentelemetry.io/collector/internal/telemetry v0.138.0 // indirect + go.opentelemetry.io/collector/pdata/pprofile v0.138.0 // indirect + go.opentelemetry.io/collector/pdata/testdata v0.138.0 // indirect go.opentelemetry.io/collector/pdata/xpdata v0.136.0 // indirect - go.opentelemetry.io/collector/pipeline/xpipeline v0.136.0 // indirect - go.opentelemetry.io/collector/processor/processorhelper v0.134.0 // indirect - go.opentelemetry.io/collector/processor/processorhelper/xprocessorhelper v0.134.0 // indirect - go.opentelemetry.io/collector/processor/processortest v0.134.0 // indirect - go.opentelemetry.io/collector/processor/xprocessor v0.134.0 // indirect - go.opentelemetry.io/collector/receiver/xreceiver v0.136.0 // indirect + go.opentelemetry.io/collector/pipeline/xpipeline v0.138.0 // indirect + go.opentelemetry.io/collector/processor/processorhelper v0.138.0 // indirect + go.opentelemetry.io/collector/processor/processorhelper/xprocessorhelper v0.138.0 // indirect + go.opentelemetry.io/collector/processor/processortest v0.138.0 // indirect + go.opentelemetry.io/collector/processor/xprocessor v0.138.0 // indirect + go.opentelemetry.io/collector/receiver/xreceiver v0.138.0 // indirect go.opentelemetry.io/collector/scraper v0.134.0 // indirect go.opentelemetry.io/collector/semconv v0.128.1-0.20250610090210-188191247685 // indirect go.opentelemetry.io/collector/service/hostcapabilities v0.134.0 // indirect @@ -940,7 +942,7 @@ require ( go.opentelemetry.io/contrib/detectors/gcp v1.38.0 // indirect go.opentelemetry.io/contrib/exporters/autoexport v0.61.0 // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.63.0 // indirect - go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace v0.61.0 // indirect + go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace v0.63.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.63.0 go.opentelemetry.io/contrib/otelconf v0.16.0 // indirect go.opentelemetry.io/contrib/propagators/b3 v1.37.0 // indirect @@ -969,8 +971,8 @@ require ( gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect gonum.org/v1/gonum v0.16.0 // indirect google.golang.org/genproto v0.0.0-20250603155806-513f23925822 // indirect - google.golang.org/genproto/googleapis/api v0.0.0-20250922171735-9219d122eba9 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20250922171735-9219d122eba9 // indirect + google.golang.org/genproto/googleapis/api v0.0.0-20250929231259-57b25ae835d4 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20251002232023-7c0ddcbb5797 // indirect gopkg.in/alecthomas/kingpin.v2 v2.2.6 // indirect gopkg.in/evanphx/json-patch.v4 v4.13.0 // indirect gopkg.in/fsnotify/fsnotify.v1 v1.4.7 // indirect @@ -985,13 +987,10 @@ require ( k8s.io/kube-openapi v0.0.0-20250910181357-589584f1c912 // indirect sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730 // indirect sigs.k8s.io/randfill v1.0.0 // indirect - sigs.k8s.io/structured-merge-diff/v4 v4.7.0 // indirect + sigs.k8s.io/structured-merge-diff/v6 v6.3.0 // indirect ) -require ( - github.com/grafana/pyroscope/lidia v0.0.0-20250716102313-506840f4afcd - github.com/peterbourgon/ff/v3 v3.4.0 // indirect -) +require github.com/grafana/pyroscope/lidia v0.0.0-20250716102313-506840f4afcd require ( github.com/go-openapi/swag/cmdutils v0.25.1 // indirect @@ -1029,7 +1028,7 @@ replace github.com/fsnotify/fsnotify v1.8.0 => github.com/fsnotify/fsnotify v1.7 // TODO: remove replace directive once: // * There is a release of Prometheus which addresses https://github.com/prometheus/prometheus/issues/14049, // for example, via this implementation: https://github.com/grafana/prometheus/pull/34 -replace github.com/prometheus/prometheus => github.com/grafana/prometheus v1.8.2-0.20250811161144-6e21f656d8e5 // staleness_disabling_v3.4.2 branch +replace github.com/prometheus/prometheus => github.com/grafana/prometheus v1.8.2-0.20251020143145-59659a23710a // staleness_disabling_v3.7.1 branch replace gopkg.in/yaml.v2 => github.com/rfratto/go-yaml v0.0.0-20211119180816-77389c3526dc @@ -1046,8 +1045,6 @@ replace ( github.com/hashicorp/memberlist => github.com/grafana/memberlist v0.3.1-0.20220714140823-09ffed8adbbe // leodido fork his project to continue support github.com/influxdata/go-syslog/v3 => github.com/leodido/go-syslog/v4 v4.2.0 - // Loki needs a NormalizeLabel function which has been removed from the latest version of the translator - github.com/prometheus/otlptranslator => github.com/prometheus/otlptranslator v0.0.0-20250414121140-35db323fe9fb github.com/thanos-io/objstore => github.com/grafana/objstore v0.0.0-20250210100727-533688b5600d ) @@ -1086,11 +1083,12 @@ replace go.opentelemetry.io/obi => github.com/grafana/opentelemetry-ebpf-instrum replace go.opentelemetry.io/ebpf-profiler => github.com/grafana/opentelemetry-ebpf-profiler v0.0.202537-0.20250916114748-f2ff2fc6048c -// TODO - remove this once otel updates to go 1.24 & k8s client 0.33.x -replace k8s.io/client-go => k8s.io/client-go v0.32.6 +// Update openshift/client-go to a version compatible with structured-merge-diff v6 +replace github.com/openshift/client-go => github.com/openshift/client-go v0.0.0-20251015124057-db0dee36e235 -// TODO - remove this once otel updates to go 1.24 & k8s client 0.33.x -replace k8s.io/api => k8s.io/api v0.32.6 +// Use Grafana's patched k8sattributesprocessor that supports k8s.io/client-go v0.34.1 +// Adds RunWithContext and AddEventHandlerWithOptions methods to fake informers +replace github.com/open-telemetry/opentelemetry-collector-contrib/processor/k8sattributesprocessor => github.com/grafana/opentelemetry-collector-contrib/processor/k8sattributesprocessor v0.0.0-20251021125353-73458b01ab23 // TODO - remove this once otel updates to go 1.24 & k8s client 0.33.x replace go.opentelemetry.io/collector/pdata/pprofile => go.opentelemetry.io/collector/pdata/pprofile v0.135.0 @@ -1101,14 +1099,12 @@ replace go.opentelemetry.io/collector/pdata => go.opentelemetry.io/collector/pda // TODO - remove this once otel updates to go 1.24 & k8s client 0.33.x replace go.opentelemetry.io/collector/pdata/testdata => go.opentelemetry.io/collector/pdata/testdata v0.135.0 -// TODO - remove this once otel updates to go 1.24 & k8s client 0.33.x -replace k8s.io/apimachinery => k8s.io/apimachinery v0.33.5 - -// TODO - remove this once otel updates to go 1.24 & k8s client 0.33.x -replace k8s.io/kube-openapi => k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff - -// TODO - remove this once otel updates to go 1.24 & k8s client 0.33.x -replace github.com/google/gnostic-models => github.com/google/gnostic-models v0.6.9 +// Pin slim proto packages to v0.0.1 to maintain compatibility with pdata/pprofile v0.134.0 +// These packages contain the AttributeUnit type that pprofile v0.134.0 depends on +replace ( + go.opentelemetry.io/proto/slim/otlp/collector/profiles/v1development => go.opentelemetry.io/proto/slim/otlp/collector/profiles/v1development v0.0.1 + go.opentelemetry.io/proto/slim/otlp/profiles/v1development => go.opentelemetry.io/proto/slim/otlp/profiles/v1development v0.0.1 +) // Do not remove this until the bug breaking backwards compatibility is resolved & included in walqueue: https://github.com/deneonet/benc/issues/13 replace github.com/deneonet/benc => github.com/deneonet/benc v1.1.7 diff --git a/go.sum b/go.sum index 96d1c3facb..35637b1df8 100644 --- a/go.sum +++ b/go.sum @@ -15,10 +15,10 @@ cloud.google.com/go v0.56.0/go.mod h1:jr7tqZxxKOVYizybht9+26Z/gUq7tiRzu+ACVAMbKV cloud.google.com/go v0.57.0/go.mod h1:oXiQ6Rzq3RAkkY7N6t3TcE6jE+CIBBbA36lwQ1JyzZs= cloud.google.com/go v0.62.0/go.mod h1:jmCYTdRCQuc1PHIIJ/maLInMho30T/Y0M4hTdTShOYc= cloud.google.com/go v0.65.0/go.mod h1:O5N8zS7uWy9vkA9vayVHs65eM1ubvY4h553ofrNHObY= -cloud.google.com/go v0.121.4 h1:cVvUiY0sX0xwyxPwdSU2KsF9knOVmtRyAMt8xou0iTs= -cloud.google.com/go v0.121.4/go.mod h1:XEBchUiHFJbz4lKBZwYBDHV/rSyfFktk737TLDU089s= -cloud.google.com/go/auth v0.16.5 h1:mFWNQ2FEVWAliEQWpAdH80omXFokmrnbDhUS9cBywsI= -cloud.google.com/go/auth v0.16.5/go.mod h1:utzRfHMP+Vv0mpOkTRQoWD2q3BatTOoWbA7gCc2dUhQ= +cloud.google.com/go v0.121.6 h1:waZiuajrI28iAf40cWgycWNgaXPO06dupuS+sgibK6c= +cloud.google.com/go v0.121.6/go.mod h1:coChdst4Ea5vUpiALcYKXEpR1S9ZgXbhEzzMcMR66vI= +cloud.google.com/go/auth v0.17.0 h1:74yCm7hCj2rUyyAocqnFzsAYXgJhrG26XCFimrc/Kz4= +cloud.google.com/go/auth v0.17.0/go.mod h1:6wv/t5/6rOPAX4fJiRjKkJCvswLwdet7G8+UGXt7nCQ= cloud.google.com/go/auth/oauth2adapt v0.2.8 h1:keo8NaayQZ6wimpNSmW5OPc283g65QNIiLpZnkHRbnc= cloud.google.com/go/auth/oauth2adapt v0.2.8/go.mod h1:XQ9y31RkqZCcwJWNSx2Xvric3RrU88hAYYbjDWYDL+c= cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o= @@ -75,10 +75,10 @@ github.com/AlessandroPomponio/go-gibberish v0.0.0-20191004143433-a2d4156f0396 h1 github.com/AlessandroPomponio/go-gibberish v0.0.0-20191004143433-a2d4156f0396/go.mod h1:2VCDG9kHYQ5vfYUqeoB7foVlcvIvB7rp9LxTELLD1qU= github.com/Azure/azure-sdk-for-go v68.0.0+incompatible h1:fcYLmCpyNYRnvJbPerq7U0hS+6+I79yEDJBqVNcqUzU= github.com/Azure/azure-sdk-for-go v68.0.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc= -github.com/Azure/azure-sdk-for-go/sdk/azcore v1.18.2 h1:Hr5FTipp7SL07o2FvoVOX9HRiRH3CR3Mj8pxqCcdD5A= -github.com/Azure/azure-sdk-for-go/sdk/azcore v1.18.2/go.mod h1:QyVsSSN64v5TGltphKLQ2sQxe4OBQg0J1eKRcVBnfgE= -github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.11.0 h1:MhRfI58HblXzCtWEZCO0feHs8LweePB3s90r7WaR1KU= -github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.11.0/go.mod h1:okZ+ZURbArNdlJ+ptXoyHNuOETzOl1Oww19rm8I2WLA= +github.com/Azure/azure-sdk-for-go/sdk/azcore v1.19.1 h1:5YTBM8QDVIBN3sxBil89WfdAAqDZbyJTgh688DSxX5w= +github.com/Azure/azure-sdk-for-go/sdk/azcore v1.19.1/go.mod h1:YD5h/ldMsG0XiIw7PdyNhLxaM317eFh5yNLccNfGdyw= +github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.12.0 h1:wL5IEG5zb7BVv1Kv0Xm92orq+5hB5Nipn3B5tn4Rqfk= +github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.12.0/go.mod h1:J7MUC/wtRpfGVbQ5sIItY5/FuVWmvzlY21WAOfQnq/I= github.com/Azure/azure-sdk-for-go/sdk/azidentity/cache v0.3.2 h1:yz1bePFlP5Vws5+8ez6T3HWXPmwOK7Yvq8QxDBD3SKY= github.com/Azure/azure-sdk-for-go/sdk/azidentity/cache v0.3.2/go.mod h1:Pa9ZNPuoNu/GztvBSKk9J1cDJW6vk/n0zLtV4mgd8N8= github.com/Azure/azure-sdk-for-go/sdk/internal v1.11.2 h1:9iefClla7iYpfYWdzPCRDozdmndjTm8DXdpCzPajMgA= @@ -143,8 +143,8 @@ github.com/Azure/go-autorest/tracing v0.6.0 h1:TYi4+3m5t6K48TGI9AUdb+IzbnSxvnvUM github.com/Azure/go-autorest/tracing v0.6.0/go.mod h1:+vhtPC754Xsa23ID7GlGsrdKBpUA79WCAKPPZVC2DeU= github.com/AzureAD/microsoft-authentication-extensions-for-go/cache v0.1.1 h1:WJTmL004Abzc5wDB5VtZG2PJk5ndYDgVacGqfirKxjM= github.com/AzureAD/microsoft-authentication-extensions-for-go/cache v0.1.1/go.mod h1:tCcJZ0uHAmvjsVYzEFivsRTN00oz5BEsRgQHu5JZ9WE= -github.com/AzureAD/microsoft-authentication-library-for-go v1.4.2 h1:oygO0locgZJe7PpYPXT5A29ZkwJaPqcva7BVeemZOZs= -github.com/AzureAD/microsoft-authentication-library-for-go v1.4.2/go.mod h1:wP83P5OoQ5p6ip3ScPr0BAq0BvuPAvacpEuSzyouqAI= +github.com/AzureAD/microsoft-authentication-library-for-go v1.5.0 h1:XkkQbfMyuH2jTSjQjSoihryI8GINRcs4xp8lNawg0FI= +github.com/AzureAD/microsoft-authentication-library-for-go v1.5.0/go.mod h1:HKpQxkWaGLJ+D/5H8QRpyQXA1eKjxkFlOMwck5+33Jk= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/BurntSushi/toml v1.5.0 h1:W5quZX/G/csjUnuI8SUYlsHs9M38FC7znL0lIO+DvMg= github.com/BurntSushi/toml v1.5.0/go.mod h1:ukJfTF/6rtPPRCnwkur4qwRxa8vTRFBF0uk2lLoLwho= @@ -393,10 +393,10 @@ github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapp github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.53.0/go.mod h1:cSgYe11MCNYunTnRXrKiR/tHc0eoKjICUuWpNZoVCOo= github.com/HdrHistogram/hdrhistogram-go v1.1.2 h1:5IcZpTvzydCQeHzK4Ef/D5rrSqwxob0t8PQPMybUNFM= github.com/HdrHistogram/hdrhistogram-go v1.1.2/go.mod h1:yDgFjdqOqDEKOvasDdhWNXYg9BVp4O+o5f6V/ehm6Oo= -github.com/IBM/sarama v1.46.0 h1:+YTM1fNd6WKMchlnLKRUB5Z0qD4M8YbvwIIPLvJD53s= -github.com/IBM/sarama v1.46.0/go.mod h1:0lOcuQziJ1/mBGHkdp5uYrltqQuKQKM5O5FOWUQVVvo= -github.com/KimMachineGun/automemlimit v0.7.1 h1:QcG/0iCOLChjfUweIMC3YL5Xy9C3VBeNmCZHrZfJMBw= -github.com/KimMachineGun/automemlimit v0.7.1/go.mod h1:QZxpHaGOQoYvFhv/r4u3U0JTC2ZcOwbSr11UZF46UBM= +github.com/IBM/sarama v1.46.1 h1:AlDkvyQm4LKktoQZxv0sbTfH3xukeH7r/UFBbUmFV9M= +github.com/IBM/sarama v1.46.1/go.mod h1:ipyOREIx+o9rMSrrPGLZHGuT0mzecNzKd19Quq+Q8AA= +github.com/KimMachineGun/automemlimit v0.7.4 h1:UY7QYOIfrr3wjjOAqahFmC3IaQCLWvur9nmfIn6LnWk= +github.com/KimMachineGun/automemlimit v0.7.4/go.mod h1:QZxpHaGOQoYvFhv/r4u3U0JTC2ZcOwbSr11UZF46UBM= github.com/Lusitaniae/apache_exporter v0.11.1-0.20220518131644-f9522724dab4 h1:UEm6tMvLH2t2honcWG0q+h0qr/60++9cuh/fy7hLyMc= github.com/Lusitaniae/apache_exporter v0.11.1-0.20220518131644-f9522724dab4/go.mod h1:IfUbHkoXypdKnVGHWQ3DLRRRZzIU/JIExQAd9xgxRfw= github.com/Masterminds/goutils v1.1.1 h1:5nUrii3FMTL5diU80unEVvNevw1nH4+ZV4DSLVJLSYI= @@ -426,8 +426,8 @@ github.com/Showmax/go-fqdn v1.0.0 h1:0rG5IbmVliNT5O19Mfuvna9LL7zlHyRfsSvBPZmF9tM github.com/Showmax/go-fqdn v1.0.0/go.mod h1:SfrFBzmDCtCGrnHhoDjuvFnKsWjEQX/Q9ARZvOrJAko= github.com/UNO-SOFT/zlog v0.8.1 h1:TEFkGJHtUfTRgMkLZiAjLSHALjwSBdw6/zByMC5GJt4= github.com/UNO-SOFT/zlog v0.8.1/go.mod h1:yqFOjn3OhvJ4j7ArJqQNA+9V+u6t9zSAyIZdWdMweWc= -github.com/Workiva/go-datastructures v1.1.5 h1:5YfhQ4ry7bZc2Mc7R0YZyYwpf5c6t1cEFvdAhd6Mkf4= -github.com/Workiva/go-datastructures v1.1.5/go.mod h1:1yZL+zfsztete+ePzZz/Zb1/t5BnDuE2Ya2MMGhzP6A= +github.com/Workiva/go-datastructures v1.1.6 h1:e2eUkTi+YlNRw6YxH2c+DmgXENTKjCofaiVeDIv6e/U= +github.com/Workiva/go-datastructures v1.1.6/go.mod h1:1yZL+zfsztete+ePzZz/Zb1/t5BnDuE2Ya2MMGhzP6A= github.com/abdullin/seq v0.0.0-20160510034733-d5467c17e7af h1:DBNMBMuMiWYu0b+8KMJuWmfCkcxl09JwdlqwDZZ6U14= github.com/abdullin/seq v0.0.0-20160510034733-d5467c17e7af/go.mod h1:5Jv4cbFiHJMsVxt52+i0Ha45fjshj6wxYr1r19tB9bw= github.com/alecthomas/assert/v2 v2.11.0 h1:2Q9r3ki8+JYXvGsDyBXwH3LcJ+WK5D0gc5E8vS6K3D0= @@ -446,11 +446,10 @@ github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRF github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d/go.mod h1:rBZYJk541a8SKzHPHnH3zbiI+7dagKZ0cgpgrD7Fyho= github.com/alecthomas/units v0.0.0-20240927000941-0f3dac36c52b h1:mimo19zliBX/vSQ6PWWSL9lK8qwHozUj03+zLoEB8O0= github.com/alecthomas/units v0.0.0-20240927000941-0f3dac36c52b/go.mod h1:fvzegU4vN3H1qMT+8wDmzjAcDONcgo2/SZ/TyfdUOFs= -github.com/alicebob/miniredis v2.5.0+incompatible h1:yBHoLpsyjupjz3NL3MhKMVkR41j82Yjf3KFv7ApYzUI= github.com/alicebob/miniredis/v2 v2.35.0 h1:QwLphYqCEAo1eu1TqPRN2jgVMPBweeQcR21jeqDCONI= github.com/alicebob/miniredis/v2 v2.35.0/go.mod h1:TcL7YfarKPGDAthEtl5NBeHZfeUQj6OXMm/+iu5cLMM= -github.com/andybalholm/brotli v1.1.1 h1:PR2pgnyFznKEugtsUo0xLdDop5SKXd5Qf5ysW+7XdTA= -github.com/andybalholm/brotli v1.1.1/go.mod h1:05ib4cKhjx3OQYUY22hTVd34Bc8upXjOLL2rKwwZBoA= +github.com/andybalholm/brotli v1.2.0 h1:ukwgCxwYrmACq68yiUqwIWnGY0cTPox/M94sVwToPjQ= +github.com/andybalholm/brotli v1.2.0/go.mod h1:rzTDkvFWvIrjDXZHkuS16NPggd91W3kUSvPlQ1pLaKY= github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be h1:9AeTilPcZAjCFIImctFaOjnTIavg87rW78vTPkQqLI8= github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be/go.mod h1:ySMOLuWl6zY27l47sB3qLNK6tF2fkHG55UZxx8oIVo4= github.com/antchfx/xmlquery v1.4.4 h1:mxMEkdYP3pjKSftxss4nUHfjBhnMk4imGoR96FRY2dg= @@ -460,8 +459,8 @@ github.com/antchfx/xpath v1.3.5 h1:PqbXLC3TkfeZyakF5eeh3NTWEbYl4VHNVeufANzDbKQ= github.com/antchfx/xpath v1.3.5/go.mod h1:i54GszH55fYfBmoZXapTHN8T8tkcHfRgLyVwwqzXNcs= github.com/antihax/optional v0.0.0-20180407024304-ca021399b1a6/go.mod h1:V8iCPQYkqmusNa815XgQio277wI47sdRh1dUOLdyC6Q= github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY= -github.com/apache/arrow-go/v18 v18.3.1 h1:oYZT8FqONiK74JhlH3WKVv+2NKYoyZ7C2ioD4Dj3ixk= -github.com/apache/arrow-go/v18 v18.3.1/go.mod h1:12QBya5JZT6PnBihi5NJTzbACrDGXYkrgjujz3MRQXU= +github.com/apache/arrow-go/v18 v18.4.0 h1:/RvkGqH517iY8bZKc4FD5/kkdwXJGjxf28JIXbJ/oB0= +github.com/apache/arrow-go/v18 v18.4.0/go.mod h1:Aawvwhj8x2jURIzD9Moy72cF0FyJXOpkYpdmGRHcw14= github.com/apache/thrift v0.22.0 h1:r7mTJdj51TMDe6RtcmNdQxgn9XcyfGDOzegMDRg47uc= github.com/apache/thrift v0.22.0/go.mod h1:1e7J/O1Ae6ZQMTYdy9xa3w9k+XHWPfRvdPyJeynQ+/g= github.com/apapsch/go-jsonmerge/v2 v2.0.0 h1:axGnT1gRIfimI7gJifB699GoE/oq+F2MU7Dml6nw9rQ= @@ -490,11 +489,11 @@ github.com/aws/aws-sdk-go-v2 v1.39.2/go.mod h1:sDioUELIUO9Znk23YVmIk86/9DOpkbyyV github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.1 h1:i8p8P4diljCr60PpJp6qZXNlgX4m2yQFpYk+9ZT+J4E= github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.1/go.mod h1:ddqbooRZYNoJ2dsTwOty16rM+/Aqmk/GOXrK8cg7V00= github.com/aws/aws-sdk-go-v2/config v1.8.3/go.mod h1:4AEiLtAb8kLs7vgw2ZV3p2VZ1+hBavOc84hqxVNpCyw= -github.com/aws/aws-sdk-go-v2/config v1.31.11 h1:6QOO1mP0MgytbfKsL/r/gE1P6/c/4pPzrrU3hKxa5fs= -github.com/aws/aws-sdk-go-v2/config v1.31.11/go.mod h1:KzpDsPX/dLxaUzoqM3sN2NOhbQIW4HW/0W8rQA1YFEs= +github.com/aws/aws-sdk-go-v2/config v1.31.12 h1:pYM1Qgy0dKZLHX2cXslNacbcEFMkDMl+Bcj5ROuS6p8= +github.com/aws/aws-sdk-go-v2/config v1.31.12/go.mod h1:/MM0dyD7KSDPR+39p9ZNVKaHDLb9qnfDurvVS2KAhN8= github.com/aws/aws-sdk-go-v2/credentials v1.4.3/go.mod h1:FNNC6nQZQUuyhq5aE5c7ata8o9e4ECGmS4lAXC7o1mQ= -github.com/aws/aws-sdk-go-v2/credentials v1.18.15 h1:Gqy7/05KEfUSulSvwxnB7t8DuZMR3ShzNcwmTD6HOLU= -github.com/aws/aws-sdk-go-v2/credentials v1.18.15/go.mod h1:VWDWSRpYHjcjURRaQ7NUzgeKFN8Iv31+EOMT/W+bFyc= +github.com/aws/aws-sdk-go-v2/credentials v1.18.16 h1:4JHirI4zp958zC026Sm+V4pSDwW4pwLefKrc0bF2lwI= +github.com/aws/aws-sdk-go-v2/credentials v1.18.16/go.mod h1:qQMtGx9OSw7ty1yLclzLxXCRbrkjWAM7JnObZjmCB7I= github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.6.0/go.mod h1:gqlclDEZp4aqJOancXK6TN24aKhT0W0Ae9MHk3wzTMM= github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.9 h1:Mv4Bc0mWmv6oDuSWTKnk+wgeqPL5DRFu5bQL9BGPQ8Y= github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.9/go.mod h1:IKlKfRppK2a1y0gy1yH6zD+yX5uplJ6UuPlgd48dJiQ= @@ -524,8 +523,8 @@ github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.54.0 h1:YBaZkj6OnJvSPKMPM github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.54.0/go.mod h1:JGvzarQ8vyLLmajh2eV3lfS/BrOE32ryCgEh6mwDGnc= github.com/aws/aws-sdk-go-v2/service/databasemigrationservice v1.45.1 h1:O1tX03VY5JIsssTG2GMxwRaKa9PRgdXr7n11a45xK0I= github.com/aws/aws-sdk-go-v2/service/databasemigrationservice v1.45.1/go.mod h1:bquWddnSuIbQ4g5Q+DVSLa28hVAPhUYXYPuHVzY8sqE= -github.com/aws/aws-sdk-go-v2/service/ec2 v1.237.0 h1:XHE2G+yaDQql32FZt19QmQt4WuisqQJIkMUSCxeCUl8= -github.com/aws/aws-sdk-go-v2/service/ec2 v1.237.0/go.mod h1:t11/j/nH9i6bbsPH9xc04BJOsV2nVPUqrB67/TLDsyM= +github.com/aws/aws-sdk-go-v2/service/ec2 v1.254.1 h1:7p9bJCZ/b3EJXXARW7JMEs2IhsnI4YFHpfXQfgMh0eg= +github.com/aws/aws-sdk-go-v2/service/ec2 v1.254.1/go.mod h1:M8WWWIfXmxA4RgTXcI/5cSByxRqjgne32Sh0VIbrn0A= github.com/aws/aws-sdk-go-v2/service/ecs v1.53.8 h1:v1OectQdV/L+KSFSiqK00fXGN8FbaljRfNFysmWB8D0= github.com/aws/aws-sdk-go-v2/service/ecs v1.53.8/go.mod h1:F0DbgxpvuSvtYun5poG67EHLvci4SgzsMVO6SsPUqKk= github.com/aws/aws-sdk-go-v2/service/iam v1.38.3 h1:2sFIoFzU1IEL9epJWubJm9Dhrn45aTNEJuwsesaCGnk= @@ -539,6 +538,8 @@ github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.9 h1:5r34CgVOD github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.9/go.mod h1:dB12CEbNWPbzO2uC6QSWHteqOg4JfBVJOojbAoAUb5I= github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.6 h1:nEXUSAwyUfLTgnc9cxlDWy637qsq4UWwp3sNAfl0Z3Y= github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.6/go.mod h1:HGzIULx4Ge3Do2V0FaiYKcyKzOqwrhUZgCI77NisswQ= +github.com/aws/aws-sdk-go-v2/service/lightsail v1.49.1 h1:J1A0VJlt5HgUX6s11Obe9zrBDECeE2uhQc7Dwhdei9o= +github.com/aws/aws-sdk-go-v2/service/lightsail v1.49.1/go.mod h1:WEOSRNyfIfvgrD9MuSIGrogKyuFahaVMziVq1pHI0NQ= github.com/aws/aws-sdk-go-v2/service/resourcegroupstaggingapi v1.25.8 h1:AbzcSvp0w09y85Mwj5AxSAQosqbce+/wOEiS+tZk/w8= github.com/aws/aws-sdk-go-v2/service/resourcegroupstaggingapi v1.25.8/go.mod h1:+34YBpm8pl2Zzg9ZB5z0Ix/FIcR06yUoJSr2sEOi+wI= github.com/aws/aws-sdk-go-v2/service/s3 v1.87.3 h1:ETkfWcXP2KNPLecaDa++5bsQhCRa5M5sLUJa5DWYIIg= @@ -550,8 +551,8 @@ github.com/aws/aws-sdk-go-v2/service/servicediscovery v1.37.0/go.mod h1:0Y5X94eP github.com/aws/aws-sdk-go-v2/service/shield v1.29.8 h1:H5urm641txrisNK7AOXVVR3FdG/dGg+CpekseU5BgZk= github.com/aws/aws-sdk-go-v2/service/shield v1.29.8/go.mod h1:fl0FdAKddek5SfmZAINtCgq0IQohtrQMpAIszgQIVjs= github.com/aws/aws-sdk-go-v2/service/sso v1.4.2/go.mod h1:NBvT9R1MEF+Ud6ApJKM0G+IkPchKS7p7c2YPKwHmBOk= -github.com/aws/aws-sdk-go-v2/service/sso v1.29.5 h1:WwL5YLHabIBuAlEKRoLgqLz1LxTvCEpwsQr7MiW/vnM= -github.com/aws/aws-sdk-go-v2/service/sso v1.29.5/go.mod h1:5PfYspyCU5Vw1wNPsxi15LZovOnULudOQuVxphSflQA= +github.com/aws/aws-sdk-go-v2/service/sso v1.29.6 h1:A1oRkiSQOWstGh61y4Wc/yQ04sqrQZr1Si/oAXj20/s= +github.com/aws/aws-sdk-go-v2/service/sso v1.29.6/go.mod h1:5PfYspyCU5Vw1wNPsxi15LZovOnULudOQuVxphSflQA= github.com/aws/aws-sdk-go-v2/service/ssooidc v1.35.1 h1:5fm5RTONng73/QA73LhCNR7UT9RpFH3hR6HWL6bIgVY= github.com/aws/aws-sdk-go-v2/service/ssooidc v1.35.1/go.mod h1:xBEjWD13h+6nq+z4AkqSfSvqRKFgDIQeaMguAJndOWo= github.com/aws/aws-sdk-go-v2/service/storagegateway v1.34.8 h1:iGmu7HMw6AkqBHV9i5ROzn9otDr5S5PuLP+Ymd20gaE= @@ -582,8 +583,9 @@ github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+Ce github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs= -github.com/bits-and-blooms/bitset v1.10.0 h1:ePXTeiPEazB5+opbv5fr8umg2R/1NlzgDsyepwsSr88= github.com/bits-and-blooms/bitset v1.10.0/go.mod h1:7hO7Gc7Pp1vODcmWvKMRA9BNmbv6a/7QIWpPxHddWR8= +github.com/bits-and-blooms/bitset v1.22.0 h1:Tquv9S8+SGaS3EhyA+up3FXzmkhxPGjQQCkcs2uw7w4= +github.com/bits-and-blooms/bitset v1.22.0/go.mod h1:7hO7Gc7Pp1vODcmWvKMRA9BNmbv6a/7QIWpPxHddWR8= github.com/bits-and-blooms/bloom/v3 v3.7.0 h1:VfknkqV4xI+PsaDIsoHueyxVDZrfvMn56jeWUzvzdls= github.com/bits-and-blooms/bloom/v3 v3.7.0/go.mod h1:VKlUSvp0lFIYqxJjzdnSsZEw4iHb1kOL2tfHTgyJBHg= github.com/bkaradzic/go-lz4 v1.0.0 h1:RXc4wYsyz985CkXXeX04y4VnZFGG8Rd43pRaHsOXAKk= @@ -659,8 +661,8 @@ github.com/cncf/xds/go v0.0.0-20250501225837-2ac532fd4443 h1:aQ3y1lwWyqYPiWZThqv github.com/cncf/xds/go v0.0.0-20250501225837-2ac532fd4443/go.mod h1:W+zGtBO5Y1IgJhy4+A9GOqVhqLpfZi+vwmdNXUehLA8= github.com/cockroachdb/apd v1.1.0 h1:3LFP3629v+1aKXU5Q37mxmRxX/pIu1nijXydLShEq5I= github.com/cockroachdb/apd v1.1.0/go.mod h1:8Sl8LxpKi29FqWXR16WEFZRNSz3SoPzUzeMeY4+DwBQ= -github.com/containerd/console v1.0.4 h1:F2g4+oChYvBTsASRTz8NP6iIAi97J3TtSAsLbIFn4ro= -github.com/containerd/console v1.0.4/go.mod h1:YynlIjWYF8myEu6sdkwKIvGQq+cOckRm6So2avqoYAk= +github.com/containerd/console v1.0.5 h1:R0ymNeydRqH2DmakFNdmjR2k0t7UPuiOV/N/27/qqsc= +github.com/containerd/console v1.0.5/go.mod h1:YynlIjWYF8myEu6sdkwKIvGQq+cOckRm6So2avqoYAk= github.com/containerd/continuity v0.4.5 h1:ZRoN1sXq9u7V6QoHMcVWGhOwDFqZ4B9i5H6un1Wh0x4= github.com/containerd/continuity v0.4.5/go.mod h1:/lNJvtJKUQStBzpVQ1+rasXO1LAWtUQssk28EZvJ3nE= github.com/containerd/errdefs v1.0.0 h1:tg5yIfIlQIrxYtu9ajqY42W3lpS19XqdxRQeEwYG8PI= @@ -734,8 +736,8 @@ github.com/dgryski/go-metro v0.0.0-20180109044635-280f6062b5bc/go.mod h1:c9O8+fp github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f h1:lO4WD4F/rVNCu3HqELle0jiPLLBs70cWOduZpkS1E78= github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f/go.mod h1:cuUVRXasLTGF7a8hSLbxyZXjz+1KgoB3wDUb6vlszIc= github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no= -github.com/digitalocean/godo v1.152.0 h1:WRgkPMogZSXEJK70IkZKTB/PsMn16hMQ+NI3wCIQdzA= -github.com/digitalocean/godo v1.152.0/go.mod h1:tYeiWY5ZXVpU48YaFv0M5irUFHXGorZpDNm7zzdWMzM= +github.com/digitalocean/godo v1.165.1 h1:H37+W7TaGFOVH+HpMW4ZeW/hrq3AGNxg+B/K8/dZ9mQ= +github.com/digitalocean/godo v1.165.1/go.mod h1:xQsWpVCCbkDrWisHA72hPzPlnC+4W5w/McZY5ij9uvU= github.com/dimchansky/utfbom v1.1.1 h1:vV6w1AhK4VMnhBno/TPVCoK9U/LP0PkLCS9tbxHdi/U= github.com/dimchansky/utfbom v1.1.1/go.mod h1:SxdoEBH5qIqFocHMyGOXVAybYJdr71b1Q/j0mACtrfE= github.com/distribution/reference v0.6.0 h1:0IXCQ5g4/QMHHkarYzh5l+u8T3t73zM5QvfrDyIgxBk= @@ -744,8 +746,8 @@ github.com/dnaeon/go-vcr v1.2.0 h1:zHCHvJYTMh1N7xnV7zf1m1GPBF9Ad0Jk/whtQ1663qI= github.com/dnaeon/go-vcr v1.2.0/go.mod h1:R4UdLID7HZT3taECzJs4YgbbH6PIGXB6W/sc5OLb6RQ= github.com/docker/cli v28.1.1+incompatible h1:eyUemzeI45DY7eDPuwUcmDyDj1pM98oD5MdSpiItp8k= github.com/docker/cli v28.1.1+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= -github.com/docker/docker v28.3.3+incompatible h1:Dypm25kh4rmk49v1eiVbsAtpAsYURjYkaKubwuBdxEI= -github.com/docker/docker v28.3.3+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= +github.com/docker/docker v28.5.1+incompatible h1:Bm8DchhSD2J6PsFzxC35TZo4TLGR2PdW/E69rU45NhM= +github.com/docker/docker v28.5.1+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= github.com/docker/go-connections v0.6.0 h1:LlMG9azAe1TqfR7sO+NJttz1gy6KO7VJBh+pMmjSD94= github.com/docker/go-connections v0.6.0/go.mod h1:AahvXYshr6JgfUJGdDCs2b5EZG/vmaMAntpSFH5BFKE= github.com/docker/go-units v0.5.0 h1:69rxXcBk27SvSaaxTtLh/8llcHD8vYHT7WSdRZ/jvr4= @@ -767,8 +769,8 @@ github.com/eapache/go-xerial-snappy v0.0.0-20230731223053-c322873962e3 h1:Oy0F4A github.com/eapache/go-xerial-snappy v0.0.0-20230731223053-c322873962e3/go.mod h1:YvSRo5mw33fLEx1+DlK6L2VV43tJt5Eyel9n9XBcR+0= github.com/eapache/queue v1.1.0 h1:YOEu7KNc61ntiQlcEeUIoDTJ2o8mQznoNvUhiigpIqc= github.com/eapache/queue v1.1.0/go.mod h1:6eCeP0CKFpHLu8blIFXhExK/dRa7WDZfr6jVFPTqq+I= -github.com/ebitengine/purego v0.8.4 h1:CF7LEKg5FFOsASUj0+QwaXf8Ht6TlFxg09+S9wz0omw= -github.com/ebitengine/purego v0.8.4/go.mod h1:iIjxzd6CiRiOG0UyXP+V1+jWqUXVjPKLAI0mRfJZTmQ= +github.com/ebitengine/purego v0.9.0 h1:mh0zpKBIXDceC63hpvPuGLiJ8ZAa3DfrFTudmfi8A4k= +github.com/ebitengine/purego v0.9.0/go.mod h1:iIjxzd6CiRiOG0UyXP+V1+jWqUXVjPKLAI0mRfJZTmQ= github.com/edsrzf/mmap-go v1.2.0 h1:hXLYlkbaPzt1SaQk+anYwKSRNhufIDCchSPkUD6dD84= github.com/edsrzf/mmap-go v1.2.0/go.mod h1:19H/e8pUPLicwkyNgOykDXkJ9F0MHE+Z52B8EIth78Q= github.com/efficientgo/core v1.0.0-rc.3 h1:X6CdgycYWDcbYiJr1H1+lQGzx13o7bq3EUkbB9DsSPc= @@ -802,8 +804,8 @@ github.com/envoyproxy/go-control-plane v0.9.9-0.20210217033140-668b12f5399d/go.m github.com/envoyproxy/go-control-plane v0.9.10-0.20210907150352-cf90f659a021/go.mod h1:AFq3mo9L8Lqqiid3OhADV3RfLJnjiw63cSpi+fDTRC0= github.com/envoyproxy/go-control-plane v0.13.4 h1:zEqyPVyku6IvWCFwux4x9RxkLOMUL+1vC9xUFv5l2/M= github.com/envoyproxy/go-control-plane v0.13.4/go.mod h1:kDfuBlDVsSj2MjrLEtRWtHlsWIFcGyB2RMO44Dc5GZA= -github.com/envoyproxy/go-control-plane/envoy v1.32.4 h1:jb83lalDRZSpPWW2Z7Mck/8kXZ5CQAFYVjQcdVIr83A= -github.com/envoyproxy/go-control-plane/envoy v1.32.4/go.mod h1:Gzjc5k8JcJswLjAx1Zm+wSYE20UrLtt7JZMWiWQXQEw= +github.com/envoyproxy/go-control-plane/envoy v1.35.0 h1:ixjkELDE+ru6idPxcHLj8LBVc2bFP7iBytj353BoHUo= +github.com/envoyproxy/go-control-plane/envoy v1.35.0/go.mod h1:09qwbGVuSWWAyN5t/b3iyVfz5+z8QWGrzkoqm/8SbEs= github.com/envoyproxy/go-control-plane/ratelimit v0.1.0 h1:/G9QYbddjL25KvtKTv3an9lx6VBE2cnb8wp1vEGNYGI= github.com/envoyproxy/go-control-plane/ratelimit v0.1.0/go.mod h1:Wk+tMFAFbCXaJPzVVHnPgRKdUdwW/KdbRt94AzgRee4= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= @@ -874,8 +876,8 @@ github.com/go-git/go-git/v5 v5.16.2/go.mod h1:4Ge4alE/5gPs30F2H1esi2gPd69R0C39lo github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU= github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= -github.com/go-jose/go-jose/v4 v4.1.1 h1:JYhSgy4mXXzAdF3nUx3ygx347LRXJRrpgyU3adRmkAI= -github.com/go-jose/go-jose/v4 v4.1.1/go.mod h1:BdsZGqgdO3b6tTc6LSE56wcDbMMLuPsw5d4ZD5f94kA= +github.com/go-jose/go-jose/v4 v4.1.2 h1:TK/7NqRQZfgAh+Td8AlsrvtPoUyiHh0LqVvokh+1vHI= +github.com/go-jose/go-jose/v4 v4.1.2/go.mod h1:22cg9HWM1pOlnRiY+9cQYJ9XHmya1bYW8OeDM6Ku6Oo= github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= github.com/go-kit/kit v0.13.0 h1:OoneCcHKHQ03LfBpoQCUfCluwd2Vt3ohz+kvbJneZAU= @@ -890,8 +892,8 @@ github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9 github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk= github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A= github.com/go-logfmt/logfmt v0.5.1/go.mod h1:WYhtIu8zTZfxdn5+rREduYbwxfcBr/Vr6KEVveWlfTs= -github.com/go-logfmt/logfmt v0.6.0 h1:wGYYu3uicYdqXVgoYbvnkrPVXkuLM1p1ifugDMEdRi4= -github.com/go-logfmt/logfmt v0.6.0/go.mod h1:WYhtIu8zTZfxdn5+rREduYbwxfcBr/Vr6KEVveWlfTs= +github.com/go-logfmt/logfmt v0.6.1 h1:4hvbpePJKnIzH1B+8OR/JPbTx37NktoI9LE2QZBBkvE= +github.com/go-logfmt/logfmt v0.6.1/go.mod h1:EV2pOAQoZaT1ZXZbqDl5hrymndi4SY9ED9/z6CO0XAk= github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= github.com/go-logr/logr v1.3.0/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= github.com/go-logr/logr v1.4.3 h1:CjnDlHq8ikf6E492q6eKboGOC0T8CDaOvkHCIg8idEI= @@ -905,8 +907,8 @@ github.com/go-ole/go-ole v1.3.0 h1:Dt6ye7+vXGIKZ7Xtk4s6/xVdGDQynvom7xCFEdWr6uE= github.com/go-ole/go-ole v1.3.0/go.mod h1:5LS6F96DhAwUc7C+1HLexzMXY1xGRSryjyPPKW6zv78= github.com/go-openapi/analysis v0.23.0 h1:aGday7OWupfMs+LbmLZG4k0MYXIANxcuBTYUC03zFCU= github.com/go-openapi/analysis v0.23.0/go.mod h1:9mz9ZWaSlV8TvjQHLl2mUW2PbZtemkE8yA5v22ohupo= -github.com/go-openapi/errors v0.22.1 h1:kslMRRnK7NCb/CvR1q1VWuEQCEIsBGn5GgKD9e+HYhU= -github.com/go-openapi/errors v0.22.1/go.mod h1:+n/5UdIqdVnLIJ6Q9Se8HNGUXYaY6CN8ImWzfi/Gzp0= +github.com/go-openapi/errors v0.22.3 h1:k6Hxa5Jg1TUyZnOwV2Lh81j8ayNw5VVYLvKrp4zFKFs= +github.com/go-openapi/errors v0.22.3/go.mod h1:+WvbaBBULWCOna//9B9TbLNGSFOfF8lY9dw4hGiEiKQ= github.com/go-openapi/jsonpointer v0.22.1 h1:sHYI1He3b9NqJ4wXLoJDKmUmHkWy/L7rtEo92JUxBNk= github.com/go-openapi/jsonpointer v0.22.1/go.mod h1:pQT9OsLkfz1yWoMgYFy4x3U5GY5nUlsOn1qSBH5MkCM= github.com/go-openapi/jsonreference v0.21.2 h1:Wxjda4M/BBQllegefXrY/9aq1fxBA8sI5M/lFU6tSWU= @@ -917,8 +919,8 @@ github.com/go-openapi/runtime v0.28.0 h1:gpPPmWSNGo214l6n8hzdXYhPuJcGtziTOgUpvsF github.com/go-openapi/runtime v0.28.0/go.mod h1:QN7OzcS+XuYmkQLw05akXk0jRH/eZ3kb18+1KwW9gyc= github.com/go-openapi/spec v0.21.0 h1:LTVzPc3p/RzRnkQqLRndbAzjY0d0BCL72A6j3CdL9ZY= github.com/go-openapi/spec v0.21.0/go.mod h1:78u6VdPw81XU44qEWGhtr982gJ5BWg2c0I5XwVMotYk= -github.com/go-openapi/strfmt v0.23.0 h1:nlUS6BCqcnAk0pyhi9Y+kdDVZdZMHfEKQiS4HaMgO/c= -github.com/go-openapi/strfmt v0.23.0/go.mod h1:NrtIpfKtWIygRkKVsxh7XQMDQW5HKQl6S5ik2elW+K4= +github.com/go-openapi/strfmt v0.24.0 h1:dDsopqbI3wrrlIzeXRbqMihRNnjzGC+ez4NQaAAJLuc= +github.com/go-openapi/strfmt v0.24.0/go.mod h1:Lnn1Bk9rZjXxU9VMADbEEOo7D7CDyKGLsSKekhFr7s4= github.com/go-openapi/swag v0.25.1 h1:6uwVsx+/OuvFVPqfQmOOPsqTcm5/GkBhNwLqIR916n8= github.com/go-openapi/swag v0.25.1/go.mod h1:bzONdGlT0fkStgGPd3bhZf1MnuPkf2YAys6h+jZipOo= github.com/go-openapi/swag/cmdutils v0.25.1 h1:nDke3nAFDArAa631aitksFGj2omusks88GF1VwdYqPY= @@ -949,14 +951,6 @@ github.com/go-openapi/validate v0.24.0 h1:LdfDKwNbpB6Vn40xhTdNZAnfLECL81w+VX3Bum github.com/go-openapi/validate v0.24.0/go.mod h1:iyeX1sEufmv3nPbBdX3ieNviWnOZaJ1+zquzJEf2BAQ= github.com/go-quicktest/qt v1.101.1-0.20240301121107-c6c8733fa1e6 h1:teYtXy9B7y5lHTp8V9KPxpYRAVA7dozigQcMiBust1s= github.com/go-quicktest/qt v1.101.1-0.20240301121107-c6c8733fa1e6/go.mod h1:p4lGIVX+8Wa6ZPNDvqcxq36XpUDLh42FLetFU7odllI= -github.com/go-redis/redis v6.15.9+incompatible h1:K0pv1D7EQUjfyoMql+r/jZqCLizCGKFlFgcHWWmHQjg= -github.com/go-redis/redis v6.15.9+incompatible/go.mod h1:NAIEuMOZ/fxfXJIrKDQDz8wamY7mA7PouImQ2Jvg6kA= -github.com/go-redis/redis/v7 v7.4.1 h1:PASvf36gyUpr2zdOUS/9Zqc80GbM+9BDyiJSJDDOrTI= -github.com/go-redis/redis/v7 v7.4.1/go.mod h1:JDNMw23GTyLNC4GZu9njt15ctBQVn7xjRfnwdHj/Dcg= -github.com/go-redis/redis/v8 v8.11.5 h1:AcZZR7igkdvfVmQTPnu9WE37LRrO/YrBH5zWyjDC0oI= -github.com/go-redis/redis/v8 v8.11.5/go.mod h1:gREzHqY1hg6oD9ngVRbLStwAWKhA0FEgq8Jd4h5lpwo= -github.com/go-redsync/redsync/v4 v4.13.0 h1:49X6GJfnbLGaIpBBREM/zA4uIMDXKAh1NDkvQ1EkZKA= -github.com/go-redsync/redsync/v4 v4.13.0/go.mod h1:HMW4Q224GZQz6x1Xc7040Yfgacukdzu7ifTDAKiyErQ= github.com/go-resty/resty/v2 v2.16.5 h1:hBKqmWrr7uRc3euHVqmh1HTHcKn99Smr7o5spptdhTM= github.com/go-resty/resty/v2 v2.16.5/go.mod h1:hkJtXbA2iKHzJheXYvQ8snQES5ZLGKMwQ07xAwp/fiA= github.com/go-sourcemap/sourcemap v2.1.4+incompatible h1:a+iTbH5auLKxaNwQFg0B+TCYl6lbukKPc7b5x0n1s6Q= @@ -1073,8 +1067,8 @@ github.com/google/dnsmasq_exporter v0.2.1-0.20230620100026-44b14480804a h1:cnKkC github.com/google/dnsmasq_exporter v0.2.1-0.20230620100026-44b14480804a/go.mod h1:0UipONgYNVYq/tP7xau4Kr5Xlv7jcb9te+sOSDjylnQ= github.com/google/flatbuffers v25.2.10+incompatible h1:F3vclr7C3HpB1k9mxCGRMXq6FdUalZ6H/pNX4FP1v0Q= github.com/google/flatbuffers v25.2.10+incompatible/go.mod h1:1AeVuKshWv4vARoZatz6mlQ0JxURH0Kv5+zNeJKJCa8= -github.com/google/gnostic-models v0.6.9 h1:MU/8wDLif2qCXZmzncUQ/BOfxWfthHi63KqpoNbWqVw= -github.com/google/gnostic-models v0.6.9/go.mod h1:CiWsm0s6BSQd1hRn8/QmxqB6BesYcbSZxsz9b0KuDBw= +github.com/google/gnostic-models v0.7.0 h1:qwTtogB15McXDaNqTZdzPJRHvaVJlAl+HVQnLmJEJxo= +github.com/google/gnostic-models v0.7.0/go.mod h1:whL5G0m6dmc5cPxKc5bdKdEN3UjI7OUGxBlw57miDrQ= github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= @@ -1112,8 +1106,8 @@ github.com/google/pprof v0.0.0-20200229191704-1ebb73c60ed3/go.mod h1:ZgVRPoUq/hf github.com/google/pprof v0.0.0-20200430221834-fc25d7d30c6d/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= github.com/google/pprof v0.0.0-20200708004538-1a94d8640e99/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= github.com/google/pprof v0.0.0-20240227163752-401108e1b7e7/go.mod h1:czg5+yv1E0ZGTi6S6vVK1mke0fV+FaUhNGcd6VRS9Ik= -github.com/google/pprof v0.0.0-20250403155104-27863c87afa6 h1:BHT72Gu3keYf3ZEu2J0b1vyeLSOYI8bm5wbJM/8yDe8= -github.com/google/pprof v0.0.0-20250403155104-27863c87afa6/go.mod h1:boTsfXsheKC2y+lKOCMpSfarhxDeIzfZG1jqGcPl3cA= +github.com/google/pprof v0.0.0-20250923004556-9e5a51aed1e8 h1:ZI8gCoCjGzPsum4L21jHdQs8shFBIQih1TM9Rd/c+EQ= +github.com/google/pprof v0.0.0-20250923004556-9e5a51aed1e8/go.mod h1:I6V7YzU0XDpsHqbsyrghnFZLO1gwK6NPTNvmetQIk9U= github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= github.com/google/renameio/v2 v2.0.0 h1:UifI23ZTGY8Tt29JbYFiuyIU3eX+RNFtUwefq9qAhxg= github.com/google/renameio/v2 v2.0.0/go.mod h1:BtmJXm5YlszgC+TD4HOEEUFgkJP3nLxehU6hfe7jRt4= @@ -1132,8 +1126,8 @@ github.com/googleapis/gax-go/v2 v2.15.0 h1:SyjDc1mGgZU5LncH8gimWo9lW1DtIfPibOG81 github.com/googleapis/gax-go/v2 v2.15.0/go.mod h1:zVVkkxAQHa1RQpg9z2AUCMnKhi0Qld9rcmyfL1OZhoc= github.com/gophercloud/gophercloud v1.14.1 h1:DTCNaTVGl8/cFu58O1JwWgis9gtISAFONqpMKNg/Vpw= github.com/gophercloud/gophercloud v1.14.1/go.mod h1:aAVqcocTSXh2vYFZ1JTvx4EQmfgzxRcNupUfxZbBNDM= -github.com/gophercloud/gophercloud/v2 v2.7.0 h1:o0m4kgVcPgHlcXiWAjoVxGd8QCmvM5VU+YM71pFbn0E= -github.com/gophercloud/gophercloud/v2 v2.7.0/go.mod h1:Ki/ILhYZr/5EPebrPL9Ej+tUg4lqx71/YH2JWVeU+Qk= +github.com/gophercloud/gophercloud/v2 v2.8.0 h1:of2+8tT6+FbEYHfYC8GBu8TXJNsXYSNm9KuvpX7Neqo= +github.com/gophercloud/gophercloud/v2 v2.8.0/go.mod h1:Ki/ILhYZr/5EPebrPL9Ej+tUg4lqx71/YH2JWVeU+Qk= github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= github.com/gopherjs/gopherjs v1.17.2 h1:fQnZVsXk8uxXIStYb0N4bGk7jeyTalG/wsZjQ25dO0g= github.com/gopherjs/gopherjs v1.17.2/go.mod h1:pRRIvn/QzFLrKfvEz3qUuEhtE/zLCWfreZ6J5gM2i+k= @@ -1154,20 +1148,20 @@ github.com/grafana/cadvisor v0.0.0-20240729082359-1f04a91701e2 h1:ju6EcY2aEobeBg github.com/grafana/cadvisor v0.0.0-20240729082359-1f04a91701e2/go.mod h1:8sLW/G7rcFe1CKMaA4pYT4mX3P1xQVGqM6luzEzx/2g= github.com/grafana/catchpoint-prometheus-exporter v0.0.0-20250218151502-6e97feaee761 h1:dPJOIEwtQ8uR3Qa79pb/lsSFJQ6j4P9vpCUQ4fKimG4= github.com/grafana/catchpoint-prometheus-exporter v0.0.0-20250218151502-6e97feaee761/go.mod h1:S/M+H/0B7LSWtXbvzEOwqCl96xP6c1NOInW21+bzol0= -github.com/grafana/ckit v0.0.0-20250514165824-dd4adf36ad34 h1:t1Nfp9udkvbYiCwNEz4THAR8C74jgR5jHuHPvabr1rM= -github.com/grafana/ckit v0.0.0-20250514165824-dd4adf36ad34/go.mod h1:THPMJBdU2XgYUsYCG/PvtaYj1/NH4uNjw7U5kNohrLY= +github.com/grafana/ckit v0.0.0-20250825110114-3ee952343746 h1:M38XP642rwteNZz0tEwsiTAiulw4z554nSEPMdJexS8= +github.com/grafana/ckit v0.0.0-20250825110114-3ee952343746/go.mod h1:THPMJBdU2XgYUsYCG/PvtaYj1/NH4uNjw7U5kNohrLY= github.com/grafana/cloudflare-go v0.0.0-20230110200409-c627cf6792f2 h1:qhugDMdQ4Vp68H0tp/0iN17DM2ehRo1rLEdOFe/gB8I= github.com/grafana/cloudflare-go v0.0.0-20230110200409-c627cf6792f2/go.mod h1:w/aiO1POVIeXUQyl0VQSZjl5OAGDTL5aX+4v0RA1tcw= -github.com/grafana/dskit v0.0.0-20250703125411-00229f5b510c h1:m5O2Oj755FlFhKSuQB1KwcFZZRVijZWYU7u34dhS88M= -github.com/grafana/dskit v0.0.0-20250703125411-00229f5b510c/go.mod h1:gVg14WngG7SMnJ/5mZGNFAs31+7BhspoWfmZ/U4rb90= +github.com/grafana/dskit v0.0.0-20250828173137-de14cf923eeb h1:/7k3iGtgl99mhmsaMpB8REUEj8uEh6Nwo74fK342Gsc= +github.com/grafana/dskit v0.0.0-20250828173137-de14cf923eeb/go.mod h1:RtZNNRB6iArFqnfpaMP1KgMqTPfKbGmhRoj8MPcakfY= github.com/grafana/faro/pkg/go v0.0.0-20250314155512-06a06da3b8bc h1:o8BraeLtggPjb/n91jvQT4SgGn8j0jxOyIGEQSoIXwU= github.com/grafana/faro/pkg/go v0.0.0-20250314155512-06a06da3b8bc/go.mod h1:4CP5sfwz5+uVfNgCeA5/N6csXnzOgnkgT1jh57ASaK4= github.com/grafana/go-gelf/v2 v2.0.1 h1:BOChP0h/jLeD+7F9mL7tq10xVkDG15he3T1zHuQaWak= github.com/grafana/go-gelf/v2 v2.0.1/go.mod h1:lexHie0xzYGwCgiRGcvZ723bSNyNI8ZRD4s0CLobh90= github.com/grafana/go-offsets-tracker v0.1.7 h1:2zBQ7iiGzvyXY7LA8kaaSiEqH/Yx82UcfRabbY5aOG4= github.com/grafana/go-offsets-tracker v0.1.7/go.mod h1:qcQdu7zlUKIFNUdBJlLyNHuJGW0SKWKjkrN6jtt+jds= -github.com/grafana/gomemcache v0.0.0-20250318131618-74242eea118d h1:oXRJlb9UjVsl6LhqBdbyAQ9YFhExwsj4bjh5vwMNRZY= -github.com/grafana/gomemcache v0.0.0-20250318131618-74242eea118d/go.mod h1:j/s0jkda4UXTemDs7Pgw/vMT06alWc42CHisvYac0qw= +github.com/grafana/gomemcache v0.0.0-20250828162811-a96f6acee2fe h1:q+QaVANzNZxvTovycpQvDTfsNZ2rHh4XIIaccMnrIR4= +github.com/grafana/gomemcache v0.0.0-20250828162811-a96f6acee2fe/go.mod h1:j/s0jkda4UXTemDs7Pgw/vMT06alWc42CHisvYac0qw= github.com/grafana/jfr-parser v0.9.3 h1:rMrDfV7U5Ycz12/d57sQrN7UHmt1N6Wi6SSuNKi8hyk= github.com/grafana/jfr-parser v0.9.3/go.mod h1:KYbwbvXtBoOsYw9b9w8R01dbM5oVfopljq3hA1WDJMQ= github.com/grafana/jfr-parser/pprof v0.0.4 h1:QIpA0tTgG17m/l2B6X0tqf8dZu+AN/UY6B3aYLfAFtY= @@ -1178,16 +1172,18 @@ github.com/grafana/jvmtools v0.0.3 h1:4uPquep5v+54Z04OQYOCldrv2SR42IRagHQXrNHsc4 github.com/grafana/jvmtools v0.0.3/go.mod h1:b0tiPI5zNyIuPUz2DwvxUCI+5bFoG7A4i47F9sc8w98= github.com/grafana/kafka_exporter v0.0.0-20240409084445-5e3488ad9f9a h1:jqM4NNdx8LSquKo8bPx+XWn91S2b+sgNvEcFfSJQtHY= github.com/grafana/kafka_exporter v0.0.0-20240409084445-5e3488ad9f9a/go.mod h1:ZXGGyeTUMenf/H1CDBK9lv3azjswfa0nVzLoQAYmnDc= -github.com/grafana/loki/pkg/push v0.0.0-20250630063055-0ee8e76ba280 h1:yTQM0vlZPXSCJs4gpgPxAbbFXzfXm2ysmvY5PX4zGmg= -github.com/grafana/loki/pkg/push v0.0.0-20250630063055-0ee8e76ba280/go.mod h1:ny/0bFitf8KNZkZfweaI4hmwb5XPhaFD2d0kVcyKmjo= -github.com/grafana/loki/v3 v3.0.0-20250630063055-0ee8e76ba280 h1:O2EOxwTjNInrhF+Bvf1KeKtABHcB7VWHrLEOJX4moN4= -github.com/grafana/loki/v3 v3.0.0-20250630063055-0ee8e76ba280/go.mod h1:U1nzeM+jUTQByZzSp+RE4driDWq6J8v8gVBzh35b29o= +github.com/grafana/loki/pkg/push v0.0.0-20251021174646-053429db2124 h1:foSyX5m6IbhiTNh0AmLTv3+pwzYmbG/EmhXPhhYHkVQ= +github.com/grafana/loki/pkg/push v0.0.0-20251021174646-053429db2124/go.mod h1:wRkbMDOBU4IUjodxzhZ3PbgnlIfM48ySk3se1tEu34c= +github.com/grafana/loki/v3 v3.0.0-20251021174646-053429db2124 h1:sWgpgNEZG6Qh2HLDd0439wsmuCuPL/q7MR1cuCBpI/o= +github.com/grafana/loki/v3 v3.0.0-20251021174646-053429db2124/go.mod h1:vFb5vhaSm2qGE+t9uya4THmGvc+PBv10tFYnSgonWFs= github.com/grafana/memberlist v0.3.1-0.20220714140823-09ffed8adbbe h1:yIXAAbLswn7VNWBIvM71O2QsgfgW9fRXZNR0DXe6pDU= github.com/grafana/memberlist v0.3.1-0.20220714140823-09ffed8adbbe/go.mod h1:MS2lj3INKhZjWNqd3N0m3J+Jxf3DAOnAH9VT3Sh9MUE= github.com/grafana/mysqld_exporter v0.17.2-0.20250226152553-be612e3fdedd h1:FW1Km8Z1mE8r/WLBAbX3LYv14DEZehdZTWOfF4qsqOY= github.com/grafana/mysqld_exporter v0.17.2-0.20250226152553-be612e3fdedd/go.mod h1:iEFA+REkm+0WRvVxy0cA1bBhJlFcQB998yymb45TqMU= github.com/grafana/node_exporter v0.18.1-grafana-r01.0.20251024133138-bfa3c0a61c7a h1:lm2JF7rk5KAeSufsk5bVkqKGDdYMtEhePUmwwLbHLtY= github.com/grafana/node_exporter v0.18.1-grafana-r01.0.20251024133138-bfa3c0a61c7a/go.mod h1:BUJCdmzfsndvLKeFuONqMPsEA0fkeVuAyt8II4Lk0Dg= +github.com/grafana/opentelemetry-collector-contrib/processor/k8sattributesprocessor v0.0.0-20251021125353-73458b01ab23 h1:Im1l5kbKfi61ySivYhUBkyWTqHNyAKiWO6rNKQJoNmU= +github.com/grafana/opentelemetry-collector-contrib/processor/k8sattributesprocessor v0.0.0-20251021125353-73458b01ab23/go.mod h1:7+xyIHr2PJNE9kic/D91c9SMxACdGIGCJykzTcqsYv0= github.com/grafana/opentelemetry-collector/featuregate v0.0.0-20240325174506-2fd1623b2ca0 h1:i/Ne0XwoRokYj52ZcSmnvuyID3h/uA91n0Ycg/grHU8= github.com/grafana/opentelemetry-collector/featuregate v0.0.0-20240325174506-2fd1623b2ca0/go.mod h1:mm8+xyQfgDmqhyegZRNIQmoKsNnDTwWKFLsdMoXAb7A= github.com/grafana/opentelemetry-ebpf-instrumentation v1.3.2 h1:mg90SB3x+FADo1eBA+x111TiaoHG8nPsebA16CCspxg= @@ -1198,8 +1194,8 @@ github.com/grafana/otel-profiling-go v0.5.1 h1:stVPKAFZSa7eGiqbYuG25VcqYksR6iWvF github.com/grafana/otel-profiling-go v0.5.1/go.mod h1:ftN/t5A/4gQI19/8MoWurBEtC6gFw8Dns1sJZ9W4Tls= github.com/grafana/postgres_exporter v0.0.0-20250930111128-c8f6a9f4d363 h1:/vCopugIegPx9brm+E9+4bMQ6uIsZujCoE7su3bLLbk= github.com/grafana/postgres_exporter v0.0.0-20250930111128-c8f6a9f4d363/go.mod h1:dOdKpz09HRMtkSs8kba90eNmrL81E+LMotcP7eW9/ek= -github.com/grafana/prometheus v1.8.2-0.20250811161144-6e21f656d8e5 h1:3EpZnrtPndi1xtFKCrSELttNhykk9012DxKOeIH/bPY= -github.com/grafana/prometheus v1.8.2-0.20250811161144-6e21f656d8e5/go.mod h1:ioGx2SGKTY+fLnJSQCdTHqARVldGNS8OlIe3kvp98so= +github.com/grafana/prometheus v1.8.2-0.20251020143145-59659a23710a h1:8sZp6S6gz2pk75KdsbszVyYWuIZhpMb71tElS6wpELk= +github.com/grafana/prometheus v1.8.2-0.20251020143145-59659a23710a/go.mod h1:/7YQG/jOLg7ktxGritmdkZvezE1fa6aWDj0MGDIZvcY= github.com/grafana/pyroscope-go/godeltaprof v0.1.8 h1:iwOtYXeeVSAeYefJNaxDytgjKtUuKQbJqgAIjlnicKg= github.com/grafana/pyroscope-go/godeltaprof v0.1.8/go.mod h1:2+l7K7twW49Ct4wFluZD3tZ6e0SjanjcUUBPVD/UuGU= github.com/grafana/pyroscope/api v1.2.0 h1:SfHDZcEZ4Vbj/Jj3bTOSpm4IDB33wLA2xBYxROhiL4U= @@ -1212,8 +1208,6 @@ github.com/grafana/regexp v0.0.0-20240518133315-a468a5bfb3bc h1:GN2Lv3MGO7AS6PrR github.com/grafana/regexp v0.0.0-20240518133315-a468a5bfb3bc/go.mod h1:+JKpmjMGhpgPL+rXZ5nsZieVzvarn86asRlBg4uNGnk= github.com/grafana/smimesign v0.2.1-0.20220408144937-2a5adf3481d3 h1:UPkAxuhlAcRmJT3/qd34OMTl+ZU7BLLfOO2+NXBlJpY= github.com/grafana/smimesign v0.2.1-0.20220408144937-2a5adf3481d3/go.mod h1:iZiiwNT4HbtGRVqCQu7uJPEZCuEE5sfSSttcnePkDl4= -github.com/grafana/snowflake-prometheus-exporter v0.0.0-20251016132346-6d442402afb2 h1:Adchz4O0C13520kAihpBrmheVOfuZK9/e+6R+Hhovf8= -github.com/grafana/snowflake-prometheus-exporter v0.0.0-20251016132346-6d442402afb2/go.mod h1:TLf/gsyKggD6qiTXOC9dlTDFR0c3v6r/0Ufs6s9+xBc= github.com/grafana/snowflake-prometheus-exporter v0.0.0-20251023151319-9baba332b98a h1:G2OWgH6RoA9u9yqqXgQtn9kHJwDNxdgKSWMU5ymmeJQ= github.com/grafana/snowflake-prometheus-exporter v0.0.0-20251023151319-9baba332b98a/go.mod h1:TLf/gsyKggD6qiTXOC9dlTDFR0c3v6r/0Ufs6s9+xBc= github.com/grafana/tail v0.0.0-20230510142333-77b18831edf0 h1:bjh0PVYSVVFxzINqPFYJmAmJNrWPgnVjuSdYJGHmtFU= @@ -1243,8 +1237,8 @@ github.com/hashicorp/consul/api v1.32.1/go.mod h1:mXUWLnxftwTmDv4W3lzxYCPD199iNL github.com/hashicorp/consul/sdk v0.8.0/go.mod h1:GBvyrGALthsZObzUGsfgHZQDXjg4lOjagTIwIR1vPms= github.com/hashicorp/consul/sdk v0.16.1 h1:V8TxTnImoPD5cj0U9Spl0TUxcytjcbbJeADFF07KdHg= github.com/hashicorp/consul/sdk v0.16.1/go.mod h1:fSXvwxB2hmh1FMZCNl6PwX0Q/1wdWtHJcZ7Ea5tns0s= -github.com/hashicorp/cronexpr v1.1.2 h1:wG/ZYIKT+RT3QkOdgYc+xsKWVRgnxJ1OJtjjy84fJ9A= -github.com/hashicorp/cronexpr v1.1.2/go.mod h1:P4wA0KBl9C5q2hABiMO7cp6jcIg96CDh1Efb3g1PWA4= +github.com/hashicorp/cronexpr v1.1.3 h1:rl5IkxXN2m681EfivTlccqIryzYJSXRGRNa0xeG7NA4= +github.com/hashicorp/cronexpr v1.1.3/go.mod h1:P4wA0KBl9C5q2hABiMO7cp6jcIg96CDh1Efb3g1PWA4= github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= github.com/hashicorp/errwrap v1.1.0 h1:OxrOeh75EUXMY8TBjag2fzXGZ40LB6IKw45YeGUDY2I= github.com/hashicorp/errwrap v1.1.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= @@ -1333,8 +1327,8 @@ github.com/hashicorp/logutils v1.0.0/go.mod h1:QIAnNjmIWmVIIkWDTG1z5v++HQmx9WQRO github.com/hashicorp/mdns v1.0.4/go.mod h1:mtBihi+LeNXGtG8L9dX59gAEa12BDtBQSp4v/YAJqrc= github.com/hashicorp/mdns v1.0.5 h1:1M5hW1cunYeoXOqHwEb/GBDDHAFo0Yqb/uz/beC6LbE= github.com/hashicorp/mdns v1.0.5/go.mod h1:mtBihi+LeNXGtG8L9dX59gAEa12BDtBQSp4v/YAJqrc= -github.com/hashicorp/nomad/api v0.0.0-20241218080744-e3ac00f30eec h1:+YBzb977VrmffaCX/OBm17dEVJUcWn5dW+eqs3aIJ/A= -github.com/hashicorp/nomad/api v0.0.0-20241218080744-e3ac00f30eec/go.mod h1:svtxn6QnrQ69P23VvIWMR34tg3vmwLz4UdUzm1dSCgE= +github.com/hashicorp/nomad/api v0.0.0-20250930071859-eaa0fe0e27af h1:ScAYf8O+9xTqTJPZH8MIlUfO+ak8cb31rW1aYJgS+jE= +github.com/hashicorp/nomad/api v0.0.0-20250930071859-eaa0fe0e27af/go.mod h1:sldFTIgs+FsUeKU3LwVjviAIuksxD8TzDOn02MYwslE= github.com/hashicorp/serf v0.9.6/go.mod h1:TXZNMjZQijwlDvp+r0b63xZ45H7JmCmgg4gpTwn9UV4= github.com/hashicorp/serf v0.10.2 h1:m5IORhuNSjaxeljg5DeQVDlQyVkhRIjJDimbkCa8aAc= github.com/hashicorp/serf v0.10.2/go.mod h1:T1CmSGfSeGfnfNy/w0odXQUR1rfECGd2Qdsp84DjOiY= @@ -1364,10 +1358,10 @@ github.com/hashicorp/yamux v0.0.0-20180604194846-3520598351bb/go.mod h1:+NfK9FKe github.com/hashicorp/yamux v0.0.0-20181012175058-2f1d1f20f75d/go.mod h1:+NfK9FKeTrX5uv1uIXGdwYDTeHna2qgaIlx54MXqjAM= github.com/hectane/go-acl v0.0.0-20230122075934-ca0b05cb1adb h1:PGufWXXDq9yaev6xX1YQauaO1MV90e6Mpoq1I7Lz/VM= github.com/hectane/go-acl v0.0.0-20230122075934-ca0b05cb1adb/go.mod h1:QiyDdbZLaJ/mZP4Zwc9g2QsfaEA4o7XvvgZegSci5/E= -github.com/heroku/x v0.4.3 h1:HF1P4Mu79BKDVk4pt+oRDpcOSTRTpHq28RYAOkuJmds= -github.com/heroku/x v0.4.3/go.mod h1:htQnSDQPP7rNbrOQ8rczL7tbdNtQHXCPoSxYomu+eI8= -github.com/hetznercloud/hcloud-go/v2 v2.21.1 h1:IH3liW8/cCRjfJ4cyqYvw3s1ek+KWP8dl1roa0lD8JM= -github.com/hetznercloud/hcloud-go/v2 v2.21.1/go.mod h1:XOaYycZJ3XKMVWzmqQ24/+1V7ormJHmPdck/kxrNnQA= +github.com/heroku/x v0.5.2 h1:B3g+m78yQk70Mhe1MsrHICgDJwJMZNVDkaQtLhsSA/U= +github.com/heroku/x v0.5.2/go.mod h1:B025iaZU9I0gPJSsBYmipizkS5TKgX9NWEx8IQQYTuI= +github.com/hetznercloud/hcloud-go/v2 v2.25.1 h1:ib86acotlvgUSnKfFG5FJl0VFeYKe/Ht8nmikdUp+po= +github.com/hetznercloud/hcloud-go/v2 v2.25.1/go.mod h1:uQdAWaW3d9TimiyOjQWY8HKShs0Nd6S4wNYqo0HjvIY= github.com/hexops/gotextdiff v1.0.3 h1:gitA9+qJrrTCsiCl7+kh75nPqQt1cx4ZkudSTLoUqJM= github.com/hexops/gotextdiff v1.0.3/go.mod h1:pSWU5MAI3yDq+fZBTazCSJysOMbxWL1BSow5/V2vxeg= github.com/hjson/hjson-go/v4 v4.0.0/go.mod h1:KaYt3bTw3zhBjYqnXkYywcYctk0A2nxeEFTse3rH13E= @@ -1470,8 +1464,8 @@ github.com/jackc/puddle v1.1.3/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dv github.com/jackc/puddle v1.3.0/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk= github.com/jaegertracing/jaeger-idl v0.6.0 h1:LOVQfVby9ywdMPI9n3hMwKbyLVV3BL1XH2QqsP5KTMk= github.com/jaegertracing/jaeger-idl v0.6.0/go.mod h1:mpW0lZfG907/+o5w5OlnNnig7nHJGT3SfKmRqC42HGQ= -github.com/jarcoal/httpmock v1.4.0 h1:BvhqnH0JAYbNudL2GMJKgOHe2CtKlzJ/5rWKyp+hc2k= -github.com/jarcoal/httpmock v1.4.0/go.mod h1:ftW1xULwo+j0R0JJkJIIi7UKigZUXCLLanykgjwBXL0= +github.com/jarcoal/httpmock v1.4.1 h1:0Ju+VCFuARfFlhVXFc2HxlcQkfB+Xq12/EotHko+x2A= +github.com/jarcoal/httpmock v1.4.1/go.mod h1:ftW1xULwo+j0R0JJkJIIi7UKigZUXCLLanykgjwBXL0= github.com/jaswdr/faker/v2 v2.8.0 h1:3AxdXW9U7dJmWckh/P0YgRbNlCcVsTyrUNUnLVP9b3Q= github.com/jaswdr/faker/v2 v2.8.0/go.mod h1:jZq+qzNQr8/P+5fHd9t3txe2GNPnthrTfohtnJ7B+68= github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 h1:BQSFePA1RWJOlocH6Fxy8MmwDt+yVQYULKfN0RoTN8A= @@ -1597,8 +1591,8 @@ github.com/lib/pq v1.10.9 h1:YXG7RB+JIjhP29X+OtkiDnYaXQwpS4JEWq7dtCCRUEw= github.com/lib/pq v1.10.9/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o= github.com/lightstep/go-expohisto v1.0.0 h1:UPtTS1rGdtehbbAF7o/dhkWLTDI73UifG8LbfQI7cA4= github.com/lightstep/go-expohisto v1.0.0/go.mod h1:xDXD0++Mu2FOaItXtdDfksfgxfV0z1TMPa+e/EUd0cs= -github.com/linode/linodego v1.52.1 h1:HJ1cz1n9n3chRP9UrtqmP91+xTi0Q5l+H/4z4tpkwgQ= -github.com/linode/linodego v1.52.1/go.mod h1:zEN2sX+cSdp67EuRY1HJiyuLujoa7HqvVwNEcJv3iXw= +github.com/linode/linodego v1.59.0 h1:kYz6sQH9g0u21gbI1UUFjZmFLirtc39JPybygrW76Q0= +github.com/linode/linodego v1.59.0/go.mod h1:1+Bt0oTz5rBnDOJbGhccxn7LYVytXTIIfAy7QYmijDs= github.com/lufia/iostat v1.2.1 h1:tnCdZBIglgxD47RyD55kfWQcJMGzO+1QBziSQfesf2k= github.com/lufia/iostat v1.2.1/go.mod h1:rEPNA0xXgjHQjuI5Cy05sLlS2oRcSlWHRLrvh/AQ+Pg= github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0/go.mod h1:zJYVVT2jmtg6P3p1VtQj7WsuWi/y4VnjVBn7F8KPB3I= @@ -1688,8 +1682,6 @@ github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= github.com/mitchellh/go-testing-interface v0.0.0-20171004221916-a61a99592b77/go.mod h1:kRemZodwjscx+RGhAo8eIhFbs2+BFgRtFPeD/KE+zxI= github.com/mitchellh/go-testing-interface v1.0.0/go.mod h1:kRemZodwjscx+RGhAo8eIhFbs2+BFgRtFPeD/KE+zxI= -github.com/mitchellh/go-testing-interface v1.14.1 h1:jrgshOhYAUVNMAJiKbEu7EqAwgJJ2JqpQmpLJOu07cU= -github.com/mitchellh/go-testing-interface v1.14.1/go.mod h1:gfgS7OtZj6MA4U1UrDRp04twqAjfvlZyCfX3sDjEym8= github.com/mitchellh/go-wordwrap v1.0.0/go.mod h1:ZXFpozHsX6DPmq2I0TCekCxypsnAUbP2oI0UX1GXzOo= github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= @@ -1829,22 +1821,22 @@ github.com/open-telemetry/opentelemetry-collector-contrib/extension/storage/file github.com/open-telemetry/opentelemetry-collector-contrib/extension/storage/filestorage v0.134.0/go.mod h1:2fhm2Qn/6bO5e84vDSVYZ3N/8gUuymkMHR0xTsP94io= github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/ecsutil v0.134.0 h1:j80VZru/pUbzHADTgJj2deyDaVP4fL9UwrmSgJzgf2s= github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/ecsutil v0.134.0/go.mod h1:TUg77hoZLhMTjjVLsTARcdTpYB3ZpIf5oGkrIKsqB+E= -github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.134.0 h1:ohtBmI5GtMDajeS4dfPvRhCdXHA5qwq0tcgoJpdyoio= -github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.134.0/go.mod h1:kLOo8O8SgNB+L7bzxkjdDcGlFYZ+QEiFXgr7f8L7OUY= -github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.136.0 h1:iw305OKkyu6xYgHA/zV4HvEpU6w9fzg5COEh5bMhor4= -github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.136.0/go.mod h1:LqKBsP+TSqiaMlOv9lQ731roP0JTjCUekw0rcm0sghE= +github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.138.0 h1:a2MUPAxHQ77aMcW/irbxOXuo+yu4WIe4DbQghkDqjFo= +github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.138.0/go.mod h1:Ia+EFnhXCJeScn3VFQa5wklR4ETCuln32y3/RxOIpis= +github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.138.0 h1:dLwfqGO0ZTo72Otdry6M6fwhxC0VNkdool09TvDk/+s= +github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.138.0/go.mod h1:wmAINjFmYgvVvFDbMDIdr+G3XNElGz1xS7agvBVtQic= github.com/open-telemetry/opentelemetry-collector-contrib/internal/datadog v0.134.0 h1:6VdXwfHM4noFJIpg6cXzeTkt2+FGvc979hPibeQWOzo= github.com/open-telemetry/opentelemetry-collector-contrib/internal/datadog v0.134.0/go.mod h1:FqU3VquS/BrBc4d3lEjhKP5Ao6G6hAq9KM49qoPl8Og= github.com/open-telemetry/opentelemetry-collector-contrib/internal/docker v0.134.0 h1:GOlNS2Sk/trkgjFdGP19prUS8fjrYjZB+DFA68+mcPg= github.com/open-telemetry/opentelemetry-collector-contrib/internal/docker v0.134.0/go.mod h1:fl5JEUQs9t/rG6T5nr1K+8iqhyzm1Nu8nXMWpEHqfCE= -github.com/open-telemetry/opentelemetry-collector-contrib/internal/exp/metrics v0.134.0 h1:W6WahMmKnKVwTWSX19nX9XwoVMh8nTu3WOVqYanaCiA= -github.com/open-telemetry/opentelemetry-collector-contrib/internal/exp/metrics v0.134.0/go.mod h1:5CWp79KDW4AsV2B4GzftsRf+QnWYtm9+7E69gA1lMT8= +github.com/open-telemetry/opentelemetry-collector-contrib/internal/exp/metrics v0.136.0 h1:OuR81KyWJaEXOoPT/qa9B8RJsUEPyniZwJwANPPdEvk= +github.com/open-telemetry/opentelemetry-collector-contrib/internal/exp/metrics v0.136.0/go.mod h1:rHQxv7q4gR8ZKk6rzPhXsjlXDY3o54SC6stTpgYw8q8= github.com/open-telemetry/opentelemetry-collector-contrib/internal/filter v0.134.0 h1:0jxlgvLdWHuWbbB9O9e/smYUtpv5bVlMOTwGiI3DDlE= github.com/open-telemetry/opentelemetry-collector-contrib/internal/filter v0.134.0/go.mod h1:S7ZxyPGF89e/1GD0nw0GFE+W6EJx+MG0aKncvj6VKl4= github.com/open-telemetry/opentelemetry-collector-contrib/internal/gopsutilenv v0.134.0 h1:SZ65e1uyI1ANcVJKsPqDLnB+EadAnsSO+8YWp0RrruI= github.com/open-telemetry/opentelemetry-collector-contrib/internal/gopsutilenv v0.134.0/go.mod h1:dJykvH/4Y7mDetjnGhktENJpKZYsH0Sowi3hVUvbETM= -github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig v0.134.0 h1:bR2lNcWoUvhJKpZ1B7ouKqxTZBVLLTQfQw+TNq4N8wY= -github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig v0.134.0/go.mod h1:NeW6vil/LDp4VP/njNBjpMgLE4dpcH2fiKzKrEXBH2Q= +github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig v0.138.0 h1:U2J1SVUSokw3/94o/d0awjuXq9mKN8AYpNCmmxzu7Hk= +github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig v0.138.0/go.mod h1:XvrL3kNJKcNYCZ4u5zmgxMN+2I5n6xR8oZzYzLBeamI= github.com/open-telemetry/opentelemetry-collector-contrib/internal/kafka v0.134.0 h1:ndxQrT2a9fgaLygVg8rw/HcDAaPx7X7bfjUIs7MfuWY= github.com/open-telemetry/opentelemetry-collector-contrib/internal/kafka v0.134.0/go.mod h1:p9KvpG4Ta3QTrXkYXwuw20FtLWFRYnb3S49JdRAsBCE= github.com/open-telemetry/opentelemetry-collector-contrib/internal/metadataproviders v0.134.0 h1:5fZmyQrtuJm6Ns46qR+eMf4ORhMmgu82kYOSFk1Uc4I= @@ -1865,18 +1857,18 @@ github.com/open-telemetry/opentelemetry-collector-contrib/pkg/datadog v0.134.0 h github.com/open-telemetry/opentelemetry-collector-contrib/pkg/datadog v0.134.0/go.mod h1:RbbjrV8FasZcznFrc0ofuZeJR7kUHNOg2eX+c4+YKac= github.com/open-telemetry/opentelemetry-collector-contrib/pkg/experimentalmetricmetadata v0.134.0 h1:Hs+yiVTQ9hSA5l2F5+Mn2idyP10FYpYkM37DkTGtj+g= github.com/open-telemetry/opentelemetry-collector-contrib/pkg/experimentalmetricmetadata v0.134.0/go.mod h1:fDdYtp+oKY6O20vzsMYVu+3cOiIc7IjpbPXRrmgUfsM= -github.com/open-telemetry/opentelemetry-collector-contrib/pkg/golden v0.136.0 h1:QUOaiK3ur0645Ivt/sbIHZpmPEWBj0Gbv05Q4mRgBCE= -github.com/open-telemetry/opentelemetry-collector-contrib/pkg/golden v0.136.0/go.mod h1:Vhkv+ColKVM57X6VXnrwQN22XvvZZ052pA5ghpQPH2Y= +github.com/open-telemetry/opentelemetry-collector-contrib/pkg/golden v0.138.0 h1:dOVIrI/Hp1KsvPSY+6KkSzmyCpCYYXdtueRy9l3sAhg= +github.com/open-telemetry/opentelemetry-collector-contrib/pkg/golden v0.138.0/go.mod h1:91O/xSJsklspoIQENWGPe9DCUOsf1oeo0PE1j2JY6p8= github.com/open-telemetry/opentelemetry-collector-contrib/pkg/kafka/configkafka v0.134.0 h1:MjMqYD0LZ4uSSJyecT+jvgm2COiaOhSQfLyOXYNz69U= github.com/open-telemetry/opentelemetry-collector-contrib/pkg/kafka/configkafka v0.134.0/go.mod h1:4di1ExS1CLf23PhgM1bkpKOVADDRQr7S7r4/1nHBTe0= github.com/open-telemetry/opentelemetry-collector-contrib/pkg/kafka/topic v0.134.0 h1:+X7LPbPB6iJHT6CFj+vY1yIS62I2kclCcBBn9LNQ/rc= github.com/open-telemetry/opentelemetry-collector-contrib/pkg/kafka/topic v0.134.0/go.mod h1:9c8AOhKr9MvCl6h7QGVZnuioWUf51w2JuZXzelDW0fQ= -github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl v0.135.0 h1:fYLZLwNEg7DYyXsWns9EzqQQA1M7UImOIwps3Mc2OSE= -github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl v0.135.0/go.mod h1:rKGDfwcoM1QsRZ/axy26SWXxzU9NMmVny1gg4bRE+Dk= -github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.136.0 h1:lDLdXA9WIvFCK4P6dFdsYJSDDNgaacj+afw7dOBIel8= -github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.136.0/go.mod h1:q15PuRASnJ6doVHWTt6ug2VvB0rSeUf39CjqKKVqFlU= -github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.136.0 h1:gp2AYLP2yL5O0RTiKpyORvxqjSEypMSH/6laB5bh0l4= -github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.136.0/go.mod h1:5mPPRoLAp4uhg7tV+OLR+HmHyYtALSGZ0oMVHgMAfL8= +github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl v0.134.0 h1:H3MB8JqqpBVP4XlQfLW+1MsGJIDPP40AKmbU6gdJEYM= +github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl v0.134.0/go.mod h1:R+4xQUWjFYa4UQULfYdcLbk41A/XyOE7YcOL7ca2Uw0= +github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.138.0 h1:z8dtQhu0HLy7bNfton2m0QdzNN1L95hbXQ5rScHL5BM= +github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.138.0/go.mod h1:vXqe3Wa4lOj+k+au737GaIc4tMzBdlwr8eX2/1qK5AA= +github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.138.0 h1:34HE7sAjlXlzL1HAbDxOBKFdU3tTQcmgFVvjnts67DA= +github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.138.0/go.mod h1:XzBJKpG3Gi3GMyWF+7NgVl219PaGTl4+RaNo8f8KAZs= github.com/open-telemetry/opentelemetry-collector-contrib/pkg/resourcetotelemetry v0.134.0 h1:k0aEKdGKrR2P7Kv636Qm1QGlSOHqHzttj2G3j2zyXsI= github.com/open-telemetry/opentelemetry-collector-contrib/pkg/resourcetotelemetry v0.134.0/go.mod h1:q7Om+cKK2Bz7rq2ZCvz1KIc5FsRya7u4LgLi6bqxCSg= github.com/open-telemetry/opentelemetry-collector-contrib/pkg/sampling v0.134.0 h1:OyqCzBatN9FXN/zSdoMaCBUu6N9/SnPCGrJVp/H2oR8= @@ -1899,22 +1891,20 @@ github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/zipkin github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/zipkin v0.134.0/go.mod h1:DRowaR3qkyl9SfyaHlhNJHdr4vIqC+iqno/+eWzG9Y8= github.com/open-telemetry/opentelemetry-collector-contrib/pkg/winperfcounters v0.134.0 h1:kYuqkvEmUyLxxI3EZyIsx4XBQYkzYG5kFsgJ8aE3l7w= github.com/open-telemetry/opentelemetry-collector-contrib/pkg/winperfcounters v0.134.0/go.mod h1:XD0HClKsKGHRJ1eH8XaOJeVyWpv16XrXrg2G9F6MbeU= -github.com/open-telemetry/opentelemetry-collector-contrib/pkg/xk8stest v0.134.0 h1:B8aN3oCncSEINTesUyuHHG/Ol5LImFYYOrtScIUf2sA= -github.com/open-telemetry/opentelemetry-collector-contrib/pkg/xk8stest v0.134.0/go.mod h1:/1rtQfoU681daCcKrRYzEyZMYjP67xqOk453EbpoeGo= +github.com/open-telemetry/opentelemetry-collector-contrib/pkg/xk8stest v0.138.0 h1:Fec1dyH3wRPjrvGN5qYLwkuXCAk4cAUcS5qGgDmT5OM= +github.com/open-telemetry/opentelemetry-collector-contrib/pkg/xk8stest v0.138.0/go.mod h1:o6eRn8JV22jyCPJcZ/NS3IeSB90E+0xBaL9Y/4NtPmY= github.com/open-telemetry/opentelemetry-collector-contrib/processor/attributesprocessor v0.134.0 h1:BNK7MOEij44vjEpm+Jopr0qrYURau5Q4bv3YUWuCNjI= github.com/open-telemetry/opentelemetry-collector-contrib/processor/attributesprocessor v0.134.0/go.mod h1:kkzvlHP9ngPuqPW330etFkBCFO33U9O3QqUHxt3AKsQ= github.com/open-telemetry/opentelemetry-collector-contrib/processor/cumulativetodeltaprocessor v0.134.0 h1:sYniVWTjTCqN3wEpjxBJ0a+6d6DFsrbovAkCjrSsn08= github.com/open-telemetry/opentelemetry-collector-contrib/processor/cumulativetodeltaprocessor v0.134.0/go.mod h1:rWRRs1t7YMDu37cqjYEMyB/MXoQc2eCNTYf7yL3CYHY= -github.com/open-telemetry/opentelemetry-collector-contrib/processor/deltatocumulativeprocessor v0.134.0 h1:O0OFmf50Z5CR0Rom4A3uZgn3tMnerHgY8H/exFfL2d0= -github.com/open-telemetry/opentelemetry-collector-contrib/processor/deltatocumulativeprocessor v0.134.0/go.mod h1:/DFj8Ri/fayvZL2ibXkwOmSEXkt10VoTXaYvpAnuQVQ= +github.com/open-telemetry/opentelemetry-collector-contrib/processor/deltatocumulativeprocessor v0.136.0 h1:3m1GQBFf8xRXjozuuyJD97122Rh81KiSR4HAMaN4Xfk= +github.com/open-telemetry/opentelemetry-collector-contrib/processor/deltatocumulativeprocessor v0.136.0/go.mod h1:5LdAGh7nkcym4+EzmzCDNK9Qdp7mL1TPzzQpdPEJtds= github.com/open-telemetry/opentelemetry-collector-contrib/processor/filterprocessor v0.134.0 h1:iYFubZ4tOSqpAc651NixIhkVnvInVaSPrhgUEJe2oFU= github.com/open-telemetry/opentelemetry-collector-contrib/processor/filterprocessor v0.134.0/go.mod h1:rboHTLw0RDeQbPvxVrl0SlxDT0QpypJacPEmGomRwlU= github.com/open-telemetry/opentelemetry-collector-contrib/processor/groupbyattrsprocessor v0.134.0 h1:Vj102UqvCjVwaqqGYI+EYoHMr9Xb+6vT8bSZpe3jrME= github.com/open-telemetry/opentelemetry-collector-contrib/processor/groupbyattrsprocessor v0.134.0/go.mod h1:Dzlx6aPxVi7nWxb5k361e9JtJwY4Ls4RiNXvfYRQrT8= github.com/open-telemetry/opentelemetry-collector-contrib/processor/intervalprocessor v0.134.0 h1:K3SlPqEzvQQuW75cmscCKdpP4YsAkE6MyUB99e4Ms8E= github.com/open-telemetry/opentelemetry-collector-contrib/processor/intervalprocessor v0.134.0/go.mod h1:UnaJo/mqHeCQhULO48Vo4CgbzHU0lxRXNzxzzagqm1M= -github.com/open-telemetry/opentelemetry-collector-contrib/processor/k8sattributesprocessor v0.134.0 h1:zAOWTmZT5QI4rk8+9ha1zR/+IygpuqvKYFRMjOWSk9E= -github.com/open-telemetry/opentelemetry-collector-contrib/processor/k8sattributesprocessor v0.134.0/go.mod h1:GlVU1g+c3V8kSxH9KpQv19Q4l9tuFgsfac40fhpGJac= github.com/open-telemetry/opentelemetry-collector-contrib/processor/probabilisticsamplerprocessor v0.134.0 h1:1yhWTjsjWss0GctPj/T8zefpESFU33IgIcz2fgwAQVQ= github.com/open-telemetry/opentelemetry-collector-contrib/processor/probabilisticsamplerprocessor v0.134.0/go.mod h1:YDp+q1XP7Gp41aTw1H+aSB9qr9MbFScPQkkFJFEv+hw= github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourcedetectionprocessor v0.134.0 h1:AVC9ZBBe3+u7ImwOy1xQOFVNoH3tENfMUMOiKDZMJBk= @@ -1977,8 +1967,8 @@ github.com/opencontainers/selinux v1.12.0 h1:6n5JV4Cf+4y0KNXW48TLj5DwfXpvWlxXplU github.com/opencontainers/selinux v1.12.0/go.mod h1:BTPX+bjVbWGXw7ZZWUbdENt8w0htPSrlgOOysQaU62U= github.com/openshift/api v3.9.0+incompatible h1:fJ/KsefYuZAjmrr3+5U9yZIZbTOpVkDDLDLFresAeYs= github.com/openshift/api v3.9.0+incompatible/go.mod h1:dh9o4Fs58gpFXGSYfnVxGR9PnV53I8TW84pQaJDdGiY= -github.com/openshift/client-go v0.0.0-20241203091221-452dfb8fa071 h1:l0++HnGVKBcs8kXFL/1yeozxioxPGNpp0PYe3Y+0sq4= -github.com/openshift/client-go v0.0.0-20241203091221-452dfb8fa071/go.mod h1:gL0laCCiIaNTNw1ZsMQZXBVu2NeQFpNWm9bLtYO9+ZU= +github.com/openshift/client-go v0.0.0-20251015124057-db0dee36e235 h1:9JBeIXmnHlpXTQPi7LPmu1jdxznBhAE7bb1K+3D8gxY= +github.com/openshift/client-go v0.0.0-20251015124057-db0dee36e235/go.mod h1:L49W6pfrZkfOE5iC1PqEkuLkXG4W0BX4w8b+L2Bv7fM= github.com/opentracing-contrib/go-grpc v0.1.2 h1:MP16Ozc59kqqwn1v18aQxpeGZhsBanJ2iurZYaQSZ+g= github.com/opentracing-contrib/go-grpc v0.1.2/go.mod h1:glU6rl1Fhfp9aXUHkE36K2mR4ht8vih0ekOVlWKEUHM= github.com/opentracing-contrib/go-stdlib v1.1.0 h1:cZBWc4pA4e65tqTJddbflK435S0tDImj6c9BMvkdUH0= @@ -2002,8 +1992,8 @@ github.com/oschwald/maxminddb-golang v1.13.1 h1:G3wwjdN9JmIK2o/ermkHM+98oX5fS+k5 github.com/oschwald/maxminddb-golang v1.13.1/go.mod h1:K4pgV9N/GcK694KSTmVSDTODk4IsCNThNdTmnaBZ/F8= github.com/outcaste-io/ristretto v0.2.3 h1:AK4zt/fJ76kjlYObOeNwh4T3asEuaCmp26pOvUOL9w0= github.com/outcaste-io/ristretto v0.2.3/go.mod h1:W8HywhmtlopSB1jeMg3JtdIhf+DYkLAr0VN/s4+MHac= -github.com/ovh/go-ovh v1.8.0 h1:eQ5TAAFZvZAVarQir62oaTL+8a503pIBuOWVn72iGtY= -github.com/ovh/go-ovh v1.8.0/go.mod h1:cTVDnl94z4tl8pP1uZ/8jlVxntjSIf09bNcQ5TJSC7c= +github.com/ovh/go-ovh v1.9.0 h1:6K8VoL3BYjVV3In9tPJUdT7qMx9h0GExN9EXx1r2kKE= +github.com/ovh/go-ovh v1.9.0/go.mod h1:cTVDnl94z4tl8pP1uZ/8jlVxntjSIf09bNcQ5TJSC7c= github.com/packethost/packngo v0.1.1-0.20180711074735-b9cb5096f54c h1:vwpFWvAO8DeIZfFeqASzZfsxuWPno9ncAebBEP0N3uE= github.com/packethost/packngo v0.1.1-0.20180711074735-b9cb5096f54c/go.mod h1:otzZQXgoO96RTzDB/Hycg0qZcXZsWJGJRSXbmEIJ+4M= github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= @@ -2131,8 +2121,8 @@ github.com/prometheus/exporter-toolkit v0.14.1 h1:uKPE4ewweVRWFainwvAcHs3uw15pjw github.com/prometheus/exporter-toolkit v0.14.1/go.mod h1:di7yaAJiaMkcjcz48f/u4yRPwtyuxTU5Jr4EnM2mhtQ= github.com/prometheus/memcached_exporter v0.13.0 h1:d246RYODFCXy39XA8S2PBrqp5jLCSvl9b4KsYspDCHk= github.com/prometheus/memcached_exporter v0.13.0/go.mod h1:fp7Wk6v0RFijeP3Syvd1TShBSJoCG5iFfvPdi5dCMEU= -github.com/prometheus/otlptranslator v0.0.0-20250414121140-35db323fe9fb h1:wuS7VydG/rDWTbYMp07paPv3R1hiPC9WgingWs+xgi0= -github.com/prometheus/otlptranslator v0.0.0-20250414121140-35db323fe9fb/go.mod h1:M7gjuJF83qnpgElJIPfhiK+YAHlvot5epcAV+Rie7eo= +github.com/prometheus/otlptranslator v1.0.0 h1:s0LJW/iN9dkIH+EnhiD3BlkkP5QVIUVEoIwkU+A6qos= +github.com/prometheus/otlptranslator v1.0.0/go.mod h1:vRYWnXvI6aWGpsdY/mOT/cbeVRBlPWtBNDb7kGR3uKM= github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= github.com/prometheus/procfs v0.0.0-20190425082905-87a4384529e0/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= @@ -2143,8 +2133,8 @@ github.com/prometheus/procfs v0.6.0/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1 github.com/prometheus/procfs v0.7.3/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA= github.com/prometheus/procfs v0.17.0 h1:FuLQ+05u4ZI+SS/w9+BWEM2TXiHKsUQ9TADiRH7DuK0= github.com/prometheus/procfs v0.17.0/go.mod h1:oPQLaDAMRbA+u8H5Pbfq+dl3VDAvHxMUOVhe0wYB2zw= -github.com/prometheus/sigv4 v0.2.0 h1:qDFKnHYFswJxdzGeRP63c4HlH3Vbn1Yf/Ao2zabtVXk= -github.com/prometheus/sigv4 v0.2.0/go.mod h1:D04rqmAaPPEUkjRQxGqjoxdyJuyCh6E0M18fZr0zBiE= +github.com/prometheus/sigv4 v0.2.1 h1:hl8D3+QEzU9rRmbKIRwMKRwaFGyLkbPdH5ZerglRHY0= +github.com/prometheus/sigv4 v0.2.1/go.mod h1:ySk6TahIlsR2sxADuHy4IBFhwEjRGGsfbbLGhFYFj6Q= github.com/prometheus/snmp_exporter v0.29.0 h1:COShgBj1tmWvA5pAkWQgO/lB3+bL/MFqUIqOELSZaBw= github.com/prometheus/snmp_exporter v0.29.0/go.mod h1:WWtqbJ4kYdgHwjh52YRjHwJRne1tzBRHXuqWKtabxm8= github.com/prometheus/statsd_exporter v0.28.0 h1:S3ZLyLm/hOKHYZFOF0h4zYmd0EeKyPF9R1pFBYXUgYY= @@ -2160,8 +2150,6 @@ github.com/rcrowley/go-metrics v0.0.0-20250401214520-65e299d6c5c9 h1:bsUq1dX0N8A github.com/rcrowley/go-metrics v0.0.0-20250401214520-65e299d6c5c9/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= github.com/redis/go-redis/v9 v9.11.0 h1:E3S08Gl/nJNn5vkxd2i78wZxWAPNZgUNTp8WIJUAiIs= github.com/redis/go-redis/v9 v9.11.0/go.mod h1:huWgSWd8mW6+m0VPhJjSSQ+d6Nh1VICQ6Q5lHuCH/Iw= -github.com/redis/rueidis v1.0.19 h1:s65oWtotzlIFN8eMPhyYwxlwLR1lUdhza2KtWprKYSo= -github.com/redis/rueidis v1.0.19/go.mod h1:8B+r5wdnjwK3lTFml5VtxjzGOQAC+5UmujoD12pDrEo= github.com/relvacode/iso8601 v1.6.0 h1:eFXUhMJN3Gz8Rcq82f9DTMW0svjtAVuIEULglM7QHTU= github.com/relvacode/iso8601 v1.6.0/go.mod h1:FlNp+jz+TXpyRqgmM7tnzHHzBnz776kmAH2h3sZCn0I= github.com/remeh/sizedwaitgroup v1.0.0 h1:VNGGFwNo/R5+MJBf6yrsr110p0m4/OX4S3DCy7Kyl5E= @@ -2201,8 +2189,8 @@ github.com/samber/lo v1.51.0/go.mod h1:4+MXEGsJzbKGaUEQFKBq2xtfuznW9oz/WrgyzMzRo github.com/samuel/go-zookeeper v0.0.0-20190923202752-2cc03de413da h1:p3Vo3i64TCLY7gIfzeQaUJ+kppEO5WQG3cL8iE8tGHU= github.com/samuel/go-zookeeper v0.0.0-20190923202752-2cc03de413da/go.mod h1:gi+0XIa01GRL2eRQVjQkKGqKF3SF9vZR/HnPullcV2E= github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0= -github.com/scaleway/scaleway-sdk-go v1.0.0-beta.34 h1:48+VFHsyVcAHIN2v1Ao9v1/RkjJS5AwctFucBrfYNIA= -github.com/scaleway/scaleway-sdk-go v1.0.0-beta.34/go.mod h1:zFWiHphneiey3s8HOtAEnGrRlWivNaxW5T6d5Xfco7g= +github.com/scaleway/scaleway-sdk-go v1.0.0-beta.35 h1:8xfn1RzeI9yoCUuEwDy08F+No6PcKZGEDOQ6hrRyLts= +github.com/scaleway/scaleway-sdk-go v1.0.0-beta.35/go.mod h1:47B1d/YXmSAxlJxUJxClzHR6b3T4M1WyCvwENPQNBWc= github.com/sean-/conswriter v0.0.0-20180208195008-f5ae3917a627/go.mod h1:7zjs06qF79/FKAJpBvFx3P8Ww4UTIMAe+lpNXDHziac= github.com/sean-/pager v0.0.0-20180208200047-666be9bf53b5/go.mod h1:BeybITEsBEg6qbIiqJ6/Bqeq25bCLbL7YFmpaFfJDuM= github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529 h1:nn5Wsu0esKSJiIVhscUtVbo7ada43DJhG55ua/hjS5I= @@ -2220,12 +2208,12 @@ github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3/go.mod h1:A0bzQcvG github.com/shirou/gopsutil/v3 v3.22.12/go.mod h1:Xd7P1kwZcp5VW52+9XsirIKd/BROzbb2wdX3Kqlz9uI= github.com/shirou/gopsutil/v3 v3.24.5 h1:i0t8kL+kQTvpAYToeuiVk3TgDeKOFioZO3Ztz/iZ9pI= github.com/shirou/gopsutil/v3 v3.24.5/go.mod h1:bsoOS1aStSs9ErQ1WWfxllSeS1K5D+U30r2NfcubMVk= -github.com/shirou/gopsutil/v4 v4.25.8-0.20250809033336-ffcdc2b7662f h1:S+PHRM3lk96X0/cGEGUukqltzkX/ekUx0F9DoCGK1G0= -github.com/shirou/gopsutil/v4 v4.25.8-0.20250809033336-ffcdc2b7662f/go.mod h1:4f4j4w8HLMPWEFs3BO2UBBLigKAaWYwkSkbIt/6Q4Ss= +github.com/shirou/gopsutil/v4 v4.25.9 h1:JImNpf6gCVhKgZhtaAHJ0serfFGtlfIlSC08eaKdTrU= +github.com/shirou/gopsutil/v4 v4.25.9/go.mod h1:gxIxoC+7nQRwUl/xNhutXlD8lq+jxTgpIkEf3rADHL8= github.com/shoenig/go-m1cpu v0.1.7 h1:C76Yd0ObKR82W4vhfjZiCp0HxcSZ8Nqd84v+HZ0qyI0= github.com/shoenig/go-m1cpu v0.1.7/go.mod h1:KkDOw6m3ZJQAPHbrzkZki4hnx+pDRR1Lo+ldA56wD5w= -github.com/shoenig/test v1.7.1 h1:UJcjSAI3aUKx52kfcfhblgyhZceouhvvs3OYdWgn+PY= -github.com/shoenig/test v1.7.1/go.mod h1:UxJ6u/x2v/TNs/LoLxBNJRV9DiwBBKYxXSyczsBHFoI= +github.com/shoenig/test v1.12.2 h1:ZVT8NeIUwGWpZcKaepPmFMoNQ3sVpxvqUh/MAqwFiJI= +github.com/shoenig/test v1.12.2/go.mod h1:UxJ6u/x2v/TNs/LoLxBNJRV9DiwBBKYxXSyczsBHFoI= github.com/shopspring/decimal v0.0.0-20180709203117-cd690d0c9e24/go.mod h1:M+9NzErvs504Cn4c5DxATwIqPbtswREoFCre64PpcG4= github.com/shopspring/decimal v1.2.0/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o= github.com/shopspring/decimal v1.4.0 h1:bxl37RwXBklmTi0C79JfXCEBD1cqqHt0bbgBAGFp81k= @@ -2262,15 +2250,15 @@ github.com/soheilhy/cmux v0.1.5 h1:jjzc5WVemNEDTLwv9tlmemhC73tI08BNOIGwBOo10Js= github.com/soheilhy/cmux v0.1.5/go.mod h1:T7TcVDs9LWfQgPlPsdngu6I6QIoyIFZDDC6sNE1GqG0= github.com/sony/gobreaker v0.5.0 h1:dRCvqm0P490vZPmy7ppEk2qCnCieBooFJ+YoXGYB+yg= github.com/sony/gobreaker v0.5.0/go.mod h1:ZKptC7FHNvhBz7dN2LGjPVBz2sZJmc0/PkyDJOjmxWY= -github.com/sony/gobreaker/v2 v2.1.0 h1:av2BnjtRmVPWBvy5gSFPytm1J8BmN5AGhq875FfGKDM= -github.com/sony/gobreaker/v2 v2.1.0/go.mod h1:dO3Q/nCzxZj6ICjH6J/gM0r4oAwBMVLY8YAQf+NTtUg= +github.com/sony/gobreaker/v2 v2.3.0 h1:7VYxZ69QXRQ2Q4eEawHn6eU4FiuwovzJwsUMA03Lu4I= +github.com/sony/gobreaker/v2 v2.3.0/go.mod h1:pTyFJgcZ3h2tdQVLZZruK2C0eoFL1fb/G83wK1ZQl+s= github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= github.com/spaolacci/murmur3 v1.1.0 h1:7c1g84S4BPRrfL5Xrdp6fOJ206sU9y293DDHaoy0bLI= github.com/spaolacci/murmur3 v1.1.0/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ= github.com/spf13/afero v1.2.1/go.mod h1:9ZxEEn6pIJ8Rxe320qSDBk6AsU0r9pR7Q4OcevTdifk= -github.com/spf13/afero v1.14.0 h1:9tH6MapGnn/j0eb0yIXiLjERO8RB6xIVZRDCX7PtqWA= -github.com/spf13/afero v1.14.0/go.mod h1:acJQ8t0ohCGuMN3O+Pv0V0hgMxNYDlvdk+VTfyZmbYo= +github.com/spf13/afero v1.15.0 h1:b/YBCLWAJdFWJTN9cLhiXXcD7mzKn9Dm86dNnfyQw1I= +github.com/spf13/afero v1.15.0/go.mod h1:NC2ByUVxtQs4b3sIUphxK0NioZnmxgyCrfzeuq8lxMg= github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= github.com/spf13/cast v1.9.2 h1:SsGfm7M8QOFtEzumm7UZrZdLLquNdzFYfIbEXntcFbE= github.com/spf13/cast v1.9.2/go.mod h1:jNfB8QC9IA6ZuY2ZjDp0KtFO2LZZlg4S/7bzP6qqeHo= @@ -2292,6 +2280,8 @@ github.com/spf13/viper v1.6.2/go.mod h1:t3iDnF5Jlj76alVNuyFBk5oUMCvsrkbvZK0WQdfD github.com/spiffe/go-spiffe/v2 v2.5.0 h1:N2I01KCUkv1FAjZXJMwh95KK1ZIQLYbPfhaxw8WS0hE= github.com/spiffe/go-spiffe/v2 v2.5.0/go.mod h1:P+NxobPc6wXhVtINNtFjNWGBTreew1GBUCwT2wPmb7g= github.com/spkg/bom v0.0.0-20160624110644-59b7046e48ad/go.mod h1:qLr4V1qq6nMqFKkMo8ZTx3f+BZEkzsRUY10Xsm2mwU0= +github.com/stackitcloud/stackit-sdk-go/core v0.17.3 h1:GsZGmRRc/3GJLmCUnsZswirr5wfLRrwavbnL/renOqg= +github.com/stackitcloud/stackit-sdk-go/core v0.17.3/go.mod h1:HBCXJGPgdRulplDzhrmwC+Dak9B/x0nzNtmOpu+1Ahg= github.com/stormcat24/protodep v0.1.8 h1:FOycjjkjZiastf21aRoCjtoVdhsoBE8mZ0RvY6AHqFE= github.com/stormcat24/protodep v0.1.8/go.mod h1:6OoSZD5GGomKfmH1LvfJxNIRvYhewFXH5+eNv8h4wOM= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= @@ -2318,8 +2308,6 @@ github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U= github.com/stvp/go-udp-testing v0.0.0-20201019212854-469649b16807 h1:LUsDduamlucuNnWcaTbXQ6aLILFcLXADpOzeEH3U+OI= github.com/stvp/go-udp-testing v0.0.0-20201019212854-469649b16807/go.mod h1:7jxmlfBCDBXRzr0eAQJ48XC1hBu1np4CS5+cHEYfwpc= -github.com/stvp/tempredis v0.0.0-20181119212430-b82af8480203 h1:QVqDTf3h2WHt08YuiTGPZLls0Wq99X9bWd0Q5ZSBesM= -github.com/stvp/tempredis v0.0.0-20181119212430-b82af8480203/go.mod h1:oqN97ltKNihBbwlX8dLpwxCl3+HnXKV/R0e+sRLd9C8= github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw= github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635 h1:kdXcSzyDtseVEc4yCz2qF8ZrQvIDBJLl4S1c3GCXmoI= github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635/go.mod h1:hkRG7XYTFWNJGYcbNJQlaLq0fg1yr4J4t/NcTQtrfww= @@ -2327,8 +2315,8 @@ github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.480 h1:Dwnf github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.480/go.mod h1:7sCQWVkxcsR38nffDW057DRGk8mUjK1Ing/EFOK8s8Y= github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cvm v1.0.480 h1:YEDZmv2ABU8QvwXEVTOQgVEQzDOByhz73vdjL6sERkE= github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cvm v1.0.480/go.mod h1:zaBIuDDs+rC74X8Aog+LSu91GFtHYRYDC196RGTm2jk= -github.com/testcontainers/testcontainers-go v0.38.0 h1:d7uEapLcv2P8AvH8ahLqDMMxda2W9gQN1nRbHS28HBw= -github.com/testcontainers/testcontainers-go v0.38.0/go.mod h1:C52c9MoHpWO+C4aqmgSU+hxlR5jlEayWtgYrb8Pzz1w= +github.com/testcontainers/testcontainers-go v0.39.0 h1:uCUJ5tA+fcxbFAB0uP3pIK3EJ2IjjDUHFSZ1H1UxAts= +github.com/testcontainers/testcontainers-go v0.39.0/go.mod h1:qmHpkG7H5uPf/EvOORKvS6EuDkBUPE3zpVGaH9NL7f8= github.com/testcontainers/testcontainers-go/modules/mongodb v0.34.0 h1:o3bgcECyBFfMwqexCH/6vIJ8XzbCffCP/Euesu33rgY= github.com/testcontainers/testcontainers-go/modules/mongodb v0.34.0/go.mod h1:ljLR42dN7k40CX0dp30R8BRIB3OOdvr7rBANEpfmMs4= github.com/tg123/go-htpasswd v1.2.4 h1:HgH8KKCjdmo7jjXWN9k1nefPBd7Be3tFCTjc2jPraPU= @@ -2505,40 +2493,40 @@ go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= go.opentelemetry.io/auto/sdk v1.2.1 h1:jXsnJ4Lmnqd11kwkBV2LgLoFMZKizbCi5fNZ/ipaZ64= go.opentelemetry.io/auto/sdk v1.2.1/go.mod h1:KRTj+aOaElaLi+wW1kO/DZRXwkF4C5xPbEe3ZiIhN7Y= -go.opentelemetry.io/collector v0.136.0 h1:fEXsiNTa7itOD2SCspqBep6fnULa7mglLlNyhSizqok= -go.opentelemetry.io/collector v0.136.0/go.mod h1:m7YjwJ3xAzGIWa+vyHOE48R6pTKgh90vnlXjFhoB5+A= -go.opentelemetry.io/collector/client v1.42.0 h1:oBEWwd0ZgC9OLlIKZX7vo8PLXuUFoXuy3k0CuzLiKcM= -go.opentelemetry.io/collector/client v1.42.0/go.mod h1:GbBP2Ztn1xeeaAX6hIus0NOH/J0HcRgHP7SU8VDxwP0= -go.opentelemetry.io/collector/component v1.42.0 h1:on4XJ/NT1oPnuCVKDEtlpcr3GGPAS9taWBe8woHSTmY= -go.opentelemetry.io/collector/component v1.42.0/go.mod h1:mehIbkABLhEEs3kmAqer2GRmLwcQLoeF7C48CR6lxP0= -go.opentelemetry.io/collector/component/componentstatus v0.134.0 h1:0ewTKisxTHK2lEO0yUdcFsCR/09Te3r8j2oBXC6B2rg= -go.opentelemetry.io/collector/component/componentstatus v0.134.0/go.mod h1:h9cIzB7i5FQKi0kNNLTwdKxrt01gdHK65RHGMnEunVE= -go.opentelemetry.io/collector/component/componenttest v0.136.0 h1:24U54okKfUl7tSApQ+84joz8KXgZicWgH+O7UB4fgNI= -go.opentelemetry.io/collector/component/componenttest v0.136.0/go.mod h1:diUZ4BjPMz0PJ/ur5BO9jSBWd8qebvOWMxVrEAoT6dQ= -go.opentelemetry.io/collector/config/configauth v0.136.0 h1:Xpi7zmpvidot/RRAcWN+8xkx87947+Ec1xMDGOLd+l4= -go.opentelemetry.io/collector/config/configauth v0.136.0/go.mod h1:WzZxFZqlc7pxbQxeto+kkV2zXFiEm5NA14fkjDp5kKU= -go.opentelemetry.io/collector/config/configcompression v1.42.0 h1:vznptUF452U526FHHp/fhGL9KgFCLb3sZ+iq4PXQYII= -go.opentelemetry.io/collector/config/configcompression v1.42.0/go.mod h1:ZlnKaXFYL3HVMUNWVAo/YOLYoxNZo7h8SrQp3l7GV00= -go.opentelemetry.io/collector/config/configgrpc v0.136.0 h1:JutKKrIa44ec6VSrE8/0K/hPewJ4H69QbkYs3Gh3/k4= -go.opentelemetry.io/collector/config/configgrpc v0.136.0/go.mod h1:yxJgGrmH9jW/hPUvLlpGLsNRiQcOgK67r5RL4dvvdDE= -go.opentelemetry.io/collector/config/confighttp v0.136.0 h1:7wnmvlm4mZOnF4LD9Q0FIU35EW2z0KB94HRBqM0S0Xw= -go.opentelemetry.io/collector/config/confighttp v0.136.0/go.mod h1:F6zKdR0MagtYZ8NBJOgw9VqPbY+BwkWmO9UYE5mODGU= -go.opentelemetry.io/collector/config/configmiddleware v1.42.0 h1:11LMjkIPnNirc5okrcjO8CEbJ+2Xo7WM/CJqv6J97+M= -go.opentelemetry.io/collector/config/configmiddleware v1.42.0/go.mod h1:v45dyG4WvLxC0Yfw80NvjSFzngTUJdH9zzZOTAXenjg= -go.opentelemetry.io/collector/config/confignet v1.42.0 h1:K2tHmUzCOQiIYr84K+dxugkxQ0jVvYEyHxAhMU7CR0Y= -go.opentelemetry.io/collector/config/confignet v1.42.0/go.mod h1:4jJWdoe1MmpqxMzxrIILcS5FK2JPocXYZGUvv5ZQVKE= -go.opentelemetry.io/collector/config/configopaque v1.42.0 h1:AffFfB6FMKrgvgeSHCsOo+Q1cR4I2kqM3nRwEr/iHyk= -go.opentelemetry.io/collector/config/configopaque v1.42.0/go.mod h1:9uzLyGsWX0FtPWkomQXqLtblmSHgJFaM4T0gMBrCma0= -go.opentelemetry.io/collector/config/configoptional v0.136.0 h1:DwrduTAWbPwOW/k4GPcYUFB7DLruLvs+Zg2/RAHJ2DI= -go.opentelemetry.io/collector/config/configoptional v0.136.0/go.mod h1:hFcVjh2DqKIVMA9mbb2ctSW8d0SRN2UrNim33WxZM4o= +go.opentelemetry.io/collector v0.138.0 h1:nIlyGQUoDlvtJENVuzOcYF8/zO8jTL1Lh8CxGNMo/yM= +go.opentelemetry.io/collector v0.138.0/go.mod h1:ZQYYPMuh4cm/E1L1pG6h5lJeH+qSCOFAPKzRQfjeGwQ= +go.opentelemetry.io/collector/client v1.44.0 h1:pfOlUf6pU/1MyucE7oC1Q/aZAxQS8icKA/iw2foHqPE= +go.opentelemetry.io/collector/client v1.44.0/go.mod h1:GoESF6Tpa5ikkYGFvctqgILCpBuG+F45HPznER6lPwk= +go.opentelemetry.io/collector/component v1.44.0 h1:SX5UO/gSDm+1zyvHVRFgpf8J1WP6U3y/SLUXiVEghbE= +go.opentelemetry.io/collector/component v1.44.0/go.mod h1:geKbCTNoQfu55tOPiDuxLzNZsoO9//HRRg10/8WusWk= +go.opentelemetry.io/collector/component/componentstatus v0.138.0 h1:KUZyp1b6W2UUb/m/IhakL4bBdX6cbBj0PPx7MZ/jtOo= +go.opentelemetry.io/collector/component/componentstatus v0.138.0/go.mod h1:IztgkWj4VDSb3afV5ZHutS3vpuVhGbueAzOKrCJ4/V8= +go.opentelemetry.io/collector/component/componenttest v0.138.0 h1:7a8whPDFu80uPk73iqeMdhYDVxl4oZEsuaBYb2ysXTc= +go.opentelemetry.io/collector/component/componenttest v0.138.0/go.mod h1:ODaEuyS6BrCnTVHCsLSRUtNklT3gnAIq0txYAAI2PKM= +go.opentelemetry.io/collector/config/configauth v1.44.0 h1:zYur6VJyHFtJW/1MSKyRaMO6+tsV12kCJot/kSkrpW4= +go.opentelemetry.io/collector/config/configauth v1.44.0/go.mod h1:8arPf8HFVkhKabgDsKqTggm081s71IYF8LogcGlHUeY= +go.opentelemetry.io/collector/config/configcompression v1.44.0 h1:AaNpVYWFrmWKGnZdJCuVSlY3STSm0UBTuZU13aavvlQ= +go.opentelemetry.io/collector/config/configcompression v1.44.0/go.mod h1:ZlnKaXFYL3HVMUNWVAo/YOLYoxNZo7h8SrQp3l7GV00= +go.opentelemetry.io/collector/config/configgrpc v0.138.0 h1:kY0vTvurV0PkeaJG/otkBrMNk6RGJk9n8s+5PpZJcGg= +go.opentelemetry.io/collector/config/configgrpc v0.138.0/go.mod h1:xOQCBmGksJxU/OUr28jxVTttS3x6Nc1IgkcbJU9MOoI= +go.opentelemetry.io/collector/config/confighttp v0.138.0 h1:6NaoRNwwS+Hci8XC+oxGH2njZTw/hm3Bv66TsvpBip8= +go.opentelemetry.io/collector/config/confighttp v0.138.0/go.mod h1:0NKEeugQ7zQ/q6REMqxNPOrkYH8LdpUm6e9OlzMbfZg= +go.opentelemetry.io/collector/config/configmiddleware v1.44.0 h1:lXIF5YMZi9hmyInvmGimmKKMtukSJP4CfvyKaLyIbUg= +go.opentelemetry.io/collector/config/configmiddleware v1.44.0/go.mod h1:7f+1+cmt4spFY3Gs14XB/04RSsDYG7ycTzvNJbeayPY= +go.opentelemetry.io/collector/config/confignet v1.44.0 h1:2bjbOxUz4z1XHSGF6UJxygdxdpG2vPf+SOh2UDww7zQ= +go.opentelemetry.io/collector/config/confignet v1.44.0/go.mod h1:4jJWdoe1MmpqxMzxrIILcS5FK2JPocXYZGUvv5ZQVKE= +go.opentelemetry.io/collector/config/configopaque v1.44.0 h1:bfpNfe42k7SEREJZ2l3jI0EKjCUqKslvlY3o4OGYhGg= +go.opentelemetry.io/collector/config/configopaque v1.44.0/go.mod h1:9uzLyGsWX0FtPWkomQXqLtblmSHgJFaM4T0gMBrCma0= +go.opentelemetry.io/collector/config/configoptional v1.44.0 h1:Jaq8V5JBVsdKQ275QkBuCYUMmZnlNMoCFatryRius2I= +go.opentelemetry.io/collector/config/configoptional v1.44.0/go.mod h1:AGi2klVapjAEHVPrBVdq+3dW9l3wfA2MLH9qn5Q8nSg= go.opentelemetry.io/collector/config/configretry v1.42.0 h1:iCm6gr8V7+J1ZI6fiHHeDqMzvFvJ9xKMlZt5DC2M5Vw= go.opentelemetry.io/collector/config/configretry v1.42.0/go.mod h1:ZSTYqAJCq4qf+/4DGoIxCElDIl5yHt8XxEbcnpWBbMM= -go.opentelemetry.io/collector/config/configtelemetry v0.136.0 h1:d5So8zVG6gRl7I3v2Trvk9kPkzSO6kubrcEUZ+wrasw= -go.opentelemetry.io/collector/config/configtelemetry v0.136.0/go.mod h1:Xjw2+DpNLjYtx596EHSWBy0dNQRiJ2H+BlWU907lO40= -go.opentelemetry.io/collector/config/configtls v1.42.0 h1:gACpOXSmxBeo+M8qjSxt7AU04B0qWzjqg2ZLvMA8Sdo= -go.opentelemetry.io/collector/config/configtls v1.42.0/go.mod h1:SJNnptQLBW+nO4CgTtNI1di8nAHNOIl2gclu9GsmK8g= -go.opentelemetry.io/collector/confmap v1.42.0 h1:Hdeqq1RkGBBWbmDpa96aC5LchklzUzCu4aSRRoPicng= -go.opentelemetry.io/collector/confmap v1.42.0/go.mod h1:KW/l4uXBGnl5OM8WYi3gTg6PeG+y24nlIMS71KwWQjk= +go.opentelemetry.io/collector/config/configtelemetry v0.134.0 h1:9fx6iv/BjeUUDV1pbqOdJgv1LqffhAfdxqgsXVFaGKk= +go.opentelemetry.io/collector/config/configtelemetry v0.134.0/go.mod h1:0AfDnMBeammIMRxF57/nhHPR0kJBuaLmUwpgh3JqBJw= +go.opentelemetry.io/collector/config/configtls v1.44.0 h1:UkFXToC6Y4p1S2a/ag5FkfRLZNxL24k3my0Tif/w2gY= +go.opentelemetry.io/collector/config/configtls v1.44.0/go.mod h1:wsOaG0LRnZjhRXpl0epNxba2HJzfZwmnKdu6NO7l7pw= +go.opentelemetry.io/collector/confmap v1.44.0 h1:CIK4jAk6H3KTKza4nvWQkqLqrudLkYGz3evu5163uxg= +go.opentelemetry.io/collector/confmap v1.44.0/go.mod h1:w37Xiu/PK3nTdqKb7YEvQECHYkuW7QnmdS7b9iRjOGo= go.opentelemetry.io/collector/confmap/provider/envprovider v1.40.0 h1:gt3NZ9q2InRu8vLACxokHQqraoK3xjRYikjUY21rLTE= go.opentelemetry.io/collector/confmap/provider/envprovider v1.40.0/go.mod h1:hMDzS4PLFb/TQwGfBpeWHNJAbcoeZNp+2h1nRK8P9y8= go.opentelemetry.io/collector/confmap/provider/fileprovider v1.40.0 h1:OFfKeW+/tpmlSyB6cVQhQC+t/5H8Z03pQt1STnvPnAc= @@ -2547,28 +2535,28 @@ go.opentelemetry.io/collector/confmap/provider/httpprovider v1.40.0 h1:eAQv2I9AZ go.opentelemetry.io/collector/confmap/provider/httpprovider v1.40.0/go.mod h1:J4nxseJtriZovCn60Bm65avrc8kcDWmXIV9ylMVQ77U= go.opentelemetry.io/collector/confmap/provider/yamlprovider v1.40.0 h1:8E7bmDhsqGjutiIOtIhEjWcR98q0WFLsQ6La6Dfo/n8= go.opentelemetry.io/collector/confmap/provider/yamlprovider v1.40.0/go.mod h1:TLzGGI8GEeNLwaBPluR9OcGZvLyKQ0zIRwQmdlFBQrg= -go.opentelemetry.io/collector/confmap/xconfmap v0.136.0 h1:eC14gN+NL5HxmOmN9Aa4SkAnJhmUgmYP5cgEjCdz0sw= -go.opentelemetry.io/collector/confmap/xconfmap v0.136.0/go.mod h1:bDvQo42iyxLGR/Nl4eKP//F/jpDcD52JCb7uLGKA3lc= +go.opentelemetry.io/collector/confmap/xconfmap v0.138.0 h1:0b/h3LXBAcHFKPE9eVjZ4KRTaj9ImdOBK2z9hBlmoyA= +go.opentelemetry.io/collector/confmap/xconfmap v0.138.0/go.mod h1:rk8hjMqoHX2KYUjGUPaiWo3qapj4o8UpQWWsdEqvorg= go.opentelemetry.io/collector/connector v0.134.0 h1:Z3f+n2FS3yRWxcGKkwKGGcI5d002eYA2fAnusOFtWR0= go.opentelemetry.io/collector/connector v0.134.0/go.mod h1:DJtK7Q4fTyZCkIfzL+CdgCvXz5CvZ/aYpf64/0lGOK8= go.opentelemetry.io/collector/connector/connectortest v0.134.0 h1:zrbHpD8d0nnWnOzWS7rQGU4cOXYb+DLsPmVpsjwN6Nw= go.opentelemetry.io/collector/connector/connectortest v0.134.0/go.mod h1:y0D81XQZ5xBMRnEub66/iKtqBkTVoNN4dv1mBm1biqU= go.opentelemetry.io/collector/connector/xconnector v0.134.0 h1:jXAxnFuB/fc6ym2UD3wb/IwMgFoGjrvsxlPlhjo1HWw= go.opentelemetry.io/collector/connector/xconnector v0.134.0/go.mod h1:YZWcFAhOEvg9pMl/9d9mveDFU/kpuOjPJRl58+3UhFs= -go.opentelemetry.io/collector/consumer v1.42.0 h1:RhdoAXrLODs4cnh1m/ihWfHTyWzGO1jL0X+E7wETzUE= -go.opentelemetry.io/collector/consumer v1.42.0/go.mod h1:jKcMYx9LXWMK4dupP2NhiAuHK063JiVMlyAC+ZMqlD0= -go.opentelemetry.io/collector/consumer/consumererror v0.136.0 h1:lYnTR/fJ8gBfVZ813sKPWXmj9a8+TajhrHBfqKwrWvQ= -go.opentelemetry.io/collector/consumer/consumererror v0.136.0/go.mod h1:DIivxQ3sy3mDZLaEcXdwZvEFLILpcyHxRiqEaPkHRFU= +go.opentelemetry.io/collector/consumer v1.44.0 h1:vkKJTfQYBQNuKas0P1zv1zxJjHvmMa/n7d6GiSHT0aw= +go.opentelemetry.io/collector/consumer v1.44.0/go.mod h1:t6u5+0FBUtyZLVFhVPgFabd4Iph7rP+b9VkxaY8dqXU= +go.opentelemetry.io/collector/consumer/consumererror v0.138.0 h1:UfdATL2xDBSUORs9ihlIEdsY6CTIKCnIOCjt0NCwzwg= +go.opentelemetry.io/collector/consumer/consumererror v0.138.0/go.mod h1:nkPNEi12ObrdScg48gCTB/64zydtRsDxktzM7knXUPY= go.opentelemetry.io/collector/consumer/consumererror/xconsumererror v0.136.0 h1:0p5xkXuvCKMKwGdTeuzy1Vz04XJyk4cVdyebtGr/PFI= go.opentelemetry.io/collector/consumer/consumererror/xconsumererror v0.136.0/go.mod h1:e8DN9AXPONTtXKO9ycYSWKrvj7I9hHIlCg2mIu2cUlc= -go.opentelemetry.io/collector/consumer/consumertest v0.136.0 h1:zzO47GjzIg2X3uVW+lwtqS6S0vRm5qMx5O4zmQznCME= -go.opentelemetry.io/collector/consumer/consumertest v0.136.0/go.mod h1:gTdRvUiJSmzmWp2Ndlh0N0yQ3hPnmTYul2DWuy31/D0= -go.opentelemetry.io/collector/consumer/xconsumer v0.136.0 h1:7GczvR8x75lTyP9M+oWHQyGRDIRJ+QjY7IiJkucgOo4= -go.opentelemetry.io/collector/consumer/xconsumer v0.136.0/go.mod h1:sXw0lOF6D1iKhLy2xorJ8D3PysDXT0egmHJZu8TY0lE= +go.opentelemetry.io/collector/consumer/consumertest v0.138.0 h1:1PwWhjQ3msYhcml/YeeSegjUAVC4nlA8+LY5uKqJbHk= +go.opentelemetry.io/collector/consumer/consumertest v0.138.0/go.mod h1:2XBKvZKVcF/7ts1Y+PxTgrQiBhXAnzMfT+1VKtzoDpQ= +go.opentelemetry.io/collector/consumer/xconsumer v0.138.0 h1:peQ59TyBmt30lv4YH8gfBbTSJPuPIZW0kpFTfk45rVk= +go.opentelemetry.io/collector/consumer/xconsumer v0.138.0/go.mod h1:ivpzDlwQowx8RTOZBPa281/4NvNBvhabm7JmeAbsGIU= go.opentelemetry.io/collector/exporter v1.42.0 h1:YMWMSAfaMu3lgy+lgaJDszdAOsg0lRh4EvIyA974Uuw= go.opentelemetry.io/collector/exporter v1.42.0/go.mod h1:is8qnDQ1NLFMGNagY986ASIJJRIeHJZ+d1hDdOY6u1w= -go.opentelemetry.io/collector/exporter/debugexporter v0.135.0 h1:f7vZHsKdHfk6ShZr48tGfdR/HcqNEd8YwPi31hU2Afo= -go.opentelemetry.io/collector/exporter/debugexporter v0.135.0/go.mod h1:g7h950ueJBmvpsPk43xC/lsa6/nzyW4/Sf+iDFglNCA= +go.opentelemetry.io/collector/exporter/debugexporter v0.134.0 h1:lQ3zXvZ30+if08B3pNBwFabPpbFCB/AixkdyDiTEQRY= +go.opentelemetry.io/collector/exporter/debugexporter v0.134.0/go.mod h1:3AYyAD76ozyjVo3r5IlSIfw2Qi+tTqR+uTDwedP8DJ4= go.opentelemetry.io/collector/exporter/exporterhelper v0.136.0 h1:fJuA2u4Ls5+OWqcrXYSC6m8hpC4fFDI8kwNjYn4O34w= go.opentelemetry.io/collector/exporter/exporterhelper v0.136.0/go.mod h1:1F2UKZ68AQaWkjxlk6rtQ/oehL83O2AoDEex9+lEasg= go.opentelemetry.io/collector/exporter/exporterhelper/xexporterhelper v0.136.0 h1:XkUU01WC9ZGYwD0DJgeeEsfmVK7qZOcEbC+1Y6UcqxA= @@ -2581,18 +2569,18 @@ go.opentelemetry.io/collector/exporter/otlphttpexporter v0.136.0 h1:PU4/zN5fnBZ7 go.opentelemetry.io/collector/exporter/otlphttpexporter v0.136.0/go.mod h1:Z6f8C8U1/4KEhZrKw6h5iHOP14GTJQE8dePCnXOkhjc= go.opentelemetry.io/collector/exporter/xexporter v0.136.0 h1:7ELBwU8sSnUMAWr+jQHDNM0+o878BTk++DiW0KA7Dr4= go.opentelemetry.io/collector/exporter/xexporter v0.136.0/go.mod h1:W4e+GmyokpCt6+d5pvCA17b7oU1fm968t5fDwW4zQv0= -go.opentelemetry.io/collector/extension v1.42.0 h1:+9pK5AGHyV3LpWcF8ez45O/6QwOnxXBRS06a7hokLVg= -go.opentelemetry.io/collector/extension v1.42.0/go.mod h1:mS3Ucj0UQw4Qy9KmXtTkdQTQxan+LbGeH4stPuTYofU= -go.opentelemetry.io/collector/extension/extensionauth v1.42.0 h1:Re0wxZOplHtdV8YaypVaktHYPiaWPwVDt+hrBFXHEoI= -go.opentelemetry.io/collector/extension/extensionauth v1.42.0/go.mod h1:m8A4ZoWKvE91c5fF7HFvnZvwxbXtPJiNSoreGYoXt6A= -go.opentelemetry.io/collector/extension/extensionauth/extensionauthtest v0.136.0 h1:yx0474FuJHinlSbAXU/IZov6TXc5LPSGRPsQRiMGRG4= -go.opentelemetry.io/collector/extension/extensionauth/extensionauthtest v0.136.0/go.mod h1:etBi3U/UCSa9x5Lao6CRcj7CmuULJbkxqXUoaSDeLOA= +go.opentelemetry.io/collector/extension v1.44.0 h1:MYoeNxhHayogTfkTvOKa+FbAxkrivLI6ka3ibkqi+RQ= +go.opentelemetry.io/collector/extension v1.44.0/go.mod h1:Lr6V2Y5bF9hLLbahKl0Y3T0vQmOBJX+u/W0iZ0xa/LM= +go.opentelemetry.io/collector/extension/extensionauth v1.44.0 h1:30JTv1rjRE+2R3wV8tA/ENz013il5IsKeyGFHTHG8U0= +go.opentelemetry.io/collector/extension/extensionauth v1.44.0/go.mod h1:6Sh0hqPfPqpg0ErCoNPO/ky2NdfGmUX+G5wekPx7A7U= +go.opentelemetry.io/collector/extension/extensionauth/extensionauthtest v0.138.0 h1:ESiON4jDR8dhU4vPj11GcYPT+KFWgc1YnEKqS5Sc/us= +go.opentelemetry.io/collector/extension/extensionauth/extensionauthtest v0.138.0/go.mod h1:w0c7bgP2FiyZlFPbIIkfn8yqQW1cqGY2DXaaT8oscIA= go.opentelemetry.io/collector/extension/extensioncapabilities v0.134.0 h1:Q9rX54wgD3uzOwGqtFFsypLveVw0NF+MUFnF03NQgck= go.opentelemetry.io/collector/extension/extensioncapabilities v0.134.0/go.mod h1:mJcmCGS3xrV0/2ogogiYw5TwHau+ZvbmFv5Wkf7nxbw= -go.opentelemetry.io/collector/extension/extensionmiddleware v0.136.0 h1:H+c3QyaN5tL3VmX3rSbV9Che5cpokLThJxZmJXed6cE= -go.opentelemetry.io/collector/extension/extensionmiddleware v0.136.0/go.mod h1:Vxtt+KlwwO4mpPEFyUMb/92BlMqOZc4Jk8RNjM99vcU= -go.opentelemetry.io/collector/extension/extensionmiddleware/extensionmiddlewaretest v0.136.0 h1:0Mqxievpq+Lu7nd7/Y7LSW30cgTYyJIpOg48+0XTRcI= -go.opentelemetry.io/collector/extension/extensionmiddleware/extensionmiddlewaretest v0.136.0/go.mod h1:Rd+mz0JkBudg+RYZuETiJpx4aByF5CyV+15mBf+1SJA= +go.opentelemetry.io/collector/extension/extensionmiddleware v0.138.0 h1:e80GXYoQ5HpZS+2TLtigPhi8IWNeYB/8s1LXP2fiWCk= +go.opentelemetry.io/collector/extension/extensionmiddleware v0.138.0/go.mod h1:/ub63cgY3YraiJJ3pBuxDnxEzeEXqniuRDQYf6NIBDE= +go.opentelemetry.io/collector/extension/extensionmiddleware/extensionmiddlewaretest v0.138.0 h1:A574ECis4EzO5Yq+u4lUfZDXiYrSco4A0XtOte6DCvY= +go.opentelemetry.io/collector/extension/extensionmiddleware/extensionmiddlewaretest v0.138.0/go.mod h1:sx6H9WWy0IyXmeR1ZRSlFA8WCNATtmPUCb5C1+2XdVw= go.opentelemetry.io/collector/extension/extensiontest v0.136.0 h1:BkL2AC38Xa/WU71YfEKdjYGl/pjALmJDtHZIm5gzEzk= go.opentelemetry.io/collector/extension/extensiontest v0.136.0/go.mod h1:XxRKblTb56a6zkrb8i9qowl7mY9ebW2NnOvCIXgxjZM= go.opentelemetry.io/collector/extension/xextension v0.136.0 h1:Ykw3UUAKugGDLTz+Secowj6pL9Mg6H/V+pezeQKhTJY= @@ -2605,10 +2593,10 @@ go.opentelemetry.io/collector/internal/fanoutconsumer v0.134.0 h1:G+LXCNtOM5aE7X go.opentelemetry.io/collector/internal/fanoutconsumer v0.134.0/go.mod h1:rS2F9GaeGHDrlYKnGkN3S4WGTEvCGGwFz3LZDi1oh9U= go.opentelemetry.io/collector/internal/memorylimiter v0.134.0 h1:i7wpIdGlsyTuk1OqY+2mit6tjzejNGJJZjIGT6sXwy4= go.opentelemetry.io/collector/internal/memorylimiter v0.134.0/go.mod h1:huAKltJPiRRw8e+B2WONQrg4vu0JgF+MyvHaDqoxNGk= -go.opentelemetry.io/collector/internal/sharedcomponent v0.134.0 h1:4QXIq5LKV0UZHreD1Zrt5IISQ6VQ4EMUNa/cAPPAWpU= -go.opentelemetry.io/collector/internal/sharedcomponent v0.134.0/go.mod h1:hbPCV7i5w9a2NHCasyCGJtCrbuCb2y9fxvVpikxofMo= -go.opentelemetry.io/collector/internal/telemetry v0.136.0 h1:3TcnxyUFs6jJZeLo5ju3fMWS4lRmIApl9To2XWk922M= -go.opentelemetry.io/collector/internal/telemetry v0.136.0/go.mod h1:dTykH9zv/zOnlyUvqfGIqpaQZhmayW7NssD7TPU4paE= +go.opentelemetry.io/collector/internal/sharedcomponent v0.138.0 h1:jVuz4ZvF8rw1NQ+up6eCyZE5w1bGQf7qV9AGGDkWTps= +go.opentelemetry.io/collector/internal/sharedcomponent v0.138.0/go.mod h1:VDLlLDAyGAhMsVhpZKZAtfxXvmJlUZO4IiQe58Ftixg= +go.opentelemetry.io/collector/internal/telemetry v0.138.0 h1:xHHYlPh1vVvr+ip0ct288l1joc4bsEeHh0rcY3WVXJo= +go.opentelemetry.io/collector/internal/telemetry v0.138.0/go.mod h1:evqf71fdIMXdQEofbs1bVnBUzfF6zysLMLR9bEAS9Xw= go.opentelemetry.io/collector/otelcol v0.134.0 h1:S+oquqo0ZTPW8dLqKwQQmhh8MrWTqTbxemL0tvIrzRY= go.opentelemetry.io/collector/otelcol v0.134.0/go.mod h1:nOD8Dp62WEqv8vS2Fr2MgwsJZaYXCFKwRxiE7j/5p64= go.opentelemetry.io/collector/otelcol/otelcoltest v0.134.0 h1:aY07CpiawHto2MmxC4M5JJf3kWN9kjl+ZzQxPMI735Q= @@ -2621,34 +2609,34 @@ go.opentelemetry.io/collector/pdata/testdata v0.135.0 h1:bp+9wKAifJcoYdS+qTwtgcK go.opentelemetry.io/collector/pdata/testdata v0.135.0/go.mod h1:w0gTft2xsn/adYgUGNBhDDjVhKCvvA9fHTKIbh7rx0o= go.opentelemetry.io/collector/pdata/xpdata v0.136.0 h1:KAYBx6+aS5rYUlwJ85QM9pxHq0VdftC9lTyXIzv1oM4= go.opentelemetry.io/collector/pdata/xpdata v0.136.0/go.mod h1:bSnwXzg3wKjaKc8FgMZ23OmcodD6eDNyntUZdtlxPeU= -go.opentelemetry.io/collector/pipeline v1.42.0 h1:jqn1lPwUdCn+lsyNubCtwzXZLEm+R3kRWxLpDkhlvvs= -go.opentelemetry.io/collector/pipeline v1.42.0/go.mod h1:xUrAqiebzYbrgxyoXSkk6/Y3oi5Sy3im2iCA51LwUAI= -go.opentelemetry.io/collector/pipeline/xpipeline v0.136.0 h1:dvzL/yfXUjBxcCqtl4ifvQqi5cIeYAmFdZz1OPE2gXA= -go.opentelemetry.io/collector/pipeline/xpipeline v0.136.0/go.mod h1:0trVl/7QYhPyIohE+n+hL0F0DdiceghKPG2olvZqipc= -go.opentelemetry.io/collector/processor v1.40.0 h1:iB4nh7hjDpVCe4DiMQDjjT7IoXm6UijRBH6LC9QYXCU= -go.opentelemetry.io/collector/processor v1.40.0/go.mod h1:cnt7b2YfiTSD3sKwr2JgrQy8/Ku1zx6WSId7dioDZUs= +go.opentelemetry.io/collector/pipeline v1.44.0 h1:EFdFBg3Wm2BlMtQbUeork5a4KFpS6haInSr+u/dk8rg= +go.opentelemetry.io/collector/pipeline v1.44.0/go.mod h1:xUrAqiebzYbrgxyoXSkk6/Y3oi5Sy3im2iCA51LwUAI= +go.opentelemetry.io/collector/pipeline/xpipeline v0.138.0 h1:Y8blByFwDqhnEa4kOTAznx8Z89wZcAIntJx/a53BllA= +go.opentelemetry.io/collector/pipeline/xpipeline v0.138.0/go.mod h1:TOtck/PIWC89dI9+aYouX39boc7d+rGHP82SuH0xxN0= +go.opentelemetry.io/collector/processor v1.44.0 h1:jB+vfkYSR9f7HJlGJrtncld9dmnPWndCoTHZ0Wz4nvg= +go.opentelemetry.io/collector/processor v1.44.0/go.mod h1:BV0s5J7TH2YrVErfYAXvq3Z2ChJZdE84pY+sk1X55kw= go.opentelemetry.io/collector/processor/batchprocessor v0.134.0 h1:yDFmy4WTMl0/sce/9bQBA+P8Clf2LbyOiRv+7HgluX8= go.opentelemetry.io/collector/processor/batchprocessor v0.134.0/go.mod h1:X6I67/BE1yASRGbspOYNXGunsjiTHWIpTDTECSNeppc= go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.134.0 h1:8sqoBAbOI18NBwgBjhc/mBoREes7fqX0vZh5ZU4jKPU= go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.134.0/go.mod h1:e67rtVllVnCAAuQaclGPx+TRc1tfY4mczwovrbWMaIw= -go.opentelemetry.io/collector/processor/processorhelper v0.134.0 h1:uDsg34g0pJYNDgfRzADl/v5ScOoMa+sHiLTTTMlq/T8= -go.opentelemetry.io/collector/processor/processorhelper v0.134.0/go.mod h1:ME9truvaRG4mBhUhJVANWr6YMmxre8JZ7AXfzftl0go= -go.opentelemetry.io/collector/processor/processorhelper/xprocessorhelper v0.134.0 h1:KmR/pN68UiXPydmelC0CgFkhjYz7zL9Ro8njNQaRna0= -go.opentelemetry.io/collector/processor/processorhelper/xprocessorhelper v0.134.0/go.mod h1:91Fph5EW5+UBy/HWBoOPcGi7lnECW66236PVbOBvCIk= -go.opentelemetry.io/collector/processor/processortest v0.134.0 h1:Bs897MOtHvBZaiMi6uBlSEMdy0D7mmgjwoLOrZUmBsY= -go.opentelemetry.io/collector/processor/processortest v0.134.0/go.mod h1:ejG2TvimCeuXPlG9bZeetbjRNUjXY6WgwthiasYAnTU= -go.opentelemetry.io/collector/processor/xprocessor v0.134.0 h1:2asofOwQJVHM6HlC0GOg/T3hU8aEB2HdVVYumisgLic= -go.opentelemetry.io/collector/processor/xprocessor v0.134.0/go.mod h1:s6fC10Dy5F6NMPJn8hFf2GdRBAaBNIO/21anFhO1XvI= -go.opentelemetry.io/collector/receiver v1.42.0 h1:wdR3SShnOUj6PQFNOHJl8amKDaMrY6gnnU7oh7z61rQ= -go.opentelemetry.io/collector/receiver v1.42.0/go.mod h1:ts8UqHPKm+fP3/nsPrLizbUClqpL8JO3HM5Rd9UQEWA= -go.opentelemetry.io/collector/receiver/otlpreceiver v0.134.0 h1:vMEg6ewdWHX3JzW2Wn2rFLkt4kBu5fGlAzdQmxtbZuo= -go.opentelemetry.io/collector/receiver/otlpreceiver v0.134.0/go.mod h1:Ekf4+grkBq09GyKHCbaBhG7DuOCc3zcE+2noUTABkKk= -go.opentelemetry.io/collector/receiver/receiverhelper v0.134.0 h1:fcgL5QYw1/MFMSpi/v1WKXkgZR9XGPRVImOt725XkZk= -go.opentelemetry.io/collector/receiver/receiverhelper v0.134.0/go.mod h1:yacJAlW3SHzoGeti462zxDivPZnQ5fa3dk1BXvpiJo8= -go.opentelemetry.io/collector/receiver/receivertest v0.136.0 h1:xPhvg2K72Iy+bqzMwz+q4CmudYKy/Vq+dS1x2ETojP0= -go.opentelemetry.io/collector/receiver/receivertest v0.136.0/go.mod h1:DgPO43LjdtRXJ7BnXU2gGKak74cvGOie9qSdb7D/UWg= -go.opentelemetry.io/collector/receiver/xreceiver v0.136.0 h1:eb2DLzWewhJMJU34mgmL8WxgoYim44+Ry6/AMrjfY8E= -go.opentelemetry.io/collector/receiver/xreceiver v0.136.0/go.mod h1:k/j2K4krExMopkkOBFyPyDSgkrnQSN1fXHqLCvh8O5g= +go.opentelemetry.io/collector/processor/processorhelper v0.138.0 h1:Affdz4mJdjE6iJMWO6IpLcorBr1E+HFbo3/ok194Qc4= +go.opentelemetry.io/collector/processor/processorhelper v0.138.0/go.mod h1:QS6FzV/0/4kN3VPIYA+FPMuKkJnXnxvGKdllz2Fuopw= +go.opentelemetry.io/collector/processor/processorhelper/xprocessorhelper v0.138.0 h1:JojL1OHoKQpqZ5dyi4sJ44+sk9hbmwkV8WIElI3XJ+I= +go.opentelemetry.io/collector/processor/processorhelper/xprocessorhelper v0.138.0/go.mod h1:oMKZdW8U17c9TpFpBAqOMguwqnX9L4Invgh2SG5CKA0= +go.opentelemetry.io/collector/processor/processortest v0.138.0 h1:WSHPESV1NqPHlt9ShzTlc9y7ZLf83223fyfC4wzJoZg= +go.opentelemetry.io/collector/processor/processortest v0.138.0/go.mod h1:h+rFcy+svVipVVpAkellP5egcPYsHeOfL3o7lkFNsGs= +go.opentelemetry.io/collector/processor/xprocessor v0.138.0 h1:V+zKVy2kstPhIDsGvEBIRUxq8HzAdG1zdJP/hAuwENQ= +go.opentelemetry.io/collector/processor/xprocessor v0.138.0/go.mod h1:0Ybup3sw+eJkB0Jn1HID/LPNvTo33ur61ArHYq7Nozo= +go.opentelemetry.io/collector/receiver v1.44.0 h1:oPgHg7u+aqplnVTLyC3FapTsAE7BiGdTtDceE1BuTJg= +go.opentelemetry.io/collector/receiver v1.44.0/go.mod h1:NzkrGOIoWigOG54eF92ZGfJ8oSWhqGHTT0ZCGaH5NMc= +go.opentelemetry.io/collector/receiver/otlpreceiver v0.138.0 h1:lYgKvKIm1/6XAVO55C7wBCocalhimBpjlXx1kHyC2No= +go.opentelemetry.io/collector/receiver/otlpreceiver v0.138.0/go.mod h1:Pyquve9PvbQcbzoIPvEd25LDwrYgFAjiIgGIXma2k/M= +go.opentelemetry.io/collector/receiver/receiverhelper v0.138.0 h1:aEgyMilBJ2FoWQ+U4m28lzjmTP2UteDAIO96jRsPHmM= +go.opentelemetry.io/collector/receiver/receiverhelper v0.138.0/go.mod h1:WxMvaPgL9MWrIKjDiZ/SmopEXAX+sO9CD/SfXI9J63A= +go.opentelemetry.io/collector/receiver/receivertest v0.138.0 h1:K6kZ/epuAjjCCr1UMzNFyx1rynFSc+ifMXt5C/hWcXI= +go.opentelemetry.io/collector/receiver/receivertest v0.138.0/go.mod h1:p3cGSplwwp71r7R6u0e8N0rP/mmPsFjJ4WFV2Bhv7os= +go.opentelemetry.io/collector/receiver/xreceiver v0.138.0 h1:wspJazZc4htPBT08JpUI6gq+qeUUxSOhxXwWGn+QnlM= +go.opentelemetry.io/collector/receiver/xreceiver v0.138.0/go.mod h1:+S/AsbEs1geUt3B+HAhdSjd+3hPkjtmcSBltKwpCBik= go.opentelemetry.io/collector/scraper v0.134.0 h1:/S0NAgsBFlrG7GzKOd+dUYN8uRpwwJ1VkymfYiKAmbs= go.opentelemetry.io/collector/scraper v0.134.0/go.mod h1:f7lKvCZTEDlYxvJ5ySsRCXCXd6LbLYGYhVFgo7lnzHo= go.opentelemetry.io/collector/scraper/scraperhelper v0.134.0 h1:wbOna+qGlqvS3z59xCHNurXZcQUJ0IoFNGbp4v97c6A= @@ -2677,8 +2665,8 @@ go.opentelemetry.io/contrib/instrumentation/github.com/gorilla/mux/otelmux v0.45 go.opentelemetry.io/contrib/instrumentation/github.com/gorilla/mux/otelmux v0.45.0/go.mod h1:LOjFy00/ZMyMYfKFPta6kZe2cDUc1sNo/qtv1pSORWA= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.63.0 h1:YH4g8lQroajqUwWbq/tr2QX1JFmEXaDLgG+ew9bLMWo= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.63.0/go.mod h1:fvPi2qXDqFs8M4B4fmJhE92TyQs9Ydjlg3RvfUp+NbQ= -go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace v0.61.0 h1:lREC4C0ilyP4WibDhQ7Gg2ygAQFP8oR07Fst/5cafwI= -go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace v0.61.0/go.mod h1:HfvuU0kW9HewH14VCOLImqKvUgONodURG7Alj/IrnGI= +go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace v0.63.0 h1:2pn7OzMewmYRiNtv1doZnLo3gONcnMHlFnmOR8Vgt+8= +go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace v0.63.0/go.mod h1:rjbQTDEPQymPE0YnRQp9/NuPwwtL0sesz/fnqRW/v84= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.63.0 h1:RbKq8BG0FI8OiXhBfcRtqqHcZcka+gU3cskNuf05R18= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.63.0/go.mod h1:h06DGIukJOevXaj/xrNjhi/2098RZzcLTbc0jDAUbsg= go.opentelemetry.io/contrib/otelconf v0.16.0 h1:mTYGRlZtpc/zDaTaUQSnsZ1hyoRONaS4Od/Ny5++lhE= @@ -2924,8 +2912,8 @@ golang.org/x/net v0.15.0/go.mod h1:idbUs1IY1+zTqbi8yxTbhexhEEk5ur9LInksu6HrEpk= golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44= golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM= golang.org/x/net v0.33.0/go.mod h1:HXLR5J+9DxmrqMwG9qjGCxZ+zKXxBru04zlTvWlWuN4= -golang.org/x/net v0.44.0 h1:evd8IRDyfNBMBTTY5XRF1vaZlD+EmWx6x8PkhR04H/I= -golang.org/x/net v0.44.0/go.mod h1:ECOoLqd5U3Lhyeyo/QDCEVQ4sNgYsqvCZ722XogGieY= +golang.org/x/net v0.45.0 h1:RLBg5JKixCy82FtLJpeNlVM0nrSqpCRYzVU1n8kj0tM= +golang.org/x/net v0.45.0/go.mod h1:ECOoLqd5U3Lhyeyo/QDCEVQ4sNgYsqvCZ722XogGieY= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= @@ -3182,8 +3170,8 @@ google.golang.org/api v0.24.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0M google.golang.org/api v0.28.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE= google.golang.org/api v0.29.0/go.mod h1:Lcubydp8VUV7KeIHD9z2Bys/sm/vGKnG1UHuDBSrHWM= google.golang.org/api v0.30.0/go.mod h1:QGmEvQ87FHZNiUVJkT14jQNYJ4ZJjdRF23ZXz5138Fc= -google.golang.org/api v0.248.0 h1:hUotakSkcwGdYUqzCRc5yGYsg4wXxpkKlW5ryVqvC1Y= -google.golang.org/api v0.248.0/go.mod h1:yAFUAF56Li7IuIQbTFoLwXTCI6XCFKueOlS7S9e4F9k= +google.golang.org/api v0.252.0 h1:xfKJeAJaMwb8OC9fesr369rjciQ704AjU/psjkKURSI= +google.golang.org/api v0.252.0/go.mod h1:dnHOv81x5RAmumZ7BWLShB/u7JZNeyalImxHmtTHxqw= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= @@ -3229,10 +3217,10 @@ google.golang.org/genproto v0.0.0-20200825200019-8632dd797987/go.mod h1:FWY/as6D google.golang.org/genproto v0.0.0-20210602131652-f16073e35f0c/go.mod h1:UODoCrxHCcBojKKwX1terBiRUaqAsFqJiF615XL43r0= google.golang.org/genproto v0.0.0-20250603155806-513f23925822 h1:rHWScKit0gvAPuOnu87KpaYtjK5zBMLcULh7gxkCXu4= google.golang.org/genproto v0.0.0-20250603155806-513f23925822/go.mod h1:HubltRL7rMh0LfnQPkMH4NPDFEWp0jw3vixw7jEM53s= -google.golang.org/genproto/googleapis/api v0.0.0-20250922171735-9219d122eba9 h1:jm6v6kMRpTYKxBRrDkYAitNJegUeO1Mf3Kt80obv0gg= -google.golang.org/genproto/googleapis/api v0.0.0-20250922171735-9219d122eba9/go.mod h1:LmwNphe5Afor5V3R5BppOULHOnt2mCIf+NxMd4XiygE= -google.golang.org/genproto/googleapis/rpc v0.0.0-20250922171735-9219d122eba9 h1:V1jCN2HBa8sySkR5vLcCSqJSTMv093Rw9EJefhQGP7M= -google.golang.org/genproto/googleapis/rpc v0.0.0-20250922171735-9219d122eba9/go.mod h1:HSkG/KdJWusxU1F6CNrwNDjBMgisKxGnc5dAZfT0mjQ= +google.golang.org/genproto/googleapis/api v0.0.0-20250929231259-57b25ae835d4 h1:8XJ4pajGwOlasW+L13MnEGA8W4115jJySQtVfS2/IBU= +google.golang.org/genproto/googleapis/api v0.0.0-20250929231259-57b25ae835d4/go.mod h1:NnuHhy+bxcg30o7FnVAZbXsPHUDQ9qKWAQKCD7VxFtk= +google.golang.org/genproto/googleapis/rpc v0.0.0-20251002232023-7c0ddcbb5797 h1:CirRxTOwnRWVLKzDNrs0CXAaVozJoR4G9xvdRecrdpk= +google.golang.org/genproto/googleapis/rpc v0.0.0-20251002232023-7c0ddcbb5797/go.mod h1:HSkG/KdJWusxU1F6CNrwNDjBMgisKxGnc5dAZfT0mjQ= google.golang.org/grpc v1.8.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw= google.golang.org/grpc v1.12.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw= google.golang.org/grpc v1.14.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw= @@ -3256,8 +3244,8 @@ google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv google.golang.org/grpc v1.36.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= google.golang.org/grpc v1.38.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM= google.golang.org/grpc v1.41.0/go.mod h1:U3l9uK9J0sini8mHphKoXyaqDA/8VyGnDee1zzIUK6k= -google.golang.org/grpc v1.75.1 h1:/ODCNEuf9VghjgO3rqLcfg8fiOP0nSluljWFlDxELLI= -google.golang.org/grpc v1.75.1/go.mod h1:JtPAzKiq4v1xcAB2hydNlWI2RnF85XXcV0mhKXr2ecQ= +google.golang.org/grpc v1.76.0 h1:UnVkv1+uMLYXoIz6o7chp59WfQUYA2ex/BXQ9rHZu7A= +google.golang.org/grpc v1.76.0/go.mod h1:Ju12QI8M6iQJtbcsV+awF5a4hfJMLi4X0JLo94ULZ6c= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= @@ -3328,20 +3316,20 @@ honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9 howett.net/plist v0.0.0-20181124034731-591f970eefbb/go.mod h1:vMygbs4qMhSZSc4lCUl2OEE+rDiIIJAIdR4m7MiMcm0= howett.net/plist v1.0.0 h1:7CrbWYbPPO/PyNy38b2EB/+gYbjCe2DXBxgtOOZbSQM= howett.net/plist v1.0.0/go.mod h1:lqaXoTrLY4hg8tnEzNru53gicrbv7rrk+2xJA/7hw9g= -k8s.io/api v0.32.6 h1:UiBAMRzTP24Tz9UT1uhhmAv1auGTT9PT/npywSk9JrU= -k8s.io/api v0.32.6/go.mod h1:+iFCyQN34v2rsL53iQEN9lYE03mFdgPvgSXvATIDteg= +k8s.io/api v0.34.1 h1:jC+153630BMdlFukegoEL8E/yT7aLyQkIVuwhmwDgJM= +k8s.io/api v0.34.1/go.mod h1:SB80FxFtXn5/gwzCoN6QCtPD7Vbu5w2n1S0J5gFfTYk= k8s.io/apiextensions-apiserver v0.33.0 h1:d2qpYL7Mngbsc1taA4IjJPRJ9ilnsXIrndH+r9IimOs= k8s.io/apiextensions-apiserver v0.33.0/go.mod h1:VeJ8u9dEEN+tbETo+lFkwaaZPg6uFKLGj5vyNEwwSzc= -k8s.io/apimachinery v0.33.5 h1:NiT64hln4TQXeYR18/ES39OrNsjGz8NguxsBgp+6QIo= -k8s.io/apimachinery v0.33.5/go.mod h1:BHW0YOu7n22fFv/JkYOEfkUYNRN0fj0BlvMFWA7b+SM= -k8s.io/client-go v0.32.6 h1:Q+O+Sd9LKKFnsGZNVX2q1RDILYRpQZX+ea2RoIgjKlM= -k8s.io/client-go v0.32.6/go.mod h1:yqL9XJ2cTXy3WdJwdeyob3O6xiLwWrh9DP7SeszniW0= +k8s.io/apimachinery v0.34.1 h1:dTlxFls/eikpJxmAC7MVE8oOeP1zryV7iRyIjB0gky4= +k8s.io/apimachinery v0.34.1/go.mod h1:/GwIlEcWuTX9zKIg2mbw0LRFIsXwrfoVxn+ef0X13lw= +k8s.io/client-go v0.34.1 h1:ZUPJKgXsnKwVwmKKdPfw4tB58+7/Ik3CrjOEhsiZ7mY= +k8s.io/client-go v0.34.1/go.mod h1:kA8v0FP+tk6sZA0yKLRG67LWjqufAoSHA2xVGKw9Of8= k8s.io/component-base v0.33.0 h1:Ot4PyJI+0JAD9covDhwLp9UNkUja209OzsJ4FzScBNk= k8s.io/component-base v0.33.0/go.mod h1:aXYZLbw3kihdkOPMDhWbjGCO6sg+luw554KP51t8qCU= k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk= k8s.io/klog/v2 v2.130.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE= -k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff h1:/usPimJzUKKu+m+TE36gUyGcf03XZEP0ZIKgKj35LS4= -k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff/go.mod h1:5jIi+8yX4RIb8wk3XwBo5Pq2ccx4FP10ohkbSKCZoK8= +k8s.io/kube-openapi v0.0.0-20250910181357-589584f1c912 h1:Y3gxNAuB0OBLImH611+UDZcmKS3g6CthxToOb37KgwE= +k8s.io/kube-openapi v0.0.0-20250910181357-589584f1c912/go.mod h1:kdmbQkyfwUagLfXIad1y2TdrjPFWp2Q89B3qkRwf/pQ= k8s.io/utils v0.0.0-20250820121507-0af2bda4dd1d h1:wAhiDyZ4Tdtt7e46e9M5ZSAJ/MnPGPs+Ki1gHw4w1R0= k8s.io/utils v0.0.0-20250820121507-0af2bda4dd1d/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= @@ -3351,12 +3339,10 @@ sigs.k8s.io/controller-runtime v0.20.4 h1:X3c+Odnxz+iPTRobG4tp092+CvBU9UK0t/bRf+ sigs.k8s.io/controller-runtime v0.20.4/go.mod h1:xg2XB0K5ShQzAgsoujxuKN4LNXR2LfwwHsPj7Iaw+XY= sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730 h1:IpInykpT6ceI+QxKBbEflcR5EXP7sU1kvOlxwZh5txg= sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730/go.mod h1:mdzfpAEoE6DHQEN0uh9ZbOCuHbLK5wOm7dK4ctXE9Tg= -sigs.k8s.io/randfill v0.0.0-20250304075658-069ef1bbf016/go.mod h1:XeLlZ/jmk4i1HRopwe7/aU3H5n1zNUcX6TM94b3QxOY= sigs.k8s.io/randfill v1.0.0 h1:JfjMILfT8A6RbawdsK2JXGBR5AQVfd+9TbzrlneTyrU= sigs.k8s.io/randfill v1.0.0/go.mod h1:XeLlZ/jmk4i1HRopwe7/aU3H5n1zNUcX6TM94b3QxOY= -sigs.k8s.io/structured-merge-diff/v4 v4.7.0 h1:qPeWmscJcXP0snki5IYF79Z8xrl8ETFxgMd7wez1XkI= -sigs.k8s.io/structured-merge-diff/v4 v4.7.0/go.mod h1:dDy58f92j70zLsuZVuUX5Wp9vtxXpaZnkPGWeqDfCps= +sigs.k8s.io/structured-merge-diff/v6 v6.3.0 h1:jTijUJbW353oVOd9oTlifJqOGEkUw2jB/fXCbTiQEco= +sigs.k8s.io/structured-merge-diff/v6 v6.3.0/go.mod h1:M3W8sfWvn2HhQDIbGWj3S099YozAsymCo/wrT5ohRUE= sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc= -sigs.k8s.io/yaml v1.4.0/go.mod h1:Ejl7/uTz7PSA4eKMyQCUTnhZYNmLIl+5c2lQPGR2BPY= sigs.k8s.io/yaml v1.6.0 h1:G8fkbMSAFqgEFgh4b1wmtzDnioxFCUgTZhlbj5P9QYs= sigs.k8s.io/yaml v1.6.0/go.mod h1:796bPqUfzR/0jLAl6XjHl3Ck7MiyVv8dbTdyT3/pMf4= diff --git a/internal/component/common/kubernetes/prometheus_rule_group_diff_test.go b/internal/component/common/kubernetes/prometheus_rule_group_diff_test.go index 343d23c8b1..11a5b4f55e 100644 --- a/internal/component/common/kubernetes/prometheus_rule_group_diff_test.go +++ b/internal/component/common/kubernetes/prometheus_rule_group_diff_test.go @@ -4,6 +4,7 @@ import ( "fmt" "testing" + "github.com/prometheus/common/model" "github.com/prometheus/prometheus/model/rulefmt" "github.com/stretchr/testify/require" ) @@ -11,7 +12,7 @@ import ( func parsePrometheusRuleGroups(t *testing.T, buf []byte) []rulefmt.RuleGroup { t.Helper() - groups, errs := rulefmt.Parse(buf, true) + groups, errs := rulefmt.Parse(buf, true, model.LegacyValidation) require.Empty(t, errs) return groups.Groups diff --git a/internal/component/common/loki/client/copy_labels.go b/internal/component/common/loki/client/copy_labels.go new file mode 100644 index 0000000000..096168c77a --- /dev/null +++ b/internal/component/common/loki/client/copy_labels.go @@ -0,0 +1,17 @@ +//go:build !slicelabels + +package client + +import ( + "github.com/prometheus/common/model" + "github.com/prometheus/prometheus/model/labels" +) + +// promLabelsToModelLabels copies the labels to a new model.LabelSet. +func promLabelsToModelLabels(lbs labels.Labels) model.LabelSet { + result := make(model.LabelSet, lbs.Len()) + lbs.Range(func(l labels.Label) { + result[model.LabelName(l.Name)] = model.LabelValue(l.Value) + }) + return result +} diff --git a/internal/component/common/loki/client/copy_slicelabels.go b/internal/component/common/loki/client/copy_slicelabels.go new file mode 100644 index 0000000000..b111313009 --- /dev/null +++ b/internal/component/common/loki/client/copy_slicelabels.go @@ -0,0 +1,21 @@ +//go:build slicelabels + +package client + +import ( + "strings" + + "github.com/prometheus/common/model" + "github.com/prometheus/prometheus/model/labels" +) + +// promLabelsToModelLabels copies the labels to a new model.LabelSet. +// The slicelabels implementation uses strings.Clone as the strings used +// for labels are backed by reused buffers. This avoids memory corruption. +func promLabelsToModelLabels(lbs labels.Labels) model.LabelSet { + result := make(model.LabelSet, lbs.Len()) + lbs.Range(func(l labels.Label) { + result[model.LabelName(strings.Clone(l.Name))] = model.LabelValue(strings.Clone(l.Value)) + }) + return result +} diff --git a/internal/component/common/loki/client/queue_client.go b/internal/component/common/loki/client/queue_client.go index 460720c0f3..0e81f45f5f 100644 --- a/internal/component/common/loki/client/queue_client.go +++ b/internal/component/common/loki/client/queue_client.go @@ -262,8 +262,7 @@ func (c *queueClient) StoreSeries(series []record.RefSeries, segment int) { defer c.seriesLock.Unlock() for _, seriesRec := range series { c.seriesSegment[seriesRec.Ref] = segment - labels := lokiutil.MapToModelLabelSet(seriesRec.Labels.Map()) - c.series[seriesRec.Ref] = labels + c.series[seriesRec.Ref] = promLabelsToModelLabels(seriesRec.Labels) } } diff --git a/internal/component/common/loki/wal/writer.go b/internal/component/common/loki/wal/writer.go index 5b870934f1..c5cb25668a 100644 --- a/internal/component/common/loki/wal/writer.go +++ b/internal/component/common/loki/wal/writer.go @@ -261,8 +261,7 @@ func newEntryWriter() *entryWriter { // write, it first has to be reset, and then overwritten accordingly. Therefore, WriteEntry is not thread-safe. func (ew *entryWriter) WriteEntry(entry loki.Entry, wl WAL, _ log.Logger) error { // Reset wal record slices - ew.reusableWALRecord.RefEntries = ew.reusableWALRecord.RefEntries[:0] - ew.reusableWALRecord.Series = ew.reusableWALRecord.Series[:0] + ew.reusableWALRecord.Reset() var fp uint64 lbs := labels.FromMap(util.ModelLabelSetToMap(entry.Labels)) diff --git a/internal/component/common/relabel/relabel.go b/internal/component/common/relabel/relabel.go index d3b3555720..d2b3aef7e7 100644 --- a/internal/component/common/relabel/relabel.go +++ b/internal/component/common/relabel/relabel.go @@ -324,13 +324,14 @@ func ComponentToPromRelabelConfigs(rcs []*Config) []*relabel.Config { } res[i] = &relabel.Config{ - SourceLabels: sourceLabels, - Separator: rc.Separator, - Modulus: rc.Modulus, - TargetLabel: rc.TargetLabel, - Replacement: rc.Replacement, - Action: relabel.Action(rc.Action), - Regex: relabel.Regexp{Regexp: rc.Regex.Regexp}, + SourceLabels: sourceLabels, + Separator: rc.Separator, + Modulus: rc.Modulus, + TargetLabel: rc.TargetLabel, + Replacement: rc.Replacement, + Action: relabel.Action(rc.Action), + Regex: relabel.Regexp{Regexp: rc.Regex.Regexp}, + NameValidationScheme: model.LegacyValidation, } } diff --git a/internal/component/loki/rules/kubernetes/events.go b/internal/component/loki/rules/kubernetes/events.go index 52c2ce681d..0b1548ea54 100644 --- a/internal/component/loki/rules/kubernetes/events.go +++ b/internal/component/loki/rules/kubernetes/events.go @@ -9,6 +9,7 @@ import ( "github.com/grafana/loki/v3/pkg/logql/syntax" "github.com/hashicorp/go-multierror" promv1 "github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1" + "github.com/prometheus/common/model" "github.com/prometheus/prometheus/model/labels" "github.com/prometheus/prometheus/model/rulefmt" "github.com/prometheus/prometheus/promql/parser" @@ -222,7 +223,8 @@ func convertCRDRuleGroupToRuleGroup(crd promv1.PrometheusRuleSpec) ([]rulefmt.Ru } var errs error - groups, _ := rulefmt.Parse(buf, false) + // TODO: Expose validation scheme setting https://github.com/grafana/alloy/issues/4122 + groups, _ := rulefmt.Parse(buf, false, model.LegacyValidation) for _, group := range groups.Groups { for _, rule := range group.Rules { if _, err := syntax.ParseExpr(rule.Expr); err != nil { diff --git a/internal/component/loki/source/api/internal/lokipush/push_api_server.go b/internal/component/loki/source/api/internal/lokipush/push_api_server.go index 2dc5740b19..d4b8cd5124 100644 --- a/internal/component/loki/source/api/internal/lokipush/push_api_server.go +++ b/internal/component/loki/source/api/internal/lokipush/push_api_server.go @@ -14,6 +14,7 @@ import ( "github.com/grafana/dskit/user" lokipush "github.com/grafana/loki/pkg/push" "github.com/grafana/loki/v3/pkg/loghttp/push" + "github.com/grafana/loki/v3/pkg/util/constants" util_log "github.com/grafana/loki/v3/pkg/util/log" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/common/model" @@ -174,6 +175,7 @@ func (s *PushAPIServer) handleLoki(w http.ResponseWriter, r *http.Request) { nil, // usage tracker nil, "", + constants.Loki, ) if err != nil { level.Warn(s.logger).Log("msg", "failed to parse incoming push request", "err", err.Error()) diff --git a/internal/component/loki/source/aws_firehose/internal/handler_test.go b/internal/component/loki/source/aws_firehose/internal/handler_test.go index 68ee4ad072..f3695c369c 100644 --- a/internal/component/loki/source/aws_firehose/internal/handler_test.go +++ b/internal/component/loki/source/aws_firehose/internal/handler_test.go @@ -129,18 +129,20 @@ func TestHandler(t *testing.T) { Body: readTestData(t, "testdata/direct_put.json"), Relabels: []*relabel.Config{ { - SourceLabels: model.LabelNames{"__aws_firehose_request_id"}, - Regex: relabel.MustNewRegexp("(.*)"), - Replacement: "$1", - TargetLabel: "aws_request_id", - Action: relabel.Replace, + SourceLabels: model.LabelNames{"__aws_firehose_request_id"}, + Regex: relabel.MustNewRegexp("(.*)"), + Replacement: "$1", + TargetLabel: "aws_request_id", + Action: relabel.Replace, + NameValidationScheme: model.LegacyValidation, }, { - SourceLabels: model.LabelNames{"__aws_firehose_source_arn"}, - Regex: relabel.MustNewRegexp("(.*)"), - Replacement: "$1", - TargetLabel: "aws_source_arn", - Action: relabel.Replace, + SourceLabels: model.LabelNames{"__aws_firehose_source_arn"}, + Regex: relabel.MustNewRegexp("(.*)"), + Replacement: "$1", + TargetLabel: "aws_source_arn", + Action: relabel.Replace, + NameValidationScheme: model.LegacyValidation, }, }, Assert: func(t *testing.T, res *httptest.ResponseRecorder, entries []loki.Entry) { @@ -479,11 +481,12 @@ func assertCloudwatchDataContents(t *testing.T, _ *httptest.ResponseRecorder, en func keepLabelRule(src, dst string) *relabel.Config { return &relabel.Config{ - SourceLabels: model.LabelNames{model.LabelName(src)}, - Regex: relabel.MustNewRegexp("(.*)"), - Replacement: "$1", - TargetLabel: dst, - Action: relabel.Replace, + SourceLabels: model.LabelNames{model.LabelName(src)}, + Regex: relabel.MustNewRegexp("(.*)"), + Replacement: "$1", + TargetLabel: dst, + Action: relabel.Replace, + NameValidationScheme: model.LegacyValidation, } } diff --git a/internal/component/loki/source/azure_event_hubs/internal/parser/parser_test.go b/internal/component/loki/source/azure_event_hubs/internal/parser/parser_test.go index b6aed72419..caf729dd11 100644 --- a/internal/component/loki/source/azure_event_hubs/internal/parser/parser_test.go +++ b/internal/component/loki/source/azure_event_hubs/internal/parser/parser_test.go @@ -198,11 +198,12 @@ func Test_parseMessage_relable_config(t *testing.T) { relableConfigs := []*relabel.Config{ { - SourceLabels: model.LabelNames{"__azure_event_hubs_category"}, - Regex: relabel.MustNewRegexp("(.*)"), - TargetLabel: "category", - Replacement: "$1", - Action: "replace", + SourceLabels: model.LabelNames{"__azure_event_hubs_category"}, + Regex: relabel.MustNewRegexp("(.*)"), + TargetLabel: "category", + Replacement: "$1", + Action: "replace", + NameValidationScheme: model.LegacyValidation, }, } diff --git a/internal/component/loki/source/gcplog/internal/gcplogtarget/formatter_test.go b/internal/component/loki/source/gcplog/internal/gcplogtarget/formatter_test.go index cf3a0f4f37..368e856dea 100644 --- a/internal/component/loki/source/gcplog/internal/gcplogtarget/formatter_test.go +++ b/internal/component/loki/source/gcplog/internal/gcplogtarget/formatter_test.go @@ -32,36 +32,40 @@ func TestFormat(t *testing.T) { }, relabel: []*relabel.Config{ { - SourceLabels: model.LabelNames{"__gcp_resource_labels_backend_service_name"}, - Separator: ";", - Regex: relabel.MustNewRegexp("(.*)"), - TargetLabel: "backend_service_name", - Action: "replace", - Replacement: "$1", + SourceLabels: model.LabelNames{"__gcp_resource_labels_backend_service_name"}, + Separator: ";", + Regex: relabel.MustNewRegexp("(.*)"), + TargetLabel: "backend_service_name", + Action: "replace", + Replacement: "$1", + NameValidationScheme: model.LegacyValidation, }, { - SourceLabels: model.LabelNames{"__gcp_resource_labels_bucket_name"}, - Separator: ";", - Regex: relabel.MustNewRegexp("(.*)"), - TargetLabel: "bucket_name", - Action: "replace", - Replacement: "$1", + SourceLabels: model.LabelNames{"__gcp_resource_labels_bucket_name"}, + Separator: ";", + Regex: relabel.MustNewRegexp("(.*)"), + TargetLabel: "bucket_name", + Action: "replace", + Replacement: "$1", + NameValidationScheme: model.LegacyValidation, }, { - SourceLabels: model.LabelNames{"__gcp_severity"}, - Separator: ";", - Regex: relabel.MustNewRegexp("(.*)"), - TargetLabel: "severity", - Action: "replace", - Replacement: "$1", + SourceLabels: model.LabelNames{"__gcp_severity"}, + Separator: ";", + Regex: relabel.MustNewRegexp("(.*)"), + TargetLabel: "severity", + Action: "replace", + Replacement: "$1", + NameValidationScheme: model.LegacyValidation, }, { - SourceLabels: model.LabelNames{"__gcp_labels_dataflow_googleapis_com_region"}, - Separator: ";", - Regex: relabel.MustNewRegexp("(.*)"), - TargetLabel: "region", - Action: "replace", - Replacement: "$1", + SourceLabels: model.LabelNames{"__gcp_labels_dataflow_googleapis_com_region"}, + Separator: ";", + Regex: relabel.MustNewRegexp("(.*)"), + TargetLabel: "region", + Action: "replace", + Replacement: "$1", + NameValidationScheme: model.LegacyValidation, }, }, useIncomingTimestamp: true, diff --git a/internal/component/loki/source/gcplog/internal/gcplogtarget/push_target_test.go b/internal/component/loki/source/gcplog/internal/gcplogtarget/push_target_test.go index 2b7c1462c4..09ef766c82 100644 --- a/internal/component/loki/source/gcplog/internal/gcplogtarget/push_target_test.go +++ b/internal/component/loki/source/gcplog/internal/gcplogtarget/push_target_test.go @@ -91,47 +91,53 @@ func TestPushTarget(t *testing.T) { }, RelabelConfigs: []*relabel.Config{ { - SourceLabels: model.LabelNames{"__gcp_attributes_logging_googleapis_com_timestamp"}, - Regex: relabel.MustNewRegexp("(.*)"), - Replacement: "$1", - TargetLabel: "google_timestamp", - Action: relabel.Replace, + SourceLabels: model.LabelNames{"__gcp_attributes_logging_googleapis_com_timestamp"}, + Regex: relabel.MustNewRegexp("(.*)"), + Replacement: "$1", + TargetLabel: "google_timestamp", + Action: relabel.Replace, + NameValidationScheme: model.LegacyValidation, }, { - SourceLabels: model.LabelNames{"__gcp_message_id"}, - Regex: relabel.MustNewRegexp("(.*)"), - Replacement: "$1", - TargetLabel: "message_id", - Action: relabel.Replace, + SourceLabels: model.LabelNames{"__gcp_message_id"}, + Regex: relabel.MustNewRegexp("(.*)"), + Replacement: "$1", + TargetLabel: "message_id", + Action: relabel.Replace, + NameValidationScheme: model.LegacyValidation, }, { - SourceLabels: model.LabelNames{"__gcp_subscription_name"}, - Regex: relabel.MustNewRegexp("(.*)"), - Replacement: "$1", - TargetLabel: "subscription", - Action: relabel.Replace, + SourceLabels: model.LabelNames{"__gcp_subscription_name"}, + Regex: relabel.MustNewRegexp("(.*)"), + Replacement: "$1", + TargetLabel: "subscription", + Action: relabel.Replace, + NameValidationScheme: model.LegacyValidation, }, // Internal GCP Log entry attributes and labels { - SourceLabels: model.LabelNames{"__gcp_logname"}, - Regex: relabel.MustNewRegexp("(.*)"), - Replacement: "$1", - TargetLabel: "log_name", - Action: relabel.Replace, + SourceLabels: model.LabelNames{"__gcp_logname"}, + Regex: relabel.MustNewRegexp("(.*)"), + Replacement: "$1", + TargetLabel: "log_name", + Action: relabel.Replace, + NameValidationScheme: model.LegacyValidation, }, { - SourceLabels: model.LabelNames{"__gcp_resource_type"}, - Regex: relabel.MustNewRegexp("(.*)"), - Replacement: "$1", - TargetLabel: "resource_type", - Action: relabel.Replace, + SourceLabels: model.LabelNames{"__gcp_resource_type"}, + Regex: relabel.MustNewRegexp("(.*)"), + Replacement: "$1", + TargetLabel: "resource_type", + Action: relabel.Replace, + NameValidationScheme: model.LegacyValidation, }, { - SourceLabels: model.LabelNames{"__gcp_resource_labels_cluster_name"}, - Regex: relabel.MustNewRegexp("(.*)"), - Replacement: "$1", - TargetLabel: "cluster", - Action: relabel.Replace, + SourceLabels: model.LabelNames{"__gcp_resource_labels_cluster_name"}, + Regex: relabel.MustNewRegexp("(.*)"), + Replacement: "$1", + TargetLabel: "cluster", + Action: relabel.Replace, + NameValidationScheme: model.LegacyValidation, }, }, }, @@ -300,11 +306,12 @@ func TestPushTarget_UseTenantIDHeaderIfPresent(t *testing.T) { metrics := NewMetrics(prometheus.DefaultRegisterer) tenantIDRelabelConfig := []*relabel.Config{ { - SourceLabels: model.LabelNames{"__tenant_id__"}, - Regex: relabel.MustNewRegexp("(.*)"), - Replacement: "$1", - TargetLabel: "tenant_id", - Action: relabel.Replace, + SourceLabels: model.LabelNames{"__tenant_id__"}, + Regex: relabel.MustNewRegexp("(.*)"), + Replacement: "$1", + TargetLabel: "tenant_id", + Action: relabel.Replace, + NameValidationScheme: model.LegacyValidation, }, } pt, err := NewPushTarget(metrics, logger, eh, t.Name()+"_test_job", config, tenantIDRelabelConfig, nil) @@ -446,11 +453,12 @@ func TestPushTarget_UsePushTimeout(t *testing.T) { metrics := NewMetrics(prometheus.DefaultRegisterer) tenantIDRelabelConfig := []*relabel.Config{ { - SourceLabels: model.LabelNames{"__tenant_id__"}, - Regex: relabel.MustNewRegexp("(.*)"), - Replacement: "$1", - TargetLabel: "tenant_id", - Action: relabel.Replace, + SourceLabels: model.LabelNames{"__tenant_id__"}, + Regex: relabel.MustNewRegexp("(.*)"), + Replacement: "$1", + TargetLabel: "tenant_id", + Action: relabel.Replace, + NameValidationScheme: model.LegacyValidation, }, } pt, err := NewPushTarget(metrics, logger, eh, t.Name()+"_test_job", config, tenantIDRelabelConfig, nil) diff --git a/internal/component/loki/source/gcplog/internal/gcplogtarget/push_translation_test.go b/internal/component/loki/source/gcplog/internal/gcplogtarget/push_translation_test.go index 8328cf4a57..ad9831b4a5 100644 --- a/internal/component/loki/source/gcplog/internal/gcplogtarget/push_translation_test.go +++ b/internal/component/loki/source/gcplog/internal/gcplogtarget/push_translation_test.go @@ -93,11 +93,12 @@ func TestTranslate(t *testing.T) { rc := []*relabel.Config{ { - SourceLabels: model.LabelNames{"__gcp_message_id"}, - Regex: mustNewRegexp("(.*)"), - Action: relabel.Replace, - Replacement: "$1", - TargetLabel: "message_id", + SourceLabels: model.LabelNames{"__gcp_message_id"}, + Regex: mustNewRegexp("(.*)"), + Action: relabel.Replace, + Replacement: "$1", + TargetLabel: "message_id", + NameValidationScheme: model.LegacyValidation, }, } diff --git a/internal/component/loki/source/heroku/internal/herokutarget/target_test.go b/internal/component/loki/source/heroku/internal/herokutarget/target_test.go index 615564e1cc..242b62edc0 100644 --- a/internal/component/loki/source/heroku/internal/herokutarget/target_test.go +++ b/internal/component/loki/source/heroku/internal/herokutarget/target_test.go @@ -179,25 +179,28 @@ func TestHerokuDrainTarget(t *testing.T) { }, RelabelConfigs: []*relabel.Config{ { - SourceLabels: model.LabelNames{"__heroku_drain_host"}, - TargetLabel: "host", - Replacement: "$1", - Action: relabel.Replace, - Regex: relabel.MustNewRegexp("(.*)"), + SourceLabels: model.LabelNames{"__heroku_drain_host"}, + TargetLabel: "host", + Replacement: "$1", + Action: relabel.Replace, + Regex: relabel.MustNewRegexp("(.*)"), + NameValidationScheme: model.LegacyValidation, }, { - SourceLabels: model.LabelNames{"__heroku_drain_app"}, - TargetLabel: "app", - Replacement: "$1", - Action: relabel.Replace, - Regex: relabel.MustNewRegexp("(.*)"), + SourceLabels: model.LabelNames{"__heroku_drain_app"}, + TargetLabel: "app", + Replacement: "$1", + Action: relabel.Replace, + Regex: relabel.MustNewRegexp("(.*)"), + NameValidationScheme: model.LegacyValidation, }, { - SourceLabels: model.LabelNames{"__heroku_drain_proc"}, - TargetLabel: "procID", - Replacement: "$1", - Action: relabel.Replace, - Regex: relabel.MustNewRegexp("(.*)"), + SourceLabels: model.LabelNames{"__heroku_drain_proc"}, + TargetLabel: "procID", + Replacement: "$1", + Action: relabel.Replace, + Regex: relabel.MustNewRegexp("(.*)"), + NameValidationScheme: model.LegacyValidation, }, }, }, @@ -224,32 +227,36 @@ func TestHerokuDrainTarget(t *testing.T) { }, RelabelConfigs: []*relabel.Config{ { - SourceLabels: model.LabelNames{"__heroku_drain_host"}, - TargetLabel: "host", - Replacement: "$1", - Action: relabel.Replace, - Regex: relabel.MustNewRegexp("(.*)"), + SourceLabels: model.LabelNames{"__heroku_drain_host"}, + TargetLabel: "host", + Replacement: "$1", + Action: relabel.Replace, + Regex: relabel.MustNewRegexp("(.*)"), + NameValidationScheme: model.LegacyValidation, }, { - SourceLabels: model.LabelNames{"__heroku_drain_app"}, - TargetLabel: "app", - Replacement: "$1", - Action: relabel.Replace, - Regex: relabel.MustNewRegexp("(.*)"), + SourceLabels: model.LabelNames{"__heroku_drain_app"}, + TargetLabel: "app", + Replacement: "$1", + Action: relabel.Replace, + Regex: relabel.MustNewRegexp("(.*)"), + NameValidationScheme: model.LegacyValidation, }, { - SourceLabels: model.LabelNames{"__heroku_drain_proc"}, - TargetLabel: "procID", - Replacement: "$1", - Action: relabel.Replace, - Regex: relabel.MustNewRegexp("(.*)"), + SourceLabels: model.LabelNames{"__heroku_drain_proc"}, + TargetLabel: "procID", + Replacement: "$1", + Action: relabel.Replace, + Regex: relabel.MustNewRegexp("(.*)"), + NameValidationScheme: model.LegacyValidation, }, { - SourceLabels: model.LabelNames{"__heroku_drain_param_some_query_param"}, - TargetLabel: "query_param", - Replacement: "$1", - Action: relabel.Replace, - Regex: relabel.MustNewRegexp("(.*)"), + SourceLabels: model.LabelNames{"__heroku_drain_param_some_query_param"}, + TargetLabel: "query_param", + Replacement: "$1", + Action: relabel.Replace, + Regex: relabel.MustNewRegexp("(.*)"), + NameValidationScheme: model.LegacyValidation, }, }, }, @@ -389,11 +396,12 @@ func TestHerokuDrainTarget_UseTenantIDHeaderIfPresent(t *testing.T) { metrics := NewMetrics(prometheus.DefaultRegisterer) tenantIDRelabelConfig := []*relabel.Config{ { - SourceLabels: model.LabelNames{"__tenant_id__"}, - TargetLabel: "tenant_id", - Replacement: "$1", - Action: relabel.Replace, - Regex: relabel.MustNewRegexp("(.*)"), + SourceLabels: model.LabelNames{"__tenant_id__"}, + TargetLabel: "tenant_id", + Replacement: "$1", + Action: relabel.Replace, + Regex: relabel.MustNewRegexp("(.*)"), + NameValidationScheme: model.LegacyValidation, }, } pt, err := NewHerokuTarget(metrics, logger, eh, tenantIDRelabelConfig, config, prometheus.DefaultRegisterer) diff --git a/internal/component/loki/source/internal/kafkatarget/kafkatarget_test.go b/internal/component/loki/source/internal/kafkatarget/kafkatarget_test.go index 672aba066c..3d1f5227fb 100644 --- a/internal/component/loki/source/internal/kafkatarget/kafkatarget_test.go +++ b/internal/component/loki/source/internal/kafkatarget/kafkatarget_test.go @@ -142,11 +142,12 @@ func Test_TargetRun(t *testing.T) { inLS: model.LabelSet{"buzz": "bazz"}, relabels: []*relabel.Config{ { - SourceLabels: model.LabelNames{"__meta_kafka_message_key"}, - Regex: relabel.MustNewRegexp("(.*)"), - TargetLabel: "message_key", - Replacement: "$1", - Action: "replace", + SourceLabels: model.LabelNames{"__meta_kafka_message_key"}, + Regex: relabel.MustNewRegexp("(.*)"), + TargetLabel: "message_key", + Replacement: "$1", + Action: "replace", + NameValidationScheme: model.LegacyValidation, }, }, expectedLS: model.LabelSet{"buzz": "bazz", "message_key": "foo"}, @@ -159,11 +160,12 @@ func Test_TargetRun(t *testing.T) { inLS: model.LabelSet{"buzz": "bazz"}, relabels: []*relabel.Config{ { - SourceLabels: model.LabelNames{"__meta_kafka_message_key"}, - Regex: relabel.MustNewRegexp("(.*)"), - TargetLabel: "message_key", - Replacement: "$1", - Action: "replace", + SourceLabels: model.LabelNames{"__meta_kafka_message_key"}, + Regex: relabel.MustNewRegexp("(.*)"), + TargetLabel: "message_key", + Replacement: "$1", + Action: "replace", + NameValidationScheme: model.LegacyValidation, }, }, expectedLS: model.LabelSet{"buzz": "bazz", "message_key": "none"}, @@ -176,11 +178,12 @@ func Test_TargetRun(t *testing.T) { inLS: model.LabelSet{"buzz": "bazz"}, relabels: []*relabel.Config{ { - SourceLabels: model.LabelNames{"__meta_kafka_message_offset"}, - Regex: relabel.MustNewRegexp("(.*)"), - TargetLabel: "message_offset", - Replacement: "$1", - Action: "replace", + SourceLabels: model.LabelNames{"__meta_kafka_message_offset"}, + Regex: relabel.MustNewRegexp("(.*)"), + TargetLabel: "message_offset", + Replacement: "$1", + Action: "replace", + NameValidationScheme: model.LegacyValidation, }, }, expectedLS: model.LabelSet{"buzz": "bazz", "message_offset": "42"}, @@ -193,11 +196,12 @@ func Test_TargetRun(t *testing.T) { inLS: model.LabelSet{"buzz": "bazz"}, relabels: []*relabel.Config{ { - SourceLabels: model.LabelNames{"__meta_kafka_message_offset"}, - Regex: relabel.MustNewRegexp("(.*)"), - TargetLabel: "message_offset", - Replacement: "$1", - Action: "replace", + SourceLabels: model.LabelNames{"__meta_kafka_message_offset"}, + Regex: relabel.MustNewRegexp("(.*)"), + TargetLabel: "message_offset", + Replacement: "$1", + Action: "replace", + NameValidationScheme: model.LegacyValidation, }, }, expectedLS: model.LabelSet{"buzz": "bazz", "message_offset": "0"}, diff --git a/internal/component/loki/source/internal/kafkatarget/target_syncer_test.go b/internal/component/loki/source/internal/kafkatarget/target_syncer_test.go index e959ed58ab..e1da528083 100644 --- a/internal/component/loki/source/internal/kafkatarget/target_syncer_test.go +++ b/internal/component/loki/source/internal/kafkatarget/target_syncer_test.go @@ -84,11 +84,12 @@ func Test_NewTarget(t *testing.T) { cfg: Config{ RelabelConfigs: []*relabel.Config{ { - SourceLabels: model.LabelNames{"__meta_kafka_topic"}, - TargetLabel: "topic", - Replacement: "$1", - Action: relabel.Replace, - Regex: relabel.MustNewRegexp("(.*)"), + SourceLabels: model.LabelNames{"__meta_kafka_topic"}, + TargetLabel: "topic", + Replacement: "$1", + Action: relabel.Replace, + Regex: relabel.MustNewRegexp("(.*)"), + NameValidationScheme: model.LegacyValidation, }, }, KafkaConfig: TargetConfig{ diff --git a/internal/component/loki/source/syslog/internal/syslogtarget/syslogtarget_test.go b/internal/component/loki/source/syslog/internal/syslogtarget/syslogtarget_test.go index 9f7afe9c25..06c11f2139 100644 --- a/internal/component/loki/source/syslog/internal/syslogtarget/syslogtarget_test.go +++ b/internal/component/loki/source/syslog/internal/syslogtarget/syslogtarget_test.go @@ -463,6 +463,11 @@ func relabelConfig(t *testing.T) []*relabel.Config { err := yaml.Unmarshal([]byte(relabelCfg), &relabels) require.NoError(t, err) + // Set the validation scheme for all relabel configs + for _, cfg := range relabels { + cfg.NameValidationScheme = model.LegacyValidation + } + return relabels } diff --git a/internal/component/prometheus/operator/configgen/config_gen.go b/internal/component/prometheus/operator/configgen/config_gen.go index 83dc6514c2..8b712a6d48 100644 --- a/internal/component/prometheus/operator/configgen/config_gen.go +++ b/internal/component/prometheus/operator/configgen/config_gen.go @@ -227,6 +227,10 @@ func (r *relabeler) add(cfgs ...*relabel.Config) { if cfg.Replacement == "" { cfg.Replacement = relabel.DefaultRelabelConfig.Replacement } + // Set NameValidationScheme to LegacyValidation to maintain compatibility + if cfg.NameValidationScheme == model.UnsetValidation { + cfg.NameValidationScheme = model.LegacyValidation + } r.configs = append(r.configs, cfg) } } diff --git a/internal/component/prometheus/operator/configgen/config_gen_podmonitor_test.go b/internal/component/prometheus/operator/configgen/config_gen_podmonitor_test.go index 7c8a33e2a5..b96bc07feb 100644 --- a/internal/component/prometheus/operator/configgen/config_gen_podmonitor_test.go +++ b/internal/component/prometheus/operator/configgen/config_gen_podmonitor_test.go @@ -28,8 +28,10 @@ import ( ) func TestGeneratePodMonitorConfig(t *testing.T) { - var falseVal = false - var proxyURL = "https://proxy:8080" + var ( + falsePtr = ptr.To(false) + proxyURL = "https://proxy:8080" + ) suite := []struct { name string m *promopv1.PodMonitor @@ -89,9 +91,10 @@ func TestGeneratePodMonitorConfig(t *testing.T) { }, }, }, - ConvertClassicHistogramsToNHCB: ptr.To(false), - MetricNameValidationScheme: "legacy", - MetricNameEscapingScheme: "underscores", + AlwaysScrapeClassicHistograms: falsePtr, + ConvertClassicHistogramsToNHCB: falsePtr, + MetricNameValidationScheme: model.LegacyValidation, + MetricNameEscapingScheme: model.UnderscoreEscaping.String(), }, }, { @@ -151,9 +154,10 @@ func TestGeneratePodMonitorConfig(t *testing.T) { }, }, }, - ConvertClassicHistogramsToNHCB: ptr.To(false), - MetricNameValidationScheme: "legacy", - MetricNameEscapingScheme: "underscores", + AlwaysScrapeClassicHistograms: falsePtr, + ConvertClassicHistogramsToNHCB: falsePtr, + MetricNameValidationScheme: model.LegacyValidation, + MetricNameEscapingScheme: model.UnderscoreEscaping.String(), }, }, { @@ -213,9 +217,10 @@ func TestGeneratePodMonitorConfig(t *testing.T) { }, }, }, - ConvertClassicHistogramsToNHCB: ptr.To(false), - MetricNameValidationScheme: "legacy", - MetricNameEscapingScheme: "underscores", + AlwaysScrapeClassicHistograms: falsePtr, + ConvertClassicHistogramsToNHCB: falsePtr, + MetricNameValidationScheme: model.LegacyValidation, + MetricNameEscapingScheme: model.UnderscoreEscaping.String(), }, }, { @@ -273,9 +278,10 @@ func TestGeneratePodMonitorConfig(t *testing.T) { }, }, }, - ConvertClassicHistogramsToNHCB: ptr.To(false), - MetricNameValidationScheme: "legacy", - MetricNameEscapingScheme: "underscores", + AlwaysScrapeClassicHistograms: falsePtr, + ConvertClassicHistogramsToNHCB: falsePtr, + MetricNameValidationScheme: model.LegacyValidation, + MetricNameEscapingScheme: model.UnderscoreEscaping.String(), }, }, { @@ -335,9 +341,10 @@ func TestGeneratePodMonitorConfig(t *testing.T) { }, }, }, - ConvertClassicHistogramsToNHCB: ptr.To(false), - MetricNameValidationScheme: "legacy", - MetricNameEscapingScheme: "underscores", + AlwaysScrapeClassicHistograms: falsePtr, + ConvertClassicHistogramsToNHCB: falsePtr, + MetricNameValidationScheme: model.LegacyValidation, + MetricNameEscapingScheme: model.UnderscoreEscaping.String(), }, }, { @@ -385,17 +392,17 @@ func TestGeneratePodMonitorConfig(t *testing.T) { }, ep: promopv1.PodMetricsEndpoint{ Port: stringPtr("metrics"), - EnableHttp2: &falseVal, + EnableHttp2: falsePtr, Path: "/foo", Params: map[string][]string{"a": {"b"}}, - FollowRedirects: &falseVal, + FollowRedirects: falsePtr, ProxyURL: &proxyURL, Scheme: "https", ScrapeTimeout: "17s", Interval: "12m", HonorLabels: true, - HonorTimestamps: &falseVal, - FilterRunning: &falseVal, + HonorTimestamps: falsePtr, + FilterRunning: falsePtr, TLSConfig: &promopv1.SafeTLSConfig{ ServerName: stringPtr("foo.com"), InsecureSkipVerify: boolPtr(true), @@ -478,7 +485,7 @@ func TestGeneratePodMonitorConfig(t *testing.T) { "a": []string{"b"}, }, HTTPClientConfig: commonConfig.HTTPClientConfig{ - FollowRedirects: falseVal, + FollowRedirects: false, EnableHTTP2: false, TLSConfig: commonConfig.TLSConfig{ ServerName: "foo.com", @@ -503,9 +510,10 @@ func TestGeneratePodMonitorConfig(t *testing.T) { LabelLimit: 103, LabelNameLengthLimit: 104, LabelValueLengthLimit: 105, - ConvertClassicHistogramsToNHCB: ptr.To(false), - MetricNameValidationScheme: "legacy", - MetricNameEscapingScheme: "underscores", + AlwaysScrapeClassicHistograms: falsePtr, + ConvertClassicHistogramsToNHCB: falsePtr, + MetricNameValidationScheme: model.LegacyValidation, + MetricNameEscapingScheme: model.UnderscoreEscaping.String(), }, }, } diff --git a/internal/component/prometheus/operator/configgen/config_gen_probe_test.go b/internal/component/prometheus/operator/configgen/config_gen_probe_test.go index e7cdc7b48b..0dce3154f5 100644 --- a/internal/component/prometheus/operator/configgen/config_gen_probe_test.go +++ b/internal/component/prometheus/operator/configgen/config_gen_probe_test.go @@ -27,6 +27,7 @@ import ( // see https://github.com/prometheus-operator/prometheus-operator/blob/aa8222d7e9b66e9293ed11c9291ea70173021029/pkg/prometheus/promcfg_test.go#L423 func TestGenerateProbeConfig(t *testing.T) { + var falsePtr = ptr.To(false) suite := []struct { name string m *promopv1.Probe @@ -80,15 +81,19 @@ func TestGenerateProbeConfig(t *testing.T) { replacement: foo.bar `), expected: &config.ScrapeConfig{ - JobName: "probe/operator/myprobe", - HonorTimestamps: true, - ScrapeInterval: model.Duration(time.Minute), - ScrapeTimeout: model.Duration(10 * time.Second), - ScrapeProtocols: config.DefaultScrapeProtocols, - ScrapeFallbackProtocol: config.PrometheusText0_0_4, - EnableCompression: true, - MetricsPath: "", - Scheme: "http", + JobName: "probe/operator/myprobe", + HonorTimestamps: true, + ScrapeInterval: model.Duration(time.Minute), + ScrapeTimeout: model.Duration(10 * time.Second), + ScrapeProtocols: config.DefaultScrapeProtocols, + ScrapeFallbackProtocol: config.PrometheusText0_0_4, + AlwaysScrapeClassicHistograms: falsePtr, + ConvertClassicHistogramsToNHCB: falsePtr, + EnableCompression: true, + MetricsPath: "", + Scheme: "http", + MetricNameValidationScheme: model.LegacyValidation, + MetricNameEscapingScheme: model.UnderscoreEscaping.String(), HTTPClientConfig: commonConfig.HTTPClientConfig{ FollowRedirects: true, EnableHTTP2: true, @@ -102,9 +107,6 @@ func TestGenerateProbeConfig(t *testing.T) { }, }, }, - ConvertClassicHistogramsToNHCB: ptr.To(false), - MetricNameValidationScheme: "legacy", - MetricNameEscapingScheme: "underscores", }, }, { @@ -164,16 +166,20 @@ func TestGenerateProbeConfig(t *testing.T) { action: replace `), expected: &config.ScrapeConfig{ - JobName: "probe/default/testprobe1", - HonorTimestamps: true, - ScrapeInterval: model.Duration(time.Minute), - ScrapeTimeout: model.Duration(10 * time.Second), - ScrapeProtocols: config.DefaultScrapeProtocols, - ScrapeFallbackProtocol: config.PrometheusText0_0_4, - EnableCompression: true, - MetricsPath: "/probe", - Scheme: "http", - Params: url.Values{"module": []string{"http_2xx"}}, + JobName: "probe/default/testprobe1", + HonorTimestamps: true, + ScrapeInterval: model.Duration(time.Minute), + ScrapeTimeout: model.Duration(10 * time.Second), + ScrapeProtocols: config.DefaultScrapeProtocols, + ScrapeFallbackProtocol: config.PrometheusText0_0_4, + AlwaysScrapeClassicHistograms: falsePtr, + ConvertClassicHistogramsToNHCB: falsePtr, + EnableCompression: true, + MetricsPath: "/probe", + Scheme: "http", + Params: url.Values{"module": []string{"http_2xx"}}, + MetricNameValidationScheme: model.LegacyValidation, + MetricNameEscapingScheme: model.UnderscoreEscaping.String(), HTTPClientConfig: commonConfig.HTTPClientConfig{ FollowRedirects: true, EnableHTTP2: true, @@ -195,9 +201,6 @@ func TestGenerateProbeConfig(t *testing.T) { }, }, }, - ConvertClassicHistogramsToNHCB: ptr.To(false), - MetricNameValidationScheme: "legacy", - MetricNameEscapingScheme: "underscores", }, }, { @@ -262,16 +265,20 @@ func TestGenerateProbeConfig(t *testing.T) { action: replace `), expected: &config.ScrapeConfig{ - JobName: "probe/default/testprobe1", - HonorTimestamps: true, - ScrapeInterval: model.Duration(30 * time.Second), - ScrapeTimeout: model.Duration(15 * time.Second), - ScrapeProtocols: []config.ScrapeProtocol{config.PrometheusProto}, - ScrapeFallbackProtocol: config.PrometheusText0_0_4, - EnableCompression: true, - MetricsPath: "/probe", - Scheme: "http", - Params: url.Values{"module": []string{"http_2xx"}}, + JobName: "probe/default/testprobe1", + HonorTimestamps: true, + ScrapeInterval: model.Duration(30 * time.Second), + ScrapeTimeout: model.Duration(15 * time.Second), + ScrapeProtocols: []config.ScrapeProtocol{config.PrometheusProto}, + ScrapeFallbackProtocol: config.PrometheusText0_0_4, + AlwaysScrapeClassicHistograms: falsePtr, + ConvertClassicHistogramsToNHCB: falsePtr, + EnableCompression: true, + MetricsPath: "/probe", + Scheme: "http", + Params: url.Values{"module": []string{"http_2xx"}}, + MetricNameValidationScheme: model.LegacyValidation, + MetricNameEscapingScheme: model.UnderscoreEscaping.String(), HTTPClientConfig: commonConfig.HTTPClientConfig{ FollowRedirects: true, EnableHTTP2: true, @@ -293,9 +300,6 @@ func TestGenerateProbeConfig(t *testing.T) { }, }, }, - ConvertClassicHistogramsToNHCB: ptr.To(false), - MetricNameValidationScheme: "legacy", - MetricNameEscapingScheme: "underscores", }, }, } diff --git a/internal/component/prometheus/operator/configgen/config_gen_scrapeconfig_test.go b/internal/component/prometheus/operator/configgen/config_gen_scrapeconfig_test.go index f183b728e3..3139ef6acd 100644 --- a/internal/component/prometheus/operator/configgen/config_gen_scrapeconfig_test.go +++ b/internal/component/prometheus/operator/configgen/config_gen_scrapeconfig_test.go @@ -28,6 +28,7 @@ import ( func TestGenerateStaticScrapeConfigConfig(t *testing.T) { HTTPS := "HTTPS" + var falsePtr = ptr.To(false) suite := []struct { name string m *promopv1alpha1.ScrapeConfig @@ -63,15 +64,19 @@ func TestGenerateStaticScrapeConfigConfig(t *testing.T) { target_label: instance `), expected: &config.ScrapeConfig{ - JobName: "scrapeConfig/operator/scrapeconfig/static/1", - HonorTimestamps: true, - ScrapeInterval: model.Duration(time.Hour), - ScrapeTimeout: model.Duration(42 * time.Second), - ScrapeProtocols: config.DefaultScrapeProtocols, - ScrapeFallbackProtocol: config.PrometheusText0_0_4, - EnableCompression: true, - MetricsPath: "/metrics", - Scheme: "http", + JobName: "scrapeConfig/operator/scrapeconfig/static/1", + HonorTimestamps: true, + ScrapeInterval: model.Duration(time.Hour), + ScrapeTimeout: model.Duration(42 * time.Second), + ScrapeProtocols: config.DefaultScrapeProtocols, + ScrapeFallbackProtocol: config.PrometheusText0_0_4, + AlwaysScrapeClassicHistograms: falsePtr, + ConvertClassicHistogramsToNHCB: falsePtr, + EnableCompression: true, + MetricsPath: "/metrics", + Scheme: "http", + MetricNameValidationScheme: model.LegacyValidation, + MetricNameEscapingScheme: model.UnderscoreEscaping.String(), HTTPClientConfig: commonConfig.HTTPClientConfig{ FollowRedirects: true, EnableHTTP2: true, @@ -85,9 +90,6 @@ func TestGenerateStaticScrapeConfigConfig(t *testing.T) { }, }, }, - ConvertClassicHistogramsToNHCB: ptr.To(false), - MetricNameValidationScheme: "legacy", - MetricNameEscapingScheme: "underscores", }, }, { @@ -123,15 +125,16 @@ func TestGenerateStaticScrapeConfigConfig(t *testing.T) { target_label: instance `), expected: &config.ScrapeConfig{ - JobName: "scrapeConfig/operator/scrapeconfig/static/1", - HonorTimestamps: true, - ScrapeInterval: model.Duration(time.Hour), - ScrapeTimeout: model.Duration(42 * time.Second), - ScrapeProtocols: []config.ScrapeProtocol{config.PrometheusProto, config.OpenMetricsText1_0_0}, - ScrapeFallbackProtocol: config.PrometheusText0_0_4, - EnableCompression: true, - MetricsPath: "/metrics", - Scheme: "http", + JobName: "scrapeConfig/operator/scrapeconfig/static/1", + HonorTimestamps: true, + ScrapeInterval: model.Duration(time.Hour), + ScrapeTimeout: model.Duration(42 * time.Second), + ScrapeProtocols: []config.ScrapeProtocol{config.PrometheusProto, config.OpenMetricsText1_0_0}, + ScrapeFallbackProtocol: config.PrometheusText0_0_4, + AlwaysScrapeClassicHistograms: falsePtr, + EnableCompression: true, + MetricsPath: "/metrics", + Scheme: "http", HTTPClientConfig: commonConfig.HTTPClientConfig{ FollowRedirects: true, EnableHTTP2: true, @@ -146,8 +149,8 @@ func TestGenerateStaticScrapeConfigConfig(t *testing.T) { }, }, ConvertClassicHistogramsToNHCB: ptr.To(false), - MetricNameValidationScheme: "legacy", - MetricNameEscapingScheme: "underscores", + MetricNameValidationScheme: model.LegacyValidation, + MetricNameEscapingScheme: model.UnderscoreEscaping.String(), }, }, { @@ -177,15 +180,19 @@ func TestGenerateStaticScrapeConfigConfig(t *testing.T) { target_label: instance `), expected: &config.ScrapeConfig{ - JobName: "scrapeConfig/operator/scrapeconfig/static/1", - HonorTimestamps: true, - ScrapeInterval: model.Duration(time.Hour), - ScrapeTimeout: model.Duration(42 * time.Second), - ScrapeProtocols: config.DefaultScrapeProtocols, - ScrapeFallbackProtocol: config.PrometheusText0_0_4, - EnableCompression: true, - MetricsPath: "/metrics", - Scheme: "https", + JobName: "scrapeConfig/operator/scrapeconfig/static/1", + HonorTimestamps: true, + ScrapeInterval: model.Duration(time.Hour), + ScrapeTimeout: model.Duration(42 * time.Second), + ScrapeProtocols: config.DefaultScrapeProtocols, + ScrapeFallbackProtocol: config.PrometheusText0_0_4, + AlwaysScrapeClassicHistograms: falsePtr, + ConvertClassicHistogramsToNHCB: falsePtr, + EnableCompression: true, + MetricsPath: "/metrics", + Scheme: "https", + MetricNameValidationScheme: model.LegacyValidation, + MetricNameEscapingScheme: model.UnderscoreEscaping.String(), HTTPClientConfig: commonConfig.HTTPClientConfig{ FollowRedirects: true, EnableHTTP2: true, @@ -199,9 +206,6 @@ func TestGenerateStaticScrapeConfigConfig(t *testing.T) { }, }, }, - ConvertClassicHistogramsToNHCB: ptr.To(false), - MetricNameValidationScheme: "legacy", - MetricNameEscapingScheme: "underscores", }, }, } diff --git a/internal/component/prometheus/operator/configgen/config_gen_servicemonitor_test.go b/internal/component/prometheus/operator/configgen/config_gen_servicemonitor_test.go index e081eba4d1..c74c203614 100644 --- a/internal/component/prometheus/operator/configgen/config_gen_servicemonitor_test.go +++ b/internal/component/prometheus/operator/configgen/config_gen_servicemonitor_test.go @@ -27,8 +27,10 @@ import ( ) func TestGenerateServiceMonitorConfig(t *testing.T) { - var falseVal = false - var proxyURL = "https://proxy:8080" + var ( + falsePtr = ptr.To(false) + proxyURL = "https://proxy:8080" + ) suite := []struct { name string m *promopv1.ServiceMonitor @@ -78,15 +80,19 @@ func TestGenerateServiceMonitorConfig(t *testing.T) { replacement: ${1} `), expected: &config.ScrapeConfig{ - JobName: "serviceMonitor/operator/svcmonitor/1", - HonorTimestamps: true, - ScrapeInterval: model.Duration(time.Minute), - ScrapeTimeout: model.Duration(10 * time.Second), - ScrapeProtocols: config.DefaultScrapeProtocols, - ScrapeFallbackProtocol: config.PrometheusText0_0_4, - EnableCompression: true, - MetricsPath: "/metrics", - Scheme: "http", + JobName: "serviceMonitor/operator/svcmonitor/1", + HonorTimestamps: true, + ScrapeInterval: model.Duration(time.Minute), + ScrapeTimeout: model.Duration(10 * time.Second), + ScrapeProtocols: config.DefaultScrapeProtocols, + ScrapeFallbackProtocol: config.PrometheusText0_0_4, + AlwaysScrapeClassicHistograms: falsePtr, + ConvertClassicHistogramsToNHCB: falsePtr, + EnableCompression: true, + MetricsPath: "/metrics", + Scheme: "http", + MetricNameValidationScheme: model.LegacyValidation, + MetricNameEscapingScheme: model.UnderscoreEscaping.String(), HTTPClientConfig: commonConfig.HTTPClientConfig{ FollowRedirects: true, EnableHTTP2: true, @@ -101,9 +107,6 @@ func TestGenerateServiceMonitorConfig(t *testing.T) { }, }, }, - ConvertClassicHistogramsToNHCB: ptr.To(false), - MetricNameValidationScheme: "legacy", - MetricNameEscapingScheme: "underscores", }, }, { @@ -153,15 +156,19 @@ func TestGenerateServiceMonitorConfig(t *testing.T) { replacement: http_metrics `), expected: &config.ScrapeConfig{ - JobName: "serviceMonitor/operator/svcmonitor/1", - HonorTimestamps: true, - ScrapeInterval: model.Duration(time.Minute), - ScrapeTimeout: model.Duration(10 * time.Second), - ScrapeProtocols: config.DefaultScrapeProtocols, - ScrapeFallbackProtocol: config.PrometheusText0_0_4, - EnableCompression: true, - MetricsPath: "/metrics", - Scheme: "http", + JobName: "serviceMonitor/operator/svcmonitor/1", + HonorTimestamps: true, + ScrapeInterval: model.Duration(time.Minute), + ScrapeTimeout: model.Duration(10 * time.Second), + ScrapeProtocols: config.DefaultScrapeProtocols, + ScrapeFallbackProtocol: config.PrometheusText0_0_4, + AlwaysScrapeClassicHistograms: falsePtr, + ConvertClassicHistogramsToNHCB: falsePtr, + EnableCompression: true, + MetricsPath: "/metrics", + Scheme: "http", + MetricNameValidationScheme: model.LegacyValidation, + MetricNameEscapingScheme: model.UnderscoreEscaping.String(), HTTPClientConfig: commonConfig.HTTPClientConfig{ FollowRedirects: true, EnableHTTP2: true, @@ -176,9 +183,6 @@ func TestGenerateServiceMonitorConfig(t *testing.T) { }, }, }, - ConvertClassicHistogramsToNHCB: ptr.To(false), - MetricNameValidationScheme: "legacy", - MetricNameEscapingScheme: "underscores", }, }, { @@ -228,15 +232,19 @@ func TestGenerateServiceMonitorConfig(t *testing.T) { replacement: "4242" `), expected: &config.ScrapeConfig{ - JobName: "serviceMonitor/operator/svcmonitor/1", - HonorTimestamps: true, - ScrapeInterval: model.Duration(time.Minute), - ScrapeTimeout: model.Duration(10 * time.Second), - ScrapeProtocols: config.DefaultScrapeProtocols, - ScrapeFallbackProtocol: config.PrometheusText0_0_4, - EnableCompression: true, - MetricsPath: "/metrics", - Scheme: "http", + JobName: "serviceMonitor/operator/svcmonitor/1", + HonorTimestamps: true, + ScrapeInterval: model.Duration(time.Minute), + ScrapeTimeout: model.Duration(10 * time.Second), + ScrapeProtocols: config.DefaultScrapeProtocols, + ScrapeFallbackProtocol: config.PrometheusText0_0_4, + AlwaysScrapeClassicHistograms: falsePtr, + ConvertClassicHistogramsToNHCB: falsePtr, + EnableCompression: true, + MetricsPath: "/metrics", + Scheme: "http", + MetricNameValidationScheme: model.LegacyValidation, + MetricNameEscapingScheme: model.UnderscoreEscaping.String(), HTTPClientConfig: commonConfig.HTTPClientConfig{ FollowRedirects: true, EnableHTTP2: true, @@ -251,9 +259,6 @@ func TestGenerateServiceMonitorConfig(t *testing.T) { }, }, }, - ConvertClassicHistogramsToNHCB: ptr.To(false), - MetricNameValidationScheme: "legacy", - MetricNameEscapingScheme: "underscores", }, }, { @@ -303,15 +308,19 @@ func TestGenerateServiceMonitorConfig(t *testing.T) { replacement: "4242" `), expected: &config.ScrapeConfig{ - JobName: "serviceMonitor/operator/svcmonitor/1", - HonorTimestamps: true, - ScrapeInterval: model.Duration(time.Minute), - ScrapeTimeout: model.Duration(10 * time.Second), - ScrapeProtocols: config.DefaultScrapeProtocols, - ScrapeFallbackProtocol: config.PrometheusText0_0_4, - EnableCompression: true, - MetricsPath: "/metrics", - Scheme: "http", + JobName: "serviceMonitor/operator/svcmonitor/1", + HonorTimestamps: true, + ScrapeInterval: model.Duration(time.Minute), + ScrapeTimeout: model.Duration(10 * time.Second), + ScrapeProtocols: config.DefaultScrapeProtocols, + ScrapeFallbackProtocol: config.PrometheusText0_0_4, + AlwaysScrapeClassicHistograms: falsePtr, + ConvertClassicHistogramsToNHCB: falsePtr, + EnableCompression: true, + MetricsPath: "/metrics", + Scheme: "http", + MetricNameValidationScheme: model.LegacyValidation, + MetricNameEscapingScheme: model.UnderscoreEscaping.String(), HTTPClientConfig: commonConfig.HTTPClientConfig{ FollowRedirects: true, EnableHTTP2: true, @@ -326,9 +335,6 @@ func TestGenerateServiceMonitorConfig(t *testing.T) { }, }, }, - ConvertClassicHistogramsToNHCB: ptr.To(false), - MetricNameValidationScheme: "legacy", - MetricNameEscapingScheme: "underscores", }, }, { @@ -379,17 +385,17 @@ func TestGenerateServiceMonitorConfig(t *testing.T) { }, ep: promopv1.Endpoint{ Port: "metrics", - EnableHttp2: &falseVal, + EnableHttp2: falsePtr, Path: "/foo", Params: map[string][]string{"a": {"b"}}, - FollowRedirects: &falseVal, + FollowRedirects: falsePtr, ProxyURL: &proxyURL, Scheme: "https", ScrapeTimeout: "17s", Interval: "12m", HonorLabels: true, - HonorTimestamps: &falseVal, - FilterRunning: &falseVal, + HonorTimestamps: falsePtr, + FilterRunning: falsePtr, TLSConfig: &promopv1.TLSConfig{ SafeTLSConfig: promopv1.SafeTLSConfig{ ServerName: stringPtr("foo.com"), @@ -488,7 +494,7 @@ func TestGenerateServiceMonitorConfig(t *testing.T) { MetricsPath: "/foo", Scheme: "https", HTTPClientConfig: commonConfig.HTTPClientConfig{ - FollowRedirects: falseVal, + FollowRedirects: false, EnableHTTP2: false, TLSConfig: commonConfig.TLSConfig{ ServerName: "foo.com", @@ -513,9 +519,10 @@ func TestGenerateServiceMonitorConfig(t *testing.T) { LabelLimit: 103, LabelNameLengthLimit: 104, LabelValueLengthLimit: 105, - ConvertClassicHistogramsToNHCB: ptr.To(false), - MetricNameValidationScheme: "legacy", - MetricNameEscapingScheme: "underscores", + AlwaysScrapeClassicHistograms: falsePtr, + ConvertClassicHistogramsToNHCB: falsePtr, + MetricNameValidationScheme: model.LegacyValidation, + MetricNameEscapingScheme: model.UnderscoreEscaping.String(), }, }, { @@ -571,15 +578,19 @@ func TestGenerateServiceMonitorConfig(t *testing.T) { target_label: bar `), expected: &config.ScrapeConfig{ - JobName: "serviceMonitor/operator/svcmonitor/1", - HonorTimestamps: true, - ScrapeInterval: model.Duration(time.Minute), - ScrapeTimeout: model.Duration(10 * time.Second), - ScrapeProtocols: config.DefaultScrapeProtocols, - ScrapeFallbackProtocol: config.PrometheusText0_0_4, - EnableCompression: true, - MetricsPath: "/metrics", - Scheme: "http", + JobName: "serviceMonitor/operator/svcmonitor/1", + HonorTimestamps: true, + ScrapeInterval: model.Duration(time.Minute), + ScrapeTimeout: model.Duration(10 * time.Second), + ScrapeProtocols: config.DefaultScrapeProtocols, + ScrapeFallbackProtocol: config.PrometheusText0_0_4, + AlwaysScrapeClassicHistograms: falsePtr, + ConvertClassicHistogramsToNHCB: falsePtr, + EnableCompression: true, + MetricsPath: "/metrics", + Scheme: "http", + MetricNameValidationScheme: model.LegacyValidation, + MetricNameEscapingScheme: model.UnderscoreEscaping.String(), HTTPClientConfig: commonConfig.HTTPClientConfig{ FollowRedirects: true, EnableHTTP2: true, @@ -593,9 +604,6 @@ func TestGenerateServiceMonitorConfig(t *testing.T) { }, }, }, - ConvertClassicHistogramsToNHCB: ptr.To(false), - MetricNameValidationScheme: "legacy", - MetricNameEscapingScheme: "underscores", }, }, } diff --git a/internal/component/prometheus/operator/types.go b/internal/component/prometheus/operator/types.go index 2df849e065..7f0005eb19 100644 --- a/internal/component/prometheus/operator/types.go +++ b/internal/component/prometheus/operator/types.go @@ -6,15 +6,16 @@ import ( promk8s "github.com/prometheus/prometheus/discovery/kubernetes" + "github.com/prometheus/common/model" + promconfig "github.com/prometheus/prometheus/config" + "github.com/prometheus/prometheus/storage" + apiv1 "k8s.io/api/core/v1" + "github.com/grafana/alloy/internal/component/common/config" "github.com/grafana/alloy/internal/component/common/kubernetes" alloy_relabel "github.com/grafana/alloy/internal/component/common/relabel" "github.com/grafana/alloy/internal/component/prometheus/scrape" "github.com/grafana/alloy/internal/service/cluster" - "github.com/prometheus/common/model" - promconfig "github.com/prometheus/prometheus/config" - "github.com/prometheus/prometheus/storage" - apiv1 "k8s.io/api/core/v1" ) type Arguments struct { @@ -54,7 +55,8 @@ func (s *ScrapeOptions) GlobalConfig() promconfig.GlobalConfig { cfg := promconfig.DefaultGlobalConfig cfg.ScrapeInterval = model.Duration(s.DefaultScrapeInterval) cfg.ScrapeTimeout = model.Duration(s.DefaultScrapeTimeout) - cfg.MetricNameValidationScheme = promconfig.LegacyValidationConfig + // TODO: add support for choosing validation scheme: https://github.com/grafana/alloy/issues/4122 + cfg.MetricNameValidationScheme = model.LegacyValidation cfg.MetricNameEscapingScheme = model.EscapeUnderscores return cfg } diff --git a/internal/component/prometheus/relabel/relabel.go b/internal/component/prometheus/relabel/relabel.go index d8de693604..483091e1a9 100644 --- a/internal/component/prometheus/relabel/relabel.go +++ b/internal/component/prometheus/relabel/relabel.go @@ -261,8 +261,8 @@ func (c *Component) relabel(ref storage.SeriesRef, val float64, lbls labels.Labe newLbls, found := c.getFromCache(ref) if found { c.cacheHits.Inc() - // If newLbls is nil but cache entry was found then we want to keep the value nil, if it's not we want to reuse the labels - if newLbls != nil { + // If newLbls is empty but cache entry was found then we want to keep the value empty, if it's not we want to reuse the labels + if !newLbls.IsEmpty() { relabelled = newLbls } } else { @@ -325,7 +325,7 @@ func (c *Component) addToCache(originalID storage.SeriesRef, lbls labels.Labels, defer c.cacheMut.Unlock() if !keep { - c.cache.Add(originalID, nil) + c.cache.Add(originalID, labels.EmptyLabels()) return } c.cache.Add(originalID, lbls) diff --git a/internal/component/prometheus/remotewrite/remote_write.go b/internal/component/prometheus/remotewrite/remote_write.go index 3e3997a72b..1d26208356 100644 --- a/internal/component/prometheus/remotewrite/remote_write.go +++ b/internal/component/prometheus/remotewrite/remote_write.go @@ -92,7 +92,8 @@ func New(o component.Options, args Arguments) (*Component, error) { log.With(o.Logger, "subcomponent", "rw"), ), ) - remoteStore := remote.NewStorage(remoteLogger, o.Registerer, startTime, o.DataPath, remoteFlushDeadline, nil) + // TODO: Expose the option to enable type and unit labels: https://github.com/grafana/alloy/issues/4659 + remoteStore := remote.NewStorage(remoteLogger, o.Registerer, startTime, o.DataPath, remoteFlushDeadline, nil, false) walStorage.SetNotifier(remoteStore) diff --git a/internal/component/prometheus/remotewrite/types_test.go b/internal/component/prometheus/remotewrite/types_test.go index 50e6c4de23..e5f78d858c 100644 --- a/internal/component/prometheus/remotewrite/types_test.go +++ b/internal/component/prometheus/remotewrite/types_test.go @@ -143,6 +143,7 @@ func TestAlloyConfig(t *testing.T) { relabelCfg.SourceLabels = model.LabelNames{"instance"} relabelCfg.TargetLabel = "instance" relabelCfg.Action = "lowercase" + relabelCfg.NameValidationScheme = model.LegacyValidation c.GlobalConfig.ExternalLabels = labels.FromMap(map[string]string{ "cluster": "local", diff --git a/internal/component/prometheus/scrape/scrape.go b/internal/component/prometheus/scrape/scrape.go index d93a9c58a6..67d1389a68 100644 --- a/internal/component/prometheus/scrape/scrape.go +++ b/internal/component/prometheus/scrape/scrape.go @@ -159,7 +159,7 @@ func (arg *Arguments) SetToDefault() { ScrapeFallbackProtocol: string(config.PrometheusText0_0_4), // Use the same fallback protocol as Prometheus v2 ScrapeNativeHistograms: false, // NOTE: the MetricNameEscapingScheme depends on this, so its default must be set in Validate() function. - MetricNameValidationScheme: config.LegacyValidationConfig, + MetricNameValidationScheme: model.LegacyValidation.String(), ConvertClassicHistogramsToNHCB: false, EnableCompression: true, NativeHistogramBucketLimit: 0, @@ -220,14 +220,14 @@ func (arg *Arguments) Validate() error { } switch arg.MetricNameValidationScheme { - case config.UTF8ValidationConfig, config.LegacyValidationConfig: + case model.UTF8Validation.String(), model.LegacyValidation.String(): default: - return fmt.Errorf("invalid metric_name_validation_scheme %q: must be either %q or %q", arg.MetricNameValidationScheme, config.UTF8ValidationConfig, config.LegacyValidationConfig) + return fmt.Errorf("invalid metric_name_validation_scheme %q: must be either %q or %q", arg.MetricNameValidationScheme, model.UTF8Validation.String(), model.LegacyValidation.String()) } switch arg.MetricNameEscapingScheme { case "": - if arg.MetricNameValidationScheme == config.LegacyValidationConfig { + if arg.MetricNameValidationScheme == model.LegacyValidation.String() { arg.MetricNameEscapingScheme = model.EscapeUnderscores } else { arg.MetricNameEscapingScheme = model.AllowUTF8 @@ -238,7 +238,7 @@ func (arg *Arguments) Validate() error { return fmt.Errorf("invalid metric_name_escaping_scheme: %q, supported values: %v", arg.MetricNameEscapingScheme, supportedValues) } - if arg.MetricNameEscapingScheme == model.AllowUTF8 && arg.MetricNameValidationScheme != config.UTF8ValidationConfig { + if arg.MetricNameEscapingScheme == model.AllowUTF8 && arg.MetricNameValidationScheme != model.UTF8Validation.String() { return fmt.Errorf("metric_name_escaping_scheme cannot be set to 'allow-utf-8' while metric_name_validation_scheme is not set to 'utf8'") } @@ -535,11 +535,12 @@ func getPromScrapeConfigs(jobName string, c Arguments) *config.ScrapeConfig { } else { dec.JobName = jobName } + copyScrapeClassicHistograms := c.ScrapeClassicHistograms // make a copy as Prometheus wants a pointer. dec.HonorLabels = c.HonorLabels dec.HonorTimestamps = c.HonorTimestamps dec.TrackTimestampsStaleness = c.TrackTimestampsStaleness dec.Params = c.Params - dec.AlwaysScrapeClassicHistograms = c.ScrapeClassicHistograms + dec.AlwaysScrapeClassicHistograms = ©ScrapeClassicHistograms dec.ScrapeInterval = model.Duration(c.ScrapeInterval) dec.ScrapeTimeout = model.Duration(c.ScrapeTimeout) dec.ScrapeFailureLogFile = c.ScrapeFailureLogFile @@ -562,7 +563,13 @@ func getPromScrapeConfigs(jobName string, c Arguments) *config.ScrapeConfig { // HTTP scrape client settings dec.HTTPClientConfig = *c.HTTPClientConfig.Convert() - dec.MetricNameValidationScheme = c.MetricNameValidationScheme + validationScheme := model.UnsetValidation + if model.LegacyValidation.String() == c.MetricNameValidationScheme { + validationScheme = model.LegacyValidation + } else if model.UTF8Validation.String() == c.MetricNameValidationScheme { + validationScheme = model.UTF8Validation + } + dec.MetricNameValidationScheme = validationScheme dec.MetricNameEscapingScheme = c.MetricNameEscapingScheme dec.ScrapeFallbackProtocol = config.ScrapeProtocol(c.ScrapeFallbackProtocol) convertToNHCB := c.ConvertClassicHistogramsToNHCB diff --git a/internal/converter/internal/prometheusconvert/component/scrape.go b/internal/converter/internal/prometheusconvert/component/scrape.go index 238a0f3f7f..e67e7c09d1 100644 --- a/internal/converter/internal/prometheusconvert/component/scrape.go +++ b/internal/converter/internal/prometheusconvert/component/scrape.go @@ -5,6 +5,7 @@ import ( "strings" "time" + "github.com/prometheus/common/model" "golang.org/x/exp/maps" prom_config "github.com/prometheus/prometheus/config" @@ -48,13 +49,14 @@ func toScrapeArguments(scrapeConfig *prom_config.ScrapeConfig, forwardTo []stora } histogramsToNHCB := scrapeConfig.ConvertClassicHistogramsToNHCB != nil && *scrapeConfig.ConvertClassicHistogramsToNHCB + scrapeClassicHistograms := scrapeConfig.AlwaysScrapeClassicHistograms != nil && *scrapeConfig.AlwaysScrapeClassicHistograms fallbackProtocol := string(scrapeConfig.ScrapeFallbackProtocol) if fallbackProtocol == "" { fallbackProtocol = string(prom_config.PrometheusText0_0_4) } // Set the escaping and validation scheme to default values in Alloy for maximum compatibility with backends. - scrapeConfig.MetricNameValidationScheme = prom_config.LegacyValidationConfig + scrapeConfig.MetricNameValidationScheme = model.LegacyValidation scrapeConfig.MetricNameEscapingScheme = "" // this will default to underscores given the legacy validation scheme alloyArgs := &scrape.Arguments{ @@ -65,7 +67,7 @@ func toScrapeArguments(scrapeConfig *prom_config.ScrapeConfig, forwardTo []stora HonorTimestamps: scrapeConfig.HonorTimestamps, TrackTimestampsStaleness: scrapeConfig.TrackTimestampsStaleness, Params: scrapeConfig.Params, - ScrapeClassicHistograms: scrapeConfig.AlwaysScrapeClassicHistograms, + ScrapeClassicHistograms: scrapeClassicHistograms, ScrapeNativeHistograms: false, // this is controlled by a Prometheus feature, not the config file ScrapeInterval: time.Duration(scrapeConfig.ScrapeInterval), ScrapeTimeout: time.Duration(scrapeConfig.ScrapeTimeout), @@ -86,7 +88,7 @@ func toScrapeArguments(scrapeConfig *prom_config.ScrapeConfig, forwardTo []stora EnableCompression: scrapeConfig.EnableCompression, NativeHistogramBucketLimit: scrapeConfig.NativeHistogramBucketLimit, NativeHistogramMinBucketFactor: scrapeConfig.NativeHistogramMinBucketFactor, - MetricNameValidationScheme: scrapeConfig.MetricNameValidationScheme, + MetricNameValidationScheme: scrapeConfig.MetricNameValidationScheme.String(), MetricNameEscapingScheme: scrapeConfig.MetricNameEscapingScheme, ScrapeFallbackProtocol: fallbackProtocol, Clustering: cluster.ComponentBlock{Enabled: false}, diff --git a/internal/converter/internal/staticconvert/internal/build/builder_integrations.go b/internal/converter/internal/staticconvert/internal/build/builder_integrations.go index 6cd79c9c81..9d6a8903ec 100644 --- a/internal/converter/internal/staticconvert/internal/build/builder_integrations.go +++ b/internal/converter/internal/staticconvert/internal/build/builder_integrations.go @@ -175,7 +175,7 @@ func (b *ConfigBuilder) appendExporter(commonConfig *int_config.Common, name str // NOTE: We use the default value, since Agent static mode doesn't support setting this. scrapeConfig.ScrapeProtocols = prom_config.DefaultScrapeProtocols - scrapeConfig.MetricNameValidationScheme = prom_config.UTF8ValidationConfig + scrapeConfig.MetricNameValidationScheme = model.LegacyValidation scrapeConfigs := []*prom_config.ScrapeConfig{&scrapeConfig} @@ -311,7 +311,7 @@ func (b *ConfigBuilder) appendExporterV2(commonConfig *common_v2.MetricsConfig, scrapeConfig.ScrapeTimeout = commonConfig.Autoscrape.ScrapeTimeout // NOTE: We use the default value, since Agent static mode doesn't support setting this. scrapeConfig.ScrapeProtocols = prom_config.DefaultScrapeProtocols - scrapeConfig.MetricNameValidationScheme = prom_config.UTF8ValidationConfig + scrapeConfig.MetricNameValidationScheme = model.UTF8Validation scrapeConfigs := []*prom_config.ScrapeConfig{&scrapeConfig} diff --git a/internal/converter/internal/staticconvert/testdata/prom_remote_write.alloy b/internal/converter/internal/staticconvert/testdata/prom_remote_write.alloy index e69152d834..5f34bffcd6 100644 --- a/internal/converter/internal/staticconvert/testdata/prom_remote_write.alloy +++ b/internal/converter/internal/staticconvert/testdata/prom_remote_write.alloy @@ -77,7 +77,7 @@ prometheus.remote_write "metrics_test5_sigv4_explicit" { prometheus.remote_write "metrics_test6_azuread_defaults" { endpoint { - name = "test6_azuread_defaults-1291c2" + name = "test6_azuread_defaults-2825c0" url = "http://localhost:9012/api/prom/push" queue_config { } @@ -94,7 +94,7 @@ prometheus.remote_write "metrics_test6_azuread_defaults" { prometheus.remote_write "metrics_test7_azuread_explicit" { endpoint { - name = "test7_azuread_explicit-d98cd2" + name = "test7_azuread_explicit-1f3955" url = "http://localhost:9012/api/prom/push" queue_config { } diff --git a/internal/mimir/client/types.go b/internal/mimir/client/types.go index af93512380..16e2065e4a 100644 --- a/internal/mimir/client/types.go +++ b/internal/mimir/client/types.go @@ -6,6 +6,7 @@ import ( "fmt" "io" + "github.com/prometheus/common/model" "github.com/prometheus/prometheus/model/rulefmt" "gopkg.in/yaml.v3" ) @@ -49,7 +50,8 @@ func (g *MimirRuleGroups) Validate(node mimirRuleGroups) (errs []error) { Alert: yaml.Node{Value: r.Alert}, } - for _, node := range r.Validate(ruleNode) { + // TODO: add support for choosing validation scheme: https://github.com/grafana/alloy/issues/4122 + for _, node := range r.Validate(ruleNode, model.LegacyValidation) { var ruleName string if r.Alert != "" { ruleName = r.Alert diff --git a/internal/service/labelstore/service_test.go b/internal/service/labelstore/service_test.go index 7ea0bf748f..fa05701219 100644 --- a/internal/service/labelstore/service_test.go +++ b/internal/service/labelstore/service_test.go @@ -16,11 +16,7 @@ import ( func TestAddingMarker(t *testing.T) { mapping := New(log.NewNopLogger(), prometheus.DefaultRegisterer) - l := labels.Labels{} - l = append(l, labels.Label{ - Name: "__name__", - Value: "test", - }) + l := labels.FromStrings("__name__", "test") globalID := mapping.GetOrAddGlobalRefID(l) shouldBeSameGlobalID := mapping.GetOrAddGlobalRefID(l) require.True(t, globalID == shouldBeSameGlobalID) @@ -29,16 +25,8 @@ func TestAddingMarker(t *testing.T) { func TestAddingDifferentMarkers(t *testing.T) { mapping := New(log.NewNopLogger(), prometheus.DefaultRegisterer) - l := labels.Labels{} - l = append(l, labels.Label{ - Name: "__name__", - Value: "test", - }) - l2 := labels.Labels{} - l2 = append(l2, labels.Label{ - Name: "__name__", - Value: "roar", - }) + l := labels.FromStrings("__name__", "test") + l2 := labels.FromStrings("__name__", "roar") globalID := mapping.GetOrAddGlobalRefID(l) shouldBeDifferentID := mapping.GetOrAddGlobalRefID(l2) require.True(t, globalID != shouldBeDifferentID) @@ -47,11 +35,7 @@ func TestAddingDifferentMarkers(t *testing.T) { func TestAddingLocalMapping(t *testing.T) { mapping := New(log.NewNopLogger(), prometheus.DefaultRegisterer) - l := labels.Labels{} - l = append(l, labels.Label{ - Name: "__name__", - Value: "test", - }) + l := labels.FromStrings("__name__", "test") globalID := mapping.GetOrAddGlobalRefID(l) shouldBeSameGlobalID := mapping.GetOrAddLink("1", 1, l) @@ -65,11 +49,7 @@ func TestAddingLocalMapping(t *testing.T) { func TestAddingLocalMappings(t *testing.T) { mapping := New(log.NewNopLogger(), prometheus.DefaultRegisterer) - l := labels.Labels{} - l = append(l, labels.Label{ - Name: "__name__", - Value: "test", - }) + l := labels.FromStrings("__name__", "test") globalID := mapping.GetOrAddGlobalRefID(l) shouldBeSameGlobalID := mapping.GetOrAddLink("1", 1, l) @@ -90,11 +70,7 @@ func TestAddingLocalMappings(t *testing.T) { func TestAddingLocalMappingsWithoutCreatingGlobalUpfront(t *testing.T) { mapping := New(log.NewNopLogger(), prometheus.DefaultRegisterer) - l := labels.Labels{} - l = append(l, labels.Label{ - Name: "__name__", - Value: "test", - }) + l := labels.FromStrings("__name__", "test") shouldBeSameGlobalID := mapping.GetOrAddLink("1", 1, l) shouldBeSameGlobalID2 := mapping.GetOrAddLink("2", 1, l) @@ -113,16 +89,8 @@ func TestAddingLocalMappingsWithoutCreatingGlobalUpfront(t *testing.T) { func TestStaleness(t *testing.T) { mapping := New(log.NewNopLogger(), prometheus.DefaultRegisterer) - l := labels.Labels{} - l = append(l, labels.Label{ - Name: "__name__", - Value: "test", - }) - l2 := labels.Labels{} - l2 = append(l2, labels.Label{ - Name: "__name__", - Value: "test2", - }) + l := labels.FromStrings("__name__", "test") + l2 := labels.FromStrings("__name__", "test2") global1 := mapping.GetOrAddLink("1", 1, l) _ = mapping.GetOrAddLink("2", 1, l2) @@ -144,11 +112,7 @@ func TestStaleness(t *testing.T) { func TestRemovingStaleness(t *testing.T) { mapping := New(log.NewNopLogger(), prometheus.DefaultRegisterer) - l := labels.Labels{} - l = append(l, labels.Label{ - Name: "__name__", - Value: "test", - }) + l := labels.FromStrings("__name__", "test") global1 := mapping.GetOrAddLink("1", 1, l) mapping.TrackStaleness([]StalenessTracker{ diff --git a/internal/static/agentctl/waltools/cardinality.go b/internal/static/agentctl/waltools/cardinality.go index 97acb4734c..44e69e7c5a 100644 --- a/internal/static/agentctl/waltools/cardinality.go +++ b/internal/static/agentctl/waltools/cardinality.go @@ -1,6 +1,9 @@ package waltools import ( + "log/slog" + "os" + "github.com/prometheus/prometheus/tsdb/record" "github.com/prometheus/prometheus/tsdb/wlog" ) @@ -39,7 +42,7 @@ func FindCardinality(walDir string, job string, instance string) ([]Cardinality, } func collectCardinality(r *wlog.Reader, job, instance string, cardinality map[string]int) error { - var dec record.Decoder + dec := record.NewDecoder(nil, slog.New(slog.NewTextHandler(os.Stdout, nil))) for r.Next() { rec := r.Record() diff --git a/internal/static/agentctl/waltools/samples.go b/internal/static/agentctl/waltools/samples.go index d3eda695a9..240b9b3566 100644 --- a/internal/static/agentctl/waltools/samples.go +++ b/internal/static/agentctl/waltools/samples.go @@ -2,6 +2,8 @@ package waltools import ( "fmt" + "log/slog" + "os" "time" "github.com/prometheus/prometheus/model/labels" @@ -75,7 +77,7 @@ func FindSamples(walDir string, selectorStr string) ([]*SampleStats, error) { } func collectSeries(r *wlog.Reader, selector labels.Selector, labelsByRef map[chunks.HeadSeriesRef]labels.Labels) error { - var dec record.Decoder + dec := record.NewDecoder(nil, slog.New(slog.NewTextHandler(os.Stdout, nil))) for r.Next() { rec := r.Record() @@ -98,7 +100,7 @@ func collectSeries(r *wlog.Reader, selector labels.Selector, labelsByRef map[chu } func collectSamples(r *wlog.Reader, labelsByRef map[chunks.HeadSeriesRef]labels.Labels, minTS, maxTS, sampleCount map[chunks.HeadSeriesRef]int64) error { - var dec record.Decoder + dec := record.NewDecoder(nil, slog.New(slog.NewTextHandler(os.Stdout, nil))) for r.Next() { rec := r.Record() diff --git a/internal/static/agentctl/waltools/walstats.go b/internal/static/agentctl/waltools/walstats.go index 562a785668..3023aede16 100644 --- a/internal/static/agentctl/waltools/walstats.go +++ b/internal/static/agentctl/waltools/walstats.go @@ -1,7 +1,9 @@ package waltools import ( + "log/slog" "math" + "os" "time" "github.com/prometheus/prometheus/model/timestamp" @@ -165,7 +167,7 @@ func (c *walStatsCalculator) Calculate() (WALStats, error) { } func (c *walStatsCalculator) readWAL(r *wlog.Reader) error { - var dec record.Decoder + dec := record.NewDecoder(nil, slog.New(slog.NewTextHandler(os.Stdout, nil))) for r.Next() { rec := r.Record() diff --git a/internal/static/agentctl/waltools/walstats_test.go b/internal/static/agentctl/waltools/walstats_test.go index 34ee6b3ed2..a2a4883225 100644 --- a/internal/static/agentctl/waltools/walstats_test.go +++ b/internal/static/agentctl/waltools/walstats_test.go @@ -93,7 +93,7 @@ func setupTestWAL(t *testing.T) string { require.NoError(t, nextSegment(w)) // Checkpoint the previous segment. - _, err = wlog.Checkpoint(l, w, 0, 1, func(_ chunks.HeadSeriesRef, _ int) bool { return true }, 0) + _, err = wlog.Checkpoint(l, w, 0, 1, func(_ chunks.HeadSeriesRef) bool { return true }, 0) require.NoError(t, err) require.NoError(t, nextSegment(w)) diff --git a/internal/static/config/config_test.go b/internal/static/config/config_test.go index 6d562943d5..bb781cabc0 100644 --- a/internal/static/config/config_test.go +++ b/internal/static/config/config_test.go @@ -79,7 +79,8 @@ metrics: ScrapeTimeout: model.Duration(33 * time.Second), ScrapeProtocols: promCfg.DefaultScrapeProtocols, EvaluationInterval: model.Duration(1 * time.Minute), - MetricNameValidationScheme: promCfg.UTF8ValidationConfig, + MetricNameValidationScheme: model.UTF8Validation, + MetricNameEscapingScheme: model.AllowUTF8, }, } @@ -103,7 +104,8 @@ metrics: ScrapeTimeout: model.Duration(33 * time.Second), ScrapeProtocols: promCfg.DefaultScrapeProtocols, EvaluationInterval: model.Duration(1 * time.Minute), - MetricNameValidationScheme: promCfg.UTF8ValidationConfig, + MetricNameValidationScheme: model.UTF8Validation, + MetricNameEscapingScheme: model.AllowUTF8, }, } t.Setenv("SCRAPE_TIMEOUT", "33s") diff --git a/internal/static/integrations/node_exporter/node_exporter_test.go b/internal/static/integrations/node_exporter/node_exporter_test.go index 0b1a8ad52e..6f4f46dbfe 100644 --- a/internal/static/integrations/node_exporter/node_exporter_test.go +++ b/internal/static/integrations/node_exporter/node_exporter_test.go @@ -55,7 +55,7 @@ func TestNodeExporter(t *testing.T) { body, err := io.ReadAll(res.Body) require.NoError(t, err) - p := textparse.NewPromParser(body, nil) + p := textparse.NewPromParser(body, nil, false) for { _, err := p.Next() if err == io.EOF { diff --git a/internal/static/integrations/redis_exporter/redis_exporter_test.go b/internal/static/integrations/redis_exporter/redis_exporter_test.go index 9ffcb26cbf..a4d411a6ac 100644 --- a/internal/static/integrations/redis_exporter/redis_exporter_test.go +++ b/internal/static/integrations/redis_exporter/redis_exporter_test.go @@ -181,7 +181,7 @@ func TestRedisCases(t *testing.T) { foundMetricNames[name] = false } - p := textparse.NewPromParser(body, nil) + p := textparse.NewPromParser(body, nil, false) for { entry, err := p.Next() if err == io.EOF { diff --git a/internal/static/metrics/instance/global.go b/internal/static/metrics/instance/global.go index a068f50e9b..8e03899aed 100644 --- a/internal/static/metrics/instance/global.go +++ b/internal/static/metrics/instance/global.go @@ -4,6 +4,7 @@ import ( "reflect" "time" + "github.com/prometheus/common/model" "github.com/prometheus/prometheus/config" ) @@ -15,7 +16,7 @@ func globalConfig() GlobalConfig { // We use `DefaultScrapeProtocols` to keep the native histograms disabled by default. // See https://github.com/prometheus/prometheus/pull/12738/files#diff-17f1012e0c2fbd9bcd8dff3c23b18ff4b6676eef3beca6f8a3e72e6a36633334R64-R68 cfg.Prometheus.ScrapeProtocols = config.DefaultScrapeProtocols - cfg.Prometheus.MetricNameValidationScheme = config.UTF8ValidationConfig + cfg.Prometheus.MetricNameValidationScheme = model.UTF8Validation return cfg } diff --git a/internal/static/metrics/instance/instance.go b/internal/static/metrics/instance/instance.go index eb778a43f1..7aa4d09757 100644 --- a/internal/static/metrics/instance/instance.go +++ b/internal/static/metrics/instance/instance.go @@ -10,6 +10,7 @@ import ( "strings" "time" + "github.com/prometheus/common/model" "github.com/prometheus/prometheus/config" "github.com/prometheus/prometheus/model/relabel" "github.com/prometheus/prometheus/scrape" @@ -137,7 +138,7 @@ func (c *Config) ApplyDefaults(global GlobalConfig) error { if sc.ScrapeProtocols == nil { sc.ScrapeProtocols = c.global.Prometheus.ScrapeProtocols } - if sc.MetricNameValidationScheme == "" { + if sc.MetricNameValidationScheme == model.UnsetValidation { sc.MetricNameValidationScheme = c.global.Prometheus.MetricNameValidationScheme } if sc.MetricNameEscapingScheme == "" { diff --git a/internal/static/metrics/wal/util.go b/internal/static/metrics/wal/util.go index 8576b45297..78b9ce4021 100644 --- a/internal/static/metrics/wal/util.go +++ b/internal/static/metrics/wal/util.go @@ -1,6 +1,8 @@ package wal import ( + "log/slog" + "os" "path/filepath" "sync" @@ -65,7 +67,7 @@ func (r walReplayer) Replay(dir string) error { } func (r walReplayer) replayWAL(reader *wlog.Reader) error { - var dec record.Decoder + dec := record.NewDecoder(nil, slog.New(slog.NewTextHandler(os.Stdout, nil))) for reader.Next() { rec := reader.Record() diff --git a/internal/static/metrics/wal/wal.go b/internal/static/metrics/wal/wal.go index c0b03ee8d3..5396941b7f 100644 --- a/internal/static/metrics/wal/wal.go +++ b/internal/static/metrics/wal/wal.go @@ -286,7 +286,7 @@ func (w *Storage) replayWAL() error { // but has not been fully removed from the WAL via a wlog.Checkpoint yet. func (w *Storage) loadWAL(r *wlog.Reader, duplicateRefToValidRef map[chunks.HeadSeriesRef]chunks.HeadSeriesRef, currentSegmentOrCheckpoint int) (err error) { var ( - dec record.Decoder + dec = record.NewDecoder(nil, slog.New(logging.NewSlogGoKitHandler(w.logger))) lastRef = chunks.HeadSeriesRef(w.nextRef.Load()) decoded = make(chan interface{}, 10) @@ -549,7 +549,7 @@ func (w *Storage) Truncate(mint int64) error { return nil } - keep := func(id chunks.HeadSeriesRef, _ int) bool { + keep := func(id chunks.HeadSeriesRef) bool { if w.series.GetByID(id) != nil { return true } diff --git a/tools/ci/docker-containers-windows b/tools/ci/docker-containers-windows index 7c70ea96e5..d80450df9f 100755 --- a/tools/ci/docker-containers-windows +++ b/tools/ci/docker-containers-windows @@ -103,7 +103,7 @@ case "$TARGET_CONTAINER" in --build-arg BASE_IMAGE_GO="$BASE_IMAGE_GO" \ --build-arg BASE_IMAGE_WINDOWS="$BASE_IMAGE_WINDOWS" \ --build-arg GOEXPERIMENT=cngcrypto \ - --build-arg GO_TAGS=cngcrypto \ + --build-arg GO_TAGS="cngcrypto slicelabels" \ -f ./Dockerfile.windows \ . @@ -143,7 +143,7 @@ case "$TARGET_CONTAINER" in --build-arg BASE_IMAGE_GO="$BASE_IMAGE_GO" \ --build-arg BASE_IMAGE_WINDOWS="$BASE_IMAGE_WINDOWS" \ --build-arg GOEXPERIMENT=cngcrypto \ - --build-arg GO_TAGS=cngcrypto \ + --build-arg GO_TAGS="cngcrypto slicelabels" \ -f ./Dockerfile.windows \ . diff --git a/tools/make/packaging.mk b/tools/make/packaging.mk index efa518d095..ceae39f547 100644 --- a/tools/make/packaging.mk +++ b/tools/make/packaging.mk @@ -32,37 +32,37 @@ dist-alloy-binaries: dist/alloy-linux-amd64 \ dist/alloy-windows-amd64.exe \ dist/alloy-freebsd-amd64 -dist/alloy-linux-amd64: GO_TAGS += netgo builtinassets promtail_journal_enabled +dist/alloy-linux-amd64: GO_TAGS += netgo builtinassets promtail_journal_enabled slicelabels dist/alloy-linux-amd64: GOOS := linux dist/alloy-linux-amd64: GOARCH := amd64 dist/alloy-linux-amd64: generate-ui $(PACKAGING_VARS) ALLOY_BINARY=$@ "$(MAKE)" -f $(PARENT_MAKEFILE) alloy -dist/alloy-linux-arm64: GO_TAGS += netgo builtinassets promtail_journal_enabled +dist/alloy-linux-arm64: GO_TAGS += netgo builtinassets promtail_journal_enabled slicelabels dist/alloy-linux-arm64: GOOS := linux dist/alloy-linux-arm64: GOARCH := arm64 dist/alloy-linux-arm64: generate-ui $(PACKAGING_VARS) ALLOY_BINARY=$@ "$(MAKE)" -f $(PARENT_MAKEFILE) alloy -dist/alloy-linux-ppc64le: GO_TAGS += netgo builtinassets promtail_journal_enabled +dist/alloy-linux-ppc64le: GO_TAGS += netgo builtinassets promtail_journal_enabled slicelabels dist/alloy-linux-ppc64le: GOOS := linux dist/alloy-linux-ppc64le: GOARCH := ppc64le dist/alloy-linux-ppc64le: generate-ui $(PACKAGING_VARS) ALLOY_BINARY=$@ "$(MAKE)" -f $(PARENT_MAKEFILE) alloy -dist/alloy-linux-s390x: GO_TAGS += netgo builtinassets promtail_journal_enabled +dist/alloy-linux-s390x: GO_TAGS += netgo builtinassets promtail_journal_enabled slicelabels dist/alloy-linux-s390x: GOOS := linux dist/alloy-linux-s390x: GOARCH := s390x dist/alloy-linux-s390x: generate-ui $(PACKAGING_VARS) ALLOY_BINARY=$@ "$(MAKE)" -f $(PARENT_MAKEFILE) alloy -dist/alloy-darwin-amd64: GO_TAGS += netgo builtinassets +dist/alloy-darwin-amd64: GO_TAGS += netgo builtinassets slicelabels dist/alloy-darwin-amd64: GOOS := darwin dist/alloy-darwin-amd64: GOARCH := amd64 dist/alloy-darwin-amd64: generate-ui $(PACKAGING_VARS) ALLOY_BINARY=$@ "$(MAKE)" -f $(PARENT_MAKEFILE) alloy -dist/alloy-darwin-arm64: GO_TAGS += netgo builtinassets +dist/alloy-darwin-arm64: GO_TAGS += netgo builtinassets slicelabels dist/alloy-darwin-arm64: GOOS := darwin dist/alloy-darwin-arm64: GOARCH := arm64 dist/alloy-darwin-arm64: generate-ui @@ -73,7 +73,7 @@ dist/alloy-darwin-arm64: generate-ui # # TODO(rfratto): add netgo back to Windows builds if a version of Go is # released which natively supports resolving DNS short names on Windows. -dist/alloy-windows-amd64.exe: GO_TAGS += builtinassets +dist/alloy-windows-amd64.exe: GO_TAGS += builtinassets slicelabels dist/alloy-windows-amd64.exe: GOOS := windows dist/alloy-windows-amd64.exe: GOARCH := amd64 dist/alloy-windows-amd64.exe: generate-ui generate-winmanifest @@ -84,7 +84,7 @@ dist/alloy-windows-amd64.exe: generate-ui generate-winmanifest # # TODO(rfratto): add netgo back to Windows builds if a version of Go is # released which natively supports resolving DNS short names on Windows. -dist/alloy-freebsd-amd64: GO_TAGS += netgo builtinassets +dist/alloy-freebsd-amd64: GO_TAGS += netgo builtinassets slicelabels dist/alloy-freebsd-amd64: GOOS := freebsd dist/alloy-freebsd-amd64: GOARCH := amd64 dist/alloy-freebsd-amd64: generate-ui @@ -97,14 +97,14 @@ dist/alloy-freebsd-amd64: generate-ui dist-alloy-boringcrypto-binaries: dist/alloy-boringcrypto-linux-amd64 \ dist/alloy-boringcrypto-linux-arm64 -dist/alloy-boringcrypto-linux-amd64: GO_TAGS += netgo builtinassets promtail_journal_enabled +dist/alloy-boringcrypto-linux-amd64: GO_TAGS += netgo builtinassets promtail_journal_enabled slicelabels dist/alloy-boringcrypto-linux-amd64: GOEXPERIMENT := boringcrypto dist/alloy-boringcrypto-linux-amd64: GOOS := linux dist/alloy-boringcrypto-linux-amd64: GOARCH := amd64 dist/alloy-boringcrypto-linux-amd64: generate-ui $(PACKAGING_VARS) ALLOY_BINARY=$@ "$(MAKE)" -f $(PARENT_MAKEFILE) alloy -dist/alloy-boringcrypto-linux-arm64: GO_TAGS += netgo builtinassets promtail_journal_enabled +dist/alloy-boringcrypto-linux-arm64: GO_TAGS += netgo builtinassets promtail_journal_enabled slicelabels dist/alloy-boringcrypto-linux-arm64: GOEXPERIMENT := boringcrypto dist/alloy-boringcrypto-linux-arm64: GOOS := linux dist/alloy-boringcrypto-linux-arm64: GOARCH := arm64 @@ -123,7 +123,7 @@ dist/alloy-boringcrypto-linux-arm64: generate-ui dist-alloy-service-binaries: dist.temp/alloy-service-windows-amd64.exe -dist.temp/alloy-service-windows-amd64.exe: GO_TAGS += builtinassets +dist.temp/alloy-service-windows-amd64.exe: GO_TAGS += builtinassets slicelabels dist.temp/alloy-service-windows-amd64.exe: GOOS := windows dist.temp/alloy-service-windows-amd64.exe: GOARCH := amd64 dist.temp/alloy-service-windows-amd64.exe: generate-ui generate-winmanifest From 66c079e57c71411ab178865f4cca60b425bc3fc8 Mon Sep 17 00:00:00 2001 From: Piotr <17101802+thampiotr@users.noreply.github.com> Date: Fri, 24 Oct 2025 14:51:54 +0100 Subject: [PATCH 2/4] update ckit to version with a fix --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 24a1e181f3..7679ebfdc4 100644 --- a/go.mod +++ b/go.mod @@ -65,7 +65,7 @@ require ( github.com/grafana/alloy/syntax v0.1.0 github.com/grafana/beyla/v2 v2.7.4 github.com/grafana/catchpoint-prometheus-exporter v0.0.0-20250218151502-6e97feaee761 - github.com/grafana/ckit v0.0.0-20250825110114-3ee952343746 + github.com/grafana/ckit v0.0.0-20251024151910-87043f5a3cf7 github.com/grafana/cloudflare-go v0.0.0-20230110200409-c627cf6792f2 github.com/grafana/dskit v0.0.0-20250828173137-de14cf923eeb github.com/grafana/go-gelf/v2 v2.0.1 diff --git a/go.sum b/go.sum index 35637b1df8..7130f302d7 100644 --- a/go.sum +++ b/go.sum @@ -1148,8 +1148,8 @@ github.com/grafana/cadvisor v0.0.0-20240729082359-1f04a91701e2 h1:ju6EcY2aEobeBg github.com/grafana/cadvisor v0.0.0-20240729082359-1f04a91701e2/go.mod h1:8sLW/G7rcFe1CKMaA4pYT4mX3P1xQVGqM6luzEzx/2g= github.com/grafana/catchpoint-prometheus-exporter v0.0.0-20250218151502-6e97feaee761 h1:dPJOIEwtQ8uR3Qa79pb/lsSFJQ6j4P9vpCUQ4fKimG4= github.com/grafana/catchpoint-prometheus-exporter v0.0.0-20250218151502-6e97feaee761/go.mod h1:S/M+H/0B7LSWtXbvzEOwqCl96xP6c1NOInW21+bzol0= -github.com/grafana/ckit v0.0.0-20250825110114-3ee952343746 h1:M38XP642rwteNZz0tEwsiTAiulw4z554nSEPMdJexS8= -github.com/grafana/ckit v0.0.0-20250825110114-3ee952343746/go.mod h1:THPMJBdU2XgYUsYCG/PvtaYj1/NH4uNjw7U5kNohrLY= +github.com/grafana/ckit v0.0.0-20251024151910-87043f5a3cf7 h1:ht6BCnZ9DBo+ZjeyxB7aungT/HtDwlWNJypHkKrL1kk= +github.com/grafana/ckit v0.0.0-20251024151910-87043f5a3cf7/go.mod h1:OoVSd3NXKXf5Bz47bvWyO1yZBVImyTrHHgw0wW5eIrU= github.com/grafana/cloudflare-go v0.0.0-20230110200409-c627cf6792f2 h1:qhugDMdQ4Vp68H0tp/0iN17DM2ehRo1rLEdOFe/gB8I= github.com/grafana/cloudflare-go v0.0.0-20230110200409-c627cf6792f2/go.mod h1:w/aiO1POVIeXUQyl0VQSZjl5OAGDTL5aX+4v0RA1tcw= github.com/grafana/dskit v0.0.0-20250828173137-de14cf923eeb h1:/7k3iGtgl99mhmsaMpB8REUEj8uEh6Nwo74fK342Gsc= From 684444cff221a17e5df587f4e0cc37a43b7420b4 Mon Sep 17 00:00:00 2001 From: Kyle Eckhart Date: Fri, 24 Oct 2025 13:29:30 -0400 Subject: [PATCH 3/4] Move to prometheus changeset with better queue send visibility --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 7679ebfdc4..cd6dabfd85 100644 --- a/go.mod +++ b/go.mod @@ -1028,7 +1028,7 @@ replace github.com/fsnotify/fsnotify v1.8.0 => github.com/fsnotify/fsnotify v1.7 // TODO: remove replace directive once: // * There is a release of Prometheus which addresses https://github.com/prometheus/prometheus/issues/14049, // for example, via this implementation: https://github.com/grafana/prometheus/pull/34 -replace github.com/prometheus/prometheus => github.com/grafana/prometheus v1.8.2-0.20251020143145-59659a23710a // staleness_disabling_v3.7.1 branch +replace github.com/prometheus/prometheus => github.com/grafana/prometheus v1.8.2-0.20251024172658-ed9a9373f990 // staleness_disabling_v3.7.1 branch replace gopkg.in/yaml.v2 => github.com/rfratto/go-yaml v0.0.0-20211119180816-77389c3526dc diff --git a/go.sum b/go.sum index 7130f302d7..42e7b47c9f 100644 --- a/go.sum +++ b/go.sum @@ -1194,8 +1194,8 @@ github.com/grafana/otel-profiling-go v0.5.1 h1:stVPKAFZSa7eGiqbYuG25VcqYksR6iWvF github.com/grafana/otel-profiling-go v0.5.1/go.mod h1:ftN/t5A/4gQI19/8MoWurBEtC6gFw8Dns1sJZ9W4Tls= github.com/grafana/postgres_exporter v0.0.0-20250930111128-c8f6a9f4d363 h1:/vCopugIegPx9brm+E9+4bMQ6uIsZujCoE7su3bLLbk= github.com/grafana/postgres_exporter v0.0.0-20250930111128-c8f6a9f4d363/go.mod h1:dOdKpz09HRMtkSs8kba90eNmrL81E+LMotcP7eW9/ek= -github.com/grafana/prometheus v1.8.2-0.20251020143145-59659a23710a h1:8sZp6S6gz2pk75KdsbszVyYWuIZhpMb71tElS6wpELk= -github.com/grafana/prometheus v1.8.2-0.20251020143145-59659a23710a/go.mod h1:/7YQG/jOLg7ktxGritmdkZvezE1fa6aWDj0MGDIZvcY= +github.com/grafana/prometheus v1.8.2-0.20251024172658-ed9a9373f990 h1:d5VwD7T8RbDP1OkPnoxkMcyJ2ZpY085kmPPYs3+gTo0= +github.com/grafana/prometheus v1.8.2-0.20251024172658-ed9a9373f990/go.mod h1:/7YQG/jOLg7ktxGritmdkZvezE1fa6aWDj0MGDIZvcY= github.com/grafana/pyroscope-go/godeltaprof v0.1.8 h1:iwOtYXeeVSAeYefJNaxDytgjKtUuKQbJqgAIjlnicKg= github.com/grafana/pyroscope-go/godeltaprof v0.1.8/go.mod h1:2+l7K7twW49Ct4wFluZD3tZ6e0SjanjcUUBPVD/UuGU= github.com/grafana/pyroscope/api v1.2.0 h1:SfHDZcEZ4Vbj/Jj3bTOSpm4IDB33wLA2xBYxROhiL4U= From c50fdd196013c304b47c459cd800700004b6e1c8 Mon Sep 17 00:00:00 2001 From: Kyle Eckhart Date: Tue, 28 Oct 2025 09:40:44 -0400 Subject: [PATCH 4/4] Bring in queue timestamp revert --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index cd6dabfd85..be63c55b58 100644 --- a/go.mod +++ b/go.mod @@ -1028,7 +1028,7 @@ replace github.com/fsnotify/fsnotify v1.8.0 => github.com/fsnotify/fsnotify v1.7 // TODO: remove replace directive once: // * There is a release of Prometheus which addresses https://github.com/prometheus/prometheus/issues/14049, // for example, via this implementation: https://github.com/grafana/prometheus/pull/34 -replace github.com/prometheus/prometheus => github.com/grafana/prometheus v1.8.2-0.20251024172658-ed9a9373f990 // staleness_disabling_v3.7.1 branch +replace github.com/prometheus/prometheus => github.com/kgeckhart/prometheus v0.304.2-0.20251028132500-64c517c682a8 // staleness_disabling_v3.7.1 branch replace gopkg.in/yaml.v2 => github.com/rfratto/go-yaml v0.0.0-20211119180816-77389c3526dc diff --git a/go.sum b/go.sum index 42e7b47c9f..c51c9af448 100644 --- a/go.sum +++ b/go.sum @@ -1194,8 +1194,6 @@ github.com/grafana/otel-profiling-go v0.5.1 h1:stVPKAFZSa7eGiqbYuG25VcqYksR6iWvF github.com/grafana/otel-profiling-go v0.5.1/go.mod h1:ftN/t5A/4gQI19/8MoWurBEtC6gFw8Dns1sJZ9W4Tls= github.com/grafana/postgres_exporter v0.0.0-20250930111128-c8f6a9f4d363 h1:/vCopugIegPx9brm+E9+4bMQ6uIsZujCoE7su3bLLbk= github.com/grafana/postgres_exporter v0.0.0-20250930111128-c8f6a9f4d363/go.mod h1:dOdKpz09HRMtkSs8kba90eNmrL81E+LMotcP7eW9/ek= -github.com/grafana/prometheus v1.8.2-0.20251024172658-ed9a9373f990 h1:d5VwD7T8RbDP1OkPnoxkMcyJ2ZpY085kmPPYs3+gTo0= -github.com/grafana/prometheus v1.8.2-0.20251024172658-ed9a9373f990/go.mod h1:/7YQG/jOLg7ktxGritmdkZvezE1fa6aWDj0MGDIZvcY= github.com/grafana/pyroscope-go/godeltaprof v0.1.8 h1:iwOtYXeeVSAeYefJNaxDytgjKtUuKQbJqgAIjlnicKg= github.com/grafana/pyroscope-go/godeltaprof v0.1.8/go.mod h1:2+l7K7twW49Ct4wFluZD3tZ6e0SjanjcUUBPVD/UuGU= github.com/grafana/pyroscope/api v1.2.0 h1:SfHDZcEZ4Vbj/Jj3bTOSpm4IDB33wLA2xBYxROhiL4U= @@ -1538,6 +1536,8 @@ github.com/kevinburke/ssh_config v1.2.0 h1:x584FjTGwHzMwvHx18PXxbBVzfnxogHaAReU4 github.com/kevinburke/ssh_config v1.2.0/go.mod h1:CT57kijsi8u/K/BOFA39wgDQJ9CxiF4nAY/ojJ6r6mM= github.com/keybase/go-keychain v0.0.1 h1:way+bWYa6lDppZoZcgMbYsvC7GxljxrskdNInRtuthU= github.com/keybase/go-keychain v0.0.1/go.mod h1:PdEILRW3i9D8JcdM+FmY6RwkHGnhHxXwkPPMeUgOK1k= +github.com/kgeckhart/prometheus v0.304.2-0.20251028132500-64c517c682a8 h1:Y1Akan/9YOLP2REgs+NahxGI3uJegYDbrZaH8cQw6B4= +github.com/kgeckhart/prometheus v0.304.2-0.20251028132500-64c517c682a8/go.mod h1:/7YQG/jOLg7ktxGritmdkZvezE1fa6aWDj0MGDIZvcY= github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q= github.com/kisielk/errcheck v1.2.0/go.mod h1:/BMXB+zMLi60iA8Vv6Ksmxu/1UDYcXs4uQLJ+jE2L00= github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=