From f5d175b56d05e7756ac32d592f8465e91e3f31cf Mon Sep 17 00:00:00 2001 From: Yuri Shkuro Date: Wed, 19 Jun 2024 14:21:06 -0400 Subject: [PATCH 1/2] Add SPM build to CI (#5663) ## Which problem is this PR solving? - Part of #5608 - SPM Makefile was calling a target that was removed in previous refactoring ## Description of the changes - Build the image directly instead of calling much more expensive target - Use workflow added in #5640 to run the build - Change crossdock target to not build debug image with devle, which is expensive ## How was this change tested? - `make build && make dev` --------- Signed-off-by: mehul gautam Signed-off-by: Yuri Shkuro Co-authored-by: mehul gautam --- .github/workflows/ci-build-spm.yml | 44 ++++++++++++++++++++++++++++++ Makefile.Crossdock.mk | 4 +-- docker-compose/monitor/Makefile | 13 ++++++--- docker/Makefile | 5 ++++ 4 files changed, 60 insertions(+), 6 deletions(-) create mode 100644 .github/workflows/ci-build-spm.yml diff --git a/.github/workflows/ci-build-spm.yml b/.github/workflows/ci-build-spm.yml new file mode 100644 index 00000000000..30a1644dfc1 --- /dev/null +++ b/.github/workflows/ci-build-spm.yml @@ -0,0 +1,44 @@ +name: Test SPM + +on: + push: + branches: [main] + + pull_request: + branches: [main] + +concurrency: + group: ${{ github.workflow }}-${{ (github.event.pull_request && github.event.pull_request.number) || github.ref || github.run_id }} + cancel-in-progress: true + +# See https://github.com/ossf/scorecard/blob/main/docs/checks.md#token-permissions +permissions: + contents: read + +jobs: + spm: + runs-on: ubuntu-latest + steps: + - name: Harden Runner + uses: step-security/harden-runner@17d0e2bd7d51742c71671bd19fa12bdc9d40a3d6 # v2.8.1 + with: + egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs + + - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 + with: + submodules: true + + - name: Fetch git tags + run: | + git fetch --prune --unshallow --tags + + - uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5.0.1 + with: + go-version: 1.22.x + + - name: Setup Node.js version + uses: ./.github/actions/setup-node.js + + - name: Temporary - only run the build + run: + cd docker-compose/monitor && make build diff --git a/Makefile.Crossdock.mk b/Makefile.Crossdock.mk index 2e702310e2b..56d6f595767 100644 --- a/Makefile.Crossdock.mk +++ b/Makefile.Crossdock.mk @@ -32,8 +32,8 @@ build-crossdock-fresh: build-crossdock-linux make crossdock-fresh .PHONY: crossdock-docker-images-jaeger-backend -crossdock-docker-images-jaeger-backend: PLATFORMS=linux/amd64 -crossdock-docker-images-jaeger-backend: create-baseimg create-debugimg +crossdock-docker-images-jaeger-backend: PLATFORMS=linux/$(shell go env GOARCH) +crossdock-docker-images-jaeger-backend: create-baseimg create-fake-debugimg for component in "jaeger-agent" "jaeger-collector" "jaeger-query" "jaeger-ingester" "all-in-one" ; do \ regex="jaeger-(.*)"; \ component_suffix=$$component; \ diff --git a/docker-compose/monitor/Makefile b/docker-compose/monitor/Makefile index caa2934fc1f..1d325829f4a 100644 --- a/docker-compose/monitor/Makefile +++ b/docker-compose/monitor/Makefile @@ -1,9 +1,14 @@ .PHONY: build -build: export DOCKER_TAG = dev build: clean-jaeger - cd ../../ && \ - make build-all-in-one-linux && \ - make docker-images-jaeger-backend + cd ../../ && make build-all-in-one-linux + cd ../../ && make create-baseimg PLATFORMS=linux/$(shell go env GOARCH) + cd ../../ && docker buildx build --target release \ + --tag jaegertracing/all-in-one:dev \ + --build-arg base_image=localhost:5000/baseimg_alpine:latest \ + --build-arg debug_image=not-used \ + --build-arg TARGETARCH=$(shell go env GOARCH) \ + --load \ + cmd/all-in-one # starts up the system required for SPM using the latest otel image and a development jaeger image. # Note: the jaeger "dev" image can be built with "make build". diff --git a/docker/Makefile b/docker/Makefile index dfb72662a7d..3edf6d8803e 100644 --- a/docker/Makefile +++ b/docker/Makefile @@ -17,6 +17,11 @@ create-debugimg: prepare-docker-buildx --platform=$(PLATFORMS) \ docker/debug +create-fake-debugimg: prepare-docker-buildx + docker buildx build -t $(DEBUG_IMAGE) --push \ + --platform=$(PLATFORMS) \ + docker/base + .PHONY: prepare-docker-buildx prepare-docker-buildx: docker buildx inspect jaeger-build > /dev/null || docker buildx create --use --name=jaeger-build --buildkitd-flags="--allow-insecure-entitlement security.insecure --allow-insecure-entitlement network.host" --driver-opt="network=host" From 79352d9300175d14e6be7cac036d1de4013e8241 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Thu, 20 Jun 2024 01:57:08 +0200 Subject: [PATCH 2/2] Update All OTEL Collector contrib packages to v0.103.0 (#5660) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [github.com/open-telemetry/opentelemetry-collector-contrib/connector/spanmetricsconnector](https://togithub.com/open-telemetry/opentelemetry-collector-contrib) | `v0.102.0` -> `v0.103.0` | [![age](https://developer.mend.io/api/mc/badges/age/go/github.com%2fopen-telemetry%2fopentelemetry-collector-contrib%2fconnector%2fspanmetricsconnector/v0.103.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/go/github.com%2fopen-telemetry%2fopentelemetry-collector-contrib%2fconnector%2fspanmetricsconnector/v0.103.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/go/github.com%2fopen-telemetry%2fopentelemetry-collector-contrib%2fconnector%2fspanmetricsconnector/v0.102.0/v0.103.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/go/github.com%2fopen-telemetry%2fopentelemetry-collector-contrib%2fconnector%2fspanmetricsconnector/v0.102.0/v0.103.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | | [github.com/open-telemetry/opentelemetry-collector-contrib/exporter/kafkaexporter](https://togithub.com/open-telemetry/opentelemetry-collector-contrib) | `v0.102.0` -> `v0.103.0` | [![age](https://developer.mend.io/api/mc/badges/age/go/github.com%2fopen-telemetry%2fopentelemetry-collector-contrib%2fexporter%2fkafkaexporter/v0.103.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/go/github.com%2fopen-telemetry%2fopentelemetry-collector-contrib%2fexporter%2fkafkaexporter/v0.103.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/go/github.com%2fopen-telemetry%2fopentelemetry-collector-contrib%2fexporter%2fkafkaexporter/v0.102.0/v0.103.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/go/github.com%2fopen-telemetry%2fopentelemetry-collector-contrib%2fexporter%2fkafkaexporter/v0.102.0/v0.103.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | | [github.com/open-telemetry/opentelemetry-collector-contrib/extension/storage](https://togithub.com/open-telemetry/opentelemetry-collector-contrib) | `v0.102.0` -> `v0.103.0` | [![age](https://developer.mend.io/api/mc/badges/age/go/github.com%2fopen-telemetry%2fopentelemetry-collector-contrib%2fextension%2fstorage/v0.103.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/go/github.com%2fopen-telemetry%2fopentelemetry-collector-contrib%2fextension%2fstorage/v0.103.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/go/github.com%2fopen-telemetry%2fopentelemetry-collector-contrib%2fextension%2fstorage/v0.102.0/v0.103.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/go/github.com%2fopen-telemetry%2fopentelemetry-collector-contrib%2fextension%2fstorage/v0.102.0/v0.103.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | | [github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger](https://togithub.com/open-telemetry/opentelemetry-collector-contrib) | `v0.102.0` -> `v0.103.0` | [![age](https://developer.mend.io/api/mc/badges/age/go/github.com%2fopen-telemetry%2fopentelemetry-collector-contrib%2fpkg%2ftranslator%2fjaeger/v0.103.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/go/github.com%2fopen-telemetry%2fopentelemetry-collector-contrib%2fpkg%2ftranslator%2fjaeger/v0.103.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/go/github.com%2fopen-telemetry%2fopentelemetry-collector-contrib%2fpkg%2ftranslator%2fjaeger/v0.102.0/v0.103.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/go/github.com%2fopen-telemetry%2fopentelemetry-collector-contrib%2fpkg%2ftranslator%2fjaeger/v0.102.0/v0.103.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | | [github.com/open-telemetry/opentelemetry-collector-contrib/receiver/jaegerreceiver](https://togithub.com/open-telemetry/opentelemetry-collector-contrib) | `v0.102.0` -> `v0.103.0` | [![age](https://developer.mend.io/api/mc/badges/age/go/github.com%2fopen-telemetry%2fopentelemetry-collector-contrib%2freceiver%2fjaegerreceiver/v0.103.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/go/github.com%2fopen-telemetry%2fopentelemetry-collector-contrib%2freceiver%2fjaegerreceiver/v0.103.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/go/github.com%2fopen-telemetry%2fopentelemetry-collector-contrib%2freceiver%2fjaegerreceiver/v0.102.0/v0.103.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/go/github.com%2fopen-telemetry%2fopentelemetry-collector-contrib%2freceiver%2fjaegerreceiver/v0.102.0/v0.103.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | | [github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kafkareceiver](https://togithub.com/open-telemetry/opentelemetry-collector-contrib) | `v0.102.0` -> `v0.103.0` | [![age](https://developer.mend.io/api/mc/badges/age/go/github.com%2fopen-telemetry%2fopentelemetry-collector-contrib%2freceiver%2fkafkareceiver/v0.103.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/go/github.com%2fopen-telemetry%2fopentelemetry-collector-contrib%2freceiver%2fkafkareceiver/v0.103.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/go/github.com%2fopen-telemetry%2fopentelemetry-collector-contrib%2freceiver%2fkafkareceiver/v0.102.0/v0.103.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/go/github.com%2fopen-telemetry%2fopentelemetry-collector-contrib%2freceiver%2fkafkareceiver/v0.102.0/v0.103.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | | [github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zipkinreceiver](https://togithub.com/open-telemetry/opentelemetry-collector-contrib) | `v0.102.0` -> `v0.103.0` | [![age](https://developer.mend.io/api/mc/badges/age/go/github.com%2fopen-telemetry%2fopentelemetry-collector-contrib%2freceiver%2fzipkinreceiver/v0.103.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/go/github.com%2fopen-telemetry%2fopentelemetry-collector-contrib%2freceiver%2fzipkinreceiver/v0.103.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/go/github.com%2fopen-telemetry%2fopentelemetry-collector-contrib%2freceiver%2fzipkinreceiver/v0.102.0/v0.103.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/go/github.com%2fopen-telemetry%2fopentelemetry-collector-contrib%2freceiver%2fzipkinreceiver/v0.102.0/v0.103.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes
open-telemetry/opentelemetry-collector-contrib (github.com/open-telemetry/opentelemetry-collector-contrib/connector/spanmetricsconnector) ### [`v0.103.0`](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/blob/HEAD/CHANGELOG.md#v01030) [Compare Source](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/compare/v0.102.0...v0.103.0) ##### 🛑 Breaking changes 🛑 - `cmd/opampsupervisor,extension/opamp`: Upgrade the opamp-go library to v0.15.0 ([#​33416](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/33416)) With this change, UUIDv7 is recommended for the OpAMP extension's instance_uid field instead of ULID. ULIDs will continue to work, but may be displayed as UUIDs. The supervisor's persistent state (${storage_dir}/persistent_state.yaml) will need to be cleared to generate a new UUIDv7 instead of a ULID. This change may be incompatible with management servers using v0.14.0 of opamp-go. - `mongodbreceiver`: Now only supports `TCP` connections ([#​32199](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/32199)) This fixes a bug where hosts had to explicitly set `tcp` as the transport type. The `transport` option has been removed. - `cmd/configschema`: Removes the deprecated `configschema` command. This command will no longer be released or supported. ([#​33384](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/33384)) - `sqlserverreceiver`: sqlserver.database.io.read_latency has been renamed to sqlserver.database.latency with a `direction` attribute. ([#​29865](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/29865)) ##### 🚩 Deprecations 🚩 - `healthcheckextension`: Remove incorrect logic behind `check_collector_pipeline` config ([#​33469](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/33469)) This logic incorrectly set the pipeline to OK after waiting for enough callbacks from the opencensus library to be called. As this was broken, I'm removing it to remove the dependency on opencensus as well. Improvements will be available via healthcheckv2 extension. - `googlecloudspannerreceiver`: Mark the component as unmaintained. If we don't find new maintainers, it will be deprecated and removed. ([#​32651](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/32651)) ##### 💡 Enhancements 💡 - `filelogreceiver`: If include_file_record_number is true, it will add the file record number as the attribute `log.file.record_number` ([#​33530](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/33530)) - `kubeletstats`: Add k8s.pod.cpu.node.utilization metric ([#​33390](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/33390)) - `awss3exporter`: endpoint should contain the S3 bucket ([#​32774](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/32774)) - `awss3receiver`: Add support for encoding extensions to be used in the AWS S3 Receiver. ([#​30750](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/30750)) - `gitproviderreceiver`: Adds branch commit and line based metrics ([#​22028](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/22028)) Adds the following branch based metrics. - git.repository.branch.time - git.repository.branch.commit.aheadby.count - git.repository.branch.commit.behindby.count - git.repository.branch.line.deletion.count - git.repository.branch.line.addition.count - `statsdreceiver`: update statsd receiver to use mdatagen ([#​33524](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/33524)) - `coralogixexporter`: Allow setting application name from `cx.application.name` and `cx.subsystem.name` resource attributes ([#​33217](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/33217)) - `metricstransformprocessor`: Adds the 'count' aggregation type to the Metrics Transform Processor. ([#​24978](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/24978)) - `elasticsearchexporter`: Add support for confighttp options, notably "auth". ([#​33367](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/33367)) Add support for confighttp and related configuration settings, such as "auth". This change also means that the Elasticsearch URL may be specified as "endpoint", like the otlphttp exporter. - `elasticsearchexporter`: Check that endpoints are valid URLs during config validation. ([#​33350](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/33350)) Check that endpoints are valid URLs during config validation so that an invalid endpoint causes a fatal error during startup, rather than leading to a persistent runtime error. - `opampsupervisor`: Add config validation for the supervisor config ([#​32843](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/32843)) - `statsdreceiver`: Added received/accepted/refused metrics ([#​24278](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/24278)) - `filelogreceiver`: Add support for gzip compressed log files ([#​2328](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/2328)) - `confmap/provider/secretsmanagerprovider`: Add support for JSON formatted secrets in secretsmanagerprovider confmap ([#​32143](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/32143)) The `secretsmanagerprovider` confmap will now allow to get secret by a json key if the secret value is json. To specify key separate key from secret name/arn by `#` e.g. `mySecret#mySecretKey`. - `geoipprocessor`: Add initial processing based on source.address resource attribute ([#​32663](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/32663)) - `healthcheckv2extension`: Add shared aggregation logic for status events. ([#​26661](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/26661)) - `tailsamplingprocessor`: Simple LRU Decision Cache for "keep" decisions ([#​31583](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/31583)) - `processor/tailsampling`: Migrates internal telemetry to OpenTelemetry SDK via mdatagen ([#​31581](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/31581)) The metric names and their properties, such as bucket boundaries for histograms, were kept like before, to keep backwards compatibility. - `kafka`: Added `disable_fast_negotiation` configuration option for Kafka Kerberos authentication, allowing the disabling of PA-FX-FAST negotiation. ([#​26345](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/26345)) - `pkg/ottl`: Added `keep_matching_keys` function to allow dropping all keys from a map that don't match the pattern. ([#​32989](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/32989)) - `OTel-Arrow`: Update to OTel-Arrow v0.24.0 ([#​26491](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/26491)) - `pkg/ottl`: Add debug logs to help troubleshoot OTTL statements/conditions ([#​33274](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/33274)) - `pkg/ottl`: Introducing `append` function for appending items into an existing array ([#​32141](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/32141)) - `pkg/ottl`: Introducing `Uri` converter parsing URI string into SemConv ([#​32433](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/32433)) - `probabilisticsamplerprocessor`: Add Proportional and Equalizing sampling modes ([#​31918](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/31918)) Both the existing hash_seed mode and the two new modes use OTEP 235 semantic conventions to encode sampling probability. - `prometheusreceiver`: Resource attributes produced by the prometheus receiver now include stable semantic conventions for `server` and `url`. ([#​32814](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/32814)) To migrate from the legacy net.host.name, net.host.port, and http.scheme resource attributes, | migrate to server.address, server.port, and url.scheme, and then | set the receiver.prometheus.removeLegacyResourceAttributes feature gate. - `datadogexporter`: The Datadog Exporter now supports the `proxy_url` parameter to configure an HTTP proxy to use when sending telemetry to Datadog. ([#​33316](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/33316)) - `spanmetrics`: Produce delta temporality span metrics with StartTimeUnixNano and TimeUnixNano values representing an uninterrupted series ([#​31671](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/31671), [#​30688](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/30688)) This allows producing delta span metrics instead of the more memory-intensive cumulative metrics, specifically when a downstream component can convert the delta metrics to cumulative. - `sqlserverreceiver`: Add support for more Database IO metrics ([#​29865](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/29865)) The following metrics have been added: - sqlserver.database.latency - sqlserver.database.io - sqlserver.database.operations - `cmd/opampsupervisor`: Receive and report effective config to the OpAMP server ([#​30622](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/30622)) - `processor/transform`: Add `transform.flatten.logs` featuregate to give each log record a distinct resource and scope. ([#​32080](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/32080)) This option is useful when applying transformations which alter the resource or scope. e.g. `set(resource.attributes["to"], attributes["from"])`, which may otherwise result in unexpected behavior. Using this option typically incurs a performance penalty as the processor must compute many hashes and create copies of resource and scope information for every log record. - `receiver/windowsperfcounters`: Counter configuration now supports recreating the underlying performance query at scrape time. ([#​32798](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/32798)) ##### 🧰 Bug fixes 🧰 - `filelogreceiver`: Container parser should add k8s metadata as resource attributes and not as log record attributes ([#​33341](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/33341)) - `deltatocumulative`: properly drop samples when at limit ([#​33285](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/33285)) fixes a segfault in the limiting behavior, where streams exceeding the limit still had their samples processed. due to not being tracked, this led to a nil-pointer deref - `postgresqlreceiver`: Fix bug where `postgresql.rows` always returning 0 for `state="dead"` ([#​33489](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/33489)) - `prometheusreceiver`: Fall back to scrape config job/instance labels for aggregated metrics without instance/job labels ([#​32555](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/32555)) - `elasticsearchexporter`: Duplicate Key in JSON ([#​33454](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/33454)) - `logzioexporter`: Fix issue where log attributes were not correctly exported ([#​33231](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/33231)) - `exporter/datadog`: Prevents collector shut down when Datadog logs pipeline fails to validate API key ([#​33195](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/33195))
--- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about these updates again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://developer.mend.io/github/jaegertracing/jaeger). --------- Signed-off-by: Mend Renovate Signed-off-by: Yuri Shkuro Co-authored-by: Yuri Shkuro Co-authored-by: Yuri Shkuro --- go.mod | 29 ++++++++++++++------------- go.sum | 62 ++++++++++++++++++++++++++++++---------------------------- 2 files changed, 47 insertions(+), 44 deletions(-) diff --git a/go.mod b/go.mod index 74e3bbf2a58..d45b4b4711d 100644 --- a/go.mod +++ b/go.mod @@ -23,12 +23,12 @@ require ( github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.1.0 github.com/kr/pretty v0.3.1 github.com/olivere/elastic v6.2.37+incompatible - github.com/open-telemetry/opentelemetry-collector-contrib/connector/spanmetricsconnector v0.102.0 - github.com/open-telemetry/opentelemetry-collector-contrib/exporter/kafkaexporter v0.102.0 - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.102.0 - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/jaegerreceiver v0.102.0 - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kafkareceiver v0.102.0 - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zipkinreceiver v0.102.0 + github.com/open-telemetry/opentelemetry-collector-contrib/connector/spanmetricsconnector v0.103.0 + github.com/open-telemetry/opentelemetry-collector-contrib/exporter/kafkaexporter v0.103.0 + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.103.0 + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/jaegerreceiver v0.103.0 + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kafkareceiver v0.103.0 + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zipkinreceiver v0.103.0 github.com/prometheus/client_golang v1.19.1 github.com/prometheus/client_model v0.6.1 github.com/prometheus/common v0.54.0 @@ -119,6 +119,7 @@ require ( github.com/hashicorp/go-uuid v1.0.3 // indirect github.com/hashicorp/go-version v1.7.0 // indirect github.com/hashicorp/golang-lru v1.0.2 // indirect + github.com/hashicorp/golang-lru/v2 v2.0.7 // indirect github.com/hashicorp/hcl v1.0.0 // indirect github.com/inconshreveable/mousetrap v1.1.0 // indirect github.com/jcmturner/aescts/v2 v2.0.0 // indirect @@ -145,14 +146,14 @@ require ( github.com/modern-go/reflect2 v1.0.2 // indirect github.com/mostynb/go-grpc-compression v1.2.3 // indirect github.com/onsi/ginkgo v1.16.5 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/extension/storage v0.102.0 - github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.102.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.102.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/internal/kafka v0.102.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/batchpersignal v0.102.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.102.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/azure v0.102.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/zipkin v0.102.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/extension/storage v0.103.0 + github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.103.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.103.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/internal/kafka v0.103.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/batchpersignal v0.103.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.103.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/azure v0.103.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/zipkin v0.103.0 // indirect github.com/opentracing/opentracing-go v1.2.0 // indirect github.com/openzipkin/zipkin-go v0.4.3 // indirect github.com/pelletier/go-toml/v2 v2.2.2 // indirect diff --git a/go.sum b/go.sum index 1790f627cfb..dd882121efa 100644 --- a/go.sum +++ b/go.sum @@ -163,6 +163,8 @@ github.com/hashicorp/go-version v1.7.0 h1:5tqGy27NaOTB8yJKUZELlFAS/LTKJkrmONwQKe github.com/hashicorp/go-version v1.7.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= github.com/hashicorp/golang-lru v1.0.2 h1:dV3g9Z/unq5DpblPpw+Oqcv4dU/1omnb4Ok8iPY6p1c= github.com/hashicorp/golang-lru v1.0.2/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4= +github.com/hashicorp/golang-lru/v2 v2.0.7 h1:a+bsQ5rvGLjzHuww6tVxozPZFVghXaHOwFs4luLUK2k= +github.com/hashicorp/golang-lru/v2 v2.0.7/go.mod h1:QeFd9opnmA6QUJc5vARoKUSoFhyfM2/ZepoAG6RGpeM= github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4= github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ= github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= @@ -250,36 +252,36 @@ github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7J github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= github.com/onsi/gomega v1.27.10 h1:naR28SdDFlqrG6kScpT8VWpu1xWY5nJRCF3XaYyBjhI= github.com/onsi/gomega v1.27.10/go.mod h1:RsS8tutOdbdgzbPtzzATp12yT7kM5I5aElG3evPbQ0M= -github.com/open-telemetry/opentelemetry-collector-contrib/connector/spanmetricsconnector v0.102.0 h1:h9PLYmJx+Ko8sqz02Vf+z+O8Wx7HaZBkvXt3g0tKG14= -github.com/open-telemetry/opentelemetry-collector-contrib/connector/spanmetricsconnector v0.102.0/go.mod h1:PVQqU0d9bUVYEWOaymAUKNRaeeYizxFWkC9ibijey8c= -github.com/open-telemetry/opentelemetry-collector-contrib/exporter/kafkaexporter v0.102.0 h1:R70PpK14trQfL/Vj5oAiGRqX09s2gOWuf6t1Ae5fevQ= -github.com/open-telemetry/opentelemetry-collector-contrib/exporter/kafkaexporter v0.102.0/go.mod h1:xmy/yFFmB1Epy+czrYMbA+4xeOKvhFqNqYWU6qINeis= -github.com/open-telemetry/opentelemetry-collector-contrib/extension/storage v0.102.0 h1:7QHxeMnKzMXMw9oh5lnOHakfPpGSglxiZfbYUn6l6yc= -github.com/open-telemetry/opentelemetry-collector-contrib/extension/storage v0.102.0/go.mod h1:BtKaHa1yDHfhM9qjGUHweb0HgqFGxFSM7AMzwLXVR98= -github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.102.0 h1:PNLVcz8kJLE9V5kGnbBh277Bvl4WwiVZ+NbFbOB80WY= -github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.102.0/go.mod h1:cBbjwd8m4rBVgCQksUbAVQX1EoM5IuCyNQw2mzvibEM= -github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.102.0 h1:qsM5HhWpAfIMg8LdO4u+CHofu4UuCuJwg/M+ySO9uZA= -github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.102.0/go.mod h1:wBJlGy9Wx6s7AxIMcSne2sGw73e5ZUy1AQ/duYwpFf8= -github.com/open-telemetry/opentelemetry-collector-contrib/internal/kafka v0.102.0 h1:xBd9EXG9qvWwa2d7qDRVv/D/2gAQqn1zGbPqdjkd+O8= -github.com/open-telemetry/opentelemetry-collector-contrib/internal/kafka v0.102.0/go.mod h1:e4pc6nkNyzBi5g2RgIRjJ1slRsOY5qHIbPu0E4oM3cE= -github.com/open-telemetry/opentelemetry-collector-contrib/pkg/batchpersignal v0.102.0 h1:pVJ792+Nzcv8nLlg18XOLOWEZ/dCK+Wo3Iak5TU8rz8= -github.com/open-telemetry/opentelemetry-collector-contrib/pkg/batchpersignal v0.102.0/go.mod h1:DmkGhNL9nuSTg8fMhYNopMuF1Y3LFqu/FQHrvhBzME0= -github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.102.0 h1:vJL6lDaeI3pVA7ADnWKD3HMpI80BSrZ2UnGc+qkwqoY= -github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.102.0/go.mod h1:xtE7tds5j8PtI/wMuGb+Em5K9rJH8hm6t28Qe4QrpoU= -github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.102.0 h1:TvJYcU/DLRFCgHr7nT98k5D+qkZ4syKVxc8OJjv+K4c= -github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.102.0/go.mod h1:WzD3Ox7tywAQHknxAFpAC1oZJGItMp5mbvgUGjvzNY8= -github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/azure v0.102.0 h1:IgLMHSuraJzxLqVeM7xU7aZPcXS5/eoVnX+HBuFGQ6E= -github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/azure v0.102.0/go.mod h1:hG8EmxUvgXIiKTG6+UVcMhFeIN6UD/bswP7WYpQ2lCc= -github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.102.0 h1:4VQidhCgkJiBvBDMOukr5ixrf5uP66iW5Hb+CFsb+4E= -github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.102.0/go.mod h1:nMto9zkv0vD8YI3oGZFZS2Uu7k2oHt1d+xUHN/ofUYo= -github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/zipkin v0.102.0 h1:5M7I78lyGsH+Xyy4NoXKM/UUCa52aZQiPcSX6so6x94= -github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/zipkin v0.102.0/go.mod h1:BEQy0zEel5uIOTEFBBmvQJ4A32R6nKLtSMtC6ylLI8k= -github.com/open-telemetry/opentelemetry-collector-contrib/receiver/jaegerreceiver v0.102.0 h1:HTGSfx2HzfudY1Uczw9yTBJnGBmTVFYzpGH1z+oD0nU= -github.com/open-telemetry/opentelemetry-collector-contrib/receiver/jaegerreceiver v0.102.0/go.mod h1:Hlz24+Ah6Ojk0FUKNb1watRmTbLEru35+feroKA7dvQ= -github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kafkareceiver v0.102.0 h1:2D3niNAKkr+NRVmAJW0bquSjzHUL6Pf1qQRLRPwA13M= -github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kafkareceiver v0.102.0/go.mod h1:h0uqwH7b+NGDfFFWTjoGErMdYRdCqP1Az1/G+tfG024= -github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zipkinreceiver v0.102.0 h1:Pemo9pZa3VMYdrM/bss3f0qqVyBzPSulOBQL8VQcgN8= -github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zipkinreceiver v0.102.0/go.mod h1:fvjAM+jOQdiXCmAENKH/eWxBBqTaImbq3lpoBI4X5Ek= +github.com/open-telemetry/opentelemetry-collector-contrib/connector/spanmetricsconnector v0.103.0 h1:th1Swa6AOTpbr8Yui5/LLQjIwUZhV4wcbfvusKL9qSk= +github.com/open-telemetry/opentelemetry-collector-contrib/connector/spanmetricsconnector v0.103.0/go.mod h1:5bCbYY4xRBBIwzUOdBcezz6iff7+LtPNZBYYxk+cFro= +github.com/open-telemetry/opentelemetry-collector-contrib/exporter/kafkaexporter v0.103.0 h1:N4+Kxr4WZ4HNuU334NaqAAjngG/IRkSTGCl9c5H+QY0= +github.com/open-telemetry/opentelemetry-collector-contrib/exporter/kafkaexporter v0.103.0/go.mod h1:3rtBpjlTpg3s+bXPNM/7o7IQZQYtwytrz9PEF+ISz8E= +github.com/open-telemetry/opentelemetry-collector-contrib/extension/storage v0.103.0 h1:txNSkgEEmDyrasuGO9egQ+58i+7P/mJKdHmSHg0sO4c= +github.com/open-telemetry/opentelemetry-collector-contrib/extension/storage v0.103.0/go.mod h1:XtRqfouM/9owDyCIi2TksmSc1sfLGmLRiFhyQ7KFS6w= +github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.103.0 h1:olbjLOuCgVCiRNzdg0I9Lv7VuUHFbEuqP31fdriyqi0= +github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.103.0/go.mod h1:2Zksmb1fF+4ksNsOxSVrHz5IoC/2ljvtqJGzy7qe8+E= +github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.103.0 h1:xtU09wCMSp/VazMC4qjP69LnuUUNDj6aGNG/jmSZXTM= +github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.103.0/go.mod h1:arqw5KwD4HBC3PZeqsLqMWPmnkaOcrrW5bMndHwNyO4= +github.com/open-telemetry/opentelemetry-collector-contrib/internal/kafka v0.103.0 h1:gksMpwy9oZN14E4kRBfLtVkE8YJn++7woM1b3hQboJg= +github.com/open-telemetry/opentelemetry-collector-contrib/internal/kafka v0.103.0/go.mod h1:OLpJzn4LgzICAnyu+7mJ33rM2WOgPWpjXvZ6YKrJ6yM= +github.com/open-telemetry/opentelemetry-collector-contrib/pkg/batchpersignal v0.103.0 h1:JjHxUTE7cbrqddMLueLhVcWbxxr9INLf5sIsRBcuPUE= +github.com/open-telemetry/opentelemetry-collector-contrib/pkg/batchpersignal v0.103.0/go.mod h1:DQUw8EmCHCqTIBfHo5Fe7MyYLXSWdInDrKkINhOMuPk= +github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.103.0 h1:XYkQCe4UPFy7qmBs1zhknhe1wzPnAff4Rb4WtnD8aAQ= +github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.103.0/go.mod h1:hmeKPJaZjzOjcndDxpWnjt0781EMqvj3or01baNVoRI= +github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.103.0 h1:1cZyMMLSpSWFdfITyVc9Bb+8rn175/GGwtWZQ3nClpc= +github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.103.0/go.mod h1:o8BPP4DM2SkdkPJxJOdmgxKz5DftGcuyUXgqf5MoWAw= +github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/azure v0.103.0 h1:GiP0syg12+MrI5IpL8Qt+rQktWDMsP0/8Nu9qmMtscw= +github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/azure v0.103.0/go.mod h1:akYmkj+fLA32/LkQTJM9KIqaOvtsyjLV1NZkFU1E6w8= +github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.103.0 h1:diJ27fBrfu/oOW0bv8q3BWbVmjNLMBJF2RgzSq6KRgI= +github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.103.0/go.mod h1:u8Ell52AGRzNA5RjfaunzYQWBb+7tKb3ZlAQJyQzNXM= +github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/zipkin v0.103.0 h1:2Fxuu4RbroXQFpUB/ZuZXyUb4QoL8XgOe7KlkK3TxHU= +github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/zipkin v0.103.0/go.mod h1:o3ju9lTtG+PnSjffls/sEGvgfYMG1jZZeT1h0rzI+T4= +github.com/open-telemetry/opentelemetry-collector-contrib/receiver/jaegerreceiver v0.103.0 h1:Hblr03Vde7jlnAsLSayhq1VG+gpTfVJNVvZqnx0fwDY= +github.com/open-telemetry/opentelemetry-collector-contrib/receiver/jaegerreceiver v0.103.0/go.mod h1:kY7NC2dfScT9zmss53yuhZNkv7XQGl46yXxTr+xEYPo= +github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kafkareceiver v0.103.0 h1:/BabP7nnV4cyI1JZNQn5zzCrJymzPpCjCMnCXex0/kU= +github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kafkareceiver v0.103.0/go.mod h1:TGJchv8xra/30Kz8oaOgvF1XyARtOSYqWowAJ5NxQyI= +github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zipkinreceiver v0.103.0 h1:AvfCPJtrzfAmoF58vTA3pehns51NUEOmulPxrYALroY= +github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zipkinreceiver v0.103.0/go.mod h1:WzOea7GxCLC23+HBXHoYwahGC+YJsu066pV4MzUL0fg= github.com/opentracing/opentracing-go v1.2.0 h1:uEJPy/1a5RIPAJ0Ov+OIO8OxWu77jEv+1B0VhjKrZUs= github.com/opentracing/opentracing-go v1.2.0/go.mod h1:GxEUsuufX4nBwe+T+Wl9TAgYrxe9dPLANfrWvHYVTgc= github.com/openzipkin/zipkin-go v0.4.3 h1:9EGwpqkgnwdEIJ+Od7QVSEIH+ocmm5nPat0G7sjsSdg=