diff --git a/Makefile b/Makefile index 5acb0b86..8f686a55 100644 --- a/Makefile +++ b/Makefile @@ -58,7 +58,7 @@ build: ## Build tracecore via OpenTelemetry Collector Builder using builder-con @# the binary's release-tag namespace. @# 3. builder-config.yaml's hardcoded dist.version (fallback when @# neither works — shallow clone with no v* tag, no git, etc). - GOOS= GOARCH= GOBIN=$(CURDIR)/_build/.tools go install go.opentelemetry.io/collector/cmd/builder@v0.120.0 + GOOS= GOARCH= GOBIN=$(CURDIR)/_build/.tools go install go.opentelemetry.io/collector/cmd/builder@v0.125.0 @version="$${TRACECORE_VERSION:-$$(git describe --tags --always --match 'v*' --dirty=-dev 2>/dev/null || true)}"; \ if [ -z "$$version" ]; then \ echo "make build: TRACECORE_VERSION empty and git describe failed; using builder-config.yaml dist.version unchanged"; \ diff --git a/builder-config.yaml b/builder-config.yaml index 57ea0af6..158c11ce 100644 --- a/builder-config.yaml +++ b/builder-config.yaml @@ -15,17 +15,17 @@ dist: module: github.com/tracecoreai/tracecore receivers: - - gomod: go.opentelemetry.io/collector/receiver/otlpreceiver v0.120.0 - - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/filelogreceiver v0.120.0 - - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/journaldreceiver v0.120.0 - - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/k8sobjectsreceiver v0.120.0 - - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusreceiver v0.120.0 + - gomod: go.opentelemetry.io/collector/receiver/otlpreceiver v0.125.0 + - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/filelogreceiver v0.125.0 + - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/journaldreceiver v0.125.0 + - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/k8sobjectsreceiver v0.125.0 + - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusreceiver v0.125.0 # RFC-0013 PR-E (2026-05-30): hostmetricsreceiver replaces the # planned-but-nonexistent telemetrygeneratorreceiver as the bench # heartbeat source. Two upstream proposals (contrib #41687, #43657) # closed `not_planned`; re-evaluation trigger is a generator-shaped # receiver landing in contrib at any future tag. - - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver v0.120.0 + - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver v0.125.0 # RFC-0013 PR-I.1b (2026-05-31): nccl_fr receiver moved out of the # root module into the in-repo Go submodule at # module/receiver/ncclfrreceiver/. The submodule has a single @@ -43,10 +43,10 @@ receivers: import: github.com/tracecoreai/tracecore/module/receiver/ncclfrreceiver processors: - - gomod: go.opentelemetry.io/collector/processor/batchprocessor v0.120.0 - - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/transformprocessor v0.120.0 - - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/filterprocessor v0.120.0 - - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/k8sattributesprocessor v0.120.0 + - gomod: go.opentelemetry.io/collector/processor/batchprocessor v0.125.0 + - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/transformprocessor v0.125.0 + - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/filterprocessor v0.125.0 + - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/k8sattributesprocessor v0.125.0 # RFC-0013 PR-I.2b (2026-05-31): in-repo processors land in the # module submodule alongside ncclfrreceiver. Same gomod / import # split semantics — see the receiver block above for the rationale. @@ -56,15 +56,15 @@ processors: import: github.com/tracecoreai/tracecore/module/processor/patterndetectorprocessor exporters: - - gomod: go.opentelemetry.io/collector/exporter/otlphttpexporter v0.120.0 - - gomod: go.opentelemetry.io/collector/exporter/debugexporter v0.120.0 - - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/datadogexporter v0.120.0 - - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/clickhouseexporter v0.120.0 + - gomod: go.opentelemetry.io/collector/exporter/otlphttpexporter v0.125.0 + - gomod: go.opentelemetry.io/collector/exporter/debugexporter v0.125.0 + - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/datadogexporter v0.125.0 + - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/clickhouseexporter v0.125.0 extensions: - - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/storage/filestorage v0.120.0 - - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/healthcheckextension v0.120.0 - - gomod: go.opentelemetry.io/collector/extension/zpagesextension v0.120.0 + - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/storage/filestorage v0.125.0 + - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/healthcheckextension v0.125.0 + - gomod: go.opentelemetry.io/collector/extension/zpagesextension v0.125.0 # RFC-0013 PR-I.2b (2026-05-31): in-repo Go submodule under module/ # now hosts ncclfrreceiver + rankjoinprocessor + patterndetectorprocessor. diff --git a/docs/integrations/examples/filelog-container.yaml b/docs/integrations/examples/filelog-container.yaml index a29d7933..e511cee8 100644 --- a/docs/integrations/examples/filelog-container.yaml +++ b/docs/integrations/examples/filelog-container.yaml @@ -37,7 +37,13 @@ receivers: operators: - id: container-parser type: container - format: auto + # Omit `format` to let the container parser auto-detect + # docker / containerd / crio at runtime per pkg/stanza + # operator/parser/container README. v0.121+ tightened + # the Build() pre-check: any non-empty value not in + # {docker, crio, containerd} is rejected before pipeline + # start, so the previous `format: auto` literal no longer + # parses. add_metadata_from_filepath: true - id: severity-parser type: severity_parser diff --git a/docs/integrations/journald-kernel.md b/docs/integrations/journald-kernel.md index ed536736..d2c252eb 100644 --- a/docs/integrations/journald-kernel.md +++ b/docs/integrations/journald-kernel.md @@ -1,5 +1,5 @@ - - + + # Kernel + systemd events via `journaldreceiver` + `filelogreceiver` + OTTL diff --git a/docs/rfcs/0013-distro-first-pivot.md b/docs/rfcs/0013-distro-first-pivot.md index ce2a0ae1..41b5b138 100644 --- a/docs/rfcs/0013-distro-first-pivot.md +++ b/docs/rfcs/0013-distro-first-pivot.md @@ -37,32 +37,32 @@ dist: module: github.com/tracecoreai/tracecore receivers: - - gomod: go.opentelemetry.io/collector/receiver/otlpreceiver v0.115.0 - - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/filelogreceiver v0.115.0 - - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/journaldreceiver v0.115.0 - - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/k8sobjectsreceiver v0.115.0 - - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusreceiver v0.115.0 - - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver v0.115.0 # ← swapped from telemetrygeneratorreceiver per §migration PR-E; original receiver does not exist in contrib - - gomod: github.com/tracecoreai/tracecore/module/receiver/ncclfrreceiver v0.1.0 + - gomod: go.opentelemetry.io/collector/receiver/otlpreceiver v0.125.0 + - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/filelogreceiver v0.125.0 + - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/journaldreceiver v0.125.0 + - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/k8sobjectsreceiver v0.125.0 + - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusreceiver v0.125.0 + - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver v0.125.0 # ← swapped from telemetrygeneratorreceiver per §migration PR-E; original receiver does not exist in contrib + - gomod: github.com/tracecoreai/tracecore/module/receiver/ncclfrreceiver v0.2.0 processors: - - gomod: go.opentelemetry.io/collector/processor/batchprocessor v0.115.0 - - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/transformprocessor v0.115.0 - - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/filterprocessor v0.115.0 - - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/k8sattributesprocessor v0.115.0 - - gomod: github.com/tracecoreai/tracecore/module/processor/rankjoinprocessor v0.1.0 - - gomod: github.com/tracecoreai/tracecore/module/processor/patterndetectorprocessor v0.1.0 + - gomod: go.opentelemetry.io/collector/processor/batchprocessor v0.125.0 + - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/transformprocessor v0.125.0 + - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/filterprocessor v0.125.0 + - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/k8sattributesprocessor v0.125.0 + - gomod: github.com/tracecoreai/tracecore/module/processor/rankjoinprocessor v0.2.0 + - gomod: github.com/tracecoreai/tracecore/module/processor/patterndetectorprocessor v0.2.0 exporters: - - gomod: go.opentelemetry.io/collector/exporter/otlphttpexporter v0.115.0 - - gomod: go.opentelemetry.io/collector/exporter/debugexporter v0.115.0 - - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/datadogexporter v0.115.0 - - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/clickhouseexporter v0.115.0 + - gomod: go.opentelemetry.io/collector/exporter/otlphttpexporter v0.125.0 + - gomod: go.opentelemetry.io/collector/exporter/debugexporter v0.125.0 + - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/datadogexporter v0.125.0 + - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/clickhouseexporter v0.125.0 extensions: - - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/storage/filestorage v0.115.0 - - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/healthcheckextension v0.115.0 - - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/zpagesextension v0.115.0 + - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/storage/filestorage v0.125.0 + - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/healthcheckextension v0.125.0 + - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/zpagesextension v0.125.0 ``` The `github.com/tracecoreai/tracecore/module` Go submodule (lives in-repo at `module/` with its own `go.mod`; root `go.work` lists both `.` and `./module` so dev builds resolve without publishing; OCB consumes via `gomod:` + `replaces: ./module` per §migration PR-I) contains only: diff --git a/install/kubernetes/tracecore/templates/_helpers.tpl b/install/kubernetes/tracecore/templates/_helpers.tpl index 81caf116..c155d6da 100644 --- a/install/kubernetes/tracecore/templates/_helpers.tpl +++ b/install/kubernetes/tracecore/templates/_helpers.tpl @@ -70,7 +70,7 @@ Intermediate dict shape: extensions: { health_check: {endpoint, path} } service: extensions: [health_check] - telemetry: { metrics: { address: ... } } + telemetry: { metrics: { readers: [ { pull: { exporter: { prometheus: {host, port} } } } ] } } pipelines.: { receivers: [...], exporters: [...] } */}} {{- define "tracecore.renderedConfig" -}} @@ -143,12 +143,22 @@ Intermediate dict shape: {{/* Telemetry + health-check extension. The chart's `telemetry.enabled` knob drives both surfaces so a single - turn-it-off intent works. */}} + turn-it-off intent works. + + v0.123 promoted `telemetry.disableAddressFieldForInternalTelemetry` + to Beta (default on), so the legacy `metrics.address` shorthand + no longer opens a listener. Emit the upstream-recommended + `metrics.readers[].pull.exporter.prometheus` shape; same + otelcol_* vocabulary on the same port. */}} {{- if .Values.telemetry.enabled -}} {{- $hcCfg := dict "endpoint" .Values.telemetry.healthListen "path" .Values.telemetry.healthPath -}} {{- $_ := set $built "extensions" (dict "health_check" $hcCfg) -}} {{- $_ := set $service "extensions" (list "health_check") -}} - {{- $_ := set $service "telemetry" (dict "metrics" (dict "address" .Values.telemetry.metricsListen)) -}} + {{- $listen := .Values.telemetry.metricsListen -}} + {{- $host := index (splitList ":" $listen) 0 -}} + {{- $port := index (splitList ":" $listen) 1 | int -}} + {{- $reader := dict "pull" (dict "exporter" (dict "prometheus" (dict "host" $host "port" $port))) -}} + {{- $_ := set $service "telemetry" (dict "metrics" (dict "readers" (list $reader))) -}} {{- end -}} {{- if gt (len $service) 0 -}} diff --git a/internal/integration/ocb_scrape_test.go b/internal/integration/ocb_scrape_test.go index 7e680fa5..ed8b38f4 100644 --- a/internal/integration/ocb_scrape_test.go +++ b/internal/integration/ocb_scrape_test.go @@ -82,6 +82,16 @@ func TestOCBScrape_UpstreamMetricVocabulary(t *testing.T) { // Compose a minimal pipeline: hostmetrics → debug. The hostmetrics // loadscraper is the same scraper the chart's default pipeline // uses, so this test exercises the operator-shipped path. + // + // Telemetry endpoint uses the `readers:` schema (otelconfig + // pull/prometheus reader) rather than the deprecated + // `metrics.address:` field. v0.123 promoted the + // `telemetry.disableAddressFieldForInternalTelemetry` feature + // gate to Beta (enabled by default), so address-only configs no + // longer open a listener at v0.123+ even though they still + // parse. `readers:` is the upstream-recommended shape going + // forward and emits identical otelcol_* vocabulary on the same + // port. cfg := `receivers: hostmetrics: collection_interval: 200ms @@ -92,7 +102,12 @@ exporters: service: telemetry: metrics: - address: 127.0.0.1:` + itoa(metricsPort) + ` + readers: + - pull: + exporter: + prometheus: + host: 127.0.0.1 + port: ` + itoa(metricsPort) + ` pipelines: metrics: receivers: [hostmetrics] diff --git a/module/go.mod b/module/go.mod index afde73ba..934db349 100644 --- a/module/go.mod +++ b/module/go.mod @@ -18,23 +18,23 @@ go 1.23.0 // to the higher version where root + submodule overlap, which is fine // for root. Use `make bump-otel VERSION=0.X.0` to bump in lockstep. require ( - go.opentelemetry.io/collector/component v0.120.0 - go.opentelemetry.io/collector/consumer v1.26.0 - go.opentelemetry.io/collector/pdata v1.26.0 - go.opentelemetry.io/collector/processor v0.120.0 - go.opentelemetry.io/collector/receiver v0.120.0 - go.opentelemetry.io/otel v1.34.0 - go.opentelemetry.io/otel/metric v1.34.0 - go.opentelemetry.io/otel/sdk/metric v1.34.0 + go.opentelemetry.io/collector/component v1.31.0 + go.opentelemetry.io/collector/consumer v1.31.0 + go.opentelemetry.io/collector/pdata v1.31.0 + go.opentelemetry.io/collector/processor v1.31.0 + go.opentelemetry.io/collector/receiver v1.31.0 + go.opentelemetry.io/otel v1.35.0 + go.opentelemetry.io/otel/metric v1.35.0 + go.opentelemetry.io/otel/sdk/metric v1.35.0 go.uber.org/zap v1.27.0 ) -require go.opentelemetry.io/collector/receiver/receivertest v0.120.0 +require go.opentelemetry.io/collector/receiver/receivertest v0.125.0 require ( github.com/santhosh-tekuri/jsonschema/v6 v6.0.2 github.com/stretchr/testify v1.10.0 - go.opentelemetry.io/collector/processor/processortest v0.120.0 + go.opentelemetry.io/collector/processor/processortest v0.125.0 ) require ( @@ -43,29 +43,34 @@ require ( github.com/go-logr/stdr v1.2.2 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/google/uuid v1.6.0 // indirect + github.com/hashicorp/go-version v1.7.0 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect go.opentelemetry.io/auto/sdk v1.1.0 // indirect - go.opentelemetry.io/collector/component/componentstatus v0.120.0 // indirect - go.opentelemetry.io/collector/component/componenttest v0.120.0 // indirect - go.opentelemetry.io/collector/consumer/consumererror v0.120.0 // indirect - go.opentelemetry.io/collector/consumer/consumertest v0.120.0 // indirect - go.opentelemetry.io/collector/consumer/xconsumer v0.120.0 // indirect - go.opentelemetry.io/collector/pdata/pprofile v0.120.0 // indirect - go.opentelemetry.io/collector/pdata/testdata v0.120.0 // indirect - go.opentelemetry.io/collector/pipeline v0.120.0 // indirect - go.opentelemetry.io/collector/processor/xprocessor v0.120.0 // indirect - go.opentelemetry.io/collector/receiver/xreceiver v0.120.0 // indirect - go.opentelemetry.io/otel/sdk v1.34.0 // indirect - go.opentelemetry.io/otel/trace v1.34.0 // indirect + go.opentelemetry.io/collector/component/componentstatus v0.125.0 // indirect + go.opentelemetry.io/collector/component/componenttest v0.125.0 // indirect + go.opentelemetry.io/collector/consumer/consumererror v0.125.0 // indirect + go.opentelemetry.io/collector/consumer/consumertest v0.125.0 // indirect + go.opentelemetry.io/collector/consumer/xconsumer v0.125.0 // indirect + go.opentelemetry.io/collector/featuregate v1.31.0 // indirect + go.opentelemetry.io/collector/internal/telemetry v0.125.0 // indirect + go.opentelemetry.io/collector/pdata/pprofile v0.125.0 // indirect + go.opentelemetry.io/collector/pdata/testdata v0.125.0 // indirect + go.opentelemetry.io/collector/pipeline v0.125.0 // indirect + go.opentelemetry.io/collector/processor/xprocessor v0.125.0 // indirect + go.opentelemetry.io/collector/receiver/xreceiver v0.125.0 // indirect + go.opentelemetry.io/contrib/bridges/otelzap v0.10.0 // indirect + go.opentelemetry.io/otel/log v0.11.0 // indirect + go.opentelemetry.io/otel/sdk v1.35.0 // indirect + go.opentelemetry.io/otel/trace v1.35.0 // indirect go.uber.org/multierr v1.11.0 // indirect - golang.org/x/net v0.33.0 // indirect - golang.org/x/sys v0.29.0 // indirect - golang.org/x/text v0.21.0 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20241202173237-19429a94021a // indirect - google.golang.org/grpc v1.70.0 // indirect - google.golang.org/protobuf v1.36.5 // indirect + golang.org/x/net v0.39.0 // indirect + golang.org/x/sys v0.32.0 // indirect + golang.org/x/text v0.24.0 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20250218202821-56aae31c358a // indirect + google.golang.org/grpc v1.72.0 // indirect + google.golang.org/protobuf v1.36.6 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/module/go.sum b/module/go.sum index 22a28ddb..2897678e 100644 --- a/module/go.sum +++ b/module/go.sum @@ -12,11 +12,13 @@ github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek= github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps= -github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= -github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= +github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8= +github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/hashicorp/go-version v1.7.0 h1:5tqGy27NaOTB8yJKUZELlFAS/LTKJkrmONwQKeRZfjY= +github.com/hashicorp/go-version v1.7.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM= github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo= github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= @@ -44,50 +46,58 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= go.opentelemetry.io/auto/sdk v1.1.0 h1:cH53jehLUN6UFLY71z+NDOiNJqDdPRaXzTel0sJySYA= go.opentelemetry.io/auto/sdk v1.1.0/go.mod h1:3wSPjt5PWp2RhlCcmmOial7AvC4DQqZb7a7wCow3W8A= -go.opentelemetry.io/collector/component v0.120.0 h1:YHEQ6NuBI6FQHKW24OwrNg2IJ0EUIg4RIuwV5YQ6PSI= -go.opentelemetry.io/collector/component v0.120.0/go.mod h1:Ya5O+5NWG9XdhJPnOVhKtBrNXHN3hweQbB98HH4KPNU= -go.opentelemetry.io/collector/component/componentstatus v0.120.0 h1:hzKjI9+AIl8A/saAARb47JqabWsge0kMp8NSPNiCNOQ= -go.opentelemetry.io/collector/component/componentstatus v0.120.0/go.mod h1:kbuAEddxvcyjGLXGmys3nckAj4jTGC0IqDIEXAOr3Ag= -go.opentelemetry.io/collector/component/componenttest v0.120.0 h1:vKX85d3lpxj/RoiFQNvmIpX9lOS80FY5svzOYUyeYX0= -go.opentelemetry.io/collector/component/componenttest v0.120.0/go.mod h1:QDLboWF2akEqAGyvje8Hc7GfXcrZvQ5FhmlWvD5SkzY= -go.opentelemetry.io/collector/consumer v1.26.0 h1:0MwuzkWFLOm13qJvwW85QkoavnGpR4ZObqCs9g1XAvk= -go.opentelemetry.io/collector/consumer v1.26.0/go.mod h1:I/ZwlWM0sbFLhbStpDOeimjtMbWpMFSoGdVmzYxLGDg= -go.opentelemetry.io/collector/consumer/consumererror v0.120.0 h1:f46ZnKCGBdvkjtJBT0ruA9cxDnvuR1jeR0amq9qc6Mc= -go.opentelemetry.io/collector/consumer/consumererror v0.120.0/go.mod h1:2Cx8948nywlM1MFJgqLrIJ7N/pfxZsMF0qq+n9oFJz0= -go.opentelemetry.io/collector/consumer/consumertest v0.120.0 h1:iPFmXygDsDOjqwdQ6YZcTmpiJeQDJX+nHvrjTPsUuv4= -go.opentelemetry.io/collector/consumer/consumertest v0.120.0/go.mod h1:HeSnmPfAEBnjsRR5UY1fDTLlSrYsMsUjufg1ihgnFJ0= -go.opentelemetry.io/collector/consumer/xconsumer v0.120.0 h1:dzM/3KkFfMBIvad+NVXDV+mA+qUpHyu5c70TFOjDg68= -go.opentelemetry.io/collector/consumer/xconsumer v0.120.0/go.mod h1:eOf7RX9CYC7bTZQFg0z2GHdATpQDxI0DP36F9gsvXOQ= -go.opentelemetry.io/collector/pdata v1.26.0 h1:o7nP0RTQOG0LXk55ZZjLrxwjX8x3wHF7Z7xPeOaskEA= -go.opentelemetry.io/collector/pdata v1.26.0/go.mod h1:18e8/xDZsqyj00h/5HM5GLdJgBzzG9Ei8g9SpNoiMtI= -go.opentelemetry.io/collector/pdata/pprofile v0.120.0 h1:lQl74z41MN9a0M+JFMZbJVesjndbwHXwUleVrVcTgc8= -go.opentelemetry.io/collector/pdata/pprofile v0.120.0/go.mod h1:4zwhklS0qhjptF5GUJTWoCZSTYE+2KkxYrQMuN4doVI= -go.opentelemetry.io/collector/pdata/testdata v0.120.0 h1:Zp0LBOv3yzv/lbWHK1oht41OZ4WNbaXb70ENqRY7HnE= -go.opentelemetry.io/collector/pdata/testdata v0.120.0/go.mod h1:PfezW5Rzd13CWwrElTZRrjRTSgMGUOOGLfHeBjj+LwY= -go.opentelemetry.io/collector/pipeline v0.120.0 h1:QQQbnLCYiuOqmxIRQ11cvFGt+SXq0rypK3fW8qMkzqQ= -go.opentelemetry.io/collector/pipeline v0.120.0/go.mod h1:TO02zju/K6E+oFIOdi372Wk0MXd+Szy72zcTsFQwXl4= -go.opentelemetry.io/collector/processor v0.120.0 h1:No+I65ybBLVy4jc7CxcsfduiBrm7Z6kGfTnekW3hx1A= -go.opentelemetry.io/collector/processor v0.120.0/go.mod h1:4zaJGLZCK8XKChkwlGC/gn0Dj4Yke04gQCu4LGbJGro= -go.opentelemetry.io/collector/processor/processortest v0.120.0 h1:R+VSVSU59W0/mPAcyt8/h1d0PfWN6JI2KY5KeMICXvo= -go.opentelemetry.io/collector/processor/processortest v0.120.0/go.mod h1:me+IVxPsj4IgK99I0pgKLX34XnJtcLwqtgTuVLhhYDI= -go.opentelemetry.io/collector/processor/xprocessor v0.120.0 h1:mBznj/1MtNqmu6UpcoXz6a63tU0931oWH2pVAt2+hzo= -go.opentelemetry.io/collector/processor/xprocessor v0.120.0/go.mod h1:Nsp0sDR3gE+GAhi9d0KbN0RhOP+BK8CGjBRn8+9d/SY= -go.opentelemetry.io/collector/receiver v0.120.0 h1:JTnPqmBLRXpOyLPh8Kch/5C8SivnpYK9Lzy4PvtEnLQ= -go.opentelemetry.io/collector/receiver v0.120.0/go.mod h1:jpYY55wTVE0FqiBIJrNv2HrvSUnGEjLS/3CWGA+CeL4= -go.opentelemetry.io/collector/receiver/receivertest v0.120.0 h1:Op9yCT0kGvqPF0BB83+iOcsxJJHPCLeL4f4/Op1MBoI= -go.opentelemetry.io/collector/receiver/receivertest v0.120.0/go.mod h1:lpFA4FzcHWki7rLzsNncYmDZ4f7Eik8JY1Mmsaw5uMw= -go.opentelemetry.io/collector/receiver/xreceiver v0.120.0 h1:+gHYd9rTBRKSQfWsTzV2wlwfaVL/LZSz5wu4sygZH7w= -go.opentelemetry.io/collector/receiver/xreceiver v0.120.0/go.mod h1:dkHpL1QqLi/G+60VZnfFpZQf9qoxDVnp6G9FuAcMgfk= -go.opentelemetry.io/otel v1.34.0 h1:zRLXxLCgL1WyKsPVrgbSdMN4c0FMkDAskSTQP+0hdUY= -go.opentelemetry.io/otel v1.34.0/go.mod h1:OWFPOQ+h4G8xpyjgqo4SxJYdDQ/qmRH+wivy7zzx9oI= -go.opentelemetry.io/otel/metric v1.34.0 h1:+eTR3U0MyfWjRDhmFMxe2SsW64QrZ84AOhvqS7Y+PoQ= -go.opentelemetry.io/otel/metric v1.34.0/go.mod h1:CEDrp0fy2D0MvkXE+dPV7cMi8tWZwX3dmaIhwPOaqHE= -go.opentelemetry.io/otel/sdk v1.34.0 h1:95zS4k/2GOy069d321O8jWgYsW3MzVV+KuSPKp7Wr1A= -go.opentelemetry.io/otel/sdk v1.34.0/go.mod h1:0e/pNiaMAqaykJGKbi+tSjWfNNHMTxoC9qANsCzbyxU= -go.opentelemetry.io/otel/sdk/metric v1.34.0 h1:5CeK9ujjbFVL5c1PhLuStg1wxA7vQv7ce1EK0Gyvahk= -go.opentelemetry.io/otel/sdk/metric v1.34.0/go.mod h1:jQ/r8Ze28zRKoNRdkjCZxfs6YvBTG1+YIqyFVFYec5w= -go.opentelemetry.io/otel/trace v1.34.0 h1:+ouXS2V8Rd4hp4580a8q23bg0azF2nI8cqLYnC8mh/k= -go.opentelemetry.io/otel/trace v1.34.0/go.mod h1:Svm7lSjQD7kG7KJ/MUHPVXSDGz2OX4h0M2jHBhmSfRE= +go.opentelemetry.io/collector/component v1.31.0 h1:9LzU8X1RhV3h8/QsAoTX23aFUfoJ3EUc9O/vK+hFpSI= +go.opentelemetry.io/collector/component v1.31.0/go.mod h1:JbZl/KywXJxpUXPbt96qlEXJSym1zQ2hauMxYMuvlxM= +go.opentelemetry.io/collector/component/componentstatus v0.125.0 h1:zlxGQZYd9kknRZSjRpOYW5SBjl0a5zYFYRPbreobXoU= +go.opentelemetry.io/collector/component/componentstatus v0.125.0/go.mod h1:bHXc2W8bqqo9adOvCgvhcO7pYzJOSpyV4cuQ1wiIl04= +go.opentelemetry.io/collector/component/componenttest v0.125.0 h1:E2mpnMQbkMpYoZ3Q8pHx4kod7kedjwRs1xqDpzCe/84= +go.opentelemetry.io/collector/component/componenttest v0.125.0/go.mod h1:pQtsE1u/SPZdTphP5BZP64XbjXSq6wc+mDut5Ws/JDI= +go.opentelemetry.io/collector/consumer v1.31.0 h1:L+y66ywxLHnAxnUxv0JDwUf5bFj53kMxCCyEfRKlM7s= +go.opentelemetry.io/collector/consumer v1.31.0/go.mod h1:rPsqy5ni+c6xNMUkOChleZYO/nInVY6eaBNZ1FmWJVk= +go.opentelemetry.io/collector/consumer/consumererror v0.125.0 h1:Qq9SgbxlJoRn0952dj4lPJhcuBiqKzD1aNxCfa+Bz00= +go.opentelemetry.io/collector/consumer/consumererror v0.125.0/go.mod h1:t/YDU7G2TxG27LbcUvgKo/l75TI5VApnnqC7FgKZds0= +go.opentelemetry.io/collector/consumer/consumertest v0.125.0 h1:TUkxomGS4DAtjBvcWQd2UY4FDLLEKMQD6iOIDUr/5dM= +go.opentelemetry.io/collector/consumer/consumertest v0.125.0/go.mod h1:vkHf3y85cFLDHARO/cTREVjLjOPAV+cQg7lkC44DWOY= +go.opentelemetry.io/collector/consumer/xconsumer v0.125.0 h1:oTreUlk1KpMSWwuHFnstW+orrjGTyvs2xd3o/Dpy+hI= +go.opentelemetry.io/collector/consumer/xconsumer v0.125.0/go.mod h1:FX0G37r0W+wXRgxxFtwEJ4rlsCB+p0cIaxtU3C4hskw= +go.opentelemetry.io/collector/featuregate v1.31.0 h1:20q7plPQZwmAiaYAa6l1m/i2qDITZuWlhjr4EkmeQls= +go.opentelemetry.io/collector/featuregate v1.31.0/go.mod h1:Y/KsHbvREENKvvN9RlpiWk/IGBK+CATBYzIIpU7nccc= +go.opentelemetry.io/collector/internal/telemetry v0.125.0 h1:6lcGOxw3dAg7LfXTKdN8ZjR+l7KvzLdEiPMhhLwG4r4= +go.opentelemetry.io/collector/internal/telemetry v0.125.0/go.mod h1:5GyFslLqjZgq1DZTtFiluxYhhXrCofHgOOOybodDPGE= +go.opentelemetry.io/collector/pdata v1.31.0 h1:P5WuLr1l2JcIvr6Dw2hl01ltp2ZafPnC4Isv+BLTBqU= +go.opentelemetry.io/collector/pdata v1.31.0/go.mod h1:m41io9nWpy7aCm/uD1L9QcKiZwOP0ldj83JEA34dmlk= +go.opentelemetry.io/collector/pdata/pprofile v0.125.0 h1:Qqlx8w1HpiYZ9RQqjmMQIysI0cHNO1nh3E/fCTeFysA= +go.opentelemetry.io/collector/pdata/pprofile v0.125.0/go.mod h1:p/yK023VxAp8hm27/1G5DPTcMIpnJy3cHGAFUQZGyaQ= +go.opentelemetry.io/collector/pdata/testdata v0.125.0 h1:due1Hl0EEVRVwfCkiamRy5E8lS6yalv0lo8Zl/SJtGw= +go.opentelemetry.io/collector/pdata/testdata v0.125.0/go.mod h1:1GpEWlgdMrd+fWsBk37ZC2YmOP5YU3gFQ4rWuCu9g24= +go.opentelemetry.io/collector/pipeline v0.125.0 h1:oitBgcAFqntDB4ihQJUHJSQ8IHqKFpPkaTVbTYdIUzM= +go.opentelemetry.io/collector/pipeline v0.125.0/go.mod h1:TO02zju/K6E+oFIOdi372Wk0MXd+Szy72zcTsFQwXl4= +go.opentelemetry.io/collector/processor v1.31.0 h1:+u7sBUpnCBsHYoALp4hfr9VEjLHHYa4uKENGITe0K9Q= +go.opentelemetry.io/collector/processor v1.31.0/go.mod h1:5hDYJ7/hTdfd2tF2Rj5Hs6+mfyFz2O7CaPzVvW1qHQc= +go.opentelemetry.io/collector/processor/processortest v0.125.0 h1:ZVAN4iZPDcWhpzKqnuok2NIuS5hwGVVQUOWkJFR12tA= +go.opentelemetry.io/collector/processor/processortest v0.125.0/go.mod h1:VAw0IRG35cWTBjBtreXeXJEgqkRegfjrH/EuLhNX2+I= +go.opentelemetry.io/collector/processor/xprocessor v0.125.0 h1:VWYPMW1VmDq6xB7M5SYjBpQCCIq3MhQ3W++wU47QpZM= +go.opentelemetry.io/collector/processor/xprocessor v0.125.0/go.mod h1:bCxUyFVlksANg8wjYZqWVsRB33lkLQ294rTrju/IZiM= +go.opentelemetry.io/collector/receiver v1.31.0 h1:OSRrCWclb1QmGPnxFMxQsdegua4vlKpZESOtDKSzKeQ= +go.opentelemetry.io/collector/receiver v1.31.0/go.mod h1:zPUiv3jgJGQSY01nx500cYJiEz6JfaR53BAvCW2tgGs= +go.opentelemetry.io/collector/receiver/receivertest v0.125.0 h1:xV3Jm3OT7SfDpJ5mXhNmK/Nch7f41whA8k0q4XkaWT8= +go.opentelemetry.io/collector/receiver/receivertest v0.125.0/go.mod h1:CoSPPn3kwVcAhdLOK5NVjMCVVjmCsFpBXU9h9I6Kdh8= +go.opentelemetry.io/collector/receiver/xreceiver v0.125.0 h1:wQ1ZgCA0Y3EFWWZ6gZDGDXT7qV5IrqkisccUWhvmmTg= +go.opentelemetry.io/collector/receiver/xreceiver v0.125.0/go.mod h1:5Kl/mtf6oIy+rizFcElkUpp3LEVTJnjAyos6z+FVsGc= +go.opentelemetry.io/contrib/bridges/otelzap v0.10.0 h1:ojdSRDvjrnm30beHOmwsSvLpoRF40MlwNCA+Oo93kXU= +go.opentelemetry.io/contrib/bridges/otelzap v0.10.0/go.mod h1:oTTm4g7NEtHSV2i/0FeVdPaPgUIZPfQkFbq0vbzqnv0= +go.opentelemetry.io/otel v1.35.0 h1:xKWKPxrxB6OtMCbmMY021CqC45J+3Onta9MqjhnusiQ= +go.opentelemetry.io/otel v1.35.0/go.mod h1:UEqy8Zp11hpkUrL73gSlELM0DupHoiq72dR+Zqel/+Y= +go.opentelemetry.io/otel/log v0.11.0 h1:c24Hrlk5WJ8JWcwbQxdBqxZdOK7PcP/LFtOtwpDTe3Y= +go.opentelemetry.io/otel/log v0.11.0/go.mod h1:U/sxQ83FPmT29trrifhQg+Zj2lo1/IPN1PF6RTFqdwc= +go.opentelemetry.io/otel/metric v1.35.0 h1:0znxYu2SNyuMSQT4Y9WDWej0VpcsxkuklLa4/siN90M= +go.opentelemetry.io/otel/metric v1.35.0/go.mod h1:nKVFgxBZ2fReX6IlyW28MgZojkoAkJGaE8CpgeAU3oE= +go.opentelemetry.io/otel/sdk v1.35.0 h1:iPctf8iprVySXSKJffSS79eOjl9pvxV9ZqOWT0QejKY= +go.opentelemetry.io/otel/sdk v1.35.0/go.mod h1:+ga1bZliga3DxJ3CQGg3updiaAJoNECOgJREo9KHGQg= +go.opentelemetry.io/otel/sdk/metric v1.35.0 h1:1RriWBmCKgkeHEhM7a2uMjMUfP7MsOF5JpUCaEqEI9o= +go.opentelemetry.io/otel/sdk/metric v1.35.0/go.mod h1:is6XYCUMpcKi+ZsOvfluY5YstFnhW0BidkR+gL+qN+w= +go.opentelemetry.io/otel/trace v1.35.0 h1:dPpEfJu1sDIqruz7BHFG3c7528f6ddfSWfFDVt/xgMs= +go.opentelemetry.io/otel/trace v1.35.0/go.mod h1:WUk7DtFp1Aw2MkvqGdwiXYDZZNvA/1J8o6xRXLrIkyc= go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto= go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE= go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0= @@ -103,20 +113,20 @@ golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.33.0 h1:74SYHlV8BIgHIFC/LrYkOGIwL19eTYXQ5wc6TBuO36I= -golang.org/x/net v0.33.0/go.mod h1:HXLR5J+9DxmrqMwG9qjGCxZ+zKXxBru04zlTvWlWuN4= +golang.org/x/net v0.39.0 h1:ZCu7HMWDxpXpaiKdhzIfaltL9Lp31x/3fCP11bc6/fY= +golang.org/x/net v0.39.0/go.mod h1:X7NRbYVEA+ewNkCNyJ513WmMdQ3BineSwVtN2zD/d+E= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.29.0 h1:TPYlXGxvx1MGTn2GiZDhnjPA9wZzZeGKHHmKhHYvgaU= -golang.org/x/sys v0.29.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.32.0 h1:s77OFDvIQeibCmezSnk/q6iAfkdiQaJi4VzroCFrN20= +golang.org/x/sys v0.32.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo= -golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ= +golang.org/x/text v0.24.0 h1:dd5Bzh4yt5KYA8f9CJHCP4FB4D51c2c6JvN37xJJkJ0= +golang.org/x/text v0.24.0/go.mod h1:L8rBsPeo2pSS+xqN0d5u2ikmjtmoJbDBT1b7nHvFCdU= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= @@ -125,12 +135,12 @@ golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -google.golang.org/genproto/googleapis/rpc v0.0.0-20241202173237-19429a94021a h1:hgh8P4EuoxpsuKMXX/To36nOFD7vixReXgn8lPGnt+o= -google.golang.org/genproto/googleapis/rpc v0.0.0-20241202173237-19429a94021a/go.mod h1:5uTbfoYQed2U9p3KIj2/Zzm02PYhndfdmML0qC3q3FU= -google.golang.org/grpc v1.70.0 h1:pWFv03aZoHzlRKHWicjsZytKAiYCtNS0dHbXnIdq7jQ= -google.golang.org/grpc v1.70.0/go.mod h1:ofIJqVKDXx/JiXrwr2IG4/zwdH9txy3IlF40RmcJSQw= -google.golang.org/protobuf v1.36.5 h1:tPhr+woSbjfYvY6/GPufUoYizxw1cF/yFoxJ2fmpwlM= -google.golang.org/protobuf v1.36.5/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE= +google.golang.org/genproto/googleapis/rpc v0.0.0-20250218202821-56aae31c358a h1:51aaUVRocpvUOSQKM6Q7VuoaktNIaMCLuhZB6DKksq4= +google.golang.org/genproto/googleapis/rpc v0.0.0-20250218202821-56aae31c358a/go.mod h1:uRxBH1mhmO8PGhU89cMcHaXKZqO+OfakD8QQO0oYwlQ= +google.golang.org/grpc v1.72.0 h1:S7UkcVa60b5AAQTaO6ZKamFp1zMZSU0fGDK2WZLbBnM= +google.golang.org/grpc v1.72.0/go.mod h1:wH5Aktxcg25y1I3w7H69nHfXdOG3UiadoBtjh3izSDM= +google.golang.org/protobuf v1.36.6 h1:z1NpPI8ku2WgiWnf+t9wTPsn6eP1L7ksHUlkfLvd9xY= +google.golang.org/protobuf v1.36.6/go.mod h1:jduwjTPXsFjZGTmRluh+L6NjiWu7pchiJ2/5YcXBHnY= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= diff --git a/module/processor/patterndetectorprocessor/patterndetector_test.go b/module/processor/patterndetectorprocessor/patterndetector_test.go index 9942ddc2..2c8429b5 100644 --- a/module/processor/patterndetectorprocessor/patterndetector_test.go +++ b/module/processor/patterndetectorprocessor/patterndetector_test.go @@ -169,7 +169,7 @@ func TestFactory_Surface(t *testing.T) { func TestFactory_CreateLogs(t *testing.T) { f := NewFactory() - p, err := f.CreateLogs(context.Background(), processortest.NewNopSettings(), f.CreateDefaultConfig(), newLogsSink()) + p, err := f.CreateLogs(context.Background(), processortest.NewNopSettings(componentType()), f.CreateDefaultConfig(), newLogsSink()) require.NoError(t, err) require.NoError(t, p.Start(context.Background(), componenttestHost{})) require.NoError(t, p.Shutdown(context.Background())) @@ -182,7 +182,10 @@ func (componenttestHost) GetExtensions() map[component.ID]component.Component func (componenttestHost) ReportFatalError(error) {} func testSettings() processor.Settings { - set := processortest.NewNopSettings() + // processortest.NewNopSettings(component.Type) at v0.122+ — + // pre-v0.120 was no-arg, v0.120-v0.121 used NewNopSettingsWithType, + // v0.122 collapsed both back into NewNopSettings(component.Type). + set := processortest.NewNopSettings(componentType()) set.ID = component.NewIDWithName(componentType(), "test") return set } diff --git a/module/processor/rankjoinprocessor/rankjoin_test.go b/module/processor/rankjoinprocessor/rankjoin_test.go index 641add61..a2c9b4dc 100644 --- a/module/processor/rankjoinprocessor/rankjoin_test.go +++ b/module/processor/rankjoinprocessor/rankjoin_test.go @@ -304,7 +304,7 @@ func TestFactory_Surface(t *testing.T) { func TestFactory_CreateLogsAndShutdown(t *testing.T) { f := NewFactory() - p, err := f.CreateLogs(context.Background(), processortest.NewNopSettings(), f.CreateDefaultConfig(), newLogsSink()) + p, err := f.CreateLogs(context.Background(), processortest.NewNopSettings(componentType()), f.CreateDefaultConfig(), newLogsSink()) if err != nil { t.Fatalf("CreateLogs: %v", err) } @@ -323,7 +323,10 @@ func (componenttestHost) GetExtensions() map[component.ID]component.Component func (componenttestHost) ReportFatalError(error) {} func testSettings() processor.Settings { - set := processortest.NewNopSettings() + // processortest.NewNopSettings(component.Type) at v0.122+ — + // pre-v0.120 was no-arg, v0.120-v0.121 used NewNopSettingsWithType, + // v0.122 collapsed both back into NewNopSettings(component.Type). + set := processortest.NewNopSettings(componentType()) set.ID = component.NewIDWithName(componentType(), "test") return set } diff --git a/module/receiver/ncclfrreceiver/nccl_fr_test.go b/module/receiver/ncclfrreceiver/nccl_fr_test.go index 55f2431e..1126f268 100644 --- a/module/receiver/ncclfrreceiver/nccl_fr_test.go +++ b/module/receiver/ncclfrreceiver/nccl_fr_test.go @@ -285,11 +285,12 @@ func TestConfig_Validate(t *testing.T) { // per-run UUID would defeat them. The wrapper lives here, not in the // production package, so production code never grows a test-only surface. func testSettings() receiver.Settings { - // NewNopSettings() is no-arg through v0.119.x; v0.120 adds - // NewNopSettingsWithType(component.Type). The component type is - // re-attached via NewIDWithName below, so BuildInfo derivation is + // NewNopSettings() is no-arg through v0.119.x; v0.120 introduces + // NewNopSettingsWithType(component.Type) which is then folded back + // into NewNopSettings(component.Type) at v0.122. The component type + // is re-attached via NewIDWithName below, so BuildInfo derivation is // unaffected. - set := receivertest.NewNopSettings() + set := receivertest.NewNopSettings(componentType()) set.ID = component.NewIDWithName(componentType(), "test") return set } diff --git a/scripts/doc-check.sh b/scripts/doc-check.sh index 5393e75d..5562b19a 100755 --- a/scripts/doc-check.sh +++ b/scripts/doc-check.sh @@ -412,10 +412,12 @@ if [ -d "$integration_dir" ]; then # makes a live API call (e.g. k8sobjectsreceiver enumerates server- # preferred resources at validate time); `tracecore validate` cannot # cover them offline, so the recipe MUST instead document a CI/ - # cluster-side verification path. The validator-recipe gate skips - # the marker with a named log line; the recipe's example YAML still - # ships and is consumed by chart / kind tests. - if ! grep -qE '^' "$recipe"; then + # cluster-side verification path. `requires-linux` covers recipes + # whose receiver Validate() rejects non-linux at v0.121+ (e.g. + # journaldreceiver: "journald is only supported on linux"). The + # validator-recipe gate runs them on Linux CI and skips on darwin + # developer laptops with a named log line; example YAML still ships. + if ! grep -qE '^' "$recipe"; then echo "doc-check: $recipe missing \`\` or \`\` marker" exit 1 fi diff --git a/scripts/validator-recipe.sh b/scripts/validator-recipe.sh index 299af693..a32c3567 100755 --- a/scripts/validator-recipe.sh +++ b/scripts/validator-recipe.sh @@ -181,6 +181,26 @@ while IFS= read -r recipe; do echo "validator-recipe: $recipe -> SKIP (requires-k8s-cluster: receiver Validate() needs a live API server; see the recipe's Verification section)" skipped_count=$((skipped_count + 1)) ;; + requires-linux) + # At v0.121+ the upstream `validate` subcommand now exercises + # the full factory.Build() path, and journaldreceiver's + # platform check rejects darwin/windows ("journald is only + # supported on linux") before the pipeline starts. The in-tree + # binary on a developer laptop cannot cover this; CI + # (ubuntu-latest) is the authority. Run there, skip elsewhere. + if [[ "$(uname -s)" == "Linux" ]]; then + echo "validator-recipe: $recipe -> tracecore validate $example (linux)" + if ! "$BIN" validate --config="$example"; then + echo "validator-recipe: tracecore rejected $example" >&2 + fail=1 + else + validated_count=$((validated_count + 1)) + fi + else + echo "validator-recipe: $recipe -> SKIP (requires-linux: receiver rejects non-linux at v0.121+ validate; CI ubuntu runner exercises this path)" + skipped_count=$((skipped_count + 1)) + fi + ;; *) echo "validator-recipe: $recipe carries unrecognized tested-against marker: $marker" >&2 fail=1