From 109048d5d2be67688cafe7df1af5069fc1be8506 Mon Sep 17 00:00:00 2001 From: Dmitrii Anoshin Date: Mon, 20 Nov 2023 05:15:06 -0800 Subject: [PATCH 01/52] [chore] [exporterhelper] Remove duplicate test TestZeroSize (#8957) The same tests as TestZeroSizeNoConsumers --- .../exporterhelper/internal/bounded_memory_queue_test.go | 7 ------- 1 file changed, 7 deletions(-) diff --git a/exporter/exporterhelper/internal/bounded_memory_queue_test.go b/exporter/exporterhelper/internal/bounded_memory_queue_test.go index ee14be9040e..fc68f4e5c5a 100644 --- a/exporter/exporterhelper/internal/bounded_memory_queue_test.go +++ b/exporter/exporterhelper/internal/bounded_memory_queue_test.go @@ -138,13 +138,6 @@ func TestShutdownWhileNotEmpty(t *testing.T) { assert.Equal(t, 0, q.Size()) } -func TestZeroSize(t *testing.T) { - q := NewBoundedMemoryQueue[string](0) - assert.NoError(t, q.Start(context.Background(), componenttest.NewNopHost())) - assert.ErrorIs(t, q.Offer(context.Background(), "a"), ErrQueueIsFull) - assert.NoError(t, q.Shutdown(context.Background())) -} - func Benchmark_QueueUsage_10000_1_50000(b *testing.B) { queueUsage(b, 10000, 1, 50000) } From 0d1d24475a18bfa1020802c36df1002535b70432 Mon Sep 17 00:00:00 2001 From: Dmitrii Anoshin Date: Mon, 20 Nov 2023 08:16:17 -0800 Subject: [PATCH 02/52] [chore] Fix flaky test TestPersistentQueue_FullCapacity (#8959) Fixes https://github.com/open-telemetry/opentelemetry-collector/issues/8958 --- exporter/exporterhelper/internal/persistent_queue_test.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/exporter/exporterhelper/internal/persistent_queue_test.go b/exporter/exporterhelper/internal/persistent_queue_test.go index 53a3256e04f..bd13ec83c11 100644 --- a/exporter/exporterhelper/internal/persistent_queue_test.go +++ b/exporter/exporterhelper/internal/persistent_queue_test.go @@ -74,7 +74,7 @@ func TestPersistentQueue_FullCapacity(t *testing.T) { start := make(chan struct{}) done := make(chan struct{}) pq := createAndStartTestPersistentQueue(t, 5, 1, func(context.Context, ptrace.Traces) { - start <- struct{}{} + <-start <-done }) assert.Equal(t, 0, pq.Size()) @@ -83,7 +83,7 @@ func TestPersistentQueue_FullCapacity(t *testing.T) { // First request is picked by the consumer. Wait until the consumer is blocked on done. assert.NoError(t, pq.Offer(context.Background(), req)) - <-start + close(start) for i := 0; i < 10; i++ { result := pq.Offer(context.Background(), newTraces(1, 10)) From 9391c12de3c61c6bbf23a2b9d43a3c054d37247a Mon Sep 17 00:00:00 2001 From: Dmitrii Anoshin Date: Mon, 20 Nov 2023 14:54:38 -0800 Subject: [PATCH 03/52] [chore] [exporterhelper] Simplify async test TestBoundedQueue (#8956) --- .../internal/bounded_memory_queue_test.go | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/exporter/exporterhelper/internal/bounded_memory_queue_test.go b/exporter/exporterhelper/internal/bounded_memory_queue_test.go index fc68f4e5c5a..6526ddf7e88 100644 --- a/exporter/exporterhelper/internal/bounded_memory_queue_test.go +++ b/exporter/exporterhelper/internal/bounded_memory_queue_test.go @@ -26,18 +26,13 @@ import ( func TestBoundedQueue(t *testing.T) { q := NewBoundedMemoryQueue[string](1) - var startLock sync.Mutex + waitCh := make(chan struct{}) - startLock.Lock() // block consumers consumerState := newConsumerState(t) consumers := NewQueueConsumers(q, 1, func(_ context.Context, item string) { consumerState.record(item) - - // block further processing until startLock is released - startLock.Lock() - //nolint:staticcheck // SA2001 ignore this! - startLock.Unlock() + <-waitCh }) assert.NoError(t, consumers.Start(context.Background(), componenttest.NewNopHost())) @@ -60,7 +55,7 @@ func TestBoundedQueue(t *testing.T) { assert.ErrorIs(t, q.Offer(context.Background(), "c"), ErrQueueIsFull) assert.Equal(t, 1, q.Size()) - startLock.Unlock() // unblock consumer + close(waitCh) // unblock consumer consumerState.assertConsumed(map[string]bool{ "a": true, From 97b7b0f09efbd18211172377b3d48ada4899969e Mon Sep 17 00:00:00 2001 From: Pablo Baeyens Date: Tue, 21 Nov 2023 01:04:53 +0100 Subject: [PATCH 04/52] [docs, .github] Add new issue template for stabilizing a module (#8935) This adds a new release template for stabilizing a module. The intent is to try this out for pdata and featuregate, and iterate on the template over time. --- .github/ISSUE_TEMPLATE/stabilization.md | 24 ++++++++++++++++++++++++ docs/release.md | 4 ++++ 2 files changed, 28 insertions(+) create mode 100644 .github/ISSUE_TEMPLATE/stabilization.md diff --git a/.github/ISSUE_TEMPLATE/stabilization.md b/.github/ISSUE_TEMPLATE/stabilization.md new file mode 100644 index 00000000000..be39d8a3f13 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/stabilization.md @@ -0,0 +1,24 @@ +--- +name: Module stabilization +about: Stabilize a module before a 1.0 release +title: 'Stabilize module X' +labels: 'stabilization' +assignees: '' +--- + +Before stabilizing a module, an approver or maintainer must make sure that the following criteria are met: + +- [ ] One RC release or more have been done of this module +- [ ] No open issues or PRs in the module that would require breaking changes +- [ ] No TODOs in the module code that would require breaking changes +- [ ] No deprecated symbols in the module +- [ ] No symbols marked as experimental in the module +- [ ] The module follows the [Coding guidelines](https://github.com/open-telemetry/opentelemetry-collector/blob/main/CONTRIBUTING.md) + +Please also make sure to publicly announce our intent to stabilize the module on: + +- [ ] The #otel-collector CNCF Slack Channel +- [ ] The #opentelemetry CNCF Slack channel +- [ ] A Collector SIG meeting (if unable to attend, just add to the agenda) + +To help other people verify the above criteria, please link to an RC release, the announcement and other links used to complete the above in a comment on this issue. diff --git a/docs/release.md b/docs/release.md index f249064587d..a964b97b79d 100644 --- a/docs/release.md +++ b/docs/release.md @@ -141,6 +141,10 @@ The following documents the procedure to release a bugfix 7. Once the branch has been merged, it will be auto-deleted. Restore the release branch via GitHub. 8. Once the patch is release, disable the **Merge pull request** setting. +## 1.0 release + +Stable modules adhere to our [versioning document guarantees](../VERSIONING.md), so we need to be careful before releasing. Before adding a module to the stable module set and making a first 1.0 release, please [open a new stabilization issue](https://github.com/open-telemetry/opentelemetry-collector/issues/new/choose) and follow the instructions in the issue template. + ## Release schedule | Date | Version | Release manager | From 036d70913845dc63275f7e189649769248dffa2f Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 20 Nov 2023 20:17:17 -0800 Subject: [PATCH 05/52] Update google.golang.org/genproto/googleapis/rpc digest to 83a465c (#8966) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![Mend Renovate logo banner](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [google.golang.org/genproto/googleapis/rpc](https://togithub.com/googleapis/go-genproto) | require | digest | `bbf56f3` -> `83a465c` | --- ### Configuration 📅 **Schedule**: Branch creation - "on tuesday" (UTC), 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 this update 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/open-telemetry/opentelemetry-collector). --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: opentelemetrybot <107717825+opentelemetrybot@users.noreply.github.com> --- cmd/otelcorecol/go.mod | 2 +- cmd/otelcorecol/go.sum | 6 +++--- exporter/otlpexporter/go.mod | 2 +- exporter/otlpexporter/go.sum | 4 ++-- exporter/otlphttpexporter/go.mod | 2 +- exporter/otlphttpexporter/go.sum | 4 ++-- receiver/otlpreceiver/go.mod | 2 +- receiver/otlpreceiver/go.sum | 4 ++-- 8 files changed, 13 insertions(+), 13 deletions(-) diff --git a/cmd/otelcorecol/go.mod b/cmd/otelcorecol/go.mod index 4fb7fbb2e48..6f98987aeee 100644 --- a/cmd/otelcorecol/go.mod +++ b/cmd/otelcorecol/go.mod @@ -120,7 +120,7 @@ require ( golang.org/x/text v0.14.0 // indirect gonum.org/v1/gonum v0.14.0 // indirect google.golang.org/genproto/googleapis/api v0.0.0-20230822172742-b8732ec3820d // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20231106174013-bbf56f31fb17 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20231120223509-83a465c0220f // indirect google.golang.org/grpc v1.59.0 // indirect google.golang.org/protobuf v1.31.0 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect diff --git a/cmd/otelcorecol/go.sum b/cmd/otelcorecol/go.sum index 033f6137d04..ecd280f93a4 100644 --- a/cmd/otelcorecol/go.sum +++ b/cmd/otelcorecol/go.sum @@ -614,11 +614,11 @@ google.golang.org/genproto v0.0.0-20200618031413-b414f8b61790/go.mod h1:jDfRM7Fc google.golang.org/genproto v0.0.0-20200729003335-053ba62fc06f/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20200804131852-c06518451d9c/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20200825200019-8632dd797987/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20231030173426-d783a09b4405 h1:I6WNifs6pF9tNdSob2W24JtyxIYjzFB9qDlpUC76q+U= +google.golang.org/genproto v0.0.0-20231106174013-bbf56f31fb17 h1:wpZ8pe2x1Q3f2KyT5f8oP/fa9rHAKgFPr/HZdNuS+PQ= google.golang.org/genproto/googleapis/api v0.0.0-20230822172742-b8732ec3820d h1:DoPTO70H+bcDXcd39vOqb2viZxgqeBeSGtZ55yZU4/Q= google.golang.org/genproto/googleapis/api v0.0.0-20230822172742-b8732ec3820d/go.mod h1:KjSP20unUpOx5kyQUFa7k4OJg0qeJ7DEZflGDu2p6Bk= -google.golang.org/genproto/googleapis/rpc v0.0.0-20231106174013-bbf56f31fb17 h1:Jyp0Hsi0bmHXG6k9eATXoYtjd6e2UzZ1SCn/wIupY14= -google.golang.org/genproto/googleapis/rpc v0.0.0-20231106174013-bbf56f31fb17/go.mod h1:oQ5rr10WTTMvP4A36n8JpR1OrO1BEiV4f78CneXZxkA= +google.golang.org/genproto/googleapis/rpc v0.0.0-20231120223509-83a465c0220f h1:ultW7fxlIvee4HYrtnaRPon9HpEgFk5zYpmfMgtKB5I= +google.golang.org/genproto/googleapis/rpc v0.0.0-20231120223509-83a465c0220f/go.mod h1:L9KNLi232K1/xB6f7AlSX692koaRnKaWSR0stBki0Yc= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= diff --git a/exporter/otlpexporter/go.mod b/exporter/otlpexporter/go.mod index 0aa4bd1cadd..18f95514521 100644 --- a/exporter/otlpexporter/go.mod +++ b/exporter/otlpexporter/go.mod @@ -16,7 +16,7 @@ require ( go.opentelemetry.io/collector/exporter v0.89.0 go.opentelemetry.io/collector/pdata v1.0.0-rcv0018 go.opentelemetry.io/collector/receiver/otlpreceiver v0.89.0 - google.golang.org/genproto/googleapis/rpc v0.0.0-20231106174013-bbf56f31fb17 + google.golang.org/genproto/googleapis/rpc v0.0.0-20231120223509-83a465c0220f google.golang.org/grpc v1.59.0 google.golang.org/protobuf v1.31.0 ) diff --git a/exporter/otlpexporter/go.sum b/exporter/otlpexporter/go.sum index 6505d3d5a32..6e6e740ab47 100644 --- a/exporter/otlpexporter/go.sum +++ b/exporter/otlpexporter/go.sum @@ -193,8 +193,8 @@ google.golang.org/appengine v1.6.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6 google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo= -google.golang.org/genproto/googleapis/rpc v0.0.0-20231106174013-bbf56f31fb17 h1:Jyp0Hsi0bmHXG6k9eATXoYtjd6e2UzZ1SCn/wIupY14= -google.golang.org/genproto/googleapis/rpc v0.0.0-20231106174013-bbf56f31fb17/go.mod h1:oQ5rr10WTTMvP4A36n8JpR1OrO1BEiV4f78CneXZxkA= +google.golang.org/genproto/googleapis/rpc v0.0.0-20231120223509-83a465c0220f h1:ultW7fxlIvee4HYrtnaRPon9HpEgFk5zYpmfMgtKB5I= +google.golang.org/genproto/googleapis/rpc v0.0.0-20231120223509-83a465c0220f/go.mod h1:L9KNLi232K1/xB6f7AlSX692koaRnKaWSR0stBki0Yc= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY= diff --git a/exporter/otlphttpexporter/go.mod b/exporter/otlphttpexporter/go.mod index f2a34b7e6df..17eccfd4c72 100644 --- a/exporter/otlphttpexporter/go.mod +++ b/exporter/otlphttpexporter/go.mod @@ -17,7 +17,7 @@ require ( go.opentelemetry.io/collector/receiver v0.89.0 go.opentelemetry.io/collector/receiver/otlpreceiver v0.89.0 go.uber.org/zap v1.26.0 - google.golang.org/genproto/googleapis/rpc v0.0.0-20231106174013-bbf56f31fb17 + google.golang.org/genproto/googleapis/rpc v0.0.0-20231120223509-83a465c0220f google.golang.org/grpc v1.59.0 google.golang.org/protobuf v1.31.0 ) diff --git a/exporter/otlphttpexporter/go.sum b/exporter/otlphttpexporter/go.sum index 6505d3d5a32..6e6e740ab47 100644 --- a/exporter/otlphttpexporter/go.sum +++ b/exporter/otlphttpexporter/go.sum @@ -193,8 +193,8 @@ google.golang.org/appengine v1.6.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6 google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo= -google.golang.org/genproto/googleapis/rpc v0.0.0-20231106174013-bbf56f31fb17 h1:Jyp0Hsi0bmHXG6k9eATXoYtjd6e2UzZ1SCn/wIupY14= -google.golang.org/genproto/googleapis/rpc v0.0.0-20231106174013-bbf56f31fb17/go.mod h1:oQ5rr10WTTMvP4A36n8JpR1OrO1BEiV4f78CneXZxkA= +google.golang.org/genproto/googleapis/rpc v0.0.0-20231120223509-83a465c0220f h1:ultW7fxlIvee4HYrtnaRPon9HpEgFk5zYpmfMgtKB5I= +google.golang.org/genproto/googleapis/rpc v0.0.0-20231120223509-83a465c0220f/go.mod h1:L9KNLi232K1/xB6f7AlSX692koaRnKaWSR0stBki0Yc= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY= diff --git a/receiver/otlpreceiver/go.mod b/receiver/otlpreceiver/go.mod index 32bfb8305de..de76d24f57e 100644 --- a/receiver/otlpreceiver/go.mod +++ b/receiver/otlpreceiver/go.mod @@ -19,7 +19,7 @@ require ( go.opentelemetry.io/collector/receiver v0.89.0 go.opentelemetry.io/collector/semconv v0.89.0 go.uber.org/zap v1.26.0 - google.golang.org/genproto/googleapis/rpc v0.0.0-20231106174013-bbf56f31fb17 + google.golang.org/genproto/googleapis/rpc v0.0.0-20231120223509-83a465c0220f google.golang.org/grpc v1.59.0 google.golang.org/protobuf v1.31.0 ) diff --git a/receiver/otlpreceiver/go.sum b/receiver/otlpreceiver/go.sum index 919a334fd33..0c5e495a5fe 100644 --- a/receiver/otlpreceiver/go.sum +++ b/receiver/otlpreceiver/go.sum @@ -549,8 +549,8 @@ google.golang.org/genproto v0.0.0-20200618031413-b414f8b61790/go.mod h1:jDfRM7Fc google.golang.org/genproto v0.0.0-20200729003335-053ba62fc06f/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20200804131852-c06518451d9c/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20200825200019-8632dd797987/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto/googleapis/rpc v0.0.0-20231106174013-bbf56f31fb17 h1:Jyp0Hsi0bmHXG6k9eATXoYtjd6e2UzZ1SCn/wIupY14= -google.golang.org/genproto/googleapis/rpc v0.0.0-20231106174013-bbf56f31fb17/go.mod h1:oQ5rr10WTTMvP4A36n8JpR1OrO1BEiV4f78CneXZxkA= +google.golang.org/genproto/googleapis/rpc v0.0.0-20231120223509-83a465c0220f h1:ultW7fxlIvee4HYrtnaRPon9HpEgFk5zYpmfMgtKB5I= +google.golang.org/genproto/googleapis/rpc v0.0.0-20231120223509-83a465c0220f/go.mod h1:L9KNLi232K1/xB6f7AlSX692koaRnKaWSR0stBki0Yc= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= From 62114595b2e1417a66b68c74c567b442f406d08d Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 20 Nov 2023 20:20:41 -0800 Subject: [PATCH 06/52] Update module github.com/klauspost/compress to v1.17.3 (#8968) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![Mend Renovate logo banner](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [github.com/klauspost/compress](https://togithub.com/klauspost/compress) | require | patch | `v1.17.2` -> `v1.17.3` | --- ### Release Notes
klauspost/compress (github.com/klauspost/compress) ### [`v1.17.3`](https://togithub.com/klauspost/compress/releases/tag/v1.17.3) [Compare Source](https://togithub.com/klauspost/compress/compare/v1.17.2...v1.17.3) #### What's Changed - fse: Fix max header size by [@​klauspost](https://togithub.com/klauspost) in [https://github.com/klauspost/compress/pull/881](https://togithub.com/klauspost/compress/pull/881) - zstd: Improve better/best compression by [@​klauspost](https://togithub.com/klauspost) in [https://github.com/klauspost/compress/pull/877](https://togithub.com/klauspost/compress/pull/877) - gzhttp: Fix missing content type on Close by [@​klauspost](https://togithub.com/klauspost) in [https://github.com/klauspost/compress/pull/883](https://togithub.com/klauspost/compress/pull/883) **Full Changelog**: https://github.com/klauspost/compress/compare/v1.17.2...v1.17.3
--- ### Configuration 📅 **Schedule**: Branch creation - "on tuesday" (UTC), 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 this update 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/open-telemetry/opentelemetry-collector). --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: opentelemetrybot <107717825+opentelemetrybot@users.noreply.github.com> --- cmd/otelcorecol/go.mod | 2 +- cmd/otelcorecol/go.sum | 4 ++-- config/confighttp/go.mod | 2 +- config/confighttp/go.sum | 4 ++-- exporter/otlpexporter/go.mod | 2 +- exporter/otlpexporter/go.sum | 4 ++-- exporter/otlphttpexporter/go.mod | 2 +- exporter/otlphttpexporter/go.sum | 4 ++-- receiver/otlpreceiver/go.mod | 2 +- receiver/otlpreceiver/go.sum | 4 ++-- 10 files changed, 15 insertions(+), 15 deletions(-) diff --git a/cmd/otelcorecol/go.mod b/cmd/otelcorecol/go.mod index 6f98987aeee..e043b0e250c 100644 --- a/cmd/otelcorecol/go.mod +++ b/cmd/otelcorecol/go.mod @@ -49,7 +49,7 @@ require ( github.com/hashicorp/go-version v1.6.0 // indirect github.com/inconshreveable/mousetrap v1.1.0 // indirect github.com/json-iterator/go v1.1.12 // indirect - github.com/klauspost/compress v1.17.2 // indirect + github.com/klauspost/compress v1.17.3 // indirect github.com/knadh/koanf/maps v0.1.1 // indirect github.com/knadh/koanf/providers/confmap v0.1.0 // indirect github.com/knadh/koanf/v2 v2.0.1 // indirect diff --git a/cmd/otelcorecol/go.sum b/cmd/otelcorecol/go.sum index ecd280f93a4..5d05c26fbb4 100644 --- a/cmd/otelcorecol/go.sum +++ b/cmd/otelcorecol/go.sum @@ -188,8 +188,8 @@ github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7V github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM= github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= -github.com/klauspost/compress v1.17.2 h1:RlWWUY/Dr4fL8qk9YG7DTZ7PDgME2V4csBXA8L/ixi4= -github.com/klauspost/compress v1.17.2/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQskQzEyD//IeE= +github.com/klauspost/compress v1.17.3 h1:qkRjuerhUU1EmXLYGkSH6EZL+vPSxIrYjLNAK4slzwA= +github.com/klauspost/compress v1.17.3/go.mod h1:/dCuZOvVtNoHsyb+cuJD3itjs3NbnF6KH9zAO4BDxPM= github.com/knadh/koanf/maps v0.1.1 h1:G5TjmUh2D7G2YWf5SQQqSiHRJEjaicvU0KpypqB3NIs= github.com/knadh/koanf/maps v0.1.1/go.mod h1:npD/QZY3V6ghQDdcQzl1W4ICNVTkohC8E73eI2xW4yI= github.com/knadh/koanf/providers/confmap v0.1.0 h1:gOkxhHkemwG4LezxxN8DMOFopOPghxRVp7JbIvdvqzU= diff --git a/config/confighttp/go.mod b/config/confighttp/go.mod index 5135ae9cd3c..3cdb4281988 100644 --- a/config/confighttp/go.mod +++ b/config/confighttp/go.mod @@ -4,7 +4,7 @@ go 1.20 require ( github.com/golang/snappy v0.0.4 - github.com/klauspost/compress v1.17.2 + github.com/klauspost/compress v1.17.3 github.com/rs/cors v1.10.1 github.com/stretchr/testify v1.8.4 go.opentelemetry.io/collector v0.89.0 diff --git a/config/confighttp/go.sum b/config/confighttp/go.sum index e37ee5bc1dd..083ee61b1d5 100644 --- a/config/confighttp/go.sum +++ b/config/confighttp/go.sum @@ -23,8 +23,8 @@ github.com/hashicorp/go-version v1.6.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09 github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM= github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= -github.com/klauspost/compress v1.17.2 h1:RlWWUY/Dr4fL8qk9YG7DTZ7PDgME2V4csBXA8L/ixi4= -github.com/klauspost/compress v1.17.2/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQskQzEyD//IeE= +github.com/klauspost/compress v1.17.3 h1:qkRjuerhUU1EmXLYGkSH6EZL+vPSxIrYjLNAK4slzwA= +github.com/klauspost/compress v1.17.3/go.mod h1:/dCuZOvVtNoHsyb+cuJD3itjs3NbnF6KH9zAO4BDxPM= github.com/knadh/koanf/maps v0.1.1 h1:G5TjmUh2D7G2YWf5SQQqSiHRJEjaicvU0KpypqB3NIs= github.com/knadh/koanf/maps v0.1.1/go.mod h1:npD/QZY3V6ghQDdcQzl1W4ICNVTkohC8E73eI2xW4yI= github.com/knadh/koanf/providers/confmap v0.1.0 h1:gOkxhHkemwG4LezxxN8DMOFopOPghxRVp7JbIvdvqzU= diff --git a/exporter/otlpexporter/go.mod b/exporter/otlpexporter/go.mod index 18f95514521..a8a9d75b67f 100644 --- a/exporter/otlpexporter/go.mod +++ b/exporter/otlpexporter/go.mod @@ -34,7 +34,7 @@ require ( github.com/golang/snappy v0.0.4 // indirect github.com/hashicorp/go-version v1.6.0 // indirect github.com/json-iterator/go v1.1.12 // indirect - github.com/klauspost/compress v1.17.2 // indirect + github.com/klauspost/compress v1.17.3 // indirect github.com/knadh/koanf/maps v0.1.1 // indirect github.com/knadh/koanf/providers/confmap v0.1.0 // indirect github.com/knadh/koanf/v2 v2.0.1 // indirect diff --git a/exporter/otlpexporter/go.sum b/exporter/otlpexporter/go.sum index 6e6e740ab47..5ce14494311 100644 --- a/exporter/otlpexporter/go.sum +++ b/exporter/otlpexporter/go.sum @@ -68,8 +68,8 @@ github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnr github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo= github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= -github.com/klauspost/compress v1.17.2 h1:RlWWUY/Dr4fL8qk9YG7DTZ7PDgME2V4csBXA8L/ixi4= -github.com/klauspost/compress v1.17.2/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQskQzEyD//IeE= +github.com/klauspost/compress v1.17.3 h1:qkRjuerhUU1EmXLYGkSH6EZL+vPSxIrYjLNAK4slzwA= +github.com/klauspost/compress v1.17.3/go.mod h1:/dCuZOvVtNoHsyb+cuJD3itjs3NbnF6KH9zAO4BDxPM= github.com/knadh/koanf/maps v0.1.1 h1:G5TjmUh2D7G2YWf5SQQqSiHRJEjaicvU0KpypqB3NIs= github.com/knadh/koanf/maps v0.1.1/go.mod h1:npD/QZY3V6ghQDdcQzl1W4ICNVTkohC8E73eI2xW4yI= github.com/knadh/koanf/providers/confmap v0.1.0 h1:gOkxhHkemwG4LezxxN8DMOFopOPghxRVp7JbIvdvqzU= diff --git a/exporter/otlphttpexporter/go.mod b/exporter/otlphttpexporter/go.mod index 17eccfd4c72..8a5df566974 100644 --- a/exporter/otlphttpexporter/go.mod +++ b/exporter/otlphttpexporter/go.mod @@ -35,7 +35,7 @@ require ( github.com/golang/snappy v0.0.4 // indirect github.com/hashicorp/go-version v1.6.0 // indirect github.com/json-iterator/go v1.1.12 // indirect - github.com/klauspost/compress v1.17.2 // indirect + github.com/klauspost/compress v1.17.3 // indirect github.com/knadh/koanf/maps v0.1.1 // indirect github.com/knadh/koanf/providers/confmap v0.1.0 // indirect github.com/knadh/koanf/v2 v2.0.1 // indirect diff --git a/exporter/otlphttpexporter/go.sum b/exporter/otlphttpexporter/go.sum index 6e6e740ab47..5ce14494311 100644 --- a/exporter/otlphttpexporter/go.sum +++ b/exporter/otlphttpexporter/go.sum @@ -68,8 +68,8 @@ github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnr github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo= github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= -github.com/klauspost/compress v1.17.2 h1:RlWWUY/Dr4fL8qk9YG7DTZ7PDgME2V4csBXA8L/ixi4= -github.com/klauspost/compress v1.17.2/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQskQzEyD//IeE= +github.com/klauspost/compress v1.17.3 h1:qkRjuerhUU1EmXLYGkSH6EZL+vPSxIrYjLNAK4slzwA= +github.com/klauspost/compress v1.17.3/go.mod h1:/dCuZOvVtNoHsyb+cuJD3itjs3NbnF6KH9zAO4BDxPM= github.com/knadh/koanf/maps v0.1.1 h1:G5TjmUh2D7G2YWf5SQQqSiHRJEjaicvU0KpypqB3NIs= github.com/knadh/koanf/maps v0.1.1/go.mod h1:npD/QZY3V6ghQDdcQzl1W4ICNVTkohC8E73eI2xW4yI= github.com/knadh/koanf/providers/confmap v0.1.0 h1:gOkxhHkemwG4LezxxN8DMOFopOPghxRVp7JbIvdvqzU= diff --git a/receiver/otlpreceiver/go.mod b/receiver/otlpreceiver/go.mod index de76d24f57e..2ae46943be1 100644 --- a/receiver/otlpreceiver/go.mod +++ b/receiver/otlpreceiver/go.mod @@ -4,7 +4,7 @@ go 1.20 require ( github.com/gogo/protobuf v1.3.2 - github.com/klauspost/compress v1.17.2 + github.com/klauspost/compress v1.17.3 github.com/stretchr/testify v1.8.4 go.opentelemetry.io/collector v0.89.0 go.opentelemetry.io/collector/component v0.89.0 diff --git a/receiver/otlpreceiver/go.sum b/receiver/otlpreceiver/go.sum index 0c5e495a5fe..48ead14d39c 100644 --- a/receiver/otlpreceiver/go.sum +++ b/receiver/otlpreceiver/go.sum @@ -174,8 +174,8 @@ github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7V github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM= github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= -github.com/klauspost/compress v1.17.2 h1:RlWWUY/Dr4fL8qk9YG7DTZ7PDgME2V4csBXA8L/ixi4= -github.com/klauspost/compress v1.17.2/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQskQzEyD//IeE= +github.com/klauspost/compress v1.17.3 h1:qkRjuerhUU1EmXLYGkSH6EZL+vPSxIrYjLNAK4slzwA= +github.com/klauspost/compress v1.17.3/go.mod h1:/dCuZOvVtNoHsyb+cuJD3itjs3NbnF6KH9zAO4BDxPM= github.com/knadh/koanf/maps v0.1.1 h1:G5TjmUh2D7G2YWf5SQQqSiHRJEjaicvU0KpypqB3NIs= github.com/knadh/koanf/maps v0.1.1/go.mod h1:npD/QZY3V6ghQDdcQzl1W4ICNVTkohC8E73eI2xW4yI= github.com/knadh/koanf/providers/confmap v0.1.0 h1:gOkxhHkemwG4LezxxN8DMOFopOPghxRVp7JbIvdvqzU= From 4e4160f22e915234a0fe5fd5e333b09b3ab3bc52 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 20 Nov 2023 21:40:33 -0800 Subject: [PATCH 07/52] Update module github.com/mikefarah/yq/v4 to v4.40.2 (#8969) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![Mend Renovate logo banner](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [github.com/mikefarah/yq/v4](https://togithub.com/mikefarah/yq) | require | patch | `v4.40.1` -> `v4.40.2` | --- ### Release Notes
mikefarah/yq (github.com/mikefarah/yq/v4) ### [`v4.40.2`](https://togithub.com/mikefarah/yq/releases/tag/v4.40.2): - Official [Compare Source](https://togithub.com/mikefarah/yq/compare/v4.40.1...v4.40.2) Thank you for all your support! I've fixed some of the issues that were kindly raised :) Happy to make the release official! - Do not panic when StdIn is closed ([#​1867](https://togithub.com/mikefarah/yq/issues/1867)) Thanks [@​aleskandro](https://togithub.com/aleskandro)! - Fixed issue when update against self [#​1869](https://togithub.com/mikefarah/yq/issues/1869) - Fixed multi doc anchor bug [#​1861](https://togithub.com/mikefarah/yq/issues/1861) - Fixes doc line separator issue when reading expression file [#​1860](https://togithub.com/mikefarah/yq/issues/1860) - Bumped dependencies
--- ### Configuration 📅 **Schedule**: Branch creation - "on tuesday" (UTC), 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 this update 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/open-telemetry/opentelemetry-collector). --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: opentelemetrybot <107717825+opentelemetrybot@users.noreply.github.com> --- internal/tools/go.mod | 8 ++++---- internal/tools/go.sum | 16 ++++++++-------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/internal/tools/go.mod b/internal/tools/go.mod index c6570b86ac0..4e2da47bf92 100644 --- a/internal/tools/go.mod +++ b/internal/tools/go.mod @@ -8,7 +8,7 @@ require ( github.com/golangci/golangci-lint v1.55.1 github.com/google/addlicense v1.1.1 github.com/jcchavezs/porto v0.6.0 - github.com/mikefarah/yq/v4 v4.40.1 + github.com/mikefarah/yq/v4 v4.40.2 github.com/pavius/impi v0.0.3 go.opentelemetry.io/build-tools/checkfile v0.12.0 go.opentelemetry.io/build-tools/chloggen v0.12.0 @@ -65,11 +65,11 @@ require ( github.com/davecgh/go-spew v1.1.1 // indirect github.com/denis-tingaikin/go-header v0.4.3 // indirect github.com/dimchansky/utfbom v1.1.1 // indirect - github.com/elliotchance/orderedmap v1.5.0 // indirect + github.com/elliotchance/orderedmap v1.5.1 // indirect github.com/emirpasic/gods v1.18.1 // indirect github.com/esimonov/ifshort v1.0.4 // indirect github.com/ettle/strcase v0.1.1 // indirect - github.com/fatih/color v1.15.0 // indirect + github.com/fatih/color v1.16.0 // indirect github.com/fatih/structtag v1.2.0 // indirect github.com/firefart/nonamedreturns v1.0.4 // indirect github.com/fsnotify/fsnotify v1.7.0 // indirect @@ -136,7 +136,7 @@ require ( github.com/maratori/testpackage v1.1.1 // indirect github.com/matoous/godox v0.0.0-20230222163458-006bad1f9d26 // indirect github.com/mattn/go-colorable v0.1.13 // indirect - github.com/mattn/go-isatty v0.0.19 // indirect + github.com/mattn/go-isatty v0.0.20 // indirect github.com/mattn/go-runewidth v0.0.9 // indirect github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0 // indirect github.com/mbilski/exhaustivestruct v1.2.0 // indirect diff --git a/internal/tools/go.sum b/internal/tools/go.sum index 4e66ffd3138..d8e95bafed3 100644 --- a/internal/tools/go.sum +++ b/internal/tools/go.sum @@ -155,8 +155,8 @@ github.com/denis-tingaikin/go-header v0.4.3/go.mod h1:0wOCWuN71D5qIgE2nz9KrKmuYB 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/elazarl/goproxy v0.0.0-20230808193330-2592e75ae04a h1:mATvB/9r/3gvcejNsXKSkQ6lcIaNec2nyfOdlTBR2lU= -github.com/elliotchance/orderedmap v1.5.0 h1:1IsExUsjv5XNBD3ZdC7jkAAqLWOOKdbPTmkHx63OsBg= -github.com/elliotchance/orderedmap v1.5.0/go.mod h1:wsDwEaX5jEoyhbs7x93zk2H/qv0zwuhg4inXhDkYqys= +github.com/elliotchance/orderedmap v1.5.1 h1:G1X4PYlljzimbdQ3RXmtIZiQ9d6aRQ3sH1nzjq5mECE= +github.com/elliotchance/orderedmap v1.5.1/go.mod h1:wsDwEaX5jEoyhbs7x93zk2H/qv0zwuhg4inXhDkYqys= github.com/emirpasic/gods v1.18.1 h1:FXtiHYKDGKCW2KzwZKx0iC0PQmdlorYgdFG9jPXJ1Bc= github.com/emirpasic/gods v1.18.1/go.mod h1:8tpGGwCnJ5H4r6BWwaV6OrWmMoPhUl5jm/FMNAnJvWQ= github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= @@ -169,8 +169,8 @@ github.com/esimonov/ifshort v1.0.4 h1:6SID4yGWfRae/M7hkVDVVyppy8q/v9OuxNdmjLQStB github.com/esimonov/ifshort v1.0.4/go.mod h1:Pe8zjlRrJ80+q2CxHLfEOfTwxCZ4O+MuhcHcfgNWTk0= github.com/ettle/strcase v0.1.1 h1:htFueZyVeE1XNnMEfbqp5r67qAN/4r6ya1ysq8Q+Zcw= github.com/ettle/strcase v0.1.1/go.mod h1:hzDLsPC7/lwKyBOywSHEP89nt2pDgdy+No1NBA9o9VY= -github.com/fatih/color v1.15.0 h1:kOqh6YHBtK8aywxGerMG2Eq3H6Qgoqeo13Bk2Mv/nBs= -github.com/fatih/color v1.15.0/go.mod h1:0h5ZqXfHYED7Bhv2ZJamyIOUej9KtShiJESRwBDUSsw= +github.com/fatih/color v1.16.0 h1:zmkK9Ngbjj+K0yRhTVONQh1p/HknKYSlNT+vZCzyokM= +github.com/fatih/color v1.16.0/go.mod h1:fL2Sau1YI5c0pdGEVCbKQbLXB6edEj1ZgiY4NijnWvE= github.com/fatih/structtag v1.2.0 h1:/OdNE99OxoI/PqaW/SuSK9uxxT3f/tcSZgon/ssNSx4= github.com/fatih/structtag v1.2.0/go.mod h1:mBJUNpUnHmRKrKlQQlmCrh5PuhftFbNv8Ys4/aAZl94= github.com/firefart/nonamedreturns v1.0.4 h1:abzI1p7mAEPYuR4A+VLKn4eNDOycjYo2phmY9sfv40Y= @@ -425,8 +425,8 @@ github.com/matryer/is v1.4.0/go.mod h1:8I/i5uYgLzgsgEloJE1U6xx5HkBQpAZvepWuujKwM github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA= github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg= github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= -github.com/mattn/go-isatty v0.0.19 h1:JITubQf0MOLdlGRuRq+jtsDlekdYPia9ZFsB8h/APPA= -github.com/mattn/go-isatty v0.0.19/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= +github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY= +github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= github.com/mattn/go-runewidth v0.0.9 h1:Lm995f3rfxdpd6TSmuVCHVb/QhupuXlYr8sCI/QdE+0= github.com/mattn/go-runewidth v0.0.9/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI= github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= @@ -436,8 +436,8 @@ github.com/mbilski/exhaustivestruct v1.2.0 h1:wCBmUnSYufAHO6J4AVWY6ff+oxWxsVFrwg github.com/mbilski/exhaustivestruct v1.2.0/go.mod h1:OeTBVxQWoEmB2J2JCHmXWPJ0aksxSUOUy+nvtVEfzXc= github.com/mgechev/revive v1.3.4 h1:k/tO3XTaWY4DEHal9tWBkkUMJYO/dLDVyMmAQxmIMDc= github.com/mgechev/revive v1.3.4/go.mod h1:W+pZCMu9qj8Uhfs1iJMQsEFLRozUfvwFwqVvRbSNLVw= -github.com/mikefarah/yq/v4 v4.40.1 h1:rc4aVCWlpS2Cs5GzX2g6Hp8nbk9UX6Ulr3vnkKMAUW8= -github.com/mikefarah/yq/v4 v4.40.1/go.mod h1:i/9RH2cZEwmzz6My0QfUIXyBUgrwFbRayztYOHzpUF8= +github.com/mikefarah/yq/v4 v4.40.2 h1:KA+s3fc1sB8GhOJOAzoyJlNJSD6u7+nbXJmcwCSCviU= +github.com/mikefarah/yq/v4 v4.40.2/go.mod h1:TSqdLNAFlwmIGQBQYIzeOX+wDWkCTWfRGWDrxQwGCaQ= github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y= github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= github.com/mitchellh/mapstructure v1.5.1-0.20220423185008-bf980b35cac4 h1:BpfhmLKZf+SjVanKKhCgf3bg+511DmU9eDQTen7LLbY= From 4f464ce1f9dc11eaa17c74724bbddc7afa801c3f Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 20 Nov 2023 21:51:16 -0800 Subject: [PATCH 08/52] Update module go.opentelemetry.io/contrib/config to v0.1.1 (#8971) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![Mend Renovate logo banner](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [go.opentelemetry.io/contrib/config](https://togithub.com/open-telemetry/opentelemetry-go-contrib) | require | patch | `v0.1.0` -> `v0.1.1` | --- ### Configuration 📅 **Schedule**: Branch creation - "on tuesday" (UTC), 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 this update 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/open-telemetry/opentelemetry-collector). --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: opentelemetrybot <107717825+opentelemetrybot@users.noreply.github.com> --- cmd/otelcorecol/go.mod | 2 +- cmd/otelcorecol/go.sum | 4 ++-- exporter/otlpexporter/go.mod | 2 +- exporter/otlpexporter/go.sum | 4 ++-- exporter/otlphttpexporter/go.mod | 2 +- exporter/otlphttpexporter/go.sum | 4 ++-- extension/zpagesextension/go.mod | 2 +- extension/zpagesextension/go.sum | 4 ++-- go.mod | 2 +- go.sum | 4 ++-- otelcol/go.mod | 2 +- otelcol/go.sum | 4 ++-- receiver/otlpreceiver/go.mod | 2 +- receiver/otlpreceiver/go.sum | 4 ++-- service/go.mod | 2 +- service/go.sum | 4 ++-- 16 files changed, 24 insertions(+), 24 deletions(-) diff --git a/cmd/otelcorecol/go.mod b/cmd/otelcorecol/go.mod index e043b0e250c..f5bfccdba9d 100644 --- a/cmd/otelcorecol/go.mod +++ b/cmd/otelcorecol/go.mod @@ -94,7 +94,7 @@ require ( go.opentelemetry.io/collector/pdata v1.0.0-rcv0018 // indirect go.opentelemetry.io/collector/semconv v0.89.0 // indirect go.opentelemetry.io/collector/service v0.89.0 // indirect - go.opentelemetry.io/contrib/config v0.1.0 // indirect + go.opentelemetry.io/contrib/config v0.1.1 // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.46.1 // indirect go.opentelemetry.io/contrib/propagators/b3 v1.21.1 // indirect diff --git a/cmd/otelcorecol/go.sum b/cmd/otelcorecol/go.sum index 5d05c26fbb4..5939fea06e2 100644 --- a/cmd/otelcorecol/go.sum +++ b/cmd/otelcorecol/go.sum @@ -316,8 +316,8 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/contrib/config v0.1.0 h1:5N2zOlUsAy4khX3ftfMWQRRl9HoSPbZ+96muywRdaLs= -go.opentelemetry.io/contrib/config v0.1.0/go.mod h1:h1OB+0kulQiQH9U2pp2RYjWUV127hc47wtFutejyofg= +go.opentelemetry.io/contrib/config v0.1.1 h1:lIUTrMWkfDE0GvzBLhwv6ATDB1vntrnTsRvUMkZKnfQ= +go.opentelemetry.io/contrib/config v0.1.1/go.mod h1:rDrK4+PS6Cs+WIphU/GO5Sk4TGV36lEQqk/Z1vZkaLI= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.0 h1:PzIubN4/sjByhDRHLviCjJuweBXWFZWhghjg7cS28+M= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.0/go.mod h1:Ct6zzQEuGK3WpJs2n4dn+wfJYzd/+hNnxMRTWjGn30M= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.46.1 h1:aFJWCqJMNjENlcleuuOkGAPH82y0yULBScfXcIEdS24= diff --git a/exporter/otlpexporter/go.mod b/exporter/otlpexporter/go.mod index a8a9d75b67f..f1f5a4a0a76 100644 --- a/exporter/otlpexporter/go.mod +++ b/exporter/otlpexporter/go.mod @@ -55,7 +55,7 @@ require ( go.opentelemetry.io/collector/extension/auth v0.89.0 // indirect go.opentelemetry.io/collector/featuregate v1.0.0-rcv0018 // indirect go.opentelemetry.io/collector/receiver v0.89.0 // indirect - go.opentelemetry.io/contrib/config v0.1.0 // indirect + go.opentelemetry.io/contrib/config v0.1.1 // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.46.1 // indirect go.opentelemetry.io/otel v1.21.0 // indirect diff --git a/exporter/otlpexporter/go.sum b/exporter/otlpexporter/go.sum index 5ce14494311..a56fb5bea93 100644 --- a/exporter/otlpexporter/go.sum +++ b/exporter/otlpexporter/go.sum @@ -116,8 +116,8 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/contrib/config v0.1.0 h1:5N2zOlUsAy4khX3ftfMWQRRl9HoSPbZ+96muywRdaLs= -go.opentelemetry.io/contrib/config v0.1.0/go.mod h1:h1OB+0kulQiQH9U2pp2RYjWUV127hc47wtFutejyofg= +go.opentelemetry.io/contrib/config v0.1.1 h1:lIUTrMWkfDE0GvzBLhwv6ATDB1vntrnTsRvUMkZKnfQ= +go.opentelemetry.io/contrib/config v0.1.1/go.mod h1:rDrK4+PS6Cs+WIphU/GO5Sk4TGV36lEQqk/Z1vZkaLI= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.0 h1:PzIubN4/sjByhDRHLviCjJuweBXWFZWhghjg7cS28+M= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.0/go.mod h1:Ct6zzQEuGK3WpJs2n4dn+wfJYzd/+hNnxMRTWjGn30M= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.46.1 h1:aFJWCqJMNjENlcleuuOkGAPH82y0yULBScfXcIEdS24= diff --git a/exporter/otlphttpexporter/go.mod b/exporter/otlphttpexporter/go.mod index 8a5df566974..22e994491d1 100644 --- a/exporter/otlphttpexporter/go.mod +++ b/exporter/otlphttpexporter/go.mod @@ -56,7 +56,7 @@ require ( go.opentelemetry.io/collector/extension v0.89.0 // indirect go.opentelemetry.io/collector/extension/auth v0.89.0 // indirect go.opentelemetry.io/collector/featuregate v1.0.0-rcv0018 // indirect - go.opentelemetry.io/contrib/config v0.1.0 // indirect + go.opentelemetry.io/contrib/config v0.1.1 // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.46.1 // indirect go.opentelemetry.io/otel v1.21.0 // indirect diff --git a/exporter/otlphttpexporter/go.sum b/exporter/otlphttpexporter/go.sum index 5ce14494311..a56fb5bea93 100644 --- a/exporter/otlphttpexporter/go.sum +++ b/exporter/otlphttpexporter/go.sum @@ -116,8 +116,8 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/contrib/config v0.1.0 h1:5N2zOlUsAy4khX3ftfMWQRRl9HoSPbZ+96muywRdaLs= -go.opentelemetry.io/contrib/config v0.1.0/go.mod h1:h1OB+0kulQiQH9U2pp2RYjWUV127hc47wtFutejyofg= +go.opentelemetry.io/contrib/config v0.1.1 h1:lIUTrMWkfDE0GvzBLhwv6ATDB1vntrnTsRvUMkZKnfQ= +go.opentelemetry.io/contrib/config v0.1.1/go.mod h1:rDrK4+PS6Cs+WIphU/GO5Sk4TGV36lEQqk/Z1vZkaLI= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.0 h1:PzIubN4/sjByhDRHLviCjJuweBXWFZWhghjg7cS28+M= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.0/go.mod h1:Ct6zzQEuGK3WpJs2n4dn+wfJYzd/+hNnxMRTWjGn30M= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.46.1 h1:aFJWCqJMNjENlcleuuOkGAPH82y0yULBScfXcIEdS24= diff --git a/extension/zpagesextension/go.mod b/extension/zpagesextension/go.mod index 0b1af4b9331..478a6cbfd1c 100644 --- a/extension/zpagesextension/go.mod +++ b/extension/zpagesextension/go.mod @@ -32,7 +32,7 @@ require ( go.opentelemetry.io/collector/config/configtelemetry v0.89.0 // indirect go.opentelemetry.io/collector/featuregate v1.0.0-rcv0018 // indirect go.opentelemetry.io/collector/pdata v1.0.0-rcv0018 // indirect - go.opentelemetry.io/contrib/config v0.1.0 // indirect + go.opentelemetry.io/contrib/config v0.1.1 // indirect go.opentelemetry.io/otel v1.21.0 // indirect go.opentelemetry.io/otel/metric v1.21.0 // indirect go.opentelemetry.io/otel/sdk/metric v1.21.0 // indirect diff --git a/extension/zpagesextension/go.sum b/extension/zpagesextension/go.sum index e24992bd7ce..5fa66a2ba32 100644 --- a/extension/zpagesextension/go.sum +++ b/extension/zpagesextension/go.sum @@ -37,8 +37,8 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/contrib/config v0.1.0 h1:5N2zOlUsAy4khX3ftfMWQRRl9HoSPbZ+96muywRdaLs= -go.opentelemetry.io/contrib/config v0.1.0/go.mod h1:h1OB+0kulQiQH9U2pp2RYjWUV127hc47wtFutejyofg= +go.opentelemetry.io/contrib/config v0.1.1 h1:lIUTrMWkfDE0GvzBLhwv6ATDB1vntrnTsRvUMkZKnfQ= +go.opentelemetry.io/contrib/config v0.1.1/go.mod h1:rDrK4+PS6Cs+WIphU/GO5Sk4TGV36lEQqk/Z1vZkaLI= go.opentelemetry.io/contrib/zpages v0.46.1 h1:U8Hh84dc+vJTVgRnL+QKWtWD2iqTSKibrQ85EeQqsNg= go.opentelemetry.io/contrib/zpages v0.46.1/go.mod h1:1Wq9YTzkhr3Jkyi/sVrasFSppVzJQcvFf2Vc2ExZd6c= go.opentelemetry.io/otel v1.21.0 h1:hzLeKBZEL7Okw2mGzZ0cc4k/A7Fta0uoPgaJCr8fsFc= diff --git a/go.mod b/go.mod index 2e246080c9a..3556267546d 100644 --- a/go.mod +++ b/go.mod @@ -19,7 +19,7 @@ require ( go.opentelemetry.io/collector/pdata v1.0.0-rcv0018 go.opentelemetry.io/collector/processor v0.89.0 go.opentelemetry.io/collector/receiver v0.89.0 - go.opentelemetry.io/contrib/config v0.1.0 + go.opentelemetry.io/contrib/config v0.1.1 go.opentelemetry.io/otel v1.21.0 go.opentelemetry.io/otel/exporters/prometheus v0.44.0 go.opentelemetry.io/otel/sdk v1.21.0 diff --git a/go.sum b/go.sum index d97321eb406..bc952f8182c 100644 --- a/go.sum +++ b/go.sum @@ -283,8 +283,8 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/contrib/config v0.1.0 h1:5N2zOlUsAy4khX3ftfMWQRRl9HoSPbZ+96muywRdaLs= -go.opentelemetry.io/contrib/config v0.1.0/go.mod h1:h1OB+0kulQiQH9U2pp2RYjWUV127hc47wtFutejyofg= +go.opentelemetry.io/contrib/config v0.1.1 h1:lIUTrMWkfDE0GvzBLhwv6ATDB1vntrnTsRvUMkZKnfQ= +go.opentelemetry.io/contrib/config v0.1.1/go.mod h1:rDrK4+PS6Cs+WIphU/GO5Sk4TGV36lEQqk/Z1vZkaLI= go.opentelemetry.io/otel v1.21.0 h1:hzLeKBZEL7Okw2mGzZ0cc4k/A7Fta0uoPgaJCr8fsFc= go.opentelemetry.io/otel v1.21.0/go.mod h1:QZzNPQPm1zLX4gZK4cMi+71eaorMSGT3A4znnUvNNEo= go.opentelemetry.io/otel/exporters/prometheus v0.44.0 h1:08qeJgaPC0YEBu2PQMbqU3rogTlyzpjhCI2b58Yn00w= diff --git a/otelcol/go.mod b/otelcol/go.mod index 3771809d438..58aae1c4417 100644 --- a/otelcol/go.mod +++ b/otelcol/go.mod @@ -69,7 +69,7 @@ require ( go.opentelemetry.io/collector/consumer v0.89.0 // indirect go.opentelemetry.io/collector/pdata v1.0.0-rcv0018 // indirect go.opentelemetry.io/collector/semconv v0.89.0 // indirect - go.opentelemetry.io/contrib/config v0.1.0 // indirect + go.opentelemetry.io/contrib/config v0.1.1 // indirect go.opentelemetry.io/contrib/propagators/b3 v1.21.1 // indirect go.opentelemetry.io/otel v1.21.0 // indirect go.opentelemetry.io/otel/bridge/opencensus v0.44.0 // indirect diff --git a/otelcol/go.sum b/otelcol/go.sum index 05dc2faa9fc..d6050f85a3b 100644 --- a/otelcol/go.sum +++ b/otelcol/go.sum @@ -298,8 +298,8 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/contrib/config v0.1.0 h1:5N2zOlUsAy4khX3ftfMWQRRl9HoSPbZ+96muywRdaLs= -go.opentelemetry.io/contrib/config v0.1.0/go.mod h1:h1OB+0kulQiQH9U2pp2RYjWUV127hc47wtFutejyofg= +go.opentelemetry.io/contrib/config v0.1.1 h1:lIUTrMWkfDE0GvzBLhwv6ATDB1vntrnTsRvUMkZKnfQ= +go.opentelemetry.io/contrib/config v0.1.1/go.mod h1:rDrK4+PS6Cs+WIphU/GO5Sk4TGV36lEQqk/Z1vZkaLI= go.opentelemetry.io/contrib/propagators/b3 v1.21.1 h1:WPYiUgmw3+b7b3sQ1bFBFAf0q+Di9dvNc3AtYfnT4RQ= go.opentelemetry.io/contrib/propagators/b3 v1.21.1/go.mod h1:EmzokPoSqsYMBVK4nRnhsfm5mbn8J1eDuz/U1UaQaWg= go.opentelemetry.io/contrib/zpages v0.46.1 h1:U8Hh84dc+vJTVgRnL+QKWtWD2iqTSKibrQ85EeQqsNg= diff --git a/receiver/otlpreceiver/go.mod b/receiver/otlpreceiver/go.mod index 2ae46943be1..c46800b9415 100644 --- a/receiver/otlpreceiver/go.mod +++ b/receiver/otlpreceiver/go.mod @@ -66,7 +66,7 @@ require ( go.opentelemetry.io/collector/extension v0.89.0 // indirect go.opentelemetry.io/collector/extension/auth v0.89.0 // indirect go.opentelemetry.io/collector/featuregate v1.0.0-rcv0018 // indirect - go.opentelemetry.io/contrib/config v0.1.0 // indirect + go.opentelemetry.io/contrib/config v0.1.1 // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.46.1 // indirect go.opentelemetry.io/otel v1.21.0 // indirect diff --git a/receiver/otlpreceiver/go.sum b/receiver/otlpreceiver/go.sum index 48ead14d39c..cf383b7f05a 100644 --- a/receiver/otlpreceiver/go.sum +++ b/receiver/otlpreceiver/go.sum @@ -281,8 +281,8 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/contrib/config v0.1.0 h1:5N2zOlUsAy4khX3ftfMWQRRl9HoSPbZ+96muywRdaLs= -go.opentelemetry.io/contrib/config v0.1.0/go.mod h1:h1OB+0kulQiQH9U2pp2RYjWUV127hc47wtFutejyofg= +go.opentelemetry.io/contrib/config v0.1.1 h1:lIUTrMWkfDE0GvzBLhwv6ATDB1vntrnTsRvUMkZKnfQ= +go.opentelemetry.io/contrib/config v0.1.1/go.mod h1:rDrK4+PS6Cs+WIphU/GO5Sk4TGV36lEQqk/Z1vZkaLI= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.0 h1:PzIubN4/sjByhDRHLviCjJuweBXWFZWhghjg7cS28+M= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.0/go.mod h1:Ct6zzQEuGK3WpJs2n4dn+wfJYzd/+hNnxMRTWjGn30M= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.46.1 h1:aFJWCqJMNjENlcleuuOkGAPH82y0yULBScfXcIEdS24= diff --git a/service/go.mod b/service/go.mod index 677fd450dfc..f10b1028c9e 100644 --- a/service/go.mod +++ b/service/go.mod @@ -26,7 +26,7 @@ require ( go.opentelemetry.io/collector/processor v0.89.0 go.opentelemetry.io/collector/receiver v0.89.0 go.opentelemetry.io/collector/semconv v0.89.0 - go.opentelemetry.io/contrib/config v0.1.0 + go.opentelemetry.io/contrib/config v0.1.1 go.opentelemetry.io/contrib/propagators/b3 v1.21.1 go.opentelemetry.io/otel v1.21.0 go.opentelemetry.io/otel/bridge/opencensus v0.44.0 diff --git a/service/go.sum b/service/go.sum index 6f123fd52e1..4fc1edcb973 100644 --- a/service/go.sum +++ b/service/go.sum @@ -290,8 +290,8 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/contrib/config v0.1.0 h1:5N2zOlUsAy4khX3ftfMWQRRl9HoSPbZ+96muywRdaLs= -go.opentelemetry.io/contrib/config v0.1.0/go.mod h1:h1OB+0kulQiQH9U2pp2RYjWUV127hc47wtFutejyofg= +go.opentelemetry.io/contrib/config v0.1.1 h1:lIUTrMWkfDE0GvzBLhwv6ATDB1vntrnTsRvUMkZKnfQ= +go.opentelemetry.io/contrib/config v0.1.1/go.mod h1:rDrK4+PS6Cs+WIphU/GO5Sk4TGV36lEQqk/Z1vZkaLI= go.opentelemetry.io/contrib/propagators/b3 v1.21.1 h1:WPYiUgmw3+b7b3sQ1bFBFAf0q+Di9dvNc3AtYfnT4RQ= go.opentelemetry.io/contrib/propagators/b3 v1.21.1/go.mod h1:EmzokPoSqsYMBVK4nRnhsfm5mbn8J1eDuz/U1UaQaWg= go.opentelemetry.io/contrib/zpages v0.46.1 h1:U8Hh84dc+vJTVgRnL+QKWtWD2iqTSKibrQ85EeQqsNg= From 7f56849c0d15312890f68d5a406dc3f22698b84f Mon Sep 17 00:00:00 2001 From: Alex Boten Date: Tue, 21 Nov 2023 02:20:48 -0800 Subject: [PATCH 09/52] [service] remove _total suffix for otel generated metrics (#8965) This ensures backwards compatibility with the metrics generated via opencensus by default today. Part of #7454 Signed-off-by: Alex Boten --- .chloggen/codeboten_prom-without-suffix.yaml | 25 +++++++++++++++++++ obsreport/obsreporttest/obsreporttest.go | 2 +- .../obsreporttest/otelprometheuschecker.go | 6 +---- processor/batchprocessor/metrics_test.go | 7 +----- service/internal/proctelemetry/config.go | 5 +++- .../proctelemetry/process_telemetry_test.go | 7 +----- service/telemetry_test.go | 24 +++++++++--------- 7 files changed, 45 insertions(+), 31 deletions(-) create mode 100755 .chloggen/codeboten_prom-without-suffix.yaml diff --git a/.chloggen/codeboten_prom-without-suffix.yaml b/.chloggen/codeboten_prom-without-suffix.yaml new file mode 100755 index 00000000000..645b24a36a1 --- /dev/null +++ b/.chloggen/codeboten_prom-without-suffix.yaml @@ -0,0 +1,25 @@ +# Use this changelog template to create an entry for release notes. + +# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' +change_type: breaking + +# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver) +component: service + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: "To remain backwards compatible w/ the metrics generated today, otel generated metrics will be generated without the `_total` suffix" + +# One or more tracking issues or pull requests related to the change +issues: [7454] + +# (Optional) One or more lines of additional information to render under the primary note. +# These lines will be padded with 2 spaces and then inserted directly into the document. +# Use pipe (|) for multiline entries. +subtext: + +# Optional: The change log or logs in which this entry should be included. +# e.g. '[user]' or '[user, api]' +# Include 'user' if the change is relevant to end users. +# Include 'api' if there is a change to a library API. +# Default: '[user]' +change_logs: [] \ No newline at end of file diff --git a/obsreport/obsreporttest/obsreporttest.go b/obsreport/obsreporttest/obsreporttest.go index 04b032b5a81..383ecb22595 100644 --- a/obsreport/obsreporttest/obsreporttest.go +++ b/obsreport/obsreporttest/obsreporttest.go @@ -160,7 +160,7 @@ func SetupTelemetry(id component.ID) (TestTelemetry, error) { promRegOtel := prometheus.NewRegistry() - exp, err := otelprom.New(otelprom.WithRegisterer(promRegOtel), otelprom.WithoutUnits(), otelprom.WithoutScopeInfo()) + exp, err := otelprom.New(otelprom.WithRegisterer(promRegOtel), otelprom.WithoutUnits(), otelprom.WithoutScopeInfo(), otelprom.WithoutCounterSuffixes()) if err != nil { return settings, err } diff --git a/obsreport/obsreporttest/otelprometheuschecker.go b/obsreport/obsreporttest/otelprometheuschecker.go index 2081e5bc1fc..962bffe879f 100644 --- a/obsreport/obsreporttest/otelprometheuschecker.go +++ b/obsreport/obsreporttest/otelprometheuschecker.go @@ -150,11 +150,7 @@ func (pc *prometheusChecker) getMetric(expectedName string, expectedType io_prom metricFamily, ok := parsed[expectedName] if !ok { - // OTel Go adds `_total` suffix for all monotonic sum. - metricFamily, ok = parsed[expectedName+"_total"] - if !ok { - return nil, fmt.Errorf("metric '%s' not found", expectedName) - } + return nil, fmt.Errorf("metric '%s' not found", expectedName) } if metricFamily.Type.String() != expectedType.String() { diff --git a/processor/batchprocessor/metrics_test.go b/processor/batchprocessor/metrics_test.go index 6e8fc490929..46b2f37b2d1 100644 --- a/processor/batchprocessor/metrics_test.go +++ b/processor/batchprocessor/metrics_test.go @@ -86,7 +86,7 @@ func setupTelemetry(t *testing.T, useOtel bool) testTelemetry { if useOtel { promReg := prometheus.NewRegistry() - exporter, err := otelprom.New(otelprom.WithRegisterer(promReg), otelprom.WithoutUnits(), otelprom.WithoutScopeInfo()) + exporter, err := otelprom.New(otelprom.WithRegisterer(promReg), otelprom.WithoutUnits(), otelprom.WithoutScopeInfo(), otelprom.WithoutCounterSuffixes()) require.NoError(t, err) telemetry.meterProvider = sdkmetric.NewMeterProvider( @@ -202,11 +202,6 @@ func (tt *testTelemetry) assertBoundaries(t *testing.T, expected []float64, hist } func (tt *testTelemetry) getMetric(t *testing.T, name string, mtype io_prometheus_client.MetricType, got map[string]*io_prometheus_client.MetricFamily) *io_prometheus_client.Metric { - if tt.useOtel && mtype == io_prometheus_client.MetricType_COUNTER { - // OTel Go suffixes counters with `_total` - name += "_total" - } - metricFamily, ok := got[name] require.True(t, ok, "expected metric '%s' not found", name) require.Equal(t, mtype, metricFamily.GetType()) diff --git a/service/internal/proctelemetry/config.go b/service/internal/proctelemetry/config.go index dad1ea9ef42..3a57ed2f226 100644 --- a/service/internal/proctelemetry/config.go +++ b/service/internal/proctelemetry/config.go @@ -210,7 +210,10 @@ func initPrometheusExporter(prometheusConfig *config.Prometheus, asyncErrorChann otelprom.WithoutUnits(), // Disabled for the moment until this becomes stable, and we are ready to break backwards compatibility. otelprom.WithoutScopeInfo(), - otelprom.WithProducer(opencensus.NewMetricProducer())) + otelprom.WithProducer(opencensus.NewMetricProducer()), + // This allows us to produce metrics that are backwards compatible w/ opencensus + otelprom.WithoutCounterSuffixes(), + ) if err != nil { return nil, nil, fmt.Errorf("error creating otel prometheus exporter: %w", err) } diff --git a/service/internal/proctelemetry/process_telemetry_test.go b/service/internal/proctelemetry/process_telemetry_test.go index 5caa96417bd..98a3b5a279c 100644 --- a/service/internal/proctelemetry/process_telemetry_test.go +++ b/service/internal/proctelemetry/process_telemetry_test.go @@ -52,7 +52,6 @@ var expectedMetrics = []string{ } var otelExpectedMetrics = []string{ - // OTel Go adds `_total` suffix "process_uptime", "process_runtime_heap_alloc_bytes", "process_runtime_total_alloc_bytes", @@ -73,7 +72,7 @@ func setupTelemetry(t *testing.T) testTelemetry { require.NoError(t, err) promReg := prometheus.NewRegistry() - exporter, err := otelprom.New(otelprom.WithRegisterer(promReg), otelprom.WithoutUnits()) + exporter, err := otelprom.New(otelprom.WithRegisterer(promReg), otelprom.WithoutUnits(), otelprom.WithoutCounterSuffixes()) require.NoError(t, err) settings.meterProvider = sdkmetric.NewMeterProvider( @@ -112,10 +111,6 @@ func TestOtelProcessTelemetry(t *testing.T) { for _, metricName := range tel.expectedMetrics { metric, ok := mp[metricName] - if !ok { - withSuffix := metricName + "_total" - metric, ok = mp[withSuffix] - } require.True(t, ok) require.True(t, len(metric.Metric) == 1) var metricValue float64 diff --git a/service/telemetry_test.go b/service/telemetry_test.go index c7169190b58..1b414730a58 100644 --- a/service/telemetry_test.go +++ b/service/telemetry_test.go @@ -126,15 +126,15 @@ func TestTelemetryInit(t *testing.T) { name: "UseOpenTelemetryForInternalMetrics", useOtel: true, expectedMetrics: map[string]metricValue{ - metricPrefix + ocPrefix + counterName + "_total": { + metricPrefix + ocPrefix + counterName: { value: 13, labels: map[string]string{}, }, - metricPrefix + otelPrefix + counterName + "_total": { + metricPrefix + otelPrefix + counterName: { value: 13, labels: map[string]string{}, }, - metricPrefix + grpcPrefix + counterName + "_total": { + metricPrefix + grpcPrefix + counterName: { value: 11, labels: map[string]string{ "net_sock_peer_addr": "", @@ -142,7 +142,7 @@ func TestTelemetryInit(t *testing.T) { "net_sock_peer_port": "", }, }, - metricPrefix + httpPrefix + counterName + "_total": { + metricPrefix + httpPrefix + counterName: { value: 10, labels: map[string]string{ "net_host_name": "", @@ -164,19 +164,19 @@ func TestTelemetryInit(t *testing.T) { useOtel: true, disableHighCard: true, expectedMetrics: map[string]metricValue{ - metricPrefix + ocPrefix + counterName + "_total": { + metricPrefix + ocPrefix + counterName: { value: 13, labels: map[string]string{}, }, - metricPrefix + otelPrefix + counterName + "_total": { + metricPrefix + otelPrefix + counterName: { value: 13, labels: map[string]string{}, }, - metricPrefix + grpcPrefix + counterName + "_total": { + metricPrefix + grpcPrefix + counterName: { value: 11, labels: map[string]string{}, }, - metricPrefix + httpPrefix + counterName + "_total": { + metricPrefix + httpPrefix + counterName: { value: 10, labels: map[string]string{}, }, @@ -213,15 +213,15 @@ func TestTelemetryInit(t *testing.T) { }, }, expectedMetrics: map[string]metricValue{ - metricPrefix + ocPrefix + counterName + "_total": { + metricPrefix + ocPrefix + counterName: { value: 13, labels: map[string]string{}, }, - metricPrefix + otelPrefix + counterName + "_total": { + metricPrefix + otelPrefix + counterName: { value: 13, labels: map[string]string{}, }, - metricPrefix + grpcPrefix + counterName + "_total": { + metricPrefix + grpcPrefix + counterName: { value: 11, labels: map[string]string{ "net_sock_peer_addr": "", @@ -229,7 +229,7 @@ func TestTelemetryInit(t *testing.T) { "net_sock_peer_port": "", }, }, - metricPrefix + httpPrefix + counterName + "_total": { + metricPrefix + httpPrefix + counterName: { value: 10, labels: map[string]string{ "net_host_name": "", From 10b7cdcff7bf866a27e89f6665b557b8f3d74b3a Mon Sep 17 00:00:00 2001 From: Pablo Baeyens Date: Tue, 21 Nov 2023 17:39:35 +0100 Subject: [PATCH 10/52] [pdata] Remove TODO, move to issue (#8977) **Description:** Removes `TODO` from code in favor of having this on the issue tracker as we do for most issues. **Link to tracking Issue:** This is now tracked by issue #8976 --- pdata/internal/cmd/pdatagen/internal/base_slices.go | 1 - pdata/pcommon/slice.go | 1 - pdata/plog/generated_logrecordslice.go | 1 - pdata/plog/generated_resourcelogsslice.go | 1 - pdata/plog/generated_scopelogsslice.go | 1 - pdata/pmetric/generated_exemplarslice.go | 1 - pdata/pmetric/generated_exponentialhistogramdatapointslice.go | 1 - pdata/pmetric/generated_histogramdatapointslice.go | 1 - pdata/pmetric/generated_metricslice.go | 1 - pdata/pmetric/generated_numberdatapointslice.go | 1 - pdata/pmetric/generated_resourcemetricsslice.go | 1 - pdata/pmetric/generated_scopemetricsslice.go | 1 - pdata/pmetric/generated_summarydatapointslice.go | 1 - pdata/pmetric/generated_summarydatapointvalueatquantileslice.go | 1 - pdata/ptrace/generated_resourcespansslice.go | 1 - pdata/ptrace/generated_scopespansslice.go | 1 - pdata/ptrace/generated_spaneventslice.go | 1 - pdata/ptrace/generated_spanlinkslice.go | 1 - pdata/ptrace/generated_spanslice.go | 1 - 19 files changed, 19 deletions(-) diff --git a/pdata/internal/cmd/pdatagen/internal/base_slices.go b/pdata/internal/cmd/pdatagen/internal/base_slices.go index cc3671796a7..d219fdc81ae 100644 --- a/pdata/internal/cmd/pdatagen/internal/base_slices.go +++ b/pdata/internal/cmd/pdatagen/internal/base_slices.go @@ -112,7 +112,6 @@ func (es {{ .structName }}) RemoveIf(f func({{ .elementName }}) bool) { (*es.orig)[newLen] = (*es.orig)[i] newLen++ } - // TODO: Prevent memory leak by erasing truncated values. *es.orig = (*es.orig)[:newLen] } diff --git a/pdata/pcommon/slice.go b/pdata/pcommon/slice.go index 5352ff44d5f..7434f467aed 100644 --- a/pdata/pcommon/slice.go +++ b/pdata/pcommon/slice.go @@ -137,7 +137,6 @@ func (es Slice) RemoveIf(f func(Value) bool) { (*es.getOrig())[newLen] = (*es.getOrig())[i] newLen++ } - // TODO: Prevent memory leak by erasing truncated values. *es.getOrig() = (*es.getOrig())[:newLen] } diff --git a/pdata/plog/generated_logrecordslice.go b/pdata/plog/generated_logrecordslice.go index e177d1af788..a900b4e1c7e 100644 --- a/pdata/plog/generated_logrecordslice.go +++ b/pdata/plog/generated_logrecordslice.go @@ -119,7 +119,6 @@ func (es LogRecordSlice) RemoveIf(f func(LogRecord) bool) { (*es.orig)[newLen] = (*es.orig)[i] newLen++ } - // TODO: Prevent memory leak by erasing truncated values. *es.orig = (*es.orig)[:newLen] } diff --git a/pdata/plog/generated_resourcelogsslice.go b/pdata/plog/generated_resourcelogsslice.go index 4f1680a0f6a..d2fc54de80b 100644 --- a/pdata/plog/generated_resourcelogsslice.go +++ b/pdata/plog/generated_resourcelogsslice.go @@ -119,7 +119,6 @@ func (es ResourceLogsSlice) RemoveIf(f func(ResourceLogs) bool) { (*es.orig)[newLen] = (*es.orig)[i] newLen++ } - // TODO: Prevent memory leak by erasing truncated values. *es.orig = (*es.orig)[:newLen] } diff --git a/pdata/plog/generated_scopelogsslice.go b/pdata/plog/generated_scopelogsslice.go index 6ab9ec5212b..5bae8d9f9c9 100644 --- a/pdata/plog/generated_scopelogsslice.go +++ b/pdata/plog/generated_scopelogsslice.go @@ -119,7 +119,6 @@ func (es ScopeLogsSlice) RemoveIf(f func(ScopeLogs) bool) { (*es.orig)[newLen] = (*es.orig)[i] newLen++ } - // TODO: Prevent memory leak by erasing truncated values. *es.orig = (*es.orig)[:newLen] } diff --git a/pdata/pmetric/generated_exemplarslice.go b/pdata/pmetric/generated_exemplarslice.go index 733341c36b5..15d70a6edeb 100644 --- a/pdata/pmetric/generated_exemplarslice.go +++ b/pdata/pmetric/generated_exemplarslice.go @@ -117,7 +117,6 @@ func (es ExemplarSlice) RemoveIf(f func(Exemplar) bool) { (*es.orig)[newLen] = (*es.orig)[i] newLen++ } - // TODO: Prevent memory leak by erasing truncated values. *es.orig = (*es.orig)[:newLen] } diff --git a/pdata/pmetric/generated_exponentialhistogramdatapointslice.go b/pdata/pmetric/generated_exponentialhistogramdatapointslice.go index 94ec5265658..a466a7c185b 100644 --- a/pdata/pmetric/generated_exponentialhistogramdatapointslice.go +++ b/pdata/pmetric/generated_exponentialhistogramdatapointslice.go @@ -119,7 +119,6 @@ func (es ExponentialHistogramDataPointSlice) RemoveIf(f func(ExponentialHistogra (*es.orig)[newLen] = (*es.orig)[i] newLen++ } - // TODO: Prevent memory leak by erasing truncated values. *es.orig = (*es.orig)[:newLen] } diff --git a/pdata/pmetric/generated_histogramdatapointslice.go b/pdata/pmetric/generated_histogramdatapointslice.go index 47b02e17f78..7ee6ef737f8 100644 --- a/pdata/pmetric/generated_histogramdatapointslice.go +++ b/pdata/pmetric/generated_histogramdatapointslice.go @@ -119,7 +119,6 @@ func (es HistogramDataPointSlice) RemoveIf(f func(HistogramDataPoint) bool) { (*es.orig)[newLen] = (*es.orig)[i] newLen++ } - // TODO: Prevent memory leak by erasing truncated values. *es.orig = (*es.orig)[:newLen] } diff --git a/pdata/pmetric/generated_metricslice.go b/pdata/pmetric/generated_metricslice.go index 30d2e0c1f67..13f05a0ecbc 100644 --- a/pdata/pmetric/generated_metricslice.go +++ b/pdata/pmetric/generated_metricslice.go @@ -119,7 +119,6 @@ func (es MetricSlice) RemoveIf(f func(Metric) bool) { (*es.orig)[newLen] = (*es.orig)[i] newLen++ } - // TODO: Prevent memory leak by erasing truncated values. *es.orig = (*es.orig)[:newLen] } diff --git a/pdata/pmetric/generated_numberdatapointslice.go b/pdata/pmetric/generated_numberdatapointslice.go index 13cd71b7278..57cdd11743e 100644 --- a/pdata/pmetric/generated_numberdatapointslice.go +++ b/pdata/pmetric/generated_numberdatapointslice.go @@ -119,7 +119,6 @@ func (es NumberDataPointSlice) RemoveIf(f func(NumberDataPoint) bool) { (*es.orig)[newLen] = (*es.orig)[i] newLen++ } - // TODO: Prevent memory leak by erasing truncated values. *es.orig = (*es.orig)[:newLen] } diff --git a/pdata/pmetric/generated_resourcemetricsslice.go b/pdata/pmetric/generated_resourcemetricsslice.go index b25fdc721ad..55217ea27d5 100644 --- a/pdata/pmetric/generated_resourcemetricsslice.go +++ b/pdata/pmetric/generated_resourcemetricsslice.go @@ -119,7 +119,6 @@ func (es ResourceMetricsSlice) RemoveIf(f func(ResourceMetrics) bool) { (*es.orig)[newLen] = (*es.orig)[i] newLen++ } - // TODO: Prevent memory leak by erasing truncated values. *es.orig = (*es.orig)[:newLen] } diff --git a/pdata/pmetric/generated_scopemetricsslice.go b/pdata/pmetric/generated_scopemetricsslice.go index d2bbe61085c..a86eb0b4815 100644 --- a/pdata/pmetric/generated_scopemetricsslice.go +++ b/pdata/pmetric/generated_scopemetricsslice.go @@ -119,7 +119,6 @@ func (es ScopeMetricsSlice) RemoveIf(f func(ScopeMetrics) bool) { (*es.orig)[newLen] = (*es.orig)[i] newLen++ } - // TODO: Prevent memory leak by erasing truncated values. *es.orig = (*es.orig)[:newLen] } diff --git a/pdata/pmetric/generated_summarydatapointslice.go b/pdata/pmetric/generated_summarydatapointslice.go index e8aa51de096..f915500963f 100644 --- a/pdata/pmetric/generated_summarydatapointslice.go +++ b/pdata/pmetric/generated_summarydatapointslice.go @@ -119,7 +119,6 @@ func (es SummaryDataPointSlice) RemoveIf(f func(SummaryDataPoint) bool) { (*es.orig)[newLen] = (*es.orig)[i] newLen++ } - // TODO: Prevent memory leak by erasing truncated values. *es.orig = (*es.orig)[:newLen] } diff --git a/pdata/pmetric/generated_summarydatapointvalueatquantileslice.go b/pdata/pmetric/generated_summarydatapointvalueatquantileslice.go index 21343f8ce5b..ed899050ac6 100644 --- a/pdata/pmetric/generated_summarydatapointvalueatquantileslice.go +++ b/pdata/pmetric/generated_summarydatapointvalueatquantileslice.go @@ -119,7 +119,6 @@ func (es SummaryDataPointValueAtQuantileSlice) RemoveIf(f func(SummaryDataPointV (*es.orig)[newLen] = (*es.orig)[i] newLen++ } - // TODO: Prevent memory leak by erasing truncated values. *es.orig = (*es.orig)[:newLen] } diff --git a/pdata/ptrace/generated_resourcespansslice.go b/pdata/ptrace/generated_resourcespansslice.go index e9185f7328a..da79ef4a342 100644 --- a/pdata/ptrace/generated_resourcespansslice.go +++ b/pdata/ptrace/generated_resourcespansslice.go @@ -119,7 +119,6 @@ func (es ResourceSpansSlice) RemoveIf(f func(ResourceSpans) bool) { (*es.orig)[newLen] = (*es.orig)[i] newLen++ } - // TODO: Prevent memory leak by erasing truncated values. *es.orig = (*es.orig)[:newLen] } diff --git a/pdata/ptrace/generated_scopespansslice.go b/pdata/ptrace/generated_scopespansslice.go index 2afdcf4dfc3..8fd0b4b8e99 100644 --- a/pdata/ptrace/generated_scopespansslice.go +++ b/pdata/ptrace/generated_scopespansslice.go @@ -119,7 +119,6 @@ func (es ScopeSpansSlice) RemoveIf(f func(ScopeSpans) bool) { (*es.orig)[newLen] = (*es.orig)[i] newLen++ } - // TODO: Prevent memory leak by erasing truncated values. *es.orig = (*es.orig)[:newLen] } diff --git a/pdata/ptrace/generated_spaneventslice.go b/pdata/ptrace/generated_spaneventslice.go index 28a443ea990..ffde17c83a2 100644 --- a/pdata/ptrace/generated_spaneventslice.go +++ b/pdata/ptrace/generated_spaneventslice.go @@ -119,7 +119,6 @@ func (es SpanEventSlice) RemoveIf(f func(SpanEvent) bool) { (*es.orig)[newLen] = (*es.orig)[i] newLen++ } - // TODO: Prevent memory leak by erasing truncated values. *es.orig = (*es.orig)[:newLen] } diff --git a/pdata/ptrace/generated_spanlinkslice.go b/pdata/ptrace/generated_spanlinkslice.go index 5a543c375e4..164038b8bed 100644 --- a/pdata/ptrace/generated_spanlinkslice.go +++ b/pdata/ptrace/generated_spanlinkslice.go @@ -119,7 +119,6 @@ func (es SpanLinkSlice) RemoveIf(f func(SpanLink) bool) { (*es.orig)[newLen] = (*es.orig)[i] newLen++ } - // TODO: Prevent memory leak by erasing truncated values. *es.orig = (*es.orig)[:newLen] } diff --git a/pdata/ptrace/generated_spanslice.go b/pdata/ptrace/generated_spanslice.go index 9724e22516e..654a547523f 100644 --- a/pdata/ptrace/generated_spanslice.go +++ b/pdata/ptrace/generated_spanslice.go @@ -119,7 +119,6 @@ func (es SpanSlice) RemoveIf(f func(Span) bool) { (*es.orig)[newLen] = (*es.orig)[i] newLen++ } - // TODO: Prevent memory leak by erasing truncated values. *es.orig = (*es.orig)[:newLen] } From 704a16c2cd879ce1ff565aef992ddf1455cc38f9 Mon Sep 17 00:00:00 2001 From: Pablo Baeyens Date: Tue, 21 Nov 2023 17:46:32 +0100 Subject: [PATCH 11/52] [pdata] Document that Marshalers/Unmarshalers use OTLP/JSON format explicitly (#8974) Explicitly documents that the `JSONMarshaler` and `JSONUnmarshaler` as conforming to the format in the OTLP/JSON specification. The intent is to be explicit that we follow this spec and that deviations (such as supporting snake case) are bugs that can be removed in a minor version update. **Link to tracking Issue:** Relates to #6287 --- pdata/plog/json.go | 4 ++++ pdata/pmetric/json.go | 4 ++++ pdata/ptrace/json.go | 4 ++++ 3 files changed, 12 insertions(+) diff --git a/pdata/plog/json.go b/pdata/plog/json.go index 1a877c68b30..15d98ffbff9 100644 --- a/pdata/plog/json.go +++ b/pdata/plog/json.go @@ -15,8 +15,10 @@ import ( "go.opentelemetry.io/collector/pdata/internal/otlp" ) +// JSONMarshaler marshals pdata.Logs to JSON bytes using the OTLP/JSON format. type JSONMarshaler struct{} +// MarshalLogs to the OTLP/JSON format. func (*JSONMarshaler) MarshalLogs(ld Logs) ([]byte, error) { buf := bytes.Buffer{} pb := internal.LogsToProto(internal.Logs(ld)) @@ -26,8 +28,10 @@ func (*JSONMarshaler) MarshalLogs(ld Logs) ([]byte, error) { var _ Unmarshaler = (*JSONUnmarshaler)(nil) +// JSONUnmarshaler unmarshals OTLP/JSON formatted-bytes to pdata.Logs. type JSONUnmarshaler struct{} +// UnmarshalLogs from OTLP/JSON format into pdata.Logs. func (*JSONUnmarshaler) UnmarshalLogs(buf []byte) (Logs, error) { iter := jsoniter.ConfigFastest.BorrowIterator(buf) defer jsoniter.ConfigFastest.ReturnIterator(iter) diff --git a/pdata/pmetric/json.go b/pdata/pmetric/json.go index 3df234c2000..3944bb0270f 100644 --- a/pdata/pmetric/json.go +++ b/pdata/pmetric/json.go @@ -17,8 +17,10 @@ import ( var _ Marshaler = (*JSONMarshaler)(nil) +// JSONMarshaler marshals pdata.Metrics to JSON bytes using the OTLP/JSON format. type JSONMarshaler struct{} +// MarshalMetrics to the OTLP/JSON format. func (*JSONMarshaler) MarshalMetrics(md Metrics) ([]byte, error) { buf := bytes.Buffer{} pb := internal.MetricsToProto(internal.Metrics(md)) @@ -26,8 +28,10 @@ func (*JSONMarshaler) MarshalMetrics(md Metrics) ([]byte, error) { return buf.Bytes(), err } +// JSONUnmarshaler unmarshals OTLP/JSON formatted-bytes to pdata.Metrics. type JSONUnmarshaler struct{} +// UnmarshalMetrics from OTLP/JSON format into pdata.Metrics. func (*JSONUnmarshaler) UnmarshalMetrics(buf []byte) (Metrics, error) { iter := jsoniter.ConfigFastest.BorrowIterator(buf) defer jsoniter.ConfigFastest.ReturnIterator(iter) diff --git a/pdata/ptrace/json.go b/pdata/ptrace/json.go index 682eeed1ca5..64bd273ba96 100644 --- a/pdata/ptrace/json.go +++ b/pdata/ptrace/json.go @@ -15,8 +15,10 @@ import ( "go.opentelemetry.io/collector/pdata/internal/otlp" ) +// JSONMarshaler marshals pdata.Traces to JSON bytes using the OTLP/JSON format. type JSONMarshaler struct{} +// MarshalTraces to the OTLP/JSON format. func (*JSONMarshaler) MarshalTraces(td Traces) ([]byte, error) { buf := bytes.Buffer{} pb := internal.TracesToProto(internal.Traces(td)) @@ -24,8 +26,10 @@ func (*JSONMarshaler) MarshalTraces(td Traces) ([]byte, error) { return buf.Bytes(), err } +// JSONUnmarshaler unmarshals OTLP/JSON formatted-bytes to pdata.Traces. type JSONUnmarshaler struct{} +// UnmarshalTraces from OTLP/JSON format into pdata.Traces. func (*JSONUnmarshaler) UnmarshalTraces(buf []byte) (Traces, error) { iter := jsoniter.ConfigFastest.BorrowIterator(buf) defer jsoniter.ConfigFastest.ReturnIterator(iter) From 8226a606635e1dc801fb47a3a596bf165d25eb3f Mon Sep 17 00:00:00 2001 From: Alex Boten Date: Tue, 21 Nov 2023 09:46:52 -0800 Subject: [PATCH 12/52] [chore] group patch renovate updates (#8970) Signed-off-by: Alex Boten --- renovate.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/renovate.json b/renovate.json index dc763e8301e..79f3abcd51d 100644 --- a/renovate.json +++ b/renovate.json @@ -24,6 +24,15 @@ "matchManagers": ["github-actions"], "groupName": "github-actions deps" }, + { + "groupName": "all patch dependencies", + "matchPackagePatterns": [ + "*" + ], + "matchUpdateTypes": [ + "patch" + ] + }, { "matchManagers": ["gomod"], "matchUpdateTypes": ["minor", "major"] From 73fa163951aeee538bd42f561d3a96205ee251d0 Mon Sep 17 00:00:00 2001 From: Dmitrii Anoshin Date: Tue, 21 Nov 2023 09:52:35 -0800 Subject: [PATCH 13/52] [chore] [exporterhelper] Update test validating failed re-enqueue (#8960) Update the test validating failed re-enqueue to ensure that the request is sent through the queue sender, not the retry sender. It'll unblock removing the dependency on the retry sender for the re-enqueue as done in https://github.com/open-telemetry/opentelemetry-collector/pull/8942 --- exporter/exporterhelper/queue_sender_test.go | 56 ++++++++++++++++---- 1 file changed, 46 insertions(+), 10 deletions(-) diff --git a/exporter/exporterhelper/queue_sender_test.go b/exporter/exporterhelper/queue_sender_test.go index 0d043ffe564..97d8220a2d4 100644 --- a/exporter/exporterhelper/queue_sender_test.go +++ b/exporter/exporterhelper/queue_sender_test.go @@ -12,6 +12,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "go.uber.org/zap" + "go.uber.org/zap/zaptest/observer" "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" @@ -257,26 +259,44 @@ func TestQueuedRetry_RequeuingEnabled(t *testing.T) { // if requeueing is enabled, but the queue is full, we get an error func TestQueuedRetry_RequeuingEnabledQueueFull(t *testing.T) { qCfg := NewDefaultQueueSettings() - qCfg.NumConsumers = 0 - qCfg.QueueSize = 0 + qCfg.NumConsumers = 1 + qCfg.QueueSize = 1 rCfg := NewDefaultRetrySettings() rCfg.MaxElapsedTime = time.Nanosecond // we don't want to retry at all, but requeue instead - be, err := newBaseExporter(defaultSettings, "", false, nil, nil, newObservabilityConsumerSender, WithRetry(rCfg), WithQueue(qCfg)) + + set := exportertest.NewNopCreateSettings() + logger, observedLogs := observer.New(zap.ErrorLevel) + set.Logger = zap.New(logger) + be, err := newBaseExporter(set, "", false, nil, nil, newNoopObsrepSender, WithRetry(rCfg), WithQueue(qCfg)) require.NoError(t, err) + be.queueSender.(*queueSender).requeuingEnabled = true require.NoError(t, be.Start(context.Background(), componenttest.NewNopHost())) t.Cleanup(func() { assert.NoError(t, be.Shutdown(context.Background())) }) - traceErr := consumererror.NewTraces(errors.New("some error"), testdata.GenerateTraces(1)) - mockR := newMockRequest(1, traceErr) - - ocs := be.obsrepSender.(*observabilityConsumerSender) - ocs.run(func() { - require.Error(t, be.retrySender.send(context.Background(), mockR), "sending_queue is full") + // send a request that will fail after waitReq1 is unblocked + waitReq1 := make(chan struct{}) + req1 := newMockExportRequest(func(ctx context.Context) error { + waitReq1 <- struct{}{} + return errors.New("some error") }) - mockR.checkNumRequests(t, 1) + require.NoError(t, be.queueSender.send(context.Background(), req1)) + + // send another request to fill the queue + req2 := newMockRequest(1, nil) + require.NoError(t, be.queueSender.send(context.Background(), req2)) + + <-waitReq1 + + // req1 cannot be put back to the queue and should be dropped, check the log message + assert.Eventually(t, func() bool { + return observedLogs.FilterMessageSnippet("Queue did not accept requeuing request. Dropping data.").Len() == 1 + }, time.Second, 1*time.Millisecond) + + // req2 should be sent out after that + req2.checkNumRequests(t, 1) } func TestQueueRetryWithDisabledQueue(t *testing.T) { @@ -388,3 +408,19 @@ type mockHost struct { func (nh *mockHost) GetExtensions() map[component.ID]component.Component { return nh.ext } + +type mockExportRequest struct { + exportFunc func(context.Context) error +} + +func newMockExportRequest(exportFunc func(context.Context) error) *mockExportRequest { + return &mockExportRequest{exportFunc: exportFunc} +} + +func (m *mockExportRequest) ItemsCount() int { + return 1 +} + +func (m *mockExportRequest) Export(ctx context.Context) error { + return m.exportFunc(ctx) +} From 4100298c4d1e375ec9800c2ef03d7a3e6f940019 Mon Sep 17 00:00:00 2001 From: Dmitrii Anoshin Date: Wed, 22 Nov 2023 00:36:58 -0800 Subject: [PATCH 14/52] [chore] Fix flaky test TestPersistentQueue_FullCapacity (#8980) Another fix for the flaky test `TestPersistentQueue_FullCapacity`. We need to make sure that the first item is consumed from the queue before proceeding. Otherwise, it can occasionally fail with: ``` --- FAIL: TestPersistentQueue_FullCapacity (0.00s) persistent_queue_test.go:91: Error Trace: /home/runner/work/opentelemetry-collector/opentelemetry-collector/exporter/exporterhelper/internal/persistent_queue_test.go:91 Error: Received unexpected error: sending queue is full Test: TestPersistentQueue_FullCapacity FAIL ``` --- exporter/exporterhelper/internal/persistent_queue_test.go | 1 + 1 file changed, 1 insertion(+) diff --git a/exporter/exporterhelper/internal/persistent_queue_test.go b/exporter/exporterhelper/internal/persistent_queue_test.go index bd13ec83c11..e39c63fe8ad 100644 --- a/exporter/exporterhelper/internal/persistent_queue_test.go +++ b/exporter/exporterhelper/internal/persistent_queue_test.go @@ -83,6 +83,7 @@ func TestPersistentQueue_FullCapacity(t *testing.T) { // First request is picked by the consumer. Wait until the consumer is blocked on done. assert.NoError(t, pq.Offer(context.Background(), req)) + start <- struct{}{} close(start) for i := 0; i < 10; i++ { From 445960b82fb4f4a979bfa5e6ce88aa754d22b92d Mon Sep 17 00:00:00 2001 From: Pablo Baeyens Date: Wed, 22 Nov 2023 18:28:16 +0100 Subject: [PATCH 15/52] Clarify our stance re: release candidates (#8975) Clarifies our stance regarding RC releases, inspired by https://github.com/open-telemetry/opentelemetry-collector/pull/8935#discussion_r1397887303. In a nutshell: - Stabilization criteria have to be met for at least two minor version releases before moving to the stable module. - We treat these two (or more) minor releases as release candidates and do not release under the `-rc` release family. - After these releases, we move directly to the `1.x` release family. **Link to tracking Issue:** Fixes #8063 (together with the upcoming 1.0 release for pdata and featuregate) cc @braydonk --------- Co-authored-by: Anthony Mirabella --- .github/ISSUE_TEMPLATE/stabilization.md | 7 ++++--- docs/release.md | 4 +++- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/stabilization.md b/.github/ISSUE_TEMPLATE/stabilization.md index be39d8a3f13..bd6d9802bcb 100644 --- a/.github/ISSUE_TEMPLATE/stabilization.md +++ b/.github/ISSUE_TEMPLATE/stabilization.md @@ -6,9 +6,8 @@ labels: 'stabilization' assignees: '' --- -Before stabilizing a module, an approver or maintainer must make sure that the following criteria are met: +Before stabilizing a module, an approver or maintainer must make sure that the following criteria have been met for at least two successive minor version releases: -- [ ] One RC release or more have been done of this module - [ ] No open issues or PRs in the module that would require breaking changes - [ ] No TODOs in the module code that would require breaking changes - [ ] No deprecated symbols in the module @@ -21,4 +20,6 @@ Please also make sure to publicly announce our intent to stabilize the module on - [ ] The #opentelemetry CNCF Slack channel - [ ] A Collector SIG meeting (if unable to attend, just add to the agenda) -To help other people verify the above criteria, please link to an RC release, the announcement and other links used to complete the above in a comment on this issue. +To help other people verify the above criteria, please link to the announcement and other links used to complete the above in a comment on this issue. + +Once all criteria are met, close this issue by moving this module to the `stable` module set. diff --git a/docs/release.md b/docs/release.md index a964b97b79d..d83d01987d6 100644 --- a/docs/release.md +++ b/docs/release.md @@ -143,7 +143,9 @@ The following documents the procedure to release a bugfix ## 1.0 release -Stable modules adhere to our [versioning document guarantees](../VERSIONING.md), so we need to be careful before releasing. Before adding a module to the stable module set and making a first 1.0 release, please [open a new stabilization issue](https://github.com/open-telemetry/opentelemetry-collector/issues/new/choose) and follow the instructions in the issue template. +Stable modules adhere to our [versioning document guarantees](../VERSIONING.md), so we need to be careful before releasing. Before adding a module to the stable module set and making a first 1.x release, please [open a new stabilization issue](https://github.com/open-telemetry/opentelemetry-collector/issues/new/choose) and follow the instructions in the issue template. + +Once a module is ready to be released under the `1.x` version scheme, file a PR to move the module to the `stable` module set and remove it from the `beta` module set. Note that we do not make `v1.x.y-rc.z` style releases for new stable modules; we instead treat the last two beta minor releases as release candidates and the module moves directly from the `0.x` to the `1.x` release series. ## Release schedule From 3ce3aac6f76be11a2501d1db01e506aa31f4c8ef Mon Sep 17 00:00:00 2001 From: Hrittik Roy <67012359+hrittikhere@users.noreply.github.com> Date: Thu, 23 Nov 2023 00:29:20 +0530 Subject: [PATCH 16/52] [confighttp] Add support for proxy (#8339) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit **Description:** Adding a feature to support proxy configuration field in all exporters **Link to tracking Issue:** https://github.com/open-telemetry/opentelemetry-collector/issues/5761 --------- Signed-off-by: Hrittik Roy <67012359+hrittikhere@users.noreply.github.com> Signed-off-by: Juraci Paixão Kröhling Co-authored-by: Juraci Paixão Kröhling Co-authored-by: Juraci Paixão Kröhling Co-authored-by: Andrzej Stencel Co-authored-by: Alex Boten --- .chloggen/proxy.yaml | 25 +++++++++++++ config/confighttp/confighttp.go | 13 +++++++ config/confighttp/confighttp_test.go | 55 ++++++++++++++++++++++++++++ 3 files changed, 93 insertions(+) create mode 100755 .chloggen/proxy.yaml diff --git a/.chloggen/proxy.yaml b/.chloggen/proxy.yaml new file mode 100755 index 00000000000..751d08fa46e --- /dev/null +++ b/.chloggen/proxy.yaml @@ -0,0 +1,25 @@ +# Use this changelog template to create an entry for release notes. + +# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' +change_type: enhancement + +# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver) +component: confighttp + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: Support proxy configuration field in all exporters that support confighttp + +# One or more tracking issues or pull requests related to the change +issues: [5761] + +# (Optional) One or more lines of additional information to render under the primary note. +# These lines will be padded with 2 spaces and then inserted directly into the document. +# Use pipe (|) for multiline entries. +subtext: + +# Optional: The change log or logs in which this entry should be included. +# e.g. '[user]' or '[user, api]' +# Include 'user' if the change is relevant to end users. +# Include 'api' if there is a change to a library API. +# Default: '[user]' +change_logs: [] \ No newline at end of file diff --git a/config/confighttp/confighttp.go b/config/confighttp/confighttp.go index ebf4f97c351..c83db25d4b6 100644 --- a/config/confighttp/confighttp.go +++ b/config/confighttp/confighttp.go @@ -9,6 +9,7 @@ import ( "io" "net" "net/http" + "net/url" "time" "github.com/rs/cors" @@ -32,6 +33,9 @@ type HTTPClientSettings struct { // The target URL to send data to (e.g.: http://some.url:9411/v1/traces). Endpoint string `mapstructure:"endpoint"` + // ProxyURL setting for the collector + ProxyURL string `mapstructure:"proxy_url"` + // TLSSetting struct exposes TLS client configuration. TLSSetting configtls.TLSClientSetting `mapstructure:"tls"` @@ -132,6 +136,15 @@ func (hcs *HTTPClientSettings) ToClient(host component.Host, settings component. transport.IdleConnTimeout = *hcs.IdleConnTimeout } + // Setting the Proxy URL + if hcs.ProxyURL != "" { + proxyURL, parseErr := url.ParseRequestURI(hcs.ProxyURL) + if parseErr != nil { + return nil, parseErr + } + transport.Proxy = http.ProxyURL(proxyURL) + } + transport.DisableKeepAlives = hcs.DisableKeepAlives clientTransport := (http.RoundTripper)(transport) diff --git a/config/confighttp/confighttp_test.go b/config/confighttp/confighttp_test.go index 5d62a7af930..43a9b865010 100644 --- a/config/confighttp/confighttp_test.go +++ b/config/confighttp/confighttp_test.go @@ -208,6 +208,61 @@ func TestDefaultHTTPClientSettings(t *testing.T) { assert.EqualValues(t, 90*time.Second, *httpClientSettings.IdleConnTimeout) } +func TestProxyURL(t *testing.T) { + testCases := []struct { + desc string + proxyURL string + expectedURL *url.URL + err bool + }{ + { + desc: "default config", + expectedURL: nil, + }, + { + desc: "proxy is set", + proxyURL: "http://proxy.example.com:8080", + expectedURL: &url.URL{Scheme: "http", Host: "proxy.example.com:8080"}, + }, + { + desc: "proxy is invalid", + proxyURL: "://example.com", + err: true, + }, + } + for _, tC := range testCases { + t.Run(tC.desc, func(t *testing.T) { + s := NewDefaultHTTPClientSettings() + s.ProxyURL = tC.proxyURL + + tt := componenttest.NewNopTelemetrySettings() + tt.TracerProvider = nil + client, err := s.ToClient(componenttest.NewNopHost(), tt) + + if tC.err { + require.Error(t, err) + } else { + require.NoError(t, err) + } + + if err == nil { + transport := client.Transport.(*http.Transport) + require.NotNil(t, transport.Proxy) + + url, err := transport.Proxy(&http.Request{URL: &url.URL{Scheme: "http", Host: "example.com"}}) + require.NoError(t, err) + + if tC.expectedURL == nil { + assert.Nil(t, url) + } else { + require.NotNil(t, url) + assert.Equal(t, tC.expectedURL, url) + } + } + }) + } +} + func TestHTTPClientSettingsError(t *testing.T) { host := &mockHost{ ext: map[component.ID]component.Component{}, From 7e3e725a2952728560b9f5f71867ad6358b1977f Mon Sep 17 00:00:00 2001 From: Dmitrii Anoshin Date: Wed, 22 Nov 2023 14:18:54 -0800 Subject: [PATCH 17/52] [chore] [exporterhelper] Simplify queue consumption logic (#8982) Remove the QueueRequest wrapper. Pass consumeFunc to the queue instead of asking for the QueueRequest wrapper with callback. The callback isn't needed for the memory queue, and the field for the callback is occupying the memory even it's always empty. The bounded queue benchmark results show the RAM savings: Before: ``` Benchmark_QueueUsage_50000_1_50000 Benchmark_QueueUsage_50000_1_50000-10 1 69813548417 ns/op 2806232 B/op 99753 allocs/op ``` After: ``` Benchmark_QueueUsage_50000_1_50000 Benchmark_QueueUsage_50000_1_50000-10 1 65498055709 ns/op 2404832 B/op 99754 allocs/op ``` Cut from https://github.com/open-telemetry/opentelemetry-collector/pull/8942 --- .../internal/bounded_memory_queue.go | 23 ++++++--- exporter/exporterhelper/internal/consumers.go | 12 ++--- .../internal/persistent_queue.go | 49 ++++++++++++------- .../internal/persistent_queue_test.go | 41 ++++++++-------- exporter/exporterhelper/internal/queue.go | 7 +-- exporter/exporterhelper/internal/request.go | 27 ---------- 6 files changed, 76 insertions(+), 83 deletions(-) delete mode 100644 exporter/exporterhelper/internal/request.go diff --git a/exporter/exporterhelper/internal/bounded_memory_queue.go b/exporter/exporterhelper/internal/bounded_memory_queue.go index 50fa478b57a..b963a73d127 100644 --- a/exporter/exporterhelper/internal/bounded_memory_queue.go +++ b/exporter/exporterhelper/internal/bounded_memory_queue.go @@ -18,14 +18,14 @@ import ( type boundedMemoryQueue[T any] struct { component.StartFunc stopped *atomic.Bool - items chan QueueRequest[T] + items chan queueRequest[T] } // NewBoundedMemoryQueue constructs the new queue of specified capacity, and with an optional // callback for dropped items (e.g. useful to emit metrics). func NewBoundedMemoryQueue[T any](capacity int) Queue[T] { return &boundedMemoryQueue[T]{ - items: make(chan QueueRequest[T], capacity), + items: make(chan queueRequest[T], capacity), stopped: &atomic.Bool{}, } } @@ -37,17 +37,23 @@ func (q *boundedMemoryQueue[T]) Offer(ctx context.Context, req T) error { } select { - case q.items <- newQueueRequest(ctx, req): + case q.items <- queueRequest[T]{ctx: ctx, req: req}: return nil default: return ErrQueueIsFull } } -// Poll returns a request from the queue once it's available. It returns false if the queue is stopped. -func (q *boundedMemoryQueue[T]) Poll() (QueueRequest[T], bool) { +// Consume applies the provided function on the head of queue. +// The call blocks until there is an item available or the queue is stopped. +// The function returns true when an item is consumed or false if the queue is stopped. +func (q *boundedMemoryQueue[T]) Consume(consumeFunc func(context.Context, T)) bool { item, ok := <-q.items - return item, ok + if !ok { + return false + } + consumeFunc(item.ctx, item.req) + return true } // Shutdown stops accepting items, and stops all consumers. It blocks until all consumers have stopped. @@ -65,3 +71,8 @@ func (q *boundedMemoryQueue[T]) Size() int { func (q *boundedMemoryQueue[T]) Capacity() int { return cap(q.items) } + +type queueRequest[T any] struct { + req T + ctx context.Context +} diff --git a/exporter/exporterhelper/internal/consumers.go b/exporter/exporterhelper/internal/consumers.go index 9a9a0dcedbc..004b1c4e0e4 100644 --- a/exporter/exporterhelper/internal/consumers.go +++ b/exporter/exporterhelper/internal/consumers.go @@ -13,15 +13,15 @@ import ( type QueueConsumers[T any] struct { queue Queue[T] numConsumers int - callback func(context.Context, T) + consumeFunc func(context.Context, T) stopWG sync.WaitGroup } -func NewQueueConsumers[T any](q Queue[T], numConsumers int, callback func(context.Context, T)) *QueueConsumers[T] { +func NewQueueConsumers[T any](q Queue[T], numConsumers int, consumeFunc func(context.Context, T)) *QueueConsumers[T] { return &QueueConsumers[T]{ queue: q, numConsumers: numConsumers, - callback: callback, + consumeFunc: consumeFunc, stopWG: sync.WaitGroup{}, } } @@ -40,12 +40,10 @@ func (qc *QueueConsumers[T]) Start(ctx context.Context, host component.Host) err startWG.Done() defer qc.stopWG.Done() for { - item, success := qc.queue.Poll() - if !success { + ok := qc.queue.Consume(qc.consumeFunc) + if !ok { return } - qc.callback(item.Context, item.Request) - item.OnProcessingFinished() } }() } diff --git a/exporter/exporterhelper/internal/persistent_queue.go b/exporter/exporterhelper/internal/persistent_queue.go index 86b77a94850..97d5a100727 100644 --- a/exporter/exporterhelper/internal/persistent_queue.go +++ b/exporter/exporterhelper/internal/persistent_queue.go @@ -138,18 +138,28 @@ func (pq *persistentQueue[T]) initPersistentContiguousStorage(ctx context.Contex } } -// Poll returns the next available item from the queue, or blocks until one is available. -// If the queue is stopped, returns (QueueRequest{}, false) -func (pq *persistentQueue[T]) Poll() (QueueRequest[T], bool) { +// Consume applies the provided function on the head of queue. +// The call blocks until there is an item available or the queue is stopped. +// The function returns true when an item is consumed or false if the queue is stopped. +func (pq *persistentQueue[T]) Consume(consumeFunc func(context.Context, T)) bool { + var ( + req T + onProcessingFinished func() + consumed bool + ) + for { select { case <-pq.stopChan: - return QueueRequest[T]{}, false + return false case <-pq.putChan: - req, found := pq.getNextItem(context.Background()) - if found { - return req, true - } + req, onProcessingFinished, consumed = pq.getNextItem(context.Background()) + } + + if consumed { + consumeFunc(context.Background(), req) + onProcessingFinished() + return true } } } @@ -221,18 +231,21 @@ func (pq *persistentQueue[T]) putInternal(ctx context.Context, req T) error { return err } -// getNextItem pulls the next available item from the persistent storage; if none is found, returns (nil, false) -func (pq *persistentQueue[T]) getNextItem(ctx context.Context) (QueueRequest[T], bool) { +// getNextItem pulls the next available item from the persistent storage along with a callback function that should be +// called after the item is processed to clean up the storage. If no new item is available, returns false. +func (pq *persistentQueue[T]) getNextItem(ctx context.Context) (T, func(), bool) { pq.mu.Lock() defer pq.mu.Unlock() + var request T + // If called in the same time with Shutdown, make sure client is not closed. if pq.refClient <= 0 { - return QueueRequest[T]{}, false + return request, nil, false } if pq.readIndex == pq.writeIndex { - return QueueRequest[T]{}, false + return request, nil, false } index := pq.readIndex // Increase here, so even if errors happen below, it always iterates @@ -245,7 +258,6 @@ func (pq *persistentQueue[T]) getNextItem(ctx context.Context) (QueueRequest[T], storage.SetOperation(currentlyDispatchedItemsKey, itemIndexArrayToBytes(pq.currentlyDispatchedItems)), getOp) - var request T if err == nil { request, err = pq.unmarshaler(getOp.Value) } @@ -257,13 +269,13 @@ func (pq *persistentQueue[T]) getNextItem(ctx context.Context) (QueueRequest[T], pq.set.Logger.Error("Error deleting item from queue", zap.Error(err)) } - return QueueRequest[T]{}, false + return request, nil, false } - req := newQueueRequest[T](context.Background(), request) - // If all went well so far, cleanup will be handled by callback + // Increase the reference count, so the client is not closed while the request is being processed. pq.refClient++ - req.onProcessingFinishedFunc = func() { + return request, func() { + // Delete the item from the persistent storage after it was processed. pq.mu.Lock() defer pq.mu.Unlock() if err = pq.itemDispatchingFinish(ctx, index); err != nil { @@ -272,8 +284,7 @@ func (pq *persistentQueue[T]) getNextItem(ctx context.Context) (QueueRequest[T], if err = pq.unrefClient(ctx); err != nil { pq.set.Logger.Error("Error closing the storage client", zap.Error(err)) } - } - return req, true + }, true } // retrieveAndEnqueueNotDispatchedReqs gets the items for which sending was not finished, cleans the storage diff --git a/exporter/exporterhelper/internal/persistent_queue_test.go b/exporter/exporterhelper/internal/persistent_queue_test.go index e39c63fe8ad..2e1598d9579 100644 --- a/exporter/exporterhelper/internal/persistent_queue_test.go +++ b/exporter/exporterhelper/internal/persistent_queue_test.go @@ -340,7 +340,7 @@ func TestPersistentQueue_CorruptedData(t *testing.T) { require.NoError(t, err) } assert.Equal(t, 3, ps.Size()) - _, _ = ps.Poll() + _, _, _ = ps.getNextItem(context.Background()) assert.Equal(t, 2, ps.Size()) assert.NoError(t, ps.Shutdown(context.Background())) @@ -387,18 +387,19 @@ func TestPersistentQueue_CurrentlyProcessedItems(t *testing.T) { requireCurrentlyDispatchedItemsEqual(t, ps, []uint64{}) // Takes index 0 in process. - readReq, found := ps.Poll() + readReq, _, found := ps.getNextItem(context.Background()) require.True(t, found) - assert.Equal(t, req, readReq.Request) + assert.Equal(t, req, readReq) requireCurrentlyDispatchedItemsEqual(t, ps, []uint64{0}) // This takes item 1 to process. - secondReadReq, found := ps.Poll() + secondReadReq, onProcessingFinished, found := ps.getNextItem(context.Background()) require.True(t, found) + assert.Equal(t, req, secondReadReq) requireCurrentlyDispatchedItemsEqual(t, ps, []uint64{0, 1}) // Lets mark item 1 as finished, it will remove it from the currently dispatched items list. - secondReadReq.OnProcessingFinished() + onProcessingFinished() requireCurrentlyDispatchedItemsEqual(t, ps, []uint64{0}) // Reload the storage. Since items 0 was not finished, this should be re-enqueued at the end. @@ -409,9 +410,10 @@ func TestPersistentQueue_CurrentlyProcessedItems(t *testing.T) { // We should be able to pull all remaining items now for i := 0; i < 4; i++ { - qReq, found := newPs.Poll() + r, onProcessingFinished, found := newPs.getNextItem(context.Background()) require.True(t, found) - qReq.OnProcessingFinished() + assert.Equal(t, req, r) + onProcessingFinished() } // The queue should be now empty @@ -444,7 +446,8 @@ func TestPersistentQueue_StartWithNonDispatched(t *testing.T) { } // get one item out, but don't mark it as processed - _, _ = ps.Poll() + <-ps.putChan + _, _, _ = ps.getNextItem(context.Background()) // put one more item in require.NoError(t, ps.Offer(context.Background(), req)) @@ -467,20 +470,20 @@ func TestPersistentQueue_PutCloseReadClose(t *testing.T) { assert.NoError(t, ps.Offer(context.Background(), req)) assert.Equal(t, 2, ps.Size()) // TODO: Remove this, after the initialization writes the readIndex. - _, _ = ps.Poll() + _, _, _ = ps.getNextItem(context.Background()) assert.NoError(t, ps.Shutdown(context.Background())) newPs := createTestPersistentQueue(createTestClient(t, ext)) require.Equal(t, 2, newPs.Size()) // Lets read both of the elements we put - readReq, found := newPs.Poll() + readReq, _, found := newPs.getNextItem(context.Background()) require.True(t, found) - require.Equal(t, req, readReq.Request) + require.Equal(t, req, readReq) - readReq, found = newPs.Poll() + readReq, _, found = newPs.getNextItem(context.Background()) require.True(t, found) - require.Equal(t, req, readReq.Request) + require.Equal(t, req, readReq) require.Equal(t, 0, newPs.Size()) assert.NoError(t, newPs.Shutdown(context.Background())) } @@ -519,9 +522,7 @@ func BenchmarkPersistentQueue_TraceSpans(b *testing.B) { } for i := 0; i < bb.N; i++ { - req, found := ps.Poll() - require.True(bb, found) - require.NotNil(bb, req) + require.True(bb, ps.Consume(func(context.Context, ptrace.Traces) {})) } require.NoError(b, ext.Shutdown(context.Background())) }) @@ -595,12 +596,12 @@ func TestPersistentQueue_ShutdownWhileConsuming(t *testing.T) { assert.NoError(t, ps.Offer(context.Background(), newTraces(5, 10))) - req, ok := ps.Poll() + _, onProcessingFinished, ok := ps.getNextItem(context.Background()) require.True(t, ok) assert.False(t, client.(*mockStorageClient).isClosed()) assert.NoError(t, ps.Shutdown(context.Background())) assert.False(t, client.(*mockStorageClient).isClosed()) - req.OnProcessingFinished() + onProcessingFinished() assert.True(t, client.(*mockStorageClient).isClosed()) } @@ -634,9 +635,7 @@ func TestPersistentQueue_StorageFull(t *testing.T) { // Take out all the items for i := reqCount; i > 0; i-- { - request, found := ps.Poll() - require.True(t, found) - request.OnProcessingFinished() + require.True(t, ps.Consume(func(context.Context, ptrace.Traces) {})) } // We should be able to put a new item in diff --git a/exporter/exporterhelper/internal/queue.go b/exporter/exporterhelper/internal/queue.go index dbc174c01bf..906caa8c830 100644 --- a/exporter/exporterhelper/internal/queue.go +++ b/exporter/exporterhelper/internal/queue.go @@ -27,9 +27,10 @@ type Queue[T any] interface { // without violating capacity restrictions. If success returns no error. // It returns ErrQueueIsFull if no space is currently available. Offer(ctx context.Context, item T) error - // Poll returns the head of this queue. The call blocks until there is an item available. - // It returns false if the queue is stopped. - Poll() (QueueRequest[T], bool) + // Consume applies the provided function on the head of queue. + // The call blocks until there is an item available or the queue is stopped. + // The function returns true when an item is consumed or false if the queue is stopped. + Consume(func(ctx context.Context, item T)) bool // Size returns the current Size of the queue Size() int // Capacity returns the capacity of the queue. diff --git a/exporter/exporterhelper/internal/request.go b/exporter/exporterhelper/internal/request.go deleted file mode 100644 index 5946992654f..00000000000 --- a/exporter/exporterhelper/internal/request.go +++ /dev/null @@ -1,27 +0,0 @@ -// Copyright The OpenTelemetry Authors -// SPDX-License-Identifier: Apache-2.0 - -package internal // import "go.opentelemetry.io/collector/exporter/exporterhelper/internal" - -import "context" - -// QueueRequest defines a request coming through a queue. -type QueueRequest[T any] struct { - Request T - Context context.Context - onProcessingFinishedFunc func() -} - -func newQueueRequest[T any](ctx context.Context, req T) QueueRequest[T] { - return QueueRequest[T]{ - Request: req, - Context: ctx, - } -} - -// OnProcessingFinished calls the optional callback function to handle cleanup after all processing is finished -func (qr *QueueRequest[T]) OnProcessingFinished() { - if qr.onProcessingFinishedFunc != nil { - qr.onProcessingFinishedFunc() - } -} From 3b56bd0b5cd147349ebe7fd4a740661143b33446 Mon Sep 17 00:00:00 2001 From: Dmitrii Anoshin Date: Thu, 23 Nov 2023 11:25:55 -0800 Subject: [PATCH 18/52] [chore] Fix TestQueuedRetryPersistentEnabled_shutdown_dataIsRequeued (#8986) Fix flaky TestQueuedRetryPersistentEnabled_shutdown_dataIsRequeued by moving it to persistent queue. - It makes the test easy to validate given that the size of the persistent queue is always available even if it's closed. - It brings behavior closer to the name of the test - It removes the flakiness associated with data race specific to re-enqueuing to the bounded memory queue by shutdown which should be resolved separately once the re-enqueue option is available for the memory queue Fixes https://github.com/open-telemetry/opentelemetry-collector/issues/8124 --- exporter/exporterhelper/queue_sender_test.go | 28 ++++++++++---------- exporter/exporterhelper/retry_sender_test.go | 13 +-------- 2 files changed, 15 insertions(+), 26 deletions(-) diff --git a/exporter/exporterhelper/queue_sender_test.go b/exporter/exporterhelper/queue_sender_test.go index 97d8220a2d4..6caceb115e2 100644 --- a/exporter/exporterhelper/queue_sender_test.go +++ b/exporter/exporterhelper/queue_sender_test.go @@ -6,7 +6,6 @@ package exporterhelper import ( "context" "errors" - "sync/atomic" "testing" "time" @@ -365,38 +364,39 @@ func TestQueuedRetryPersistenceEnabledStorageError(t *testing.T) { } func TestQueuedRetryPersistentEnabled_shutdown_dataIsRequeued(t *testing.T) { - produceCounter := &atomic.Uint32{} - qCfg := NewDefaultQueueSettings() qCfg.NumConsumers = 1 + storageID := component.NewIDWithName("file_storage", "storage") + qCfg.StorageID = &storageID // enable persistence to ensure data is re-queued on shutdown + rCfg := NewDefaultRetrySettings() rCfg.InitialInterval = time.Millisecond rCfg.MaxElapsedTime = 0 // retry infinitely so shutdown can be triggered - be, err := newBaseExporter(defaultSettings, "", false, nil, nil, newNoopObsrepSender, WithRetry(rCfg), WithQueue(qCfg)) + mockReq := newErrorRequest() + be, err := newBaseExporter(defaultSettings, "", false, mockRequestMarshaler, mockRequestUnmarshaler(mockReq), + newNoopObsrepSender, WithRetry(rCfg), WithQueue(qCfg)) require.NoError(t, err) - // wraps original queue so we can count operations - be.queueSender.(*queueSender).queue = &producerConsumerQueueWithCounter{ - Queue: be.queueSender.(*queueSender).queue, - produceCounter: produceCounter, + var extensions = map[component.ID]component.Component{ + storageID: internal.NewMockStorageExtension(nil), } - be.queueSender.(*queueSender).requeuingEnabled = true + host := &mockHost{ext: extensions} - require.NoError(t, be.Start(context.Background(), &mockHost{})) + require.NoError(t, be.Start(context.Background(), host)) // Invoke queuedRetrySender so the producer will put the item for consumer to poll - require.NoError(t, be.send(context.Background(), newErrorRequest())) + require.NoError(t, be.send(context.Background(), mockReq)) - // first wait for the item to be produced to the queue initially + // first wait for the item to be consumed from the queue assert.Eventually(t, func() bool { - return produceCounter.Load() == uint32(1) + return be.queueSender.(*queueSender).queue.Size() == 0 }, time.Second, 1*time.Millisecond) // shuts down and ensure the item is produced in the queue again require.NoError(t, be.Shutdown(context.Background())) assert.Eventually(t, func() bool { - return produceCounter.Load() == uint32(2) + return be.queueSender.(*queueSender).queue.Size() == 1 }, time.Second, 1*time.Millisecond) } diff --git a/exporter/exporterhelper/retry_sender_test.go b/exporter/exporterhelper/retry_sender_test.go index 235a9f3ccbc..89a7ab577ce 100644 --- a/exporter/exporterhelper/retry_sender_test.go +++ b/exporter/exporterhelper/retry_sender_test.go @@ -21,12 +21,11 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/consumer/consumererror" - "go.opentelemetry.io/collector/exporter/exporterhelper/internal" "go.opentelemetry.io/collector/exporter/exportertest" "go.opentelemetry.io/collector/internal/testdata" ) -func mockRequestUnmarshaler(mr *mockRequest) RequestUnmarshaler { +func mockRequestUnmarshaler(mr Request) RequestUnmarshaler { return func(bytes []byte) (Request, error) { return mr, nil } @@ -405,13 +404,3 @@ func tagsMatchLabelKeys(tags []tag.Tag, keys []metricdata.LabelKey, labels []met } return true } - -type producerConsumerQueueWithCounter struct { - internal.Queue[Request] - produceCounter *atomic.Uint32 -} - -func (pcq *producerConsumerQueueWithCounter) Offer(ctx context.Context, item Request) error { - pcq.produceCounter.Add(1) - return pcq.Queue.Offer(ctx, item) -} From c21ea1697b32a2bbed01aa66eca91ddfa6fcb80d Mon Sep 17 00:00:00 2001 From: Berkeli Halmyradov Date: Fri, 24 Nov 2023 03:42:01 +0000 Subject: [PATCH 19/52] bug: fix flaky test TestQueuedRetry_RequeuingEnabled (#8989) fixes a flaky test Fixing a bug - TestQueuedRetry_RequeuingEnabled has been failing occasionally. Upon investigation, `be.send` calls the underlying `observabilityConsumerSender.send` which calls `wg.Done()`, so we need to add `wg.Add(1)` before that Fixes #6624 **Testing:** Ran the same test multiple times before/after change: `go test -race -run TestQueuedRetry_RequeuingEnabled -count 1000` --- exporter/exporterhelper/queue_sender_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/exporter/exporterhelper/queue_sender_test.go b/exporter/exporterhelper/queue_sender_test.go index 6caceb115e2..38049ed1707 100644 --- a/exporter/exporterhelper/queue_sender_test.go +++ b/exporter/exporterhelper/queue_sender_test.go @@ -243,9 +243,9 @@ func TestQueuedRetry_RequeuingEnabled(t *testing.T) { traceErr := consumererror.NewTraces(errors.New("some error"), testdata.GenerateTraces(1)) mockR := newMockRequest(1, traceErr) ocs.run(func() { + ocs.waitGroup.Add(1) // necessary because we'll call send() again after requeueing // This is asynchronous so it should just enqueue, no errors expected. require.NoError(t, be.send(context.Background(), mockR)) - ocs.waitGroup.Add(1) // necessary because we'll call send() again after requeueing }) ocs.awaitAsyncProcessing() From b7f49f1bc8164b299b9260c331ce47296511b5e8 Mon Sep 17 00:00:00 2001 From: Alex Boten Date: Fri, 24 Nov 2023 14:08:17 -0800 Subject: [PATCH 20/52] [service] use `WithNamespace` instead of `WrapRegistererWithPrefix` (#8988) Using this functionality in the otel prom exporter fixes a bug where the target_info was prefixed as otelcol_target_info previously. --------- Signed-off-by: Alex Boten --- .chloggen/codeboten_use-namespace.yaml | 27 ++++++++++++++++++++++++ service/internal/proctelemetry/config.go | 4 ++-- service/telemetry_test.go | 6 +++--- 3 files changed, 32 insertions(+), 5 deletions(-) create mode 100755 .chloggen/codeboten_use-namespace.yaml diff --git a/.chloggen/codeboten_use-namespace.yaml b/.chloggen/codeboten_use-namespace.yaml new file mode 100755 index 00000000000..153aaad49cb --- /dev/null +++ b/.chloggen/codeboten_use-namespace.yaml @@ -0,0 +1,27 @@ +# Use this changelog template to create an entry for release notes. + +# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' +change_type: breaking + +# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver) +component: service + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: use WithNamespace instead of WrapRegistererWithPrefix + +# One or more tracking issues or pull requests related to the change +issues: [8988] + +# (Optional) One or more lines of additional information to render under the primary note. +# These lines will be padded with 2 spaces and then inserted directly into the document. +# Use pipe (|) for multiline entries. +subtext: | + Using this functionality in the otel prom exporter fixes a bug where the + target_info was prefixed as otelcol_target_info previously. + +# Optional: The change log or logs in which this entry should be included. +# e.g. '[user]' or '[user, api]' +# Include 'user' if the change is relevant to end users. +# Include 'api' if there is a change to a library API. +# Default: '[user]' +change_logs: [] \ No newline at end of file diff --git a/service/internal/proctelemetry/config.go b/service/internal/proctelemetry/config.go index 3a57ed2f226..b815250fd0d 100644 --- a/service/internal/proctelemetry/config.go +++ b/service/internal/proctelemetry/config.go @@ -203,9 +203,8 @@ func initPrometheusExporter(prometheusConfig *config.Prometheus, asyncErrorChann if prometheusConfig.Port == nil { return nil, nil, fmt.Errorf("port must be specified") } - wrappedRegisterer := prometheus.WrapRegistererWithPrefix("otelcol_", promRegistry) exporter, err := otelprom.New( - otelprom.WithRegisterer(wrappedRegisterer), + otelprom.WithRegisterer(promRegistry), // https://github.com/open-telemetry/opentelemetry-collector/issues/8043 otelprom.WithoutUnits(), // Disabled for the moment until this becomes stable, and we are ready to break backwards compatibility. @@ -213,6 +212,7 @@ func initPrometheusExporter(prometheusConfig *config.Prometheus, asyncErrorChann otelprom.WithProducer(opencensus.NewMetricProducer()), // This allows us to produce metrics that are backwards compatible w/ opencensus otelprom.WithoutCounterSuffixes(), + otelprom.WithNamespace("otelcol"), ) if err != nil { return nil, nil, fmt.Errorf("error creating otel prometheus exporter: %w", err) diff --git a/service/telemetry_test.go b/service/telemetry_test.go index 1b414730a58..07d78687295 100644 --- a/service/telemetry_test.go +++ b/service/telemetry_test.go @@ -149,7 +149,7 @@ func TestTelemetryInit(t *testing.T) { "net_host_port": "", }, }, - metricPrefix + "target_info": { + "target_info": { value: 0, labels: map[string]string{ "service_name": "otelcol", @@ -180,7 +180,7 @@ func TestTelemetryInit(t *testing.T) { value: 10, labels: map[string]string{}, }, - metricPrefix + "target_info": { + "target_info": { value: 0, labels: map[string]string{ "service_name": "otelcol", @@ -236,7 +236,7 @@ func TestTelemetryInit(t *testing.T) { "net_host_port": "", }, }, - metricPrefix + "target_info": { + "target_info": { value: 0, labels: map[string]string{ "service_name": "otelcol", From c0deae5d7933b751ae55e876ffe675e63266087a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miko=C5=82aj=20=C5=9Awi=C4=85tek?= Date: Mon, 27 Nov 2023 01:35:44 +0100 Subject: [PATCH 21/52] [exporterhelper] Fix invalid write index updates in the persistent queue (#8963) **Description:** Fixing a bug where the in-memory value of the persistent queue's write index would be updated even if writing to the storage failed. This normally wouldn't have any negative effect other than inflating the queue size temporarily, as the read loop would simply skip over the nonexistent record. However, in the case where the storage doesn't have any available space, the in-memory and in-storage write index could become significantly different, at which point a collector restart would leave the queue in an inconsistent state. Worth noting that the same issue affects reading from the queue, but in that case the writes are very small, and in practice the storage will almost always have enough space to carry them out. **Link to tracking Issue:** #8115 **Testing:** The `TestPersistentQueue_StorageFull` test actually only passed by accident. Writing would leave one additional item in the put channel, then the first read would fail (as there is not enough space to do the read index and dispatched items writes), but subsequent reads would succeed, so the bugs would cancel out. I modified this test to check for the number of items in the queue after inserting them, and also to expect one fewer item to be returned. --- .../fix_persistentstorage_index-updates.yaml | 25 +++++++++++++++++++ .../internal/persistent_queue.go | 17 +++++++++---- .../internal/persistent_queue_test.go | 6 +++++ 3 files changed, 43 insertions(+), 5 deletions(-) create mode 100755 .chloggen/fix_persistentstorage_index-updates.yaml diff --git a/.chloggen/fix_persistentstorage_index-updates.yaml b/.chloggen/fix_persistentstorage_index-updates.yaml new file mode 100755 index 00000000000..9b10afbaafe --- /dev/null +++ b/.chloggen/fix_persistentstorage_index-updates.yaml @@ -0,0 +1,25 @@ +# Use this changelog template to create an entry for release notes. + +# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' +change_type: bug_fix + +# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver) +component: exporterhelper + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: Fix invalid write index updates in the persistent queue + +# One or more tracking issues or pull requests related to the change +issues: [8115] + +# (Optional) One or more lines of additional information to render under the primary note. +# These lines will be padded with 2 spaces and then inserted directly into the document. +# Use pipe (|) for multiline entries. +subtext: + +# Optional: The change log or logs in which this entry should be included. +# e.g. '[user]' or '[user, api]' +# Include 'user' if the change is relevant to end users. +# Include 'api' if there is a change to a library API. +# Default: '[user]' +change_logs: [] \ No newline at end of file diff --git a/exporter/exporterhelper/internal/persistent_queue.go b/exporter/exporterhelper/internal/persistent_queue.go index 97d5a100727..17bc2fe642e 100644 --- a/exporter/exporterhelper/internal/persistent_queue.go +++ b/exporter/exporterhelper/internal/persistent_queue.go @@ -215,20 +215,27 @@ func (pq *persistentQueue[T]) putInternal(ctx context.Context, req T) error { } itemKey := getItemKey(pq.writeIndex) - pq.writeIndex++ + newIndex := pq.writeIndex + 1 reqBuf, err := pq.marshaler(req) if err != nil { return err } - err = pq.client.Batch(ctx, - storage.SetOperation(writeIndexKey, itemIndexToBytes(pq.writeIndex)), - storage.SetOperation(itemKey, reqBuf)) + // Carry out a transaction where we both add the item and update the write index + ops := []storage.Operation{ + storage.SetOperation(writeIndexKey, itemIndexToBytes(newIndex)), + storage.SetOperation(itemKey, reqBuf), + } + if storageErr := pq.client.Batch(ctx, ops...); storageErr != nil { + return storageErr + } + + pq.writeIndex = newIndex // Inform the loop that there's some data to process pq.putChan <- struct{}{} - return err + return nil } // getNextItem pulls the next available item from the persistent storage along with a callback function that should be diff --git a/exporter/exporterhelper/internal/persistent_queue_test.go b/exporter/exporterhelper/internal/persistent_queue_test.go index 2e1598d9579..5fb87e6bc10 100644 --- a/exporter/exporterhelper/internal/persistent_queue_test.go +++ b/exporter/exporterhelper/internal/persistent_queue_test.go @@ -626,6 +626,9 @@ func TestPersistentQueue_StorageFull(t *testing.T) { reqCount++ } + // Check that the size is correct + require.Equal(t, reqCount, ps.Size(), "Size must be equal to the number of items inserted") + // Manually set the storage to only have a small amount of free space left newMaxSize := client.GetSizeInBytes() + freeSpaceInBytes client.SetMaxSizeInBytes(newMaxSize) @@ -634,6 +637,9 @@ func TestPersistentQueue_StorageFull(t *testing.T) { require.Error(t, ps.Offer(context.Background(), req)) // Take out all the items + // Getting the first item fails, as we can't update the state in storage, so we just delete it without returning it + // Subsequent items succeed, as deleting the first item frees enough space for the state update + reqCount-- for i := reqCount; i > 0; i-- { require.True(t, ps.Consume(func(context.Context, ptrace.Traces) {})) } From 8cec790c1c5b8a7dfc4006b7a05b2f6bf904af8f Mon Sep 17 00:00:00 2001 From: Dmitrii Anoshin Date: Sun, 26 Nov 2023 16:46:30 -0800 Subject: [PATCH 22/52] [chore] [exporterhelper] Remove retry sender -> queue sender callback (#8985) Use returned error instead to simplify the senders feedback loop. This change preserves the behavior. Re-enqueueing of the temporary failures depends on the enabled retry sender. This will be changed in the next step when re-queueing becomes a configurable option --- exporter/exporterhelper/common.go | 25 +++++++------- exporter/exporterhelper/queue_sender.go | 27 +++++++++------- exporter/exporterhelper/queue_sender_test.go | 33 +++++++++++++++++++ exporter/exporterhelper/retry_sender.go | 34 +++++++------------- 4 files changed, 72 insertions(+), 47 deletions(-) diff --git a/exporter/exporterhelper/common.go b/exporter/exporterhelper/common.go index a129d9bbd92..69fb3771d85 100644 --- a/exporter/exporterhelper/common.go +++ b/exporter/exporterhelper/common.go @@ -91,7 +91,7 @@ func WithRetry(config RetrySettings) Option { } return } - o.retrySender = newRetrySender(config, o.set, o.onTemporaryFailure) + o.retrySender = newRetrySender(config, o.set) } } @@ -110,9 +110,7 @@ func WithQueue(config QueueSettings) Option { } return } - qs := newQueueSender(config, o.set, o.signal, o.marshaler, o.unmarshaler) - o.queueSender = qs - o.setOnTemporaryFailure(qs.onTemporaryFailure) + o.queueSender = newQueueSender(config, o.set, o.signal, o.marshaler, o.unmarshaler) } } @@ -146,9 +144,6 @@ type baseExporter struct { retrySender requestSender timeoutSender *timeoutSender // timeoutSender is always initialized. - // onTemporaryFailure is a function that is called when the retrySender is unable to send data to the next consumer. - onTemporaryFailure onRequestHandlingFinishedFunc - consumerOptions []consumer.Option } @@ -181,6 +176,15 @@ func newBaseExporter(set exporter.CreateSettings, signal component.DataType, req } be.connectSenders() + // If retry sender is disabled then disable requeuing in the queue sender. + // TODO: Make re-enqueuing configurable on queue sender instead of relying on retry sender. + if qs, ok := be.queueSender.(*queueSender); ok { + // if it's not retrySender, then it is disabled. + if _, ok = be.retrySender.(*retrySender); !ok { + qs.requeuingEnabled = false + } + } + return be, nil } @@ -215,10 +219,3 @@ func (be *baseExporter) Shutdown(ctx context.Context) error { // Last shutdown the wrapped exporter itself. be.ShutdownFunc.Shutdown(ctx)) } - -func (be *baseExporter) setOnTemporaryFailure(onTemporaryFailure onRequestHandlingFinishedFunc) { - be.onTemporaryFailure = onTemporaryFailure - if rs, ok := be.retrySender.(*retrySender); ok { - rs.onTemporaryFailure = onTemporaryFailure - } -} diff --git a/exporter/exporterhelper/queue_sender.go b/exporter/exporterhelper/queue_sender.go index d629af4c438..41e885af0cf 100644 --- a/exporter/exporterhelper/queue_sender.go +++ b/exporter/exporterhelper/queue_sender.go @@ -18,6 +18,7 @@ import ( "go.uber.org/zap" "go.opentelemetry.io/collector/component" + "go.opentelemetry.io/collector/consumer/consumererror" "go.opentelemetry.io/collector/exporter" "go.opentelemetry.io/collector/exporter/exporterhelper/internal" "go.opentelemetry.io/collector/internal/obsreportconfig" @@ -114,37 +115,41 @@ func newQueueSender(config QueueSettings, set exporter.CreateSettings, signal co } } -func (qs *queueSender) onTemporaryFailure(ctx context.Context, req Request, err error, logger *zap.Logger) error { +// consume is the function that is executed by the queue consumers to send the data to the next consumerSender. +func (qs *queueSender) consume(ctx context.Context, req Request) { + err := qs.nextSender.send(ctx, req) + + // Nothing to do if the error is nil or permanent. Permanent errors are already logged by retrySender. + if err == nil || consumererror.IsPermanent(err) { + return + } + if !qs.requeuingEnabled { - logger.Error( + qs.logger.Error( "Exporting failed. No more retries left. Dropping data.", zap.Error(err), zap.Int("dropped_items", req.ItemsCount()), ) - return err + return } if qs.queue.Offer(ctx, req) == nil { - logger.Error( + qs.logger.Error( "Exporting failed. Putting back to the end of the queue.", zap.Error(err), ) } else { - logger.Error( + qs.logger.Error( "Exporting failed. Queue did not accept requeuing request. Dropping data.", zap.Error(err), zap.Int("dropped_items", req.ItemsCount()), ) } - return err } // Start is invoked during service startup. func (qs *queueSender) Start(ctx context.Context, host component.Host) error { - qs.consumers = internal.NewQueueConsumers(qs.queue, qs.numConsumers, func(ctx context.Context, req Request) { - // TODO: Update item.OnProcessingFinished to accept error and remove the retry->queue sender callback. - _ = qs.nextSender.send(ctx, req) - }) + qs.consumers = internal.NewQueueConsumers(qs.queue, qs.numConsumers, qs.consume) if err := qs.consumers.Start(ctx, host); err != nil { return err } @@ -214,7 +219,7 @@ func (qs *queueSender) Shutdown(ctx context.Context) error { return qs.consumers.Shutdown(ctx) } -// send implements the requestSender interface +// send implements the requestSender interface. It puts the request in the queue. func (qs *queueSender) send(ctx context.Context, req Request) error { // Prevent cancellation and deadline to propagate to the context stored in the queue. // The grpc/http based receivers will cancel the request context after this function returns. diff --git a/exporter/exporterhelper/queue_sender_test.go b/exporter/exporterhelper/queue_sender_test.go index 38049ed1707..7893b427019 100644 --- a/exporter/exporterhelper/queue_sender_test.go +++ b/exporter/exporterhelper/queue_sender_test.go @@ -255,6 +255,39 @@ func TestQueuedRetry_RequeuingEnabled(t *testing.T) { ocs.checkDroppedItemsCount(t, 1) // not actually dropped, but ocs counts each failed send here } +// disabling retry sender should disable requeuing. +func TestQueuedRetry_RequeuingDisabled(t *testing.T) { + mockR := newMockRequest(2, errors.New("transient error")) + + // use persistent storage as it expected to be used with requeuing unless the retry sender is disabled + qCfg := NewDefaultQueueSettings() + storageID := component.NewIDWithName("file_storage", "storage") + qCfg.StorageID = &storageID // enable persistence + rCfg := NewDefaultRetrySettings() + rCfg.Enabled = false + + be, err := newBaseExporter(defaultSettings, "", false, mockRequestMarshaler, mockRequestUnmarshaler(mockR), newObservabilityConsumerSender, WithRetry(rCfg), WithQueue(qCfg)) + require.NoError(t, err) + ocs := be.obsrepSender.(*observabilityConsumerSender) + + var extensions = map[component.ID]component.Component{ + storageID: internal.NewMockStorageExtension(nil), + } + host := &mockHost{ext: extensions} + require.NoError(t, be.Start(context.Background(), host)) + + ocs.run(func() { + // This is asynchronous so it should just enqueue, no errors expected. + require.NoError(t, be.send(context.Background(), mockR)) + }) + ocs.awaitAsyncProcessing() + + // one failed request, no retries, two items dropped. + mockR.checkNumRequests(t, 1) + ocs.checkSendItemsCount(t, 0) + ocs.checkDroppedItemsCount(t, 2) +} + // if requeueing is enabled, but the queue is full, we get an error func TestQueuedRetry_RequeuingEnabledQueueFull(t *testing.T) { qCfg := NewDefaultQueueSettings() diff --git a/exporter/exporterhelper/retry_sender.go b/exporter/exporterhelper/retry_sender.go index f74aecc6bfb..3cb3f775a91 100644 --- a/exporter/exporterhelper/retry_sender.go +++ b/exporter/exporterhelper/retry_sender.go @@ -73,29 +73,20 @@ func NewThrottleRetry(err error, delay time.Duration) error { } } -type onRequestHandlingFinishedFunc func(context.Context, Request, error, *zap.Logger) error - type retrySender struct { baseRequestSender - traceAttribute attribute.KeyValue - cfg RetrySettings - stopCh chan struct{} - logger *zap.Logger - onTemporaryFailure onRequestHandlingFinishedFunc + traceAttribute attribute.KeyValue + cfg RetrySettings + stopCh chan struct{} + logger *zap.Logger } -func newRetrySender(config RetrySettings, set exporter.CreateSettings, onTemporaryFailure onRequestHandlingFinishedFunc) *retrySender { - if onTemporaryFailure == nil { - onTemporaryFailure = func(_ context.Context, _ Request, err error, _ *zap.Logger) error { - return err - } - } +func newRetrySender(config RetrySettings, set exporter.CreateSettings) *retrySender { return &retrySender{ - traceAttribute: attribute.String(obsmetrics.ExporterKey, set.ID.String()), - cfg: config, - stopCh: make(chan struct{}), - logger: set.Logger, - onTemporaryFailure: onTemporaryFailure, + traceAttribute: attribute.String(obsmetrics.ExporterKey, set.ID.String()), + cfg: config, + stopCh: make(chan struct{}), + logger: set.Logger, } } @@ -126,6 +117,7 @@ func (rs *retrySender) send(ctx context.Context, req Request) error { trace.WithAttributes(rs.traceAttribute, attribute.Int64("retry_num", retryNum))) err := rs.nextSender.send(ctx, req) + rs.logger.Info("Exporting finished.", zap.Error(err)) if err == nil { return nil } @@ -148,9 +140,7 @@ func (rs *retrySender) send(ctx context.Context, req Request) error { backoffDelay := expBackoff.NextBackOff() if backoffDelay == backoff.Stop { - // throw away the batch - err = fmt.Errorf("max elapsed time expired %w", err) - return rs.onTemporaryFailure(ctx, req, err, rs.logger) + return fmt.Errorf("max elapsed time expired %w", err) } throttleErr := throttleRetry{} @@ -178,7 +168,7 @@ func (rs *retrySender) send(ctx context.Context, req Request) error { case <-ctx.Done(): return fmt.Errorf("request is cancelled or timed out %w", err) case <-rs.stopCh: - return rs.onTemporaryFailure(ctx, req, fmt.Errorf("interrupted due to shutdown %w", err), rs.logger) + return fmt.Errorf("interrupted due to shutdown %w", err) case <-time.After(backoffDelay): } } From 0ae738f0c8eebf669967cd1bdda5072929df4b9d Mon Sep 17 00:00:00 2001 From: Dmitrii Anoshin Date: Sun, 26 Nov 2023 18:28:14 -0800 Subject: [PATCH 23/52] [chore] [exporterhelper] Fix requeuing of partially failed request (#8992) After https://github.com/open-telemetry/opentelemetry-collector/pull/8985, the whole request is requeued even with the partial request error. This change fixes it and restores the previous behavior. No changelog is needed since the bug is not released yet. --- exporter/exporterhelper/queue_sender.go | 2 +- exporter/exporterhelper/queue_sender_test.go | 8 +++----- exporter/exporterhelper/request.go | 9 +++++++++ exporter/exporterhelper/retry_sender.go | 6 +----- 4 files changed, 14 insertions(+), 11 deletions(-) diff --git a/exporter/exporterhelper/queue_sender.go b/exporter/exporterhelper/queue_sender.go index 41e885af0cf..f6369b778ca 100644 --- a/exporter/exporterhelper/queue_sender.go +++ b/exporter/exporterhelper/queue_sender.go @@ -133,7 +133,7 @@ func (qs *queueSender) consume(ctx context.Context, req Request) { return } - if qs.queue.Offer(ctx, req) == nil { + if qs.queue.Offer(ctx, extractPartialRequest(req, err)) == nil { qs.logger.Error( "Exporting failed. Putting back to the end of the queue.", zap.Error(err), diff --git a/exporter/exporterhelper/queue_sender_test.go b/exporter/exporterhelper/queue_sender_test.go index 7893b427019..0b76915d20d 100644 --- a/exporter/exporterhelper/queue_sender_test.go +++ b/exporter/exporterhelper/queue_sender_test.go @@ -16,13 +16,11 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" - "go.opentelemetry.io/collector/consumer/consumererror" "go.opentelemetry.io/collector/exporter" "go.opentelemetry.io/collector/exporter/exporterhelper/internal" "go.opentelemetry.io/collector/exporter/exportertest" "go.opentelemetry.io/collector/featuregate" "go.opentelemetry.io/collector/internal/obsreportconfig" - "go.opentelemetry.io/collector/internal/testdata" "go.opentelemetry.io/collector/obsreport/obsreporttest" ) @@ -240,8 +238,7 @@ func TestQueuedRetry_RequeuingEnabled(t *testing.T) { assert.NoError(t, be.Shutdown(context.Background())) }) - traceErr := consumererror.NewTraces(errors.New("some error"), testdata.GenerateTraces(1)) - mockR := newMockRequest(1, traceErr) + mockR := newMockRequest(4, errors.New("transient error")) ocs.run(func() { ocs.waitGroup.Add(1) // necessary because we'll call send() again after requeueing // This is asynchronous so it should just enqueue, no errors expected. @@ -251,8 +248,9 @@ func TestQueuedRetry_RequeuingEnabled(t *testing.T) { // In the newMockConcurrentExporter we count requests and items even for failed requests mockR.checkNumRequests(t, 2) + // ensure that only 1 item was sent which correspond to items count in the error returned by mockRequest.OnError() ocs.checkSendItemsCount(t, 1) - ocs.checkDroppedItemsCount(t, 1) // not actually dropped, but ocs counts each failed send here + ocs.checkDroppedItemsCount(t, 4) // not actually dropped, but ocs counts each failed send here } // disabling retry sender should disable requeuing. diff --git a/exporter/exporterhelper/request.go b/exporter/exporterhelper/request.go index 2c074f565ff..c29da3a10a3 100644 --- a/exporter/exporterhelper/request.go +++ b/exporter/exporterhelper/request.go @@ -41,3 +41,12 @@ type RequestMarshaler func(req Request) ([]byte, error) // This API is at the early stage of development and may change without backward compatibility // until https://github.com/open-telemetry/opentelemetry-collector/issues/8122 is resolved. type RequestUnmarshaler func(data []byte) (Request, error) + +// extractPartialRequest returns a new Request that may contain the items left to be sent +// if only some items failed to process and can be retried. Otherwise, it returns the original Request. +func extractPartialRequest(req Request, err error) Request { + if errReq, ok := req.(RequestErrorHandler); ok { + return errReq.OnError(err) + } + return req +} diff --git a/exporter/exporterhelper/retry_sender.go b/exporter/exporterhelper/retry_sender.go index 3cb3f775a91..e1ffb7b9388 100644 --- a/exporter/exporterhelper/retry_sender.go +++ b/exporter/exporterhelper/retry_sender.go @@ -132,11 +132,7 @@ func (rs *retrySender) send(ctx context.Context, req Request) error { return err } - // Give the request a chance to extract signal data to retry if only some data - // failed to process. - if errReq, ok := req.(RequestErrorHandler); ok { - req = errReq.OnError(err) - } + req = extractPartialRequest(req, err) backoffDelay := expBackoff.NextBackOff() if backoffDelay == backoff.Stop { From 575c5f5e25319ad46dc13b09fe85566d3851310c Mon Sep 17 00:00:00 2001 From: Dmitrii Anoshin Date: Mon, 27 Nov 2023 10:14:43 -0800 Subject: [PATCH 24/52] [chore] [exporterheper] Fix not-started queue sender shutdown (#8995) Do not panic on the shutdown of a not-started queue sender --- exporter/exporterhelper/queue_sender.go | 7 +++---- exporter/exporterhelper/queue_sender_test.go | 5 +++++ 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/exporter/exporterhelper/queue_sender.go b/exporter/exporterhelper/queue_sender.go index f6369b778ca..2f86c475611 100644 --- a/exporter/exporterhelper/queue_sender.go +++ b/exporter/exporterhelper/queue_sender.go @@ -81,7 +81,6 @@ type queueSender struct { traceAttribute attribute.KeyValue logger *zap.Logger meter otelmetric.Meter - numConsumers int consumers *internal.QueueConsumers[Request] stopWG sync.WaitGroup requeuingEnabled bool @@ -101,18 +100,19 @@ func newQueueSender(config QueueSettings, set exporter.CreateSettings, signal co } else { queue = internal.NewBoundedMemoryQueue[Request](config.QueueSize) } - return &queueSender{ + qs := &queueSender{ fullName: set.ID.String(), signal: signal, queue: queue, traceAttribute: attribute.String(obsmetrics.ExporterKey, set.ID.String()), logger: set.TelemetrySettings.Logger, meter: set.TelemetrySettings.MeterProvider.Meter(scopeName), - numConsumers: config.NumConsumers, stopWG: sync.WaitGroup{}, // TODO: this can be further exposed as a config param rather than relying on a type of queue requeuingEnabled: isPersistent, } + qs.consumers = internal.NewQueueConsumers(queue, config.NumConsumers, qs.consume) + return qs } // consume is the function that is executed by the queue consumers to send the data to the next consumerSender. @@ -149,7 +149,6 @@ func (qs *queueSender) consume(ctx context.Context, req Request) { // Start is invoked during service startup. func (qs *queueSender) Start(ctx context.Context, host component.Host) error { - qs.consumers = internal.NewQueueConsumers(qs.queue, qs.numConsumers, qs.consume) if err := qs.consumers.Start(ctx, host); err != nil { return err } diff --git a/exporter/exporterhelper/queue_sender_test.go b/exporter/exporterhelper/queue_sender_test.go index 0b76915d20d..75a30226e25 100644 --- a/exporter/exporterhelper/queue_sender_test.go +++ b/exporter/exporterhelper/queue_sender_test.go @@ -431,6 +431,11 @@ func TestQueuedRetryPersistentEnabled_shutdown_dataIsRequeued(t *testing.T) { }, time.Second, 1*time.Millisecond) } +func TestQueueSenderNoStartShutdown(t *testing.T) { + qs := newQueueSender(NewDefaultQueueSettings(), exportertest.NewNopCreateSettings(), "", nil, nil) + assert.NoError(t, qs.Shutdown(context.Background())) +} + type mockHost struct { component.Host ext map[component.ID]component.Component From 66168df411e3ec183abb4b0073512c6709fe7bbd Mon Sep 17 00:00:00 2001 From: OpenTelemetry Bot <107717825+opentelemetrybot@users.noreply.github.com> Date: Mon, 27 Nov 2023 23:26:40 +0100 Subject: [PATCH 25/52] [chore] Prepare release v1.0.0/v0.90.0 (#8997) The following commands were run to prepare this release: - make chlog-update VERSION=v1.0.0/v0.90.0 - make prepare-release GH=none PREVIOUS_VERSION=1.0.0-rcv0018 RELEASE_CANDIDATE=1.0.0 MODSET=stable - make prepare-release GH=none PREVIOUS_VERSION=0.89.0 RELEASE_CANDIDATE=0.90.0 MODSET=beta --- .chloggen/codeboten_prom-without-suffix.yaml | 25 ------- ...odeboten_rm-generated-jsonschema-code.yaml | 25 ------- .chloggen/codeboten_use-namespace.yaml | 27 -------- ...ebug-exporter-default-verbosity-basic.yaml | 25 ------- ...e-func-instead-of-converter-interface.yaml | 20 ------ .chloggen/expose-zerothreshold.yaml | 18 ----- .../fix_persistentstorage_index-updates.yaml | 25 ------- .chloggen/fixshutdown.yaml | 13 ---- .chloggen/mx-psi_remove-NewFlags.yaml | 25 ------- .chloggen/proxy.yaml | 25 ------- CHANGELOG-API.md | 16 +++++ CHANGELOG.md | 21 ++++++ cmd/builder/internal/builder/config.go | 2 +- cmd/builder/internal/config/default.yaml | 24 +++---- cmd/builder/test/core.builder.yaml | 8 +-- cmd/otelcorecol/builder-config.yaml | 24 +++---- cmd/otelcorecol/go.mod | 68 +++++++++---------- cmd/otelcorecol/main.go | 2 +- component/go.mod | 8 +-- config/configauth/go.mod | 14 ++-- config/configgrpc/go.mod | 28 ++++---- config/confighttp/go.mod | 26 +++---- config/configtls/go.mod | 2 +- confmap/go.mod | 2 +- connector/forwardconnector/go.mod | 16 ++--- connector/go.mod | 14 ++-- consumer/go.mod | 4 +- examples/k8s/otel-config.yaml | 4 +- exporter/debugexporter/go.mod | 20 +++--- exporter/go.mod | 18 ++--- exporter/loggingexporter/go.mod | 20 +++--- exporter/otlpexporter/go.mod | 40 +++++------ exporter/otlphttpexporter/go.mod | 40 +++++------ extension/auth/go.mod | 12 ++-- extension/ballastextension/go.mod | 14 ++-- extension/go.mod | 10 +-- extension/zpagesextension/go.mod | 16 ++--- go.mod | 22 +++--- otelcol/go.mod | 28 ++++---- processor/batchprocessor/go.mod | 16 ++--- processor/go.mod | 14 ++-- processor/memorylimiterprocessor/go.mod | 16 ++--- receiver/go.mod | 14 ++-- receiver/otlpreceiver/go.mod | 38 +++++------ service/go.mod | 30 ++++---- versions.yaml | 4 +- 46 files changed, 346 insertions(+), 537 deletions(-) delete mode 100755 .chloggen/codeboten_prom-without-suffix.yaml delete mode 100755 .chloggen/codeboten_rm-generated-jsonschema-code.yaml delete mode 100755 .chloggen/codeboten_use-namespace.yaml delete mode 100755 .chloggen/debug-exporter-default-verbosity-basic.yaml delete mode 100755 .chloggen/dmitryax_use-func-instead-of-converter-interface.yaml delete mode 100644 .chloggen/expose-zerothreshold.yaml delete mode 100755 .chloggen/fix_persistentstorage_index-updates.yaml delete mode 100755 .chloggen/fixshutdown.yaml delete mode 100755 .chloggen/mx-psi_remove-NewFlags.yaml delete mode 100755 .chloggen/proxy.yaml diff --git a/.chloggen/codeboten_prom-without-suffix.yaml b/.chloggen/codeboten_prom-without-suffix.yaml deleted file mode 100755 index 645b24a36a1..00000000000 --- a/.chloggen/codeboten_prom-without-suffix.yaml +++ /dev/null @@ -1,25 +0,0 @@ -# Use this changelog template to create an entry for release notes. - -# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' -change_type: breaking - -# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver) -component: service - -# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). -note: "To remain backwards compatible w/ the metrics generated today, otel generated metrics will be generated without the `_total` suffix" - -# One or more tracking issues or pull requests related to the change -issues: [7454] - -# (Optional) One or more lines of additional information to render under the primary note. -# These lines will be padded with 2 spaces and then inserted directly into the document. -# Use pipe (|) for multiline entries. -subtext: - -# Optional: The change log or logs in which this entry should be included. -# e.g. '[user]' or '[user, api]' -# Include 'user' if the change is relevant to end users. -# Include 'api' if there is a change to a library API. -# Default: '[user]' -change_logs: [] \ No newline at end of file diff --git a/.chloggen/codeboten_rm-generated-jsonschema-code.yaml b/.chloggen/codeboten_rm-generated-jsonschema-code.yaml deleted file mode 100755 index 189e452c680..00000000000 --- a/.chloggen/codeboten_rm-generated-jsonschema-code.yaml +++ /dev/null @@ -1,25 +0,0 @@ -# Use this changelog template to create an entry for release notes. - -# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' -change_type: deprecation - -# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver) -component: telemetry - -# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). -note: deprecate jsonschema generated types - -# One or more tracking issues or pull requests related to the change -issues: [15009] - -# (Optional) One or more lines of additional information to render under the primary note. -# These lines will be padded with 2 spaces and then inserted directly into the document. -# Use pipe (|) for multiline entries. -subtext: - -# Optional: The change log or logs in which this entry should be included. -# e.g. '[user]' or '[user, api]' -# Include 'user' if the change is relevant to end users. -# Include 'api' if there is a change to a library API. -# Default: '[user]' -change_logs: [api] \ No newline at end of file diff --git a/.chloggen/codeboten_use-namespace.yaml b/.chloggen/codeboten_use-namespace.yaml deleted file mode 100755 index 153aaad49cb..00000000000 --- a/.chloggen/codeboten_use-namespace.yaml +++ /dev/null @@ -1,27 +0,0 @@ -# Use this changelog template to create an entry for release notes. - -# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' -change_type: breaking - -# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver) -component: service - -# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). -note: use WithNamespace instead of WrapRegistererWithPrefix - -# One or more tracking issues or pull requests related to the change -issues: [8988] - -# (Optional) One or more lines of additional information to render under the primary note. -# These lines will be padded with 2 spaces and then inserted directly into the document. -# Use pipe (|) for multiline entries. -subtext: | - Using this functionality in the otel prom exporter fixes a bug where the - target_info was prefixed as otelcol_target_info previously. - -# Optional: The change log or logs in which this entry should be included. -# e.g. '[user]' or '[user, api]' -# Include 'user' if the change is relevant to end users. -# Include 'api' if there is a change to a library API. -# Default: '[user]' -change_logs: [] \ No newline at end of file diff --git a/.chloggen/debug-exporter-default-verbosity-basic.yaml b/.chloggen/debug-exporter-default-verbosity-basic.yaml deleted file mode 100755 index e2c72763f4d..00000000000 --- a/.chloggen/debug-exporter-default-verbosity-basic.yaml +++ /dev/null @@ -1,25 +0,0 @@ -# Use this changelog template to create an entry for release notes. - -# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' -change_type: enhancement - -# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver) -component: exporter/debug - -# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). -note: Change default `verbosity` from `normal` to `basic` - -# One or more tracking issues or pull requests related to the change -issues: [8844] - -# (Optional) One or more lines of additional information to render under the primary note. -# These lines will be padded with 2 spaces and then inserted directly into the document. -# Use pipe (|) for multiline entries. -subtext: This change has currently no effect, as `basic` and `normal` verbosity share the same behavior. This might change in the future though, with the `normal` verbosity being more verbose than it currently is (see https://github.com/open-telemetry/opentelemetry-collector/issues/7806). This is why we are changing the default to `basic`, which is expected to stay at the current level of verbosity (one line per batch). - -# Optional: The change log or logs in which this entry should be included. -# e.g. '[user]' or '[user, api]' -# Include 'user' if the change is relevant to end users. -# Include 'api' if there is a change to a library API. -# Default: '[user]' -change_logs: [user] diff --git a/.chloggen/dmitryax_use-func-instead-of-converter-interface.yaml b/.chloggen/dmitryax_use-func-instead-of-converter-interface.yaml deleted file mode 100755 index b27f064fcf2..00000000000 --- a/.chloggen/dmitryax_use-func-instead-of-converter-interface.yaml +++ /dev/null @@ -1,20 +0,0 @@ -# Use this changelog template to create an entry for release notes. - -# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' -change_type: breaking - -# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver) -component: exporterhelper - -# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). -note: Replace converter interface with function in the new experimental exporter helper. - -# One or more tracking issues or pull requests related to the change -issues: [8122] - -# Optional: The change log or logs in which this entry should be included. -# e.g. '[user]' or '[user, api]' -# Include 'user' if the change is relevant to end users. -# Include 'api' if there is a change to a library API. -# Default: '[user]' -change_logs: [api] \ No newline at end of file diff --git a/.chloggen/expose-zerothreshold.yaml b/.chloggen/expose-zerothreshold.yaml deleted file mode 100644 index ff9a51d9b4c..00000000000 --- a/.chloggen/expose-zerothreshold.yaml +++ /dev/null @@ -1,18 +0,0 @@ -# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' -change_type: enhancement - -# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver) -component: pdata - -# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). -note: Add ZeroThreshold field to exponentialHistogramDataPoint in pmetric package. - -# One or more tracking issues or pull requests related to the change -issues: [8802] - -# Optional: The change log or logs in which this entry should be included. -# e.g. '[user]' or '[user, api]' -# Include 'user' if the change is relevant to end users. -# Include 'api' if there is a change to a library API. -# Default: '[user]' -change_logs: [api] diff --git a/.chloggen/fix_persistentstorage_index-updates.yaml b/.chloggen/fix_persistentstorage_index-updates.yaml deleted file mode 100755 index 9b10afbaafe..00000000000 --- a/.chloggen/fix_persistentstorage_index-updates.yaml +++ /dev/null @@ -1,25 +0,0 @@ -# Use this changelog template to create an entry for release notes. - -# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' -change_type: bug_fix - -# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver) -component: exporterhelper - -# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). -note: Fix invalid write index updates in the persistent queue - -# One or more tracking issues or pull requests related to the change -issues: [8115] - -# (Optional) One or more lines of additional information to render under the primary note. -# These lines will be padded with 2 spaces and then inserted directly into the document. -# Use pipe (|) for multiline entries. -subtext: - -# Optional: The change log or logs in which this entry should be included. -# e.g. '[user]' or '[user, api]' -# Include 'user' if the change is relevant to end users. -# Include 'api' if there is a change to a library API. -# Default: '[user]' -change_logs: [] \ No newline at end of file diff --git a/.chloggen/fixshutdown.yaml b/.chloggen/fixshutdown.yaml deleted file mode 100755 index 8b016577997..00000000000 --- a/.chloggen/fixshutdown.yaml +++ /dev/null @@ -1,13 +0,0 @@ -# Use this changelog template to create an entry for release notes. - -# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' -change_type: 'enhancement' - -# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver) -component: exporterhelper - -# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). -note: "Fix shutdown logic in persistent queue to not require consumers to be closed first" - -# One or more tracking issues or pull requests related to the change -issues: [8899] diff --git a/.chloggen/mx-psi_remove-NewFlags.yaml b/.chloggen/mx-psi_remove-NewFlags.yaml deleted file mode 100755 index 5302a1f58b2..00000000000 --- a/.chloggen/mx-psi_remove-NewFlags.yaml +++ /dev/null @@ -1,25 +0,0 @@ -# Use this changelog template to create an entry for release notes. - -# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' -change_type: breaking - -# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver) -component: featuregate - -# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). -note: Remove deprecate function `featuregate.NewFlag` - -# One or more tracking issues or pull requests related to the change -issues: [8727] - -# (Optional) One or more lines of additional information to render under the primary note. -# These lines will be padded with 2 spaces and then inserted directly into the document. -# Use pipe (|) for multiline entries. -subtext: Use `featuregate.Registry`'s `RegisterFlags` method instead. - -# Optional: The change log or logs in which this entry should be included. -# e.g. '[user]' or '[user, api]' -# Include 'user' if the change is relevant to end users. -# Include 'api' if there is a change to a library API. -# Default: '[user]' -change_logs: [api] diff --git a/.chloggen/proxy.yaml b/.chloggen/proxy.yaml deleted file mode 100755 index 751d08fa46e..00000000000 --- a/.chloggen/proxy.yaml +++ /dev/null @@ -1,25 +0,0 @@ -# Use this changelog template to create an entry for release notes. - -# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' -change_type: enhancement - -# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver) -component: confighttp - -# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). -note: Support proxy configuration field in all exporters that support confighttp - -# One or more tracking issues or pull requests related to the change -issues: [5761] - -# (Optional) One or more lines of additional information to render under the primary note. -# These lines will be padded with 2 spaces and then inserted directly into the document. -# Use pipe (|) for multiline entries. -subtext: - -# Optional: The change log or logs in which this entry should be included. -# e.g. '[user]' or '[user, api]' -# Include 'user' if the change is relevant to end users. -# Include 'api' if there is a change to a library API. -# Default: '[user]' -change_logs: [] \ No newline at end of file diff --git a/CHANGELOG-API.md b/CHANGELOG-API.md index 73082b9b4bb..4ef6591a436 100644 --- a/CHANGELOG-API.md +++ b/CHANGELOG-API.md @@ -7,6 +7,22 @@ If you are looking for user-facing changes, check out [CHANGELOG.md](./CHANGELOG +## v1.0.0/v0.90.0 + +### 🛑 Breaking changes 🛑 + +- `exporterhelper`: Replace converter interface with function in the new experimental exporter helper. (#8122) +- `featuregate`: Remove deprecate function `featuregate.NewFlag` (#8727) + Use `featuregate.Registry`'s `RegisterFlags` method instead. + +### 🚩 Deprecations 🚩 + +- `telemetry`: deprecate jsonschema generated types (#15009) + +### 💡 Enhancements 💡 + +- `pdata`: Add ZeroThreshold field to exponentialHistogramDataPoint in pmetric package. (#8802) + ## v1.0.0-rcv0018/v0.89.0 ### 🛑 Breaking changes 🛑 diff --git a/CHANGELOG.md b/CHANGELOG.md index 206d65364db..91a651b0aba 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,27 @@ If you are looking for developer-facing changes, check out [CHANGELOG-API.md](./ +## v1.0.0/v0.90.0 + +### 🛑 Breaking changes 🛑 + +- `service`: To remain backwards compatible w/ the metrics generated today, otel generated metrics will be generated without the `_total` suffix (#7454) +- `service`: use WithNamespace instead of WrapRegistererWithPrefix (#8988) + Using this functionality in the otel prom exporter fixes a bug where the + target_info was prefixed as otelcol_target_info previously. + + +### 💡 Enhancements 💡 + +- `exporter/debug`: Change default `verbosity` from `normal` to `basic` (#8844) + This change has currently no effect, as `basic` and `normal` verbosity share the same behavior. This might change in the future though, with the `normal` verbosity being more verbose than it currently is (see https://github.com/open-telemetry/opentelemetry-collector/issues/7806). This is why we are changing the default to `basic`, which is expected to stay at the current level of verbosity (one line per batch). +- `exporterhelper`: Fix shutdown logic in persistent queue to not require consumers to be closed first (#8899) +- `confighttp`: Support proxy configuration field in all exporters that support confighttp (#5761) + +### 🧰 Bug fixes 🧰 + +- `exporterhelper`: Fix invalid write index updates in the persistent queue (#8115) + ## v1.0.0-rcv0018/v0.89.0 ### 💡 Enhancements 💡 diff --git a/cmd/builder/internal/builder/config.go b/cmd/builder/internal/builder/config.go index 34407623433..ca17b644663 100644 --- a/cmd/builder/internal/builder/config.go +++ b/cmd/builder/internal/builder/config.go @@ -16,7 +16,7 @@ import ( "go.uber.org/zap" ) -const defaultOtelColVersion = "0.89.0" +const defaultOtelColVersion = "0.90.0" // ErrInvalidGoMod indicates an invalid gomod var ErrInvalidGoMod = errors.New("invalid gomod specification for module") diff --git a/cmd/builder/internal/config/default.yaml b/cmd/builder/internal/config/default.yaml index dfbb3efba35..cf8f9114ef0 100644 --- a/cmd/builder/internal/config/default.yaml +++ b/cmd/builder/internal/config/default.yaml @@ -2,22 +2,22 @@ dist: module: go.opentelemetry.io/collector/cmd/otelcorecol name: otelcorecol description: Local OpenTelemetry Collector binary, testing only. - version: 0.89.0-dev - otelcol_version: 0.89.0 + version: 0.90.0-dev + otelcol_version: 0.90.0 receivers: - - gomod: go.opentelemetry.io/collector/receiver/otlpreceiver v0.89.0 + - gomod: go.opentelemetry.io/collector/receiver/otlpreceiver v0.90.0 exporters: - - gomod: go.opentelemetry.io/collector/exporter/debugexporter v0.89.0 - - gomod: go.opentelemetry.io/collector/exporter/loggingexporter v0.89.0 - - gomod: go.opentelemetry.io/collector/exporter/otlpexporter v0.89.0 - - gomod: go.opentelemetry.io/collector/exporter/otlphttpexporter v0.89.0 + - gomod: go.opentelemetry.io/collector/exporter/debugexporter v0.90.0 + - gomod: go.opentelemetry.io/collector/exporter/loggingexporter v0.90.0 + - gomod: go.opentelemetry.io/collector/exporter/otlpexporter v0.90.0 + - gomod: go.opentelemetry.io/collector/exporter/otlphttpexporter v0.90.0 extensions: - - gomod: go.opentelemetry.io/collector/extension/ballastextension v0.89.0 - - gomod: go.opentelemetry.io/collector/extension/zpagesextension v0.89.0 + - gomod: go.opentelemetry.io/collector/extension/ballastextension v0.90.0 + - gomod: go.opentelemetry.io/collector/extension/zpagesextension v0.90.0 processors: - - gomod: go.opentelemetry.io/collector/processor/batchprocessor v0.89.0 - - gomod: go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.89.0 + - gomod: go.opentelemetry.io/collector/processor/batchprocessor v0.90.0 + - gomod: go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.90.0 connectors: - - gomod: go.opentelemetry.io/collector/connector/forwardconnector v0.89.0 + - gomod: go.opentelemetry.io/collector/connector/forwardconnector v0.90.0 diff --git a/cmd/builder/test/core.builder.yaml b/cmd/builder/test/core.builder.yaml index 230719acc70..3cd616fcb7d 100644 --- a/cmd/builder/test/core.builder.yaml +++ b/cmd/builder/test/core.builder.yaml @@ -1,20 +1,20 @@ dist: module: go.opentelemetry.io/collector/builder/test/core - otelcol_version: 0.89.0 + otelcol_version: 0.90.0 extensions: - import: go.opentelemetry.io/collector/extension/zpagesextension - gomod: go.opentelemetry.io/collector v0.89.0 + gomod: go.opentelemetry.io/collector v0.90.0 path: ${WORKSPACE_DIR} receivers: - import: go.opentelemetry.io/collector/receiver/otlpreceiver - gomod: go.opentelemetry.io/collector v0.89.0 + gomod: go.opentelemetry.io/collector v0.90.0 path: ${WORKSPACE_DIR} exporters: - import: go.opentelemetry.io/collector/exporter/debugexporter - gomod: go.opentelemetry.io/collector v0.89.0 + gomod: go.opentelemetry.io/collector v0.90.0 path: ${WORKSPACE_DIR} replaces: diff --git a/cmd/otelcorecol/builder-config.yaml b/cmd/otelcorecol/builder-config.yaml index 1526d8b537d..a1f3ee6525d 100644 --- a/cmd/otelcorecol/builder-config.yaml +++ b/cmd/otelcorecol/builder-config.yaml @@ -2,24 +2,24 @@ dist: module: go.opentelemetry.io/collector/cmd/otelcorecol name: otelcorecol description: Local OpenTelemetry Collector binary, testing only. - version: 0.89.0-dev - otelcol_version: 0.89.0 + version: 0.90.0-dev + otelcol_version: 0.90.0 receivers: - - gomod: go.opentelemetry.io/collector/receiver/otlpreceiver v0.89.0 + - gomod: go.opentelemetry.io/collector/receiver/otlpreceiver v0.90.0 exporters: - - gomod: go.opentelemetry.io/collector/exporter/debugexporter v0.89.0 - - gomod: go.opentelemetry.io/collector/exporter/loggingexporter v0.89.0 - - gomod: go.opentelemetry.io/collector/exporter/otlpexporter v0.89.0 - - gomod: go.opentelemetry.io/collector/exporter/otlphttpexporter v0.89.0 + - gomod: go.opentelemetry.io/collector/exporter/debugexporter v0.90.0 + - gomod: go.opentelemetry.io/collector/exporter/loggingexporter v0.90.0 + - gomod: go.opentelemetry.io/collector/exporter/otlpexporter v0.90.0 + - gomod: go.opentelemetry.io/collector/exporter/otlphttpexporter v0.90.0 extensions: - - gomod: go.opentelemetry.io/collector/extension/ballastextension v0.89.0 - - gomod: go.opentelemetry.io/collector/extension/zpagesextension v0.89.0 + - gomod: go.opentelemetry.io/collector/extension/ballastextension v0.90.0 + - gomod: go.opentelemetry.io/collector/extension/zpagesextension v0.90.0 processors: - - gomod: go.opentelemetry.io/collector/processor/batchprocessor v0.89.0 - - gomod: go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.89.0 + - gomod: go.opentelemetry.io/collector/processor/batchprocessor v0.90.0 + - gomod: go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.90.0 connectors: - - gomod: go.opentelemetry.io/collector/connector/forwardconnector v0.89.0 + - gomod: go.opentelemetry.io/collector/connector/forwardconnector v0.90.0 replaces: - go.opentelemetry.io/collector => ../../ diff --git a/cmd/otelcorecol/go.mod b/cmd/otelcorecol/go.mod index f5bfccdba9d..667a3d0bd78 100644 --- a/cmd/otelcorecol/go.mod +++ b/cmd/otelcorecol/go.mod @@ -6,23 +6,23 @@ go 1.20 require ( github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.89.0 - go.opentelemetry.io/collector/connector v0.89.0 - go.opentelemetry.io/collector/connector/forwardconnector v0.89.0 - go.opentelemetry.io/collector/exporter v0.89.0 - go.opentelemetry.io/collector/exporter/debugexporter v0.89.0 - go.opentelemetry.io/collector/exporter/loggingexporter v0.89.0 - go.opentelemetry.io/collector/exporter/otlpexporter v0.89.0 - go.opentelemetry.io/collector/exporter/otlphttpexporter v0.89.0 - go.opentelemetry.io/collector/extension v0.89.0 - go.opentelemetry.io/collector/extension/ballastextension v0.89.0 - go.opentelemetry.io/collector/extension/zpagesextension v0.89.0 - go.opentelemetry.io/collector/otelcol v0.89.0 - go.opentelemetry.io/collector/processor v0.89.0 - go.opentelemetry.io/collector/processor/batchprocessor v0.89.0 - go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.89.0 - go.opentelemetry.io/collector/receiver v0.89.0 - go.opentelemetry.io/collector/receiver/otlpreceiver v0.89.0 + go.opentelemetry.io/collector/component v0.90.0 + go.opentelemetry.io/collector/connector v0.90.0 + go.opentelemetry.io/collector/connector/forwardconnector v0.90.0 + go.opentelemetry.io/collector/exporter v0.90.0 + go.opentelemetry.io/collector/exporter/debugexporter v0.90.0 + go.opentelemetry.io/collector/exporter/loggingexporter v0.90.0 + go.opentelemetry.io/collector/exporter/otlpexporter v0.90.0 + go.opentelemetry.io/collector/exporter/otlphttpexporter v0.90.0 + go.opentelemetry.io/collector/extension v0.90.0 + go.opentelemetry.io/collector/extension/ballastextension v0.90.0 + go.opentelemetry.io/collector/extension/zpagesextension v0.90.0 + go.opentelemetry.io/collector/otelcol v0.90.0 + go.opentelemetry.io/collector/processor v0.90.0 + go.opentelemetry.io/collector/processor/batchprocessor v0.90.0 + go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.90.0 + go.opentelemetry.io/collector/receiver v0.90.0 + go.opentelemetry.io/collector/receiver/otlpreceiver v0.90.0 golang.org/x/sys v0.14.0 ) @@ -77,23 +77,23 @@ require ( github.com/tklauser/numcpus v0.6.1 // indirect github.com/yusufpapurcu/wmi v1.2.3 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector v0.89.0 // indirect - go.opentelemetry.io/collector/config/configauth v0.89.0 // indirect - go.opentelemetry.io/collector/config/configcompression v0.89.0 // indirect - go.opentelemetry.io/collector/config/configgrpc v0.89.0 // indirect - go.opentelemetry.io/collector/config/confighttp v0.89.0 // indirect - go.opentelemetry.io/collector/config/confignet v0.89.0 // indirect - go.opentelemetry.io/collector/config/configopaque v0.89.0 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.89.0 // indirect - go.opentelemetry.io/collector/config/configtls v0.89.0 // indirect - go.opentelemetry.io/collector/config/internal v0.89.0 // indirect - go.opentelemetry.io/collector/confmap v0.89.0 // indirect - go.opentelemetry.io/collector/consumer v0.89.0 // indirect - go.opentelemetry.io/collector/extension/auth v0.89.0 // indirect - go.opentelemetry.io/collector/featuregate v1.0.0-rcv0018 // indirect - go.opentelemetry.io/collector/pdata v1.0.0-rcv0018 // indirect - go.opentelemetry.io/collector/semconv v0.89.0 // indirect - go.opentelemetry.io/collector/service v0.89.0 // indirect + go.opentelemetry.io/collector v0.90.0 // indirect + go.opentelemetry.io/collector/config/configauth v0.90.0 // indirect + go.opentelemetry.io/collector/config/configcompression v0.90.0 // indirect + go.opentelemetry.io/collector/config/configgrpc v0.90.0 // indirect + go.opentelemetry.io/collector/config/confighttp v0.90.0 // indirect + go.opentelemetry.io/collector/config/confignet v0.90.0 // indirect + go.opentelemetry.io/collector/config/configopaque v0.90.0 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.90.0 // indirect + go.opentelemetry.io/collector/config/configtls v0.90.0 // indirect + go.opentelemetry.io/collector/config/internal v0.90.0 // indirect + go.opentelemetry.io/collector/confmap v0.90.0 // indirect + go.opentelemetry.io/collector/consumer v0.90.0 // indirect + go.opentelemetry.io/collector/extension/auth v0.90.0 // indirect + go.opentelemetry.io/collector/featuregate v1.0.0 // indirect + go.opentelemetry.io/collector/pdata v1.0.0 // indirect + go.opentelemetry.io/collector/semconv v0.90.0 // indirect + go.opentelemetry.io/collector/service v0.90.0 // indirect go.opentelemetry.io/contrib/config v0.1.1 // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.46.1 // indirect diff --git a/cmd/otelcorecol/main.go b/cmd/otelcorecol/main.go index 3e78c70b501..9a71baf327a 100644 --- a/cmd/otelcorecol/main.go +++ b/cmd/otelcorecol/main.go @@ -14,7 +14,7 @@ func main() { info := component.BuildInfo{ Command: "otelcorecol", Description: "Local OpenTelemetry Collector binary, testing only.", - Version: "0.89.0-dev", + Version: "0.90.0-dev", } if err := run(otelcol.CollectorSettings{BuildInfo: info, Factories: components}); err != nil { diff --git a/component/go.mod b/component/go.mod index 40c30879438..c58fe1f0e69 100644 --- a/component/go.mod +++ b/component/go.mod @@ -4,9 +4,9 @@ go 1.20 require ( github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/config/configtelemetry v0.89.0 - go.opentelemetry.io/collector/confmap v0.89.0 - go.opentelemetry.io/collector/pdata v1.0.0-rcv0018 + go.opentelemetry.io/collector/config/configtelemetry v0.90.0 + go.opentelemetry.io/collector/confmap v0.90.0 + go.opentelemetry.io/collector/pdata v1.0.0 go.opentelemetry.io/otel/metric v1.21.0 go.opentelemetry.io/otel/trace v1.21.0 go.uber.org/multierr v1.11.0 @@ -25,7 +25,7 @@ require ( github.com/mitchellh/mapstructure v1.5.1-0.20220423185008-bf980b35cac4 // indirect github.com/mitchellh/reflectwalk v1.0.2 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect - go.opentelemetry.io/collector/featuregate v1.0.0-rcv0018 // indirect + go.opentelemetry.io/collector/featuregate v1.0.0 // indirect go.opentelemetry.io/otel v1.21.0 // indirect golang.org/x/net v0.18.0 // indirect golang.org/x/sys v0.14.0 // indirect diff --git a/config/configauth/go.mod b/config/configauth/go.mod index 7dd9a02728f..30366c91dcc 100644 --- a/config/configauth/go.mod +++ b/config/configauth/go.mod @@ -4,9 +4,9 @@ go 1.20 require ( github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.89.0 - go.opentelemetry.io/collector/extension v0.89.0 - go.opentelemetry.io/collector/extension/auth v0.89.0 + go.opentelemetry.io/collector/component v0.90.0 + go.opentelemetry.io/collector/extension v0.90.0 + go.opentelemetry.io/collector/extension/auth v0.90.0 ) require ( @@ -21,10 +21,10 @@ require ( github.com/mitchellh/mapstructure v1.5.1-0.20220423185008-bf980b35cac4 // indirect github.com/mitchellh/reflectwalk v1.0.2 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.89.0 // indirect - go.opentelemetry.io/collector/confmap v0.89.0 // indirect - go.opentelemetry.io/collector/featuregate v1.0.0-rcv0018 // indirect - go.opentelemetry.io/collector/pdata v1.0.0-rcv0018 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.90.0 // indirect + go.opentelemetry.io/collector/confmap v0.90.0 // indirect + go.opentelemetry.io/collector/featuregate v1.0.0 // indirect + go.opentelemetry.io/collector/pdata v1.0.0 // indirect go.opentelemetry.io/otel v1.21.0 // indirect go.opentelemetry.io/otel/metric v1.21.0 // indirect go.opentelemetry.io/otel/trace v1.21.0 // indirect diff --git a/config/configgrpc/go.mod b/config/configgrpc/go.mod index 7ed7cb17f60..de5b026bf76 100644 --- a/config/configgrpc/go.mod +++ b/config/configgrpc/go.mod @@ -5,16 +5,16 @@ go 1.20 require ( github.com/mostynb/go-grpc-compression v1.2.2 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector v0.89.0 - go.opentelemetry.io/collector/component v0.89.0 - go.opentelemetry.io/collector/config/configauth v0.89.0 - go.opentelemetry.io/collector/config/configcompression v0.89.0 - go.opentelemetry.io/collector/config/confignet v0.89.0 - go.opentelemetry.io/collector/config/configopaque v0.89.0 - go.opentelemetry.io/collector/config/configtls v0.89.0 - go.opentelemetry.io/collector/config/internal v0.89.0 - go.opentelemetry.io/collector/extension/auth v0.89.0 - go.opentelemetry.io/collector/pdata v1.0.0-rcv0018 + go.opentelemetry.io/collector v0.90.0 + go.opentelemetry.io/collector/component v0.90.0 + go.opentelemetry.io/collector/config/configauth v0.90.0 + go.opentelemetry.io/collector/config/configcompression v0.90.0 + go.opentelemetry.io/collector/config/confignet v0.90.0 + go.opentelemetry.io/collector/config/configopaque v0.90.0 + go.opentelemetry.io/collector/config/configtls v0.90.0 + go.opentelemetry.io/collector/config/internal v0.90.0 + go.opentelemetry.io/collector/extension/auth v0.90.0 + go.opentelemetry.io/collector/pdata v1.0.0 go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.0 go.opentelemetry.io/otel v1.21.0 go.uber.org/zap v1.26.0 @@ -55,10 +55,10 @@ require ( github.com/prometheus/procfs v0.11.1 // indirect github.com/prometheus/statsd_exporter v0.22.7 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.89.0 // indirect - go.opentelemetry.io/collector/confmap v0.89.0 // indirect - go.opentelemetry.io/collector/extension v0.89.0 // indirect - go.opentelemetry.io/collector/featuregate v1.0.0-rcv0018 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.90.0 // indirect + go.opentelemetry.io/collector/confmap v0.90.0 // indirect + go.opentelemetry.io/collector/extension v0.90.0 // indirect + go.opentelemetry.io/collector/featuregate v1.0.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.44.0 // indirect go.opentelemetry.io/otel/metric v1.21.0 // indirect go.opentelemetry.io/otel/sdk v1.21.0 // indirect diff --git a/config/confighttp/go.mod b/config/confighttp/go.mod index 3cdb4281988..b991126b5ee 100644 --- a/config/confighttp/go.mod +++ b/config/confighttp/go.mod @@ -7,15 +7,15 @@ require ( github.com/klauspost/compress v1.17.3 github.com/rs/cors v1.10.1 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector v0.89.0 - go.opentelemetry.io/collector/component v0.89.0 - go.opentelemetry.io/collector/config/configauth v0.89.0 - go.opentelemetry.io/collector/config/configcompression v0.89.0 - go.opentelemetry.io/collector/config/configopaque v0.89.0 - go.opentelemetry.io/collector/config/configtelemetry v0.89.0 - go.opentelemetry.io/collector/config/configtls v0.89.0 - go.opentelemetry.io/collector/config/internal v0.89.0 - go.opentelemetry.io/collector/extension/auth v0.89.0 + go.opentelemetry.io/collector v0.90.0 + go.opentelemetry.io/collector/component v0.90.0 + go.opentelemetry.io/collector/config/configauth v0.90.0 + go.opentelemetry.io/collector/config/configcompression v0.90.0 + go.opentelemetry.io/collector/config/configopaque v0.90.0 + go.opentelemetry.io/collector/config/configtelemetry v0.90.0 + go.opentelemetry.io/collector/config/configtls v0.90.0 + go.opentelemetry.io/collector/config/internal v0.90.0 + go.opentelemetry.io/collector/extension/auth v0.90.0 go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.46.1 go.opentelemetry.io/otel v1.21.0 go.uber.org/zap v1.26.0 @@ -38,10 +38,10 @@ require ( github.com/mitchellh/mapstructure v1.5.1-0.20220423185008-bf980b35cac4 // indirect github.com/mitchellh/reflectwalk v1.0.2 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect - go.opentelemetry.io/collector/confmap v0.89.0 // indirect - go.opentelemetry.io/collector/extension v0.89.0 // indirect - go.opentelemetry.io/collector/featuregate v1.0.0-rcv0018 // indirect - go.opentelemetry.io/collector/pdata v1.0.0-rcv0018 // indirect + go.opentelemetry.io/collector/confmap v0.90.0 // indirect + go.opentelemetry.io/collector/extension v0.90.0 // indirect + go.opentelemetry.io/collector/featuregate v1.0.0 // indirect + go.opentelemetry.io/collector/pdata v1.0.0 // indirect go.opentelemetry.io/otel/metric v1.21.0 // indirect go.opentelemetry.io/otel/trace v1.21.0 // indirect go.uber.org/multierr v1.11.0 // indirect diff --git a/config/configtls/go.mod b/config/configtls/go.mod index 57e822cc1cd..6113e3f2f04 100644 --- a/config/configtls/go.mod +++ b/config/configtls/go.mod @@ -5,7 +5,7 @@ go 1.20 require ( github.com/fsnotify/fsnotify v1.7.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/config/configopaque v0.89.0 + go.opentelemetry.io/collector/config/configopaque v0.90.0 ) require ( diff --git a/confmap/go.mod b/confmap/go.mod index a0100ff1698..c01c1ee96b8 100644 --- a/confmap/go.mod +++ b/confmap/go.mod @@ -8,7 +8,7 @@ require ( github.com/knadh/koanf/v2 v2.0.1 github.com/mitchellh/mapstructure v1.5.1-0.20220423185008-bf980b35cac4 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/featuregate v1.0.0-rcv0018 + go.opentelemetry.io/collector/featuregate v1.0.0 go.uber.org/multierr v1.11.0 gopkg.in/yaml.v3 v3.0.1 ) diff --git a/connector/forwardconnector/go.mod b/connector/forwardconnector/go.mod index 431d440beed..c281603cfa4 100644 --- a/connector/forwardconnector/go.mod +++ b/connector/forwardconnector/go.mod @@ -4,10 +4,10 @@ go 1.20 require ( github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.89.0 - go.opentelemetry.io/collector/connector v0.89.0 - go.opentelemetry.io/collector/consumer v0.89.0 - go.opentelemetry.io/collector/pdata v1.0.0-rcv0018 + go.opentelemetry.io/collector/component v0.90.0 + go.opentelemetry.io/collector/connector v0.90.0 + go.opentelemetry.io/collector/consumer v0.90.0 + go.opentelemetry.io/collector/pdata v1.0.0 ) require ( @@ -25,10 +25,10 @@ require ( 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/collector v0.89.0 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.89.0 // indirect - go.opentelemetry.io/collector/confmap v0.89.0 // indirect - go.opentelemetry.io/collector/featuregate v1.0.0-rcv0018 // indirect + go.opentelemetry.io/collector v0.90.0 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.90.0 // indirect + go.opentelemetry.io/collector/confmap v0.90.0 // indirect + go.opentelemetry.io/collector/featuregate v1.0.0 // indirect go.opentelemetry.io/otel v1.21.0 // indirect go.opentelemetry.io/otel/metric v1.21.0 // indirect go.opentelemetry.io/otel/trace v1.21.0 // indirect diff --git a/connector/go.mod b/connector/go.mod index 516caa000e3..b11aa8ef470 100644 --- a/connector/go.mod +++ b/connector/go.mod @@ -4,10 +4,10 @@ go 1.20 require ( github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector v0.89.0 - go.opentelemetry.io/collector/component v0.89.0 - go.opentelemetry.io/collector/consumer v0.89.0 - go.opentelemetry.io/collector/pdata v1.0.0-rcv0018 + go.opentelemetry.io/collector v0.90.0 + go.opentelemetry.io/collector/component v0.90.0 + go.opentelemetry.io/collector/consumer v0.90.0 + go.opentelemetry.io/collector/pdata v1.0.0 go.uber.org/zap v1.26.0 ) @@ -26,9 +26,9 @@ require ( 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/collector/config/configtelemetry v0.89.0 // indirect - go.opentelemetry.io/collector/confmap v0.89.0 // indirect - go.opentelemetry.io/collector/featuregate v1.0.0-rcv0018 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.90.0 // indirect + go.opentelemetry.io/collector/confmap v0.90.0 // indirect + go.opentelemetry.io/collector/featuregate v1.0.0 // indirect go.opentelemetry.io/otel v1.21.0 // indirect go.opentelemetry.io/otel/metric v1.21.0 // indirect go.opentelemetry.io/otel/trace v1.21.0 // indirect diff --git a/consumer/go.mod b/consumer/go.mod index 96ce04cdd00..7974139a685 100644 --- a/consumer/go.mod +++ b/consumer/go.mod @@ -4,8 +4,8 @@ go 1.20 require ( github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector v0.89.0 - go.opentelemetry.io/collector/pdata v1.0.0-rcv0018 + go.opentelemetry.io/collector v0.90.0 + go.opentelemetry.io/collector/pdata v1.0.0 ) require ( diff --git a/examples/k8s/otel-config.yaml b/examples/k8s/otel-config.yaml index 42286a00eaf..d5383591edd 100644 --- a/examples/k8s/otel-config.yaml +++ b/examples/k8s/otel-config.yaml @@ -68,7 +68,7 @@ spec: - command: - "/otelcol" - "--config=/conf/otel-agent-config.yaml" - image: otel/opentelemetry-collector:0.89.0 + image: otel/opentelemetry-collector:0.90.0 name: otel-agent resources: limits: @@ -187,7 +187,7 @@ spec: - command: - "/otelcol" - "--config=/conf/otel-collector-config.yaml" - image: otel/opentelemetry-collector:0.89.0 + image: otel/opentelemetry-collector:0.90.0 name: otel-collector resources: limits: diff --git a/exporter/debugexporter/go.mod b/exporter/debugexporter/go.mod index 7eb82a56d89..860f7637316 100644 --- a/exporter/debugexporter/go.mod +++ b/exporter/debugexporter/go.mod @@ -4,10 +4,10 @@ go 1.20 require ( github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.89.0 - go.opentelemetry.io/collector/config/configtelemetry v0.89.0 - go.opentelemetry.io/collector/confmap v0.89.0 - go.opentelemetry.io/collector/exporter v0.89.0 + go.opentelemetry.io/collector/component v0.90.0 + go.opentelemetry.io/collector/config/configtelemetry v0.90.0 + go.opentelemetry.io/collector/confmap v0.90.0 + go.opentelemetry.io/collector/exporter v0.90.0 ) require ( @@ -27,12 +27,12 @@ require ( github.com/modern-go/reflect2 v1.0.2 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector v0.89.0 // indirect - go.opentelemetry.io/collector/consumer v0.89.0 // indirect - go.opentelemetry.io/collector/extension v0.89.0 // indirect - go.opentelemetry.io/collector/featuregate v1.0.0-rcv0018 // indirect - go.opentelemetry.io/collector/pdata v1.0.0-rcv0018 // indirect - go.opentelemetry.io/collector/receiver v0.89.0 // indirect + go.opentelemetry.io/collector v0.90.0 // indirect + go.opentelemetry.io/collector/consumer v0.90.0 // indirect + go.opentelemetry.io/collector/extension v0.90.0 // indirect + go.opentelemetry.io/collector/featuregate v1.0.0 // indirect + go.opentelemetry.io/collector/pdata v1.0.0 // indirect + go.opentelemetry.io/collector/receiver v0.90.0 // indirect go.opentelemetry.io/otel v1.21.0 // indirect go.opentelemetry.io/otel/metric v1.21.0 // indirect go.opentelemetry.io/otel/trace v1.21.0 // indirect diff --git a/exporter/go.mod b/exporter/go.mod index 74e6f239858..940a11b8eb0 100644 --- a/exporter/go.mod +++ b/exporter/go.mod @@ -6,14 +6,14 @@ require ( github.com/cenkalti/backoff/v4 v4.2.1 github.com/stretchr/testify v1.8.4 go.opencensus.io v0.24.0 - go.opentelemetry.io/collector v0.89.0 - go.opentelemetry.io/collector/component v0.89.0 - go.opentelemetry.io/collector/config/configtelemetry v0.89.0 - go.opentelemetry.io/collector/consumer v0.89.0 - go.opentelemetry.io/collector/extension v0.89.0 - go.opentelemetry.io/collector/featuregate v1.0.0-rcv0018 - go.opentelemetry.io/collector/pdata v1.0.0-rcv0018 - go.opentelemetry.io/collector/receiver v0.89.0 + go.opentelemetry.io/collector v0.90.0 + go.opentelemetry.io/collector/component v0.90.0 + go.opentelemetry.io/collector/config/configtelemetry v0.90.0 + go.opentelemetry.io/collector/consumer v0.90.0 + go.opentelemetry.io/collector/extension v0.90.0 + go.opentelemetry.io/collector/featuregate v1.0.0 + go.opentelemetry.io/collector/pdata v1.0.0 + go.opentelemetry.io/collector/receiver v0.90.0 go.opentelemetry.io/otel v1.21.0 go.opentelemetry.io/otel/metric v1.21.0 go.opentelemetry.io/otel/sdk v1.21.0 @@ -53,7 +53,7 @@ require ( github.com/prometheus/common v0.45.0 // indirect github.com/prometheus/procfs v0.11.1 // indirect github.com/prometheus/statsd_exporter v0.22.7 // indirect - go.opentelemetry.io/collector/confmap v0.89.0 // indirect + go.opentelemetry.io/collector/confmap v0.90.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.44.0 // indirect go.opentelemetry.io/otel/sdk/metric v1.21.0 // indirect golang.org/x/net v0.18.0 // indirect diff --git a/exporter/loggingexporter/go.mod b/exporter/loggingexporter/go.mod index 04dad14b623..04f6f3c39b7 100644 --- a/exporter/loggingexporter/go.mod +++ b/exporter/loggingexporter/go.mod @@ -5,10 +5,10 @@ go 1.20 require ( github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.89.0 - go.opentelemetry.io/collector/config/configtelemetry v0.89.0 - go.opentelemetry.io/collector/confmap v0.89.0 - go.opentelemetry.io/collector/exporter v0.89.0 + go.opentelemetry.io/collector/component v0.90.0 + go.opentelemetry.io/collector/config/configtelemetry v0.90.0 + go.opentelemetry.io/collector/confmap v0.90.0 + go.opentelemetry.io/collector/exporter v0.90.0 go.uber.org/zap v1.26.0 ) @@ -29,12 +29,12 @@ require ( github.com/modern-go/reflect2 v1.0.2 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector v0.89.0 // indirect - go.opentelemetry.io/collector/consumer v0.89.0 // indirect - go.opentelemetry.io/collector/extension v0.89.0 // indirect - go.opentelemetry.io/collector/featuregate v1.0.0-rcv0018 // indirect - go.opentelemetry.io/collector/pdata v1.0.0-rcv0018 // indirect - go.opentelemetry.io/collector/receiver v0.89.0 // indirect + go.opentelemetry.io/collector v0.90.0 // indirect + go.opentelemetry.io/collector/consumer v0.90.0 // indirect + go.opentelemetry.io/collector/extension v0.90.0 // indirect + go.opentelemetry.io/collector/featuregate v1.0.0 // indirect + go.opentelemetry.io/collector/pdata v1.0.0 // indirect + go.opentelemetry.io/collector/receiver v0.90.0 // indirect go.opentelemetry.io/otel v1.21.0 // indirect go.opentelemetry.io/otel/metric v1.21.0 // indirect go.opentelemetry.io/otel/trace v1.21.0 // indirect diff --git a/exporter/otlpexporter/go.mod b/exporter/otlpexporter/go.mod index f1f5a4a0a76..8e5d11253cb 100644 --- a/exporter/otlpexporter/go.mod +++ b/exporter/otlpexporter/go.mod @@ -4,18 +4,18 @@ go 1.20 require ( github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector v0.89.0 - go.opentelemetry.io/collector/component v0.89.0 - go.opentelemetry.io/collector/config/configauth v0.89.0 - go.opentelemetry.io/collector/config/configcompression v0.89.0 - go.opentelemetry.io/collector/config/configgrpc v0.89.0 - go.opentelemetry.io/collector/config/configopaque v0.89.0 - go.opentelemetry.io/collector/config/configtls v0.89.0 - go.opentelemetry.io/collector/confmap v0.89.0 - go.opentelemetry.io/collector/consumer v0.89.0 - go.opentelemetry.io/collector/exporter v0.89.0 - go.opentelemetry.io/collector/pdata v1.0.0-rcv0018 - go.opentelemetry.io/collector/receiver/otlpreceiver v0.89.0 + go.opentelemetry.io/collector v0.90.0 + go.opentelemetry.io/collector/component v0.90.0 + go.opentelemetry.io/collector/config/configauth v0.90.0 + go.opentelemetry.io/collector/config/configcompression v0.90.0 + go.opentelemetry.io/collector/config/configgrpc v0.90.0 + go.opentelemetry.io/collector/config/configopaque v0.90.0 + go.opentelemetry.io/collector/config/configtls v0.90.0 + go.opentelemetry.io/collector/confmap v0.90.0 + go.opentelemetry.io/collector/consumer v0.90.0 + go.opentelemetry.io/collector/exporter v0.90.0 + go.opentelemetry.io/collector/pdata v1.0.0 + go.opentelemetry.io/collector/receiver/otlpreceiver v0.90.0 google.golang.org/genproto/googleapis/rpc v0.0.0-20231120223509-83a465c0220f google.golang.org/grpc v1.59.0 google.golang.org/protobuf v1.31.0 @@ -47,14 +47,14 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rs/cors v1.10.1 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/config/confighttp v0.89.0 // indirect - go.opentelemetry.io/collector/config/confignet v0.89.0 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.89.0 // indirect - go.opentelemetry.io/collector/config/internal v0.89.0 // indirect - go.opentelemetry.io/collector/extension v0.89.0 // indirect - go.opentelemetry.io/collector/extension/auth v0.89.0 // indirect - go.opentelemetry.io/collector/featuregate v1.0.0-rcv0018 // indirect - go.opentelemetry.io/collector/receiver v0.89.0 // indirect + go.opentelemetry.io/collector/config/confighttp v0.90.0 // indirect + go.opentelemetry.io/collector/config/confignet v0.90.0 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.90.0 // indirect + go.opentelemetry.io/collector/config/internal v0.90.0 // indirect + go.opentelemetry.io/collector/extension v0.90.0 // indirect + go.opentelemetry.io/collector/extension/auth v0.90.0 // indirect + go.opentelemetry.io/collector/featuregate v1.0.0 // indirect + go.opentelemetry.io/collector/receiver v0.90.0 // indirect go.opentelemetry.io/contrib/config v0.1.1 // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.46.1 // indirect diff --git a/exporter/otlphttpexporter/go.mod b/exporter/otlphttpexporter/go.mod index 22e994491d1..291ef788f13 100644 --- a/exporter/otlphttpexporter/go.mod +++ b/exporter/otlphttpexporter/go.mod @@ -4,18 +4,18 @@ go 1.20 require ( github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector v0.89.0 - go.opentelemetry.io/collector/component v0.89.0 - go.opentelemetry.io/collector/config/configcompression v0.89.0 - go.opentelemetry.io/collector/config/confighttp v0.89.0 - go.opentelemetry.io/collector/config/configopaque v0.89.0 - go.opentelemetry.io/collector/config/configtls v0.89.0 - go.opentelemetry.io/collector/confmap v0.89.0 - go.opentelemetry.io/collector/consumer v0.89.0 - go.opentelemetry.io/collector/exporter v0.89.0 - go.opentelemetry.io/collector/pdata v1.0.0-rcv0018 - go.opentelemetry.io/collector/receiver v0.89.0 - go.opentelemetry.io/collector/receiver/otlpreceiver v0.89.0 + go.opentelemetry.io/collector v0.90.0 + go.opentelemetry.io/collector/component v0.90.0 + go.opentelemetry.io/collector/config/configcompression v0.90.0 + go.opentelemetry.io/collector/config/confighttp v0.90.0 + go.opentelemetry.io/collector/config/configopaque v0.90.0 + go.opentelemetry.io/collector/config/configtls v0.90.0 + go.opentelemetry.io/collector/confmap v0.90.0 + go.opentelemetry.io/collector/consumer v0.90.0 + go.opentelemetry.io/collector/exporter v0.90.0 + go.opentelemetry.io/collector/pdata v1.0.0 + go.opentelemetry.io/collector/receiver v0.90.0 + go.opentelemetry.io/collector/receiver/otlpreceiver v0.90.0 go.uber.org/zap v1.26.0 google.golang.org/genproto/googleapis/rpc v0.0.0-20231120223509-83a465c0220f google.golang.org/grpc v1.59.0 @@ -48,14 +48,14 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rs/cors v1.10.1 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/config/configauth v0.89.0 // indirect - go.opentelemetry.io/collector/config/configgrpc v0.89.0 // indirect - go.opentelemetry.io/collector/config/confignet v0.89.0 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.89.0 // indirect - go.opentelemetry.io/collector/config/internal v0.89.0 // indirect - go.opentelemetry.io/collector/extension v0.89.0 // indirect - go.opentelemetry.io/collector/extension/auth v0.89.0 // indirect - go.opentelemetry.io/collector/featuregate v1.0.0-rcv0018 // indirect + go.opentelemetry.io/collector/config/configauth v0.90.0 // indirect + go.opentelemetry.io/collector/config/configgrpc v0.90.0 // indirect + go.opentelemetry.io/collector/config/confignet v0.90.0 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.90.0 // indirect + go.opentelemetry.io/collector/config/internal v0.90.0 // indirect + go.opentelemetry.io/collector/extension v0.90.0 // indirect + go.opentelemetry.io/collector/extension/auth v0.90.0 // indirect + go.opentelemetry.io/collector/featuregate v1.0.0 // indirect go.opentelemetry.io/contrib/config v0.1.1 // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.46.1 // indirect diff --git a/extension/auth/go.mod b/extension/auth/go.mod index 564e1899960..af743158a04 100644 --- a/extension/auth/go.mod +++ b/extension/auth/go.mod @@ -4,8 +4,8 @@ go 1.20 require ( github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.89.0 - go.opentelemetry.io/collector/extension v0.89.0 + go.opentelemetry.io/collector/component v0.90.0 + go.opentelemetry.io/collector/extension v0.90.0 google.golang.org/grpc v1.59.0 ) @@ -21,10 +21,10 @@ require ( github.com/mitchellh/mapstructure v1.5.1-0.20220423185008-bf980b35cac4 // indirect github.com/mitchellh/reflectwalk v1.0.2 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.89.0 // indirect - go.opentelemetry.io/collector/confmap v0.89.0 // indirect - go.opentelemetry.io/collector/featuregate v1.0.0-rcv0018 // indirect - go.opentelemetry.io/collector/pdata v1.0.0-rcv0018 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.90.0 // indirect + go.opentelemetry.io/collector/confmap v0.90.0 // indirect + go.opentelemetry.io/collector/featuregate v1.0.0 // indirect + go.opentelemetry.io/collector/pdata v1.0.0 // indirect go.opentelemetry.io/otel v1.21.0 // indirect go.opentelemetry.io/otel/metric v1.21.0 // indirect go.opentelemetry.io/otel/trace v1.21.0 // indirect diff --git a/extension/ballastextension/go.mod b/extension/ballastextension/go.mod index 83e6d18ebb6..e670f4c9148 100644 --- a/extension/ballastextension/go.mod +++ b/extension/ballastextension/go.mod @@ -4,10 +4,10 @@ go 1.20 require ( github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector v0.89.0 - go.opentelemetry.io/collector/component v0.89.0 - go.opentelemetry.io/collector/confmap v0.89.0 - go.opentelemetry.io/collector/extension v0.89.0 + go.opentelemetry.io/collector v0.90.0 + go.opentelemetry.io/collector/component v0.90.0 + go.opentelemetry.io/collector/confmap v0.90.0 + go.opentelemetry.io/collector/extension v0.90.0 go.uber.org/zap v1.26.0 ) @@ -30,9 +30,9 @@ require ( github.com/tklauser/go-sysconf v0.3.12 // indirect github.com/tklauser/numcpus v0.6.1 // indirect github.com/yusufpapurcu/wmi v1.2.3 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.89.0 // indirect - go.opentelemetry.io/collector/featuregate v1.0.0-rcv0018 // indirect - go.opentelemetry.io/collector/pdata v1.0.0-rcv0018 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.90.0 // indirect + go.opentelemetry.io/collector/featuregate v1.0.0 // indirect + go.opentelemetry.io/collector/pdata v1.0.0 // indirect go.opentelemetry.io/otel v1.21.0 // indirect go.opentelemetry.io/otel/metric v1.21.0 // indirect go.opentelemetry.io/otel/trace v1.21.0 // indirect diff --git a/extension/go.mod b/extension/go.mod index efb860e5493..1cc7e26225d 100644 --- a/extension/go.mod +++ b/extension/go.mod @@ -4,8 +4,8 @@ go 1.20 require ( github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.89.0 - go.opentelemetry.io/collector/confmap v0.89.0 + go.opentelemetry.io/collector/component v0.90.0 + go.opentelemetry.io/collector/confmap v0.90.0 ) require ( @@ -20,9 +20,9 @@ require ( github.com/mitchellh/mapstructure v1.5.1-0.20220423185008-bf980b35cac4 // indirect github.com/mitchellh/reflectwalk v1.0.2 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.89.0 // indirect - go.opentelemetry.io/collector/featuregate v1.0.0-rcv0018 // indirect - go.opentelemetry.io/collector/pdata v1.0.0-rcv0018 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.90.0 // indirect + go.opentelemetry.io/collector/featuregate v1.0.0 // indirect + go.opentelemetry.io/collector/pdata v1.0.0 // indirect go.opentelemetry.io/otel v1.21.0 // indirect go.opentelemetry.io/otel/metric v1.21.0 // indirect go.opentelemetry.io/otel/trace v1.21.0 // indirect diff --git a/extension/zpagesextension/go.mod b/extension/zpagesextension/go.mod index 478a6cbfd1c..285689989c5 100644 --- a/extension/zpagesextension/go.mod +++ b/extension/zpagesextension/go.mod @@ -4,11 +4,11 @@ go 1.20 require ( github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector v0.89.0 - go.opentelemetry.io/collector/component v0.89.0 - go.opentelemetry.io/collector/config/confignet v0.89.0 - go.opentelemetry.io/collector/confmap v0.89.0 - go.opentelemetry.io/collector/extension v0.89.0 + go.opentelemetry.io/collector v0.90.0 + go.opentelemetry.io/collector/component v0.90.0 + go.opentelemetry.io/collector/config/confignet v0.90.0 + go.opentelemetry.io/collector/confmap v0.90.0 + go.opentelemetry.io/collector/extension v0.90.0 go.opentelemetry.io/contrib/zpages v0.46.1 go.opentelemetry.io/otel/sdk v1.21.0 go.opentelemetry.io/otel/trace v1.21.0 @@ -29,9 +29,9 @@ require ( github.com/mitchellh/mapstructure v1.5.1-0.20220423185008-bf980b35cac4 // indirect github.com/mitchellh/reflectwalk v1.0.2 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.89.0 // indirect - go.opentelemetry.io/collector/featuregate v1.0.0-rcv0018 // indirect - go.opentelemetry.io/collector/pdata v1.0.0-rcv0018 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.90.0 // indirect + go.opentelemetry.io/collector/featuregate v1.0.0 // indirect + go.opentelemetry.io/collector/pdata v1.0.0 // indirect go.opentelemetry.io/contrib/config v0.1.1 // indirect go.opentelemetry.io/otel v1.21.0 // indirect go.opentelemetry.io/otel/metric v1.21.0 // indirect diff --git a/go.mod b/go.mod index 3556267546d..954c2c5e206 100644 --- a/go.mod +++ b/go.mod @@ -10,15 +10,15 @@ require ( github.com/shirou/gopsutil/v3 v3.23.10 github.com/stretchr/testify v1.8.4 go.opencensus.io v0.24.0 - go.opentelemetry.io/collector/component v0.89.0 - go.opentelemetry.io/collector/config/configtelemetry v0.89.0 - go.opentelemetry.io/collector/connector v0.89.0 - go.opentelemetry.io/collector/consumer v0.89.0 - go.opentelemetry.io/collector/exporter v0.89.0 - go.opentelemetry.io/collector/featuregate v1.0.0-rcv0018 - go.opentelemetry.io/collector/pdata v1.0.0-rcv0018 - go.opentelemetry.io/collector/processor v0.89.0 - go.opentelemetry.io/collector/receiver v0.89.0 + go.opentelemetry.io/collector/component v0.90.0 + go.opentelemetry.io/collector/config/configtelemetry v0.90.0 + go.opentelemetry.io/collector/connector v0.90.0 + go.opentelemetry.io/collector/consumer v0.90.0 + go.opentelemetry.io/collector/exporter v0.90.0 + go.opentelemetry.io/collector/featuregate v1.0.0 + go.opentelemetry.io/collector/pdata v1.0.0 + go.opentelemetry.io/collector/processor v0.90.0 + go.opentelemetry.io/collector/receiver v0.90.0 go.opentelemetry.io/contrib/config v0.1.1 go.opentelemetry.io/otel v1.21.0 go.opentelemetry.io/otel/exporters/prometheus v0.44.0 @@ -59,8 +59,8 @@ require ( github.com/tklauser/go-sysconf v0.3.12 // indirect github.com/tklauser/numcpus v0.6.1 // indirect github.com/yusufpapurcu/wmi v1.2.3 // indirect - go.opentelemetry.io/collector/confmap v0.89.0 // indirect - go.opentelemetry.io/collector/extension v0.89.0 // indirect + go.opentelemetry.io/collector/confmap v0.90.0 // indirect + go.opentelemetry.io/collector/extension v0.90.0 // indirect go.opentelemetry.io/otel/metric v1.21.0 // indirect go.opentelemetry.io/otel/trace v1.21.0 // indirect go.uber.org/goleak v1.2.1 // indirect diff --git a/otelcol/go.mod b/otelcol/go.mod index 58aae1c4417..63e87f32e44 100644 --- a/otelcol/go.mod +++ b/otelcol/go.mod @@ -5,16 +5,16 @@ go 1.20 require ( github.com/spf13/cobra v1.8.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.89.0 - go.opentelemetry.io/collector/config/configtelemetry v0.89.0 - go.opentelemetry.io/collector/confmap v0.89.0 - go.opentelemetry.io/collector/connector v0.89.0 - go.opentelemetry.io/collector/exporter v0.89.0 - go.opentelemetry.io/collector/extension v0.89.0 - go.opentelemetry.io/collector/featuregate v1.0.0-rcv0018 - go.opentelemetry.io/collector/processor v0.89.0 - go.opentelemetry.io/collector/receiver v0.89.0 - go.opentelemetry.io/collector/service v0.89.0 + go.opentelemetry.io/collector/component v0.90.0 + go.opentelemetry.io/collector/config/configtelemetry v0.90.0 + go.opentelemetry.io/collector/confmap v0.90.0 + go.opentelemetry.io/collector/connector v0.90.0 + go.opentelemetry.io/collector/exporter v0.90.0 + go.opentelemetry.io/collector/extension v0.90.0 + go.opentelemetry.io/collector/featuregate v1.0.0 + go.opentelemetry.io/collector/processor v0.90.0 + go.opentelemetry.io/collector/receiver v0.90.0 + go.opentelemetry.io/collector/service v0.90.0 go.uber.org/multierr v1.11.0 go.uber.org/zap v1.26.0 golang.org/x/sys v0.14.0 @@ -65,10 +65,10 @@ require ( github.com/tklauser/numcpus v0.6.1 // indirect github.com/yusufpapurcu/wmi v1.2.3 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector v0.89.0 // indirect - go.opentelemetry.io/collector/consumer v0.89.0 // indirect - go.opentelemetry.io/collector/pdata v1.0.0-rcv0018 // indirect - go.opentelemetry.io/collector/semconv v0.89.0 // indirect + go.opentelemetry.io/collector v0.90.0 // indirect + go.opentelemetry.io/collector/consumer v0.90.0 // indirect + go.opentelemetry.io/collector/pdata v1.0.0 // indirect + go.opentelemetry.io/collector/semconv v0.90.0 // indirect go.opentelemetry.io/contrib/config v0.1.1 // indirect go.opentelemetry.io/contrib/propagators/b3 v1.21.1 // indirect go.opentelemetry.io/otel v1.21.0 // indirect diff --git a/processor/batchprocessor/go.mod b/processor/batchprocessor/go.mod index 44722c264d2..c24e05d8f08 100644 --- a/processor/batchprocessor/go.mod +++ b/processor/batchprocessor/go.mod @@ -9,13 +9,13 @@ require ( github.com/prometheus/common v0.45.0 github.com/stretchr/testify v1.8.4 go.opencensus.io v0.24.0 - go.opentelemetry.io/collector v0.89.0 - go.opentelemetry.io/collector/component v0.89.0 - go.opentelemetry.io/collector/config/configtelemetry v0.89.0 - go.opentelemetry.io/collector/confmap v0.89.0 - go.opentelemetry.io/collector/consumer v0.89.0 - go.opentelemetry.io/collector/pdata v1.0.0-rcv0018 - go.opentelemetry.io/collector/processor v0.89.0 + go.opentelemetry.io/collector v0.90.0 + go.opentelemetry.io/collector/component v0.90.0 + go.opentelemetry.io/collector/config/configtelemetry v0.90.0 + go.opentelemetry.io/collector/confmap v0.90.0 + go.opentelemetry.io/collector/consumer v0.90.0 + go.opentelemetry.io/collector/pdata v1.0.0 + go.opentelemetry.io/collector/processor v0.90.0 go.opentelemetry.io/otel v1.21.0 go.opentelemetry.io/otel/exporters/prometheus v0.44.0 go.opentelemetry.io/otel/metric v1.21.0 @@ -50,7 +50,7 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/prometheus/procfs v0.11.1 // indirect github.com/prometheus/statsd_exporter v0.22.7 // indirect - go.opentelemetry.io/collector/featuregate v1.0.0-rcv0018 // indirect + go.opentelemetry.io/collector/featuregate v1.0.0 // indirect go.opentelemetry.io/otel/trace v1.21.0 // indirect golang.org/x/net v0.18.0 // indirect golang.org/x/sys v0.14.0 // indirect diff --git a/processor/go.mod b/processor/go.mod index ec0a0b2a562..e79fd9149e0 100644 --- a/processor/go.mod +++ b/processor/go.mod @@ -5,12 +5,12 @@ go 1.20 require ( github.com/stretchr/testify v1.8.4 go.opencensus.io v0.24.0 - go.opentelemetry.io/collector v0.89.0 - go.opentelemetry.io/collector/component v0.89.0 - go.opentelemetry.io/collector/config/configtelemetry v0.89.0 - go.opentelemetry.io/collector/consumer v0.89.0 - go.opentelemetry.io/collector/featuregate v1.0.0-rcv0018 - go.opentelemetry.io/collector/pdata v1.0.0-rcv0018 + go.opentelemetry.io/collector v0.90.0 + go.opentelemetry.io/collector/component v0.90.0 + go.opentelemetry.io/collector/config/configtelemetry v0.90.0 + go.opentelemetry.io/collector/consumer v0.90.0 + go.opentelemetry.io/collector/featuregate v1.0.0 + go.opentelemetry.io/collector/pdata v1.0.0 go.opentelemetry.io/otel v1.21.0 go.opentelemetry.io/otel/metric v1.21.0 go.opentelemetry.io/otel/trace v1.21.0 @@ -47,7 +47,7 @@ require ( github.com/prometheus/common v0.45.0 // indirect github.com/prometheus/procfs v0.11.1 // indirect github.com/prometheus/statsd_exporter v0.22.7 // indirect - go.opentelemetry.io/collector/confmap v0.89.0 // indirect + go.opentelemetry.io/collector/confmap v0.90.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.44.0 // indirect go.opentelemetry.io/otel/sdk v1.21.0 // indirect go.opentelemetry.io/otel/sdk/metric v1.21.0 // indirect diff --git a/processor/memorylimiterprocessor/go.mod b/processor/memorylimiterprocessor/go.mod index 5c012ac26db..b40cea6823e 100644 --- a/processor/memorylimiterprocessor/go.mod +++ b/processor/memorylimiterprocessor/go.mod @@ -4,13 +4,13 @@ go 1.20 require ( github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector v0.89.0 - go.opentelemetry.io/collector/component v0.89.0 - go.opentelemetry.io/collector/config/configtelemetry v0.89.0 - go.opentelemetry.io/collector/confmap v0.89.0 - go.opentelemetry.io/collector/consumer v0.89.0 - go.opentelemetry.io/collector/pdata v1.0.0-rcv0018 - go.opentelemetry.io/collector/processor v0.89.0 + go.opentelemetry.io/collector v0.90.0 + go.opentelemetry.io/collector/component v0.90.0 + go.opentelemetry.io/collector/config/configtelemetry v0.90.0 + go.opentelemetry.io/collector/confmap v0.90.0 + go.opentelemetry.io/collector/consumer v0.90.0 + go.opentelemetry.io/collector/pdata v1.0.0 + go.opentelemetry.io/collector/processor v0.90.0 go.uber.org/zap v1.26.0 ) @@ -37,7 +37,7 @@ require ( github.com/tklauser/numcpus v0.6.1 // indirect github.com/yusufpapurcu/wmi v1.2.3 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v1.0.0-rcv0018 // indirect + go.opentelemetry.io/collector/featuregate v1.0.0 // indirect go.opentelemetry.io/otel v1.21.0 // indirect go.opentelemetry.io/otel/metric v1.21.0 // indirect go.opentelemetry.io/otel/trace v1.21.0 // indirect diff --git a/receiver/go.mod b/receiver/go.mod index 9ec7c4db5ad..161e1ddfe16 100644 --- a/receiver/go.mod +++ b/receiver/go.mod @@ -5,12 +5,12 @@ go 1.20 require ( github.com/stretchr/testify v1.8.4 go.opencensus.io v0.24.0 - go.opentelemetry.io/collector v0.89.0 - go.opentelemetry.io/collector/component v0.89.0 - go.opentelemetry.io/collector/config/configtelemetry v0.89.0 - go.opentelemetry.io/collector/consumer v0.89.0 - go.opentelemetry.io/collector/featuregate v1.0.0-rcv0018 - go.opentelemetry.io/collector/pdata v1.0.0-rcv0018 + go.opentelemetry.io/collector v0.90.0 + go.opentelemetry.io/collector/component v0.90.0 + go.opentelemetry.io/collector/config/configtelemetry v0.90.0 + go.opentelemetry.io/collector/consumer v0.90.0 + go.opentelemetry.io/collector/featuregate v1.0.0 + go.opentelemetry.io/collector/pdata v1.0.0 go.opentelemetry.io/otel v1.21.0 go.opentelemetry.io/otel/metric v1.21.0 go.opentelemetry.io/otel/sdk v1.21.0 @@ -48,7 +48,7 @@ require ( github.com/prometheus/common v0.45.0 // indirect github.com/prometheus/procfs v0.11.1 // indirect github.com/prometheus/statsd_exporter v0.22.7 // indirect - go.opentelemetry.io/collector/confmap v0.89.0 // indirect + go.opentelemetry.io/collector/confmap v0.90.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.44.0 // indirect go.opentelemetry.io/otel/sdk/metric v1.21.0 // indirect golang.org/x/net v0.18.0 // indirect diff --git a/receiver/otlpreceiver/go.mod b/receiver/otlpreceiver/go.mod index c46800b9415..f401c8d93f5 100644 --- a/receiver/otlpreceiver/go.mod +++ b/receiver/otlpreceiver/go.mod @@ -6,18 +6,18 @@ require ( github.com/gogo/protobuf v1.3.2 github.com/klauspost/compress v1.17.3 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector v0.89.0 - go.opentelemetry.io/collector/component v0.89.0 - go.opentelemetry.io/collector/config/configgrpc v0.89.0 - go.opentelemetry.io/collector/config/confighttp v0.89.0 - go.opentelemetry.io/collector/config/confignet v0.89.0 - go.opentelemetry.io/collector/config/configtelemetry v0.89.0 - go.opentelemetry.io/collector/config/configtls v0.89.0 - go.opentelemetry.io/collector/confmap v0.89.0 - go.opentelemetry.io/collector/consumer v0.89.0 - go.opentelemetry.io/collector/pdata v1.0.0-rcv0018 - go.opentelemetry.io/collector/receiver v0.89.0 - go.opentelemetry.io/collector/semconv v0.89.0 + go.opentelemetry.io/collector v0.90.0 + go.opentelemetry.io/collector/component v0.90.0 + go.opentelemetry.io/collector/config/configgrpc v0.90.0 + go.opentelemetry.io/collector/config/confighttp v0.90.0 + go.opentelemetry.io/collector/config/confignet v0.90.0 + go.opentelemetry.io/collector/config/configtelemetry v0.90.0 + go.opentelemetry.io/collector/config/configtls v0.90.0 + go.opentelemetry.io/collector/confmap v0.90.0 + go.opentelemetry.io/collector/consumer v0.90.0 + go.opentelemetry.io/collector/pdata v1.0.0 + go.opentelemetry.io/collector/receiver v0.90.0 + go.opentelemetry.io/collector/semconv v0.90.0 go.uber.org/zap v1.26.0 google.golang.org/genproto/googleapis/rpc v0.0.0-20231120223509-83a465c0220f google.golang.org/grpc v1.59.0 @@ -59,13 +59,13 @@ require ( github.com/prometheus/statsd_exporter v0.22.7 // indirect github.com/rs/cors v1.10.1 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/config/configauth v0.89.0 // indirect - go.opentelemetry.io/collector/config/configcompression v0.89.0 // indirect - go.opentelemetry.io/collector/config/configopaque v0.89.0 // indirect - go.opentelemetry.io/collector/config/internal v0.89.0 // indirect - go.opentelemetry.io/collector/extension v0.89.0 // indirect - go.opentelemetry.io/collector/extension/auth v0.89.0 // indirect - go.opentelemetry.io/collector/featuregate v1.0.0-rcv0018 // indirect + go.opentelemetry.io/collector/config/configauth v0.90.0 // indirect + go.opentelemetry.io/collector/config/configcompression v0.90.0 // indirect + go.opentelemetry.io/collector/config/configopaque v0.90.0 // indirect + go.opentelemetry.io/collector/config/internal v0.90.0 // indirect + go.opentelemetry.io/collector/extension v0.90.0 // indirect + go.opentelemetry.io/collector/extension/auth v0.90.0 // indirect + go.opentelemetry.io/collector/featuregate v1.0.0 // indirect go.opentelemetry.io/contrib/config v0.1.1 // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.46.1 // indirect diff --git a/service/go.mod b/service/go.mod index f10b1028c9e..fc6ea998d96 100644 --- a/service/go.mod +++ b/service/go.mod @@ -11,21 +11,21 @@ require ( github.com/shirou/gopsutil/v3 v3.23.10 github.com/stretchr/testify v1.8.4 go.opencensus.io v0.24.0 - go.opentelemetry.io/collector v0.89.0 - go.opentelemetry.io/collector/component v0.89.0 - go.opentelemetry.io/collector/config/confignet v0.89.0 - go.opentelemetry.io/collector/config/configtelemetry v0.89.0 - go.opentelemetry.io/collector/confmap v0.89.0 - go.opentelemetry.io/collector/connector v0.89.0 - go.opentelemetry.io/collector/consumer v0.89.0 - go.opentelemetry.io/collector/exporter v0.89.0 - go.opentelemetry.io/collector/extension v0.89.0 - go.opentelemetry.io/collector/extension/zpagesextension v0.89.0 - go.opentelemetry.io/collector/featuregate v1.0.0-rcv0018 - go.opentelemetry.io/collector/pdata v1.0.0-rcv0018 - go.opentelemetry.io/collector/processor v0.89.0 - go.opentelemetry.io/collector/receiver v0.89.0 - go.opentelemetry.io/collector/semconv v0.89.0 + go.opentelemetry.io/collector v0.90.0 + go.opentelemetry.io/collector/component v0.90.0 + go.opentelemetry.io/collector/config/confignet v0.90.0 + go.opentelemetry.io/collector/config/configtelemetry v0.90.0 + go.opentelemetry.io/collector/confmap v0.90.0 + go.opentelemetry.io/collector/connector v0.90.0 + go.opentelemetry.io/collector/consumer v0.90.0 + go.opentelemetry.io/collector/exporter v0.90.0 + go.opentelemetry.io/collector/extension v0.90.0 + go.opentelemetry.io/collector/extension/zpagesextension v0.90.0 + go.opentelemetry.io/collector/featuregate v1.0.0 + go.opentelemetry.io/collector/pdata v1.0.0 + go.opentelemetry.io/collector/processor v0.90.0 + go.opentelemetry.io/collector/receiver v0.90.0 + go.opentelemetry.io/collector/semconv v0.90.0 go.opentelemetry.io/contrib/config v0.1.1 go.opentelemetry.io/contrib/propagators/b3 v1.21.1 go.opentelemetry.io/otel v1.21.0 diff --git a/versions.yaml b/versions.yaml index 32cebe3d35e..e30bf2ddef3 100644 --- a/versions.yaml +++ b/versions.yaml @@ -3,12 +3,12 @@ module-sets: stable: - version: v1.0.0-rcv0018 + version: v1.0.0 modules: - go.opentelemetry.io/collector/featuregate - go.opentelemetry.io/collector/pdata beta: - version: v0.89.0 + version: v0.90.0 modules: - go.opentelemetry.io/collector - go.opentelemetry.io/collector/cmd/builder From cce02b6e62a8e1a477c77f74f835a93d241a1eb1 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 27 Nov 2023 18:46:16 -0800 Subject: [PATCH 26/52] Update module golang.org/x/net to v0.19.0 (#9002) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![Mend Renovate logo banner](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | golang.org/x/net | require | minor | `v0.18.0` -> `v0.19.0` | --- ### Configuration 📅 **Schedule**: Branch creation - "on tuesday" (UTC), 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 this update 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/open-telemetry/opentelemetry-collector). --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: opentelemetrybot <107717825+opentelemetrybot@users.noreply.github.com> --- cmd/otelcorecol/go.mod | 4 ++-- cmd/otelcorecol/go.sum | 8 ++++---- config/confighttp/go.mod | 4 ++-- config/confighttp/go.sum | 8 ++++---- exporter/otlpexporter/go.mod | 4 ++-- exporter/otlpexporter/go.sum | 8 ++++---- exporter/otlphttpexporter/go.mod | 4 ++-- exporter/otlphttpexporter/go.sum | 8 ++++---- receiver/otlpreceiver/go.mod | 4 ++-- receiver/otlpreceiver/go.sum | 8 ++++---- 10 files changed, 30 insertions(+), 30 deletions(-) diff --git a/cmd/otelcorecol/go.mod b/cmd/otelcorecol/go.mod index 667a3d0bd78..01291527c82 100644 --- a/cmd/otelcorecol/go.mod +++ b/cmd/otelcorecol/go.mod @@ -23,7 +23,7 @@ require ( go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.90.0 go.opentelemetry.io/collector/receiver v0.90.0 go.opentelemetry.io/collector/receiver/otlpreceiver v0.90.0 - golang.org/x/sys v0.14.0 + golang.org/x/sys v0.15.0 ) require ( @@ -116,7 +116,7 @@ require ( go.opentelemetry.io/proto/otlp v1.0.0 // indirect go.uber.org/multierr v1.11.0 // indirect go.uber.org/zap v1.26.0 // indirect - golang.org/x/net v0.18.0 // indirect + golang.org/x/net v0.19.0 // indirect golang.org/x/text v0.14.0 // indirect gonum.org/v1/gonum v0.14.0 // indirect google.golang.org/genproto/googleapis/api v0.0.0-20230822172742-b8732ec3820d // indirect diff --git a/cmd/otelcorecol/go.sum b/cmd/otelcorecol/go.sum index 5939fea06e2..c31d248e4ee 100644 --- a/cmd/otelcorecol/go.sum +++ b/cmd/otelcorecol/go.sum @@ -431,8 +431,8 @@ golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwY golang.org/x/net v0.0.0-20210525063256-abc453219eb5/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= golang.org/x/net v0.0.0-20220225172249-27dd8689420f/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= -golang.org/x/net v0.18.0 h1:mIYleuAkSbHh0tCv7RvjL3F6ZVbLjq4+R7zbOn3Kokg= -golang.org/x/net v0.18.0/go.mod h1:/czyP5RqHAH4odGYxBJ1qz0+CE5WZ+2j1YgoEo8F2jQ= +golang.org/x/net v0.19.0 h1:zTwKpTd2XuCqf8huc7Fo2iSy+4RHPd10s4KzeTnVr1c= +golang.org/x/net v0.19.0/go.mod h1:CfAk/cbD4CthTvqiEl8NpboMuiuOYsAr/7NOjZJtv1U= 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= @@ -498,8 +498,8 @@ golang.org/x/sys v0.0.0-20220708085239-5a0f0661e09d/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.14.0 h1:Vz7Qs629MkJkGyHxUlRHizWJRG2j8fbQKjELVSNhy7Q= -golang.org/x/sys v0.14.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.15.0 h1:h48lPFYpsTvQJZF4EKyI4aLHaev3CxivZmv7yZig9pc= +golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= diff --git a/config/confighttp/go.mod b/config/confighttp/go.mod index b991126b5ee..341910e76ae 100644 --- a/config/confighttp/go.mod +++ b/config/confighttp/go.mod @@ -19,7 +19,7 @@ require ( go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.46.1 go.opentelemetry.io/otel v1.21.0 go.uber.org/zap v1.26.0 - golang.org/x/net v0.18.0 + golang.org/x/net v0.19.0 ) require ( @@ -45,7 +45,7 @@ require ( go.opentelemetry.io/otel/metric v1.21.0 // indirect go.opentelemetry.io/otel/trace v1.21.0 // indirect go.uber.org/multierr v1.11.0 // indirect - golang.org/x/sys v0.14.0 // indirect + golang.org/x/sys v0.15.0 // indirect golang.org/x/text v0.14.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d // indirect google.golang.org/grpc v1.59.0 // indirect diff --git a/config/confighttp/go.sum b/config/confighttp/go.sum index 083ee61b1d5..721181594d7 100644 --- a/config/confighttp/go.sum +++ b/config/confighttp/go.sum @@ -72,16 +72,16 @@ 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.18.0 h1:mIYleuAkSbHh0tCv7RvjL3F6ZVbLjq4+R7zbOn3Kokg= -golang.org/x/net v0.18.0/go.mod h1:/czyP5RqHAH4odGYxBJ1qz0+CE5WZ+2j1YgoEo8F2jQ= +golang.org/x/net v0.19.0 h1:zTwKpTd2XuCqf8huc7Fo2iSy+4RHPd10s4KzeTnVr1c= +golang.org/x/net v0.19.0/go.mod h1:CfAk/cbD4CthTvqiEl8NpboMuiuOYsAr/7NOjZJtv1U= 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.14.0 h1:Vz7Qs629MkJkGyHxUlRHizWJRG2j8fbQKjELVSNhy7Q= -golang.org/x/sys v0.14.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.15.0 h1:h48lPFYpsTvQJZF4EKyI4aLHaev3CxivZmv7yZig9pc= +golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= 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.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ= diff --git a/exporter/otlpexporter/go.mod b/exporter/otlpexporter/go.mod index 8e5d11253cb..85a07dd899d 100644 --- a/exporter/otlpexporter/go.mod +++ b/exporter/otlpexporter/go.mod @@ -65,8 +65,8 @@ require ( go.opentelemetry.io/otel/trace v1.21.0 // indirect go.uber.org/multierr v1.11.0 // indirect go.uber.org/zap v1.26.0 // indirect - golang.org/x/net v0.18.0 // indirect - golang.org/x/sys v0.14.0 // indirect + golang.org/x/net v0.19.0 // indirect + golang.org/x/sys v0.15.0 // indirect golang.org/x/text v0.14.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/exporter/otlpexporter/go.sum b/exporter/otlpexporter/go.sum index a56fb5bea93..a47c2420fcb 100644 --- a/exporter/otlpexporter/go.sum +++ b/exporter/otlpexporter/go.sum @@ -156,8 +156,8 @@ golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLL 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.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.18.0 h1:mIYleuAkSbHh0tCv7RvjL3F6ZVbLjq4+R7zbOn3Kokg= -golang.org/x/net v0.18.0/go.mod h1:/czyP5RqHAH4odGYxBJ1qz0+CE5WZ+2j1YgoEo8F2jQ= +golang.org/x/net v0.19.0 h1:zTwKpTd2XuCqf8huc7Fo2iSy+4RHPd10s4KzeTnVr1c= +golang.org/x/net v0.19.0/go.mod h1:CfAk/cbD4CthTvqiEl8NpboMuiuOYsAr/7NOjZJtv1U= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.11.0 h1:vPL4xzxBM4niKCW6g9whtaWVXTJf1U5e4aZxxFx/gbU= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -169,8 +169,8 @@ golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5h 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.14.0 h1:Vz7Qs629MkJkGyHxUlRHizWJRG2j8fbQKjELVSNhy7Q= -golang.org/x/sys v0.14.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.15.0 h1:h48lPFYpsTvQJZF4EKyI4aLHaev3CxivZmv7yZig9pc= +golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= 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.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ= diff --git a/exporter/otlphttpexporter/go.mod b/exporter/otlphttpexporter/go.mod index 291ef788f13..7c5df785b5f 100644 --- a/exporter/otlphttpexporter/go.mod +++ b/exporter/otlphttpexporter/go.mod @@ -65,8 +65,8 @@ require ( go.opentelemetry.io/otel/sdk/metric v1.21.0 // indirect go.opentelemetry.io/otel/trace v1.21.0 // indirect go.uber.org/multierr v1.11.0 // indirect - golang.org/x/net v0.18.0 // indirect - golang.org/x/sys v0.14.0 // indirect + golang.org/x/net v0.19.0 // indirect + golang.org/x/sys v0.15.0 // indirect golang.org/x/text v0.14.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/exporter/otlphttpexporter/go.sum b/exporter/otlphttpexporter/go.sum index a56fb5bea93..a47c2420fcb 100644 --- a/exporter/otlphttpexporter/go.sum +++ b/exporter/otlphttpexporter/go.sum @@ -156,8 +156,8 @@ golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLL 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.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.18.0 h1:mIYleuAkSbHh0tCv7RvjL3F6ZVbLjq4+R7zbOn3Kokg= -golang.org/x/net v0.18.0/go.mod h1:/czyP5RqHAH4odGYxBJ1qz0+CE5WZ+2j1YgoEo8F2jQ= +golang.org/x/net v0.19.0 h1:zTwKpTd2XuCqf8huc7Fo2iSy+4RHPd10s4KzeTnVr1c= +golang.org/x/net v0.19.0/go.mod h1:CfAk/cbD4CthTvqiEl8NpboMuiuOYsAr/7NOjZJtv1U= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.11.0 h1:vPL4xzxBM4niKCW6g9whtaWVXTJf1U5e4aZxxFx/gbU= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -169,8 +169,8 @@ golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5h 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.14.0 h1:Vz7Qs629MkJkGyHxUlRHizWJRG2j8fbQKjELVSNhy7Q= -golang.org/x/sys v0.14.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.15.0 h1:h48lPFYpsTvQJZF4EKyI4aLHaev3CxivZmv7yZig9pc= +golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= 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.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ= diff --git a/receiver/otlpreceiver/go.mod b/receiver/otlpreceiver/go.mod index f401c8d93f5..9fdc1b8fe33 100644 --- a/receiver/otlpreceiver/go.mod +++ b/receiver/otlpreceiver/go.mod @@ -76,8 +76,8 @@ require ( go.opentelemetry.io/otel/sdk/metric v1.21.0 // indirect go.opentelemetry.io/otel/trace v1.21.0 // indirect go.uber.org/multierr v1.11.0 // indirect - golang.org/x/net v0.18.0 // indirect - golang.org/x/sys v0.14.0 // indirect + golang.org/x/net v0.19.0 // indirect + golang.org/x/sys v0.15.0 // indirect golang.org/x/text v0.14.0 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect diff --git a/receiver/otlpreceiver/go.sum b/receiver/otlpreceiver/go.sum index cf383b7f05a..e8f04e99241 100644 --- a/receiver/otlpreceiver/go.sum +++ b/receiver/otlpreceiver/go.sum @@ -373,8 +373,8 @@ golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwY golang.org/x/net v0.0.0-20210525063256-abc453219eb5/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= golang.org/x/net v0.0.0-20220225172249-27dd8689420f/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= -golang.org/x/net v0.18.0 h1:mIYleuAkSbHh0tCv7RvjL3F6ZVbLjq4+R7zbOn3Kokg= -golang.org/x/net v0.18.0/go.mod h1:/czyP5RqHAH4odGYxBJ1qz0+CE5WZ+2j1YgoEo8F2jQ= +golang.org/x/net v0.19.0 h1:zTwKpTd2XuCqf8huc7Fo2iSy+4RHPd10s4KzeTnVr1c= +golang.org/x/net v0.19.0/go.mod h1:CfAk/cbD4CthTvqiEl8NpboMuiuOYsAr/7NOjZJtv1U= 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= @@ -435,8 +435,8 @@ golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220114195835-da31bd327af9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220708085239-5a0f0661e09d/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.14.0 h1:Vz7Qs629MkJkGyHxUlRHizWJRG2j8fbQKjELVSNhy7Q= -golang.org/x/sys v0.14.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.15.0 h1:h48lPFYpsTvQJZF4EKyI4aLHaev3CxivZmv7yZig9pc= +golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= From 914bf385bd53a73393eee41e9e3146f6fc3c0385 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 27 Nov 2023 19:19:07 -0800 Subject: [PATCH 27/52] Update module golang.org/x/sys to v0.15.0 (#9003) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![Mend Renovate logo banner](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | golang.org/x/sys | require | minor | `v0.14.0` -> `v0.15.0` | --- ### Configuration 📅 **Schedule**: Branch creation - "on tuesday" (UTC), 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 this update 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/open-telemetry/opentelemetry-collector). --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: opentelemetrybot <107717825+opentelemetrybot@users.noreply.github.com> --- config/configgrpc/go.mod | 2 +- config/configgrpc/go.sum | 4 ++-- connector/forwardconnector/go.mod | 2 +- connector/forwardconnector/go.sum | 4 ++-- connector/go.mod | 2 +- connector/go.sum | 4 ++-- consumer/go.mod | 2 +- consumer/go.sum | 4 ++-- exporter/debugexporter/go.mod | 2 +- exporter/debugexporter/go.sum | 4 ++-- exporter/go.mod | 2 +- exporter/go.sum | 4 ++-- exporter/loggingexporter/go.mod | 2 +- exporter/loggingexporter/go.sum | 4 ++-- extension/ballastextension/go.mod | 2 +- extension/ballastextension/go.sum | 4 ++-- extension/zpagesextension/go.mod | 2 +- extension/zpagesextension/go.sum | 4 ++-- go.mod | 2 +- go.sum | 4 ++-- otelcol/go.mod | 2 +- otelcol/go.sum | 4 ++-- processor/batchprocessor/go.mod | 2 +- processor/batchprocessor/go.sum | 4 ++-- processor/go.mod | 2 +- processor/go.sum | 4 ++-- processor/memorylimiterprocessor/go.mod | 2 +- processor/memorylimiterprocessor/go.sum | 4 ++-- receiver/go.mod | 2 +- receiver/go.sum | 4 ++-- service/go.mod | 2 +- service/go.sum | 4 ++-- 32 files changed, 48 insertions(+), 48 deletions(-) diff --git a/config/configgrpc/go.mod b/config/configgrpc/go.mod index de5b026bf76..85e358f896b 100644 --- a/config/configgrpc/go.mod +++ b/config/configgrpc/go.mod @@ -66,7 +66,7 @@ require ( go.opentelemetry.io/otel/trace v1.21.0 // indirect go.uber.org/multierr v1.11.0 // indirect golang.org/x/net v0.18.0 // indirect - golang.org/x/sys v0.14.0 // indirect + golang.org/x/sys v0.15.0 // indirect golang.org/x/text v0.14.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20231012201019-e917dd12ba7a // indirect google.golang.org/protobuf v1.31.0 // indirect diff --git a/config/configgrpc/go.sum b/config/configgrpc/go.sum index 8426e9acb6b..bd0bf66de39 100644 --- a/config/configgrpc/go.sum +++ b/config/configgrpc/go.sum @@ -427,8 +427,8 @@ golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220114195835-da31bd327af9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220708085239-5a0f0661e09d/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.14.0 h1:Vz7Qs629MkJkGyHxUlRHizWJRG2j8fbQKjELVSNhy7Q= -golang.org/x/sys v0.14.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.15.0 h1:h48lPFYpsTvQJZF4EKyI4aLHaev3CxivZmv7yZig9pc= +golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= diff --git a/connector/forwardconnector/go.mod b/connector/forwardconnector/go.mod index c281603cfa4..47f25f45125 100644 --- a/connector/forwardconnector/go.mod +++ b/connector/forwardconnector/go.mod @@ -35,7 +35,7 @@ require ( go.uber.org/multierr v1.11.0 // indirect go.uber.org/zap v1.26.0 // indirect golang.org/x/net v0.18.0 // indirect - golang.org/x/sys v0.14.0 // indirect + golang.org/x/sys v0.15.0 // indirect golang.org/x/text v0.14.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d // indirect google.golang.org/grpc v1.59.0 // indirect diff --git a/connector/forwardconnector/go.sum b/connector/forwardconnector/go.sum index 148522ef3a6..6dd1a6468a2 100644 --- a/connector/forwardconnector/go.sum +++ b/connector/forwardconnector/go.sum @@ -73,8 +73,8 @@ golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJ 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.14.0 h1:Vz7Qs629MkJkGyHxUlRHizWJRG2j8fbQKjELVSNhy7Q= -golang.org/x/sys v0.14.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.15.0 h1:h48lPFYpsTvQJZF4EKyI4aLHaev3CxivZmv7yZig9pc= +golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= 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.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ= diff --git a/connector/go.mod b/connector/go.mod index b11aa8ef470..27046adaad5 100644 --- a/connector/go.mod +++ b/connector/go.mod @@ -34,7 +34,7 @@ require ( go.opentelemetry.io/otel/trace v1.21.0 // indirect go.uber.org/multierr v1.11.0 // indirect golang.org/x/net v0.18.0 // indirect - golang.org/x/sys v0.14.0 // indirect + golang.org/x/sys v0.15.0 // indirect golang.org/x/text v0.14.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d // indirect google.golang.org/grpc v1.59.0 // indirect diff --git a/connector/go.sum b/connector/go.sum index 148522ef3a6..6dd1a6468a2 100644 --- a/connector/go.sum +++ b/connector/go.sum @@ -73,8 +73,8 @@ golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJ 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.14.0 h1:Vz7Qs629MkJkGyHxUlRHizWJRG2j8fbQKjELVSNhy7Q= -golang.org/x/sys v0.14.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.15.0 h1:h48lPFYpsTvQJZF4EKyI4aLHaev3CxivZmv7yZig9pc= +golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= 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.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ= diff --git a/consumer/go.mod b/consumer/go.mod index 7974139a685..4f4a164a102 100644 --- a/consumer/go.mod +++ b/consumer/go.mod @@ -19,7 +19,7 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect go.uber.org/multierr v1.11.0 // indirect golang.org/x/net v0.18.0 // indirect - golang.org/x/sys v0.14.0 // indirect + golang.org/x/sys v0.15.0 // indirect golang.org/x/text v0.14.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d // indirect google.golang.org/grpc v1.59.0 // indirect diff --git a/consumer/go.sum b/consumer/go.sum index ab390ea6b77..03f4cad2b11 100644 --- a/consumer/go.sum +++ b/consumer/go.sum @@ -50,8 +50,8 @@ golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJ 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.14.0 h1:Vz7Qs629MkJkGyHxUlRHizWJRG2j8fbQKjELVSNhy7Q= -golang.org/x/sys v0.14.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.15.0 h1:h48lPFYpsTvQJZF4EKyI4aLHaev3CxivZmv7yZig9pc= +golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= 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.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ= diff --git a/exporter/debugexporter/go.mod b/exporter/debugexporter/go.mod index 860f7637316..8074fbc0690 100644 --- a/exporter/debugexporter/go.mod +++ b/exporter/debugexporter/go.mod @@ -39,7 +39,7 @@ require ( go.uber.org/multierr v1.11.0 // indirect go.uber.org/zap v1.26.0 // indirect golang.org/x/net v0.18.0 // indirect - golang.org/x/sys v0.14.0 // indirect + golang.org/x/sys v0.15.0 // indirect golang.org/x/text v0.14.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d // indirect google.golang.org/grpc v1.59.0 // indirect diff --git a/exporter/debugexporter/go.sum b/exporter/debugexporter/go.sum index d54fbbffcc0..03b3aa75210 100644 --- a/exporter/debugexporter/go.sum +++ b/exporter/debugexporter/go.sum @@ -139,8 +139,8 @@ golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5h 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.14.0 h1:Vz7Qs629MkJkGyHxUlRHizWJRG2j8fbQKjELVSNhy7Q= -golang.org/x/sys v0.14.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.15.0 h1:h48lPFYpsTvQJZF4EKyI4aLHaev3CxivZmv7yZig9pc= +golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= 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.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ= diff --git a/exporter/go.mod b/exporter/go.mod index 940a11b8eb0..16ec311d2be 100644 --- a/exporter/go.mod +++ b/exporter/go.mod @@ -20,7 +20,7 @@ require ( go.opentelemetry.io/otel/trace v1.21.0 go.uber.org/multierr v1.11.0 go.uber.org/zap v1.26.0 - golang.org/x/sys v0.14.0 + golang.org/x/sys v0.15.0 google.golang.org/grpc v1.59.0 ) diff --git a/exporter/go.sum b/exporter/go.sum index 431010c6f8c..4f88806ced9 100644 --- a/exporter/go.sum +++ b/exporter/go.sum @@ -411,8 +411,8 @@ golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220114195835-da31bd327af9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220708085239-5a0f0661e09d/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.14.0 h1:Vz7Qs629MkJkGyHxUlRHizWJRG2j8fbQKjELVSNhy7Q= -golang.org/x/sys v0.14.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.15.0 h1:h48lPFYpsTvQJZF4EKyI4aLHaev3CxivZmv7yZig9pc= +golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= diff --git a/exporter/loggingexporter/go.mod b/exporter/loggingexporter/go.mod index 04f6f3c39b7..0326312a5e3 100644 --- a/exporter/loggingexporter/go.mod +++ b/exporter/loggingexporter/go.mod @@ -40,7 +40,7 @@ require ( go.opentelemetry.io/otel/trace v1.21.0 // indirect go.uber.org/multierr v1.11.0 // indirect golang.org/x/net v0.18.0 // indirect - golang.org/x/sys v0.14.0 // indirect + golang.org/x/sys v0.15.0 // indirect golang.org/x/text v0.14.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d // indirect google.golang.org/grpc v1.59.0 // indirect diff --git a/exporter/loggingexporter/go.sum b/exporter/loggingexporter/go.sum index d54fbbffcc0..03b3aa75210 100644 --- a/exporter/loggingexporter/go.sum +++ b/exporter/loggingexporter/go.sum @@ -139,8 +139,8 @@ golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5h 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.14.0 h1:Vz7Qs629MkJkGyHxUlRHizWJRG2j8fbQKjELVSNhy7Q= -golang.org/x/sys v0.14.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.15.0 h1:h48lPFYpsTvQJZF4EKyI4aLHaev3CxivZmv7yZig9pc= +golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= 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.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ= diff --git a/extension/ballastextension/go.mod b/extension/ballastextension/go.mod index e670f4c9148..12b31d4778d 100644 --- a/extension/ballastextension/go.mod +++ b/extension/ballastextension/go.mod @@ -38,7 +38,7 @@ require ( go.opentelemetry.io/otel/trace v1.21.0 // indirect go.uber.org/multierr v1.11.0 // indirect golang.org/x/net v0.18.0 // indirect - golang.org/x/sys v0.14.0 // indirect + golang.org/x/sys v0.15.0 // indirect golang.org/x/text v0.14.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d // indirect google.golang.org/grpc v1.59.0 // indirect diff --git a/extension/ballastextension/go.sum b/extension/ballastextension/go.sum index f326ce1bfc3..ca39b8f14b6 100644 --- a/extension/ballastextension/go.sum +++ b/extension/ballastextension/go.sum @@ -92,8 +92,8 @@ golang.org/x/sys v0.0.0-20201204225414-ed752295db88/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.14.0 h1:Vz7Qs629MkJkGyHxUlRHizWJRG2j8fbQKjELVSNhy7Q= -golang.org/x/sys v0.14.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.15.0 h1:h48lPFYpsTvQJZF4EKyI4aLHaev3CxivZmv7yZig9pc= +golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= 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.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ= diff --git a/extension/zpagesextension/go.mod b/extension/zpagesextension/go.mod index 285689989c5..b8068c922f4 100644 --- a/extension/zpagesextension/go.mod +++ b/extension/zpagesextension/go.mod @@ -38,7 +38,7 @@ require ( go.opentelemetry.io/otel/sdk/metric v1.21.0 // indirect go.uber.org/multierr v1.11.0 // indirect golang.org/x/net v0.18.0 // indirect - golang.org/x/sys v0.14.0 // indirect + golang.org/x/sys v0.15.0 // indirect golang.org/x/text v0.14.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d // indirect google.golang.org/grpc v1.59.0 // indirect diff --git a/extension/zpagesextension/go.sum b/extension/zpagesextension/go.sum index 5fa66a2ba32..22cce011d11 100644 --- a/extension/zpagesextension/go.sum +++ b/extension/zpagesextension/go.sum @@ -73,8 +73,8 @@ golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJ 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.14.0 h1:Vz7Qs629MkJkGyHxUlRHizWJRG2j8fbQKjELVSNhy7Q= -golang.org/x/sys v0.14.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.15.0 h1:h48lPFYpsTvQJZF4EKyI4aLHaev3CxivZmv7yZig9pc= +golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= 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.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ= diff --git a/go.mod b/go.mod index 954c2c5e206..c692e658cfc 100644 --- a/go.mod +++ b/go.mod @@ -66,7 +66,7 @@ require ( go.uber.org/goleak v1.2.1 // indirect go.uber.org/zap v1.26.0 // indirect golang.org/x/net v0.18.0 // indirect - golang.org/x/sys v0.14.0 // indirect + golang.org/x/sys v0.15.0 // indirect golang.org/x/text v0.14.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d // indirect google.golang.org/grpc v1.59.0 // indirect diff --git a/go.sum b/go.sum index bc952f8182c..2efac08aed8 100644 --- a/go.sum +++ b/go.sum @@ -438,8 +438,8 @@ golang.org/x/sys v0.0.0-20220708085239-5a0f0661e09d/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.14.0 h1:Vz7Qs629MkJkGyHxUlRHizWJRG2j8fbQKjELVSNhy7Q= -golang.org/x/sys v0.14.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.15.0 h1:h48lPFYpsTvQJZF4EKyI4aLHaev3CxivZmv7yZig9pc= +golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= diff --git a/otelcol/go.mod b/otelcol/go.mod index 63e87f32e44..46c2c4da1bf 100644 --- a/otelcol/go.mod +++ b/otelcol/go.mod @@ -17,7 +17,7 @@ require ( go.opentelemetry.io/collector/service v0.90.0 go.uber.org/multierr v1.11.0 go.uber.org/zap v1.26.0 - golang.org/x/sys v0.14.0 + golang.org/x/sys v0.15.0 google.golang.org/grpc v1.59.0 gopkg.in/yaml.v3 v3.0.1 ) diff --git a/otelcol/go.sum b/otelcol/go.sum index d6050f85a3b..dfce23caa78 100644 --- a/otelcol/go.sum +++ b/otelcol/go.sum @@ -474,8 +474,8 @@ golang.org/x/sys v0.0.0-20220708085239-5a0f0661e09d/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.14.0 h1:Vz7Qs629MkJkGyHxUlRHizWJRG2j8fbQKjELVSNhy7Q= -golang.org/x/sys v0.14.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.15.0 h1:h48lPFYpsTvQJZF4EKyI4aLHaev3CxivZmv7yZig9pc= +golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= diff --git a/processor/batchprocessor/go.mod b/processor/batchprocessor/go.mod index c24e05d8f08..283adb20e4f 100644 --- a/processor/batchprocessor/go.mod +++ b/processor/batchprocessor/go.mod @@ -53,7 +53,7 @@ require ( go.opentelemetry.io/collector/featuregate v1.0.0 // indirect go.opentelemetry.io/otel/trace v1.21.0 // indirect golang.org/x/net v0.18.0 // indirect - golang.org/x/sys v0.14.0 // indirect + golang.org/x/sys v0.15.0 // indirect golang.org/x/text v0.14.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d // indirect google.golang.org/grpc v1.59.0 // indirect diff --git a/processor/batchprocessor/go.sum b/processor/batchprocessor/go.sum index 872bd110761..c76932bda35 100644 --- a/processor/batchprocessor/go.sum +++ b/processor/batchprocessor/go.sum @@ -409,8 +409,8 @@ golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220114195835-da31bd327af9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220708085239-5a0f0661e09d/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.14.0 h1:Vz7Qs629MkJkGyHxUlRHizWJRG2j8fbQKjELVSNhy7Q= -golang.org/x/sys v0.14.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.15.0 h1:h48lPFYpsTvQJZF4EKyI4aLHaev3CxivZmv7yZig9pc= +golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= diff --git a/processor/go.mod b/processor/go.mod index e79fd9149e0..e8f9eb91ddb 100644 --- a/processor/go.mod +++ b/processor/go.mod @@ -52,7 +52,7 @@ require ( go.opentelemetry.io/otel/sdk v1.21.0 // indirect go.opentelemetry.io/otel/sdk/metric v1.21.0 // indirect golang.org/x/net v0.18.0 // indirect - golang.org/x/sys v0.14.0 // indirect + golang.org/x/sys v0.15.0 // indirect golang.org/x/text v0.14.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d // indirect google.golang.org/grpc v1.59.0 // indirect diff --git a/processor/go.sum b/processor/go.sum index 83d1e15f138..0035c881cf9 100644 --- a/processor/go.sum +++ b/processor/go.sum @@ -410,8 +410,8 @@ golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220114195835-da31bd327af9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220708085239-5a0f0661e09d/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.14.0 h1:Vz7Qs629MkJkGyHxUlRHizWJRG2j8fbQKjELVSNhy7Q= -golang.org/x/sys v0.14.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.15.0 h1:h48lPFYpsTvQJZF4EKyI4aLHaev3CxivZmv7yZig9pc= +golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= diff --git a/processor/memorylimiterprocessor/go.mod b/processor/memorylimiterprocessor/go.mod index b40cea6823e..2e534afade8 100644 --- a/processor/memorylimiterprocessor/go.mod +++ b/processor/memorylimiterprocessor/go.mod @@ -43,7 +43,7 @@ require ( go.opentelemetry.io/otel/trace v1.21.0 // indirect go.uber.org/multierr v1.11.0 // indirect golang.org/x/net v0.18.0 // indirect - golang.org/x/sys v0.14.0 // indirect + golang.org/x/sys v0.15.0 // indirect golang.org/x/text v0.14.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d // indirect google.golang.org/grpc v1.59.0 // indirect diff --git a/processor/memorylimiterprocessor/go.sum b/processor/memorylimiterprocessor/go.sum index f089941e600..69dc6394507 100644 --- a/processor/memorylimiterprocessor/go.sum +++ b/processor/memorylimiterprocessor/go.sum @@ -161,8 +161,8 @@ golang.org/x/sys v0.0.0-20201204225414-ed752295db88/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.14.0 h1:Vz7Qs629MkJkGyHxUlRHizWJRG2j8fbQKjELVSNhy7Q= -golang.org/x/sys v0.14.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.15.0 h1:h48lPFYpsTvQJZF4EKyI4aLHaev3CxivZmv7yZig9pc= +golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= 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.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ= diff --git a/receiver/go.mod b/receiver/go.mod index 161e1ddfe16..bca1bd72967 100644 --- a/receiver/go.mod +++ b/receiver/go.mod @@ -52,7 +52,7 @@ require ( go.opentelemetry.io/otel/exporters/prometheus v0.44.0 // indirect go.opentelemetry.io/otel/sdk/metric v1.21.0 // indirect golang.org/x/net v0.18.0 // indirect - golang.org/x/sys v0.14.0 // indirect + golang.org/x/sys v0.15.0 // indirect golang.org/x/text v0.14.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d // indirect google.golang.org/grpc v1.59.0 // indirect diff --git a/receiver/go.sum b/receiver/go.sum index 83d1e15f138..0035c881cf9 100644 --- a/receiver/go.sum +++ b/receiver/go.sum @@ -410,8 +410,8 @@ golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220114195835-da31bd327af9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220708085239-5a0f0661e09d/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.14.0 h1:Vz7Qs629MkJkGyHxUlRHizWJRG2j8fbQKjELVSNhy7Q= -golang.org/x/sys v0.14.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.15.0 h1:h48lPFYpsTvQJZF4EKyI4aLHaev3CxivZmv7yZig9pc= +golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= diff --git a/service/go.mod b/service/go.mod index fc6ea998d96..06fd368b57a 100644 --- a/service/go.mod +++ b/service/go.mod @@ -84,7 +84,7 @@ require ( go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.21.0 // indirect go.opentelemetry.io/proto/otlp v1.0.0 // indirect golang.org/x/net v0.18.0 // indirect - golang.org/x/sys v0.14.0 // indirect + golang.org/x/sys v0.15.0 // indirect golang.org/x/text v0.14.0 // indirect google.golang.org/genproto/googleapis/api v0.0.0-20230822172742-b8732ec3820d // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d // indirect diff --git a/service/go.sum b/service/go.sum index 4fc1edcb973..68ad4efddfc 100644 --- a/service/go.sum +++ b/service/go.sum @@ -467,8 +467,8 @@ golang.org/x/sys v0.0.0-20220708085239-5a0f0661e09d/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.14.0 h1:Vz7Qs629MkJkGyHxUlRHizWJRG2j8fbQKjELVSNhy7Q= -golang.org/x/sys v0.14.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.15.0 h1:h48lPFYpsTvQJZF4EKyI4aLHaev3CxivZmv7yZig9pc= +golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= From 05abe26444aeec4e211c7147f6216c487cf6e740 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 27 Nov 2023 20:00:23 -0800 Subject: [PATCH 28/52] Update google.golang.org/genproto/googleapis/rpc digest to 3a041ad (#9000) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![Mend Renovate logo banner](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [google.golang.org/genproto/googleapis/rpc](https://togithub.com/googleapis/go-genproto) | require | digest | `83a465c` -> `3a041ad` | --- ### Configuration 📅 **Schedule**: Branch creation - "on tuesday" (UTC), 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 this update 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/open-telemetry/opentelemetry-collector). --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: opentelemetrybot <107717825+opentelemetrybot@users.noreply.github.com> --- cmd/otelcorecol/go.mod | 2 +- cmd/otelcorecol/go.sum | 6 +++--- exporter/otlpexporter/go.mod | 2 +- exporter/otlpexporter/go.sum | 4 ++-- exporter/otlphttpexporter/go.mod | 2 +- exporter/otlphttpexporter/go.sum | 4 ++-- receiver/otlpreceiver/go.mod | 2 +- receiver/otlpreceiver/go.sum | 4 ++-- 8 files changed, 13 insertions(+), 13 deletions(-) diff --git a/cmd/otelcorecol/go.mod b/cmd/otelcorecol/go.mod index 01291527c82..f4807b9bfc8 100644 --- a/cmd/otelcorecol/go.mod +++ b/cmd/otelcorecol/go.mod @@ -120,7 +120,7 @@ require ( golang.org/x/text v0.14.0 // indirect gonum.org/v1/gonum v0.14.0 // indirect google.golang.org/genproto/googleapis/api v0.0.0-20230822172742-b8732ec3820d // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20231120223509-83a465c0220f // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20231127180814-3a041ad873d4 // indirect google.golang.org/grpc v1.59.0 // indirect google.golang.org/protobuf v1.31.0 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect diff --git a/cmd/otelcorecol/go.sum b/cmd/otelcorecol/go.sum index c31d248e4ee..b013695005b 100644 --- a/cmd/otelcorecol/go.sum +++ b/cmd/otelcorecol/go.sum @@ -614,11 +614,11 @@ google.golang.org/genproto v0.0.0-20200618031413-b414f8b61790/go.mod h1:jDfRM7Fc google.golang.org/genproto v0.0.0-20200729003335-053ba62fc06f/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20200804131852-c06518451d9c/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20200825200019-8632dd797987/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20231106174013-bbf56f31fb17 h1:wpZ8pe2x1Q3f2KyT5f8oP/fa9rHAKgFPr/HZdNuS+PQ= +google.golang.org/genproto v0.0.0-20231120223509-83a465c0220f h1:Vn+VyHU5guc9KjB5KrjI2q0wCOWEOIh0OEsleqakHJg= google.golang.org/genproto/googleapis/api v0.0.0-20230822172742-b8732ec3820d h1:DoPTO70H+bcDXcd39vOqb2viZxgqeBeSGtZ55yZU4/Q= google.golang.org/genproto/googleapis/api v0.0.0-20230822172742-b8732ec3820d/go.mod h1:KjSP20unUpOx5kyQUFa7k4OJg0qeJ7DEZflGDu2p6Bk= -google.golang.org/genproto/googleapis/rpc v0.0.0-20231120223509-83a465c0220f h1:ultW7fxlIvee4HYrtnaRPon9HpEgFk5zYpmfMgtKB5I= -google.golang.org/genproto/googleapis/rpc v0.0.0-20231120223509-83a465c0220f/go.mod h1:L9KNLi232K1/xB6f7AlSX692koaRnKaWSR0stBki0Yc= +google.golang.org/genproto/googleapis/rpc v0.0.0-20231127180814-3a041ad873d4 h1:DC7wcm+i+P1rN3Ff07vL+OndGg5OhNddHyTA+ocPqYE= +google.golang.org/genproto/googleapis/rpc v0.0.0-20231127180814-3a041ad873d4/go.mod h1:eJVxU6o+4G1PSczBr85xmyvSNYAKvAYgkub40YGomFM= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= diff --git a/exporter/otlpexporter/go.mod b/exporter/otlpexporter/go.mod index 85a07dd899d..e9675b63259 100644 --- a/exporter/otlpexporter/go.mod +++ b/exporter/otlpexporter/go.mod @@ -16,7 +16,7 @@ require ( go.opentelemetry.io/collector/exporter v0.90.0 go.opentelemetry.io/collector/pdata v1.0.0 go.opentelemetry.io/collector/receiver/otlpreceiver v0.90.0 - google.golang.org/genproto/googleapis/rpc v0.0.0-20231120223509-83a465c0220f + google.golang.org/genproto/googleapis/rpc v0.0.0-20231127180814-3a041ad873d4 google.golang.org/grpc v1.59.0 google.golang.org/protobuf v1.31.0 ) diff --git a/exporter/otlpexporter/go.sum b/exporter/otlpexporter/go.sum index a47c2420fcb..a3a95abdf88 100644 --- a/exporter/otlpexporter/go.sum +++ b/exporter/otlpexporter/go.sum @@ -193,8 +193,8 @@ google.golang.org/appengine v1.6.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6 google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo= -google.golang.org/genproto/googleapis/rpc v0.0.0-20231120223509-83a465c0220f h1:ultW7fxlIvee4HYrtnaRPon9HpEgFk5zYpmfMgtKB5I= -google.golang.org/genproto/googleapis/rpc v0.0.0-20231120223509-83a465c0220f/go.mod h1:L9KNLi232K1/xB6f7AlSX692koaRnKaWSR0stBki0Yc= +google.golang.org/genproto/googleapis/rpc v0.0.0-20231127180814-3a041ad873d4 h1:DC7wcm+i+P1rN3Ff07vL+OndGg5OhNddHyTA+ocPqYE= +google.golang.org/genproto/googleapis/rpc v0.0.0-20231127180814-3a041ad873d4/go.mod h1:eJVxU6o+4G1PSczBr85xmyvSNYAKvAYgkub40YGomFM= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY= diff --git a/exporter/otlphttpexporter/go.mod b/exporter/otlphttpexporter/go.mod index 7c5df785b5f..9e5bbaefbf4 100644 --- a/exporter/otlphttpexporter/go.mod +++ b/exporter/otlphttpexporter/go.mod @@ -17,7 +17,7 @@ require ( go.opentelemetry.io/collector/receiver v0.90.0 go.opentelemetry.io/collector/receiver/otlpreceiver v0.90.0 go.uber.org/zap v1.26.0 - google.golang.org/genproto/googleapis/rpc v0.0.0-20231120223509-83a465c0220f + google.golang.org/genproto/googleapis/rpc v0.0.0-20231127180814-3a041ad873d4 google.golang.org/grpc v1.59.0 google.golang.org/protobuf v1.31.0 ) diff --git a/exporter/otlphttpexporter/go.sum b/exporter/otlphttpexporter/go.sum index a47c2420fcb..a3a95abdf88 100644 --- a/exporter/otlphttpexporter/go.sum +++ b/exporter/otlphttpexporter/go.sum @@ -193,8 +193,8 @@ google.golang.org/appengine v1.6.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6 google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo= -google.golang.org/genproto/googleapis/rpc v0.0.0-20231120223509-83a465c0220f h1:ultW7fxlIvee4HYrtnaRPon9HpEgFk5zYpmfMgtKB5I= -google.golang.org/genproto/googleapis/rpc v0.0.0-20231120223509-83a465c0220f/go.mod h1:L9KNLi232K1/xB6f7AlSX692koaRnKaWSR0stBki0Yc= +google.golang.org/genproto/googleapis/rpc v0.0.0-20231127180814-3a041ad873d4 h1:DC7wcm+i+P1rN3Ff07vL+OndGg5OhNddHyTA+ocPqYE= +google.golang.org/genproto/googleapis/rpc v0.0.0-20231127180814-3a041ad873d4/go.mod h1:eJVxU6o+4G1PSczBr85xmyvSNYAKvAYgkub40YGomFM= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY= diff --git a/receiver/otlpreceiver/go.mod b/receiver/otlpreceiver/go.mod index 9fdc1b8fe33..807fce69392 100644 --- a/receiver/otlpreceiver/go.mod +++ b/receiver/otlpreceiver/go.mod @@ -19,7 +19,7 @@ require ( go.opentelemetry.io/collector/receiver v0.90.0 go.opentelemetry.io/collector/semconv v0.90.0 go.uber.org/zap v1.26.0 - google.golang.org/genproto/googleapis/rpc v0.0.0-20231120223509-83a465c0220f + google.golang.org/genproto/googleapis/rpc v0.0.0-20231127180814-3a041ad873d4 google.golang.org/grpc v1.59.0 google.golang.org/protobuf v1.31.0 ) diff --git a/receiver/otlpreceiver/go.sum b/receiver/otlpreceiver/go.sum index e8f04e99241..3319b4bcd16 100644 --- a/receiver/otlpreceiver/go.sum +++ b/receiver/otlpreceiver/go.sum @@ -549,8 +549,8 @@ google.golang.org/genproto v0.0.0-20200618031413-b414f8b61790/go.mod h1:jDfRM7Fc google.golang.org/genproto v0.0.0-20200729003335-053ba62fc06f/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20200804131852-c06518451d9c/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20200825200019-8632dd797987/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto/googleapis/rpc v0.0.0-20231120223509-83a465c0220f h1:ultW7fxlIvee4HYrtnaRPon9HpEgFk5zYpmfMgtKB5I= -google.golang.org/genproto/googleapis/rpc v0.0.0-20231120223509-83a465c0220f/go.mod h1:L9KNLi232K1/xB6f7AlSX692koaRnKaWSR0stBki0Yc= +google.golang.org/genproto/googleapis/rpc v0.0.0-20231127180814-3a041ad873d4 h1:DC7wcm+i+P1rN3Ff07vL+OndGg5OhNddHyTA+ocPqYE= +google.golang.org/genproto/googleapis/rpc v0.0.0-20231127180814-3a041ad873d4/go.mod h1:eJVxU6o+4G1PSczBr85xmyvSNYAKvAYgkub40YGomFM= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= From 384f04a0e0537efc0df30ff1f5c19e2c3cb64041 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 28 Nov 2023 06:39:49 -0800 Subject: [PATCH 29/52] Update module golang.org/x/tools to v0.16.0 (#9004) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![Mend Renovate logo banner](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | golang.org/x/tools | require | minor | `v0.15.0` -> `v0.16.0` | --- ### Configuration 📅 **Schedule**: Branch creation - "on tuesday" (UTC), 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 this update 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/open-telemetry/opentelemetry-collector). --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: opentelemetrybot <107717825+opentelemetrybot@users.noreply.github.com> --- internal/tools/go.mod | 8 ++++---- internal/tools/go.sum | 18 +++++++++--------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/tools/go.mod b/internal/tools/go.mod index 4e2da47bf92..3f4cc1edea9 100644 --- a/internal/tools/go.mod +++ b/internal/tools/go.mod @@ -16,7 +16,7 @@ require ( go.opentelemetry.io/build-tools/multimod v0.12.0 go.opentelemetry.io/build-tools/semconvgen v0.12.0 golang.org/x/exp v0.0.0-20230905200255-921286631fa9 - golang.org/x/tools v0.15.0 + golang.org/x/tools v0.16.0 golang.org/x/vuln v1.0.1 ) @@ -209,12 +209,12 @@ require ( go.tmz.dev/musttag v0.7.2 // indirect go.uber.org/multierr v1.11.0 // indirect go.uber.org/zap v1.26.0 // indirect - golang.org/x/crypto v0.15.0 // indirect + golang.org/x/crypto v0.16.0 // indirect golang.org/x/exp/typeparams v0.0.0-20230307190834-24139beb5833 // indirect golang.org/x/mod v0.14.0 // indirect - golang.org/x/net v0.18.0 // indirect + golang.org/x/net v0.19.0 // indirect golang.org/x/sync v0.5.0 // indirect - golang.org/x/sys v0.14.0 // indirect + golang.org/x/sys v0.15.0 // indirect golang.org/x/text v0.14.0 // indirect golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect google.golang.org/protobuf v1.31.0 // indirect diff --git a/internal/tools/go.sum b/internal/tools/go.sum index d8e95bafed3..1222ca71840 100644 --- a/internal/tools/go.sum +++ b/internal/tools/go.sum @@ -677,8 +677,8 @@ golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa/go.mod h1:IxCIyHEi3zRg3s0 golang.org/x/crypto v0.1.0/go.mod h1:RecgLatLF4+eUMCP1PoPZQb+cVrJcOPbHkTkbkB9sbw= golang.org/x/crypto v0.3.1-0.20221117191849-2c476679df9a/go.mod h1:hebNnKkNXi2UzZN1eVRvBB7co0a+JxK6XbPiWVs/3J4= golang.org/x/crypto v0.7.0/go.mod h1:pYwdfH91IfpZVANVyUOhSIPZaFoJGxTFbZhFTx+dXZU= -golang.org/x/crypto v0.15.0 h1:frVn1TEaCEaZcn3Tmd7Y2b5KKPaZ+I32Q2OA3kYp5TA= -golang.org/x/crypto v0.15.0/go.mod h1:4ChreQoLWfG3xLDer1WdlH5NdlQ3+mwnQq1YTKY+72g= +golang.org/x/crypto v0.16.0 h1:mMMrFzRSCF0GvB7Ne27XVtVAaXLrPmgPC7/v0tkwHaY= +golang.org/x/crypto v0.16.0/go.mod h1:gCAAfMLgwOJRpTjQ2zCCt2OcSfYMTeZVSRtQlPC7Nq4= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= @@ -770,8 +770,8 @@ golang.org/x/net v0.2.0/go.mod h1:KqCZLdyyvdV855qA2rE3GC2aiw5xGR5TEjj8smXukLY= golang.org/x/net v0.5.0/go.mod h1:DivGGAXEgPSlEBzxGzZI+ZLohi+xUj054jfeKui00ws= golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= golang.org/x/net v0.8.0/go.mod h1:QVkue5JL9kW//ek3r6jTKnTFis1tRmNAW2P1shuFdJc= -golang.org/x/net v0.18.0 h1:mIYleuAkSbHh0tCv7RvjL3F6ZVbLjq4+R7zbOn3Kokg= -golang.org/x/net v0.18.0/go.mod h1:/czyP5RqHAH4odGYxBJ1qz0+CE5WZ+2j1YgoEo8F2jQ= +golang.org/x/net v0.19.0 h1:zTwKpTd2XuCqf8huc7Fo2iSy+4RHPd10s4KzeTnVr1c= +golang.org/x/net v0.19.0/go.mod h1:CfAk/cbD4CthTvqiEl8NpboMuiuOYsAr/7NOjZJtv1U= 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= @@ -857,8 +857,8 @@ golang.org/x/sys v0.3.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.4.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.14.0 h1:Vz7Qs629MkJkGyHxUlRHizWJRG2j8fbQKjELVSNhy7Q= -golang.org/x/sys v0.14.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.15.0 h1:h48lPFYpsTvQJZF4EKyI4aLHaev3CxivZmv7yZig9pc= +golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.1.0/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= @@ -866,7 +866,7 @@ golang.org/x/term v0.2.0/go.mod h1:TVmDHMZPmdnySmBfhjOoOdhjzdE1h4u1VwSiw2l1Nuc= golang.org/x/term v0.4.0/go.mod h1:9P2UbLfCdcvo3p/nzKvsmas4TnlujnuoV9hGgYzW1lQ= golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= golang.org/x/term v0.6.0/go.mod h1:m6U89DPEgQRMq3DNkDClhWw02AUbt2daBVO4cn4Hv9U= -golang.org/x/term v0.14.0 h1:LGK9IlZ8T9jvdy6cTdfKUCltatMFOehAQo9SRC46UQ8= +golang.org/x/term v0.15.0 h1:y/Oo/a/q3IXu26lQgl04j/gjuBDOBlx7X6Om1j2CPW4= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -952,8 +952,8 @@ golang.org/x/tools v0.2.0/go.mod h1:y4OqIKeOV/fWJetJ8bXPU1sEVniLMIyDAZWeHdV+NTA= golang.org/x/tools v0.3.0/go.mod h1:/rWhSS2+zyEVwoJf8YAX6L2f0ntZ7Kn/mGgAWcipA5k= golang.org/x/tools v0.5.0/go.mod h1:N+Kgy78s5I24c24dU8OfWNEotWjutIs8SnJvn5IDq+k= golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU= -golang.org/x/tools v0.15.0 h1:zdAyfUGbYmuVokhzVmghFl2ZJh5QhcfebBgmVPFYA+8= -golang.org/x/tools v0.15.0/go.mod h1:hpksKq4dtpQWS1uQ61JkdqWM3LscIS6Slf+VVkm+wQk= +golang.org/x/tools v0.16.0 h1:GO788SKMRunPIBCXiQyo2AaexLstOrVhuAL5YwsckQM= +golang.org/x/tools v0.16.0/go.mod h1:kYVVN6I1mBNoB1OX+noeBjbRk4IUEPa7JJ+TJMEooJ0= golang.org/x/vuln v1.0.1 h1:KUas02EjQK5LTuIx1OylBQdKKZ9jeugs+HiqO5HormU= golang.org/x/vuln v1.0.1/go.mod h1:bb2hMwln/tqxg32BNY4CcxHWtHXuYa3SbIBmtsyjxtM= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= From 49665092465959da8f7eee1b4855077a2e23327b Mon Sep 17 00:00:00 2001 From: Dmitrii Anoshin Date: Tue, 28 Nov 2023 07:12:30 -0800 Subject: [PATCH 30/52] [chore] [exporterhelper] Remove redundant queueSender field (#9001) Not being used after the recent changes --- exporter/exporterhelper/queue_sender.go | 2 -- 1 file changed, 2 deletions(-) diff --git a/exporter/exporterhelper/queue_sender.go b/exporter/exporterhelper/queue_sender.go index 2f86c475611..a6abaa16ec7 100644 --- a/exporter/exporterhelper/queue_sender.go +++ b/exporter/exporterhelper/queue_sender.go @@ -76,7 +76,6 @@ func (qCfg *QueueSettings) Validate() error { type queueSender struct { baseRequestSender fullName string - signal component.DataType queue internal.Queue[Request] traceAttribute attribute.KeyValue logger *zap.Logger @@ -102,7 +101,6 @@ func newQueueSender(config QueueSettings, set exporter.CreateSettings, signal co } qs := &queueSender{ fullName: set.ID.String(), - signal: signal, queue: queue, traceAttribute: attribute.String(obsmetrics.ExporterKey, set.ID.String()), logger: set.TelemetrySettings.Logger, From 7d2cb74e293e1261e3808c0db6bfc8cbeaefb0d0 Mon Sep 17 00:00:00 2001 From: xu0o0 Date: Wed, 29 Nov 2023 00:42:56 +0800 Subject: [PATCH 31/52] [chore][extension] update NotifyConfig contract (#9005) **Description:** The collector implementation makes a copy of effective configuration before calling `NotifyConfig` so it's safe for the config watcher to save the pointer and use it later. It is resonable to promise this in the API contract. **Link to tracking Issue:** https://github.com/open-telemetry/opentelemetry-collector-contrib/pull/29277#discussion_r1406522281 --------- Co-authored-by: Evan Bradley <11745660+evan-bradley@users.noreply.github.com> --- extension/extension.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/extension/extension.go b/extension/extension.go index b19f4236734..292358b33ba 100644 --- a/extension/extension.go +++ b/extension/extension.go @@ -45,6 +45,9 @@ type PipelineWatcher interface { // wishes to be notified of the Collector's effective configuration. type ConfigWatcher interface { // NotifyConfig notifies the extension of the Collector's current effective configuration. + // The extension owns the `confmap.Conf`. Callers must ensure that it's safe for + // extensions to store the `conf` pointer and use it concurrently with any other + // instances of `conf`. NotifyConfig(ctx context.Context, conf *confmap.Conf) error } From ccddc54059ea823eea475e4f63e062e5fadbd67b Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 28 Nov 2023 10:40:10 -0800 Subject: [PATCH 32/52] Update all patch dependencies (#8979) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![Mend Renovate logo banner](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [github.com/golangci/golangci-lint](https://togithub.com/golangci/golangci-lint) | require | patch | `v1.55.1` -> `v1.55.2` | | [github.com/mikefarah/yq/v4](https://togithub.com/mikefarah/yq) | require | patch | `v4.40.2` -> `v4.40.3` | | [go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc](https://togithub.com/open-telemetry/opentelemetry-go-contrib) | require | patch | `v0.46.0` -> `v0.46.1` | --- ### Release Notes
golangci/golangci-lint (github.com/golangci/golangci-lint) ### [`v1.55.2`](https://togithub.com/golangci/golangci-lint/blob/HEAD/CHANGELOG.md#v1552) [Compare Source](https://togithub.com/golangci/golangci-lint/compare/v1.55.1...v1.55.2) 1. updated linters - `ireturn`: from 0.2.1 to 0.2.2 - `ginkgolinter`: from 0.14.0 to 0.14.1
mikefarah/yq (github.com/mikefarah/yq/v4) ### [`v4.40.3`](https://togithub.com/mikefarah/yq/releases/tag/v4.40.3): - Fixes JSON empty array bug [Compare Source](https://togithub.com/mikefarah/yq/compare/v4.40.2...v4.40.3) - Fixed JSON output issue with empty arrays [#​1880](https://togithub.com/mikefarah/yq/issues/1880)
--- ### Configuration 📅 **Schedule**: Branch creation - "on tuesday" (UTC), 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. 👻 **Immortal**: This PR will be recreated if closed unmerged. Get [config help](https://togithub.com/renovatebot/renovate/discussions) if that's undesired. --- - [ ] 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/open-telemetry/opentelemetry-collector). --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: opentelemetrybot <107717825+opentelemetrybot@users.noreply.github.com> --- cmd/otelcorecol/go.mod | 2 +- cmd/otelcorecol/go.sum | 4 ++-- config/configgrpc/go.mod | 2 +- config/configgrpc/go.sum | 4 ++-- exporter/otlpexporter/go.mod | 2 +- exporter/otlpexporter/go.sum | 4 ++-- exporter/otlphttpexporter/go.mod | 2 +- exporter/otlphttpexporter/go.sum | 4 ++-- internal/tools/go.mod | 4 ++-- internal/tools/go.sum | 8 ++++---- receiver/otlpreceiver/go.mod | 2 +- receiver/otlpreceiver/go.sum | 4 ++-- 12 files changed, 21 insertions(+), 21 deletions(-) diff --git a/cmd/otelcorecol/go.mod b/cmd/otelcorecol/go.mod index f4807b9bfc8..055f04987af 100644 --- a/cmd/otelcorecol/go.mod +++ b/cmd/otelcorecol/go.mod @@ -95,7 +95,7 @@ require ( go.opentelemetry.io/collector/semconv v0.90.0 // indirect go.opentelemetry.io/collector/service v0.90.0 // indirect go.opentelemetry.io/contrib/config v0.1.1 // indirect - go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.0 // indirect + go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.1 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.46.1 // indirect go.opentelemetry.io/contrib/propagators/b3 v1.21.1 // indirect go.opentelemetry.io/contrib/zpages v0.46.1 // indirect diff --git a/cmd/otelcorecol/go.sum b/cmd/otelcorecol/go.sum index b013695005b..ee3c61bc108 100644 --- a/cmd/otelcorecol/go.sum +++ b/cmd/otelcorecol/go.sum @@ -318,8 +318,8 @@ go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= go.opentelemetry.io/contrib/config v0.1.1 h1:lIUTrMWkfDE0GvzBLhwv6ATDB1vntrnTsRvUMkZKnfQ= go.opentelemetry.io/contrib/config v0.1.1/go.mod h1:rDrK4+PS6Cs+WIphU/GO5Sk4TGV36lEQqk/Z1vZkaLI= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.0 h1:PzIubN4/sjByhDRHLviCjJuweBXWFZWhghjg7cS28+M= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.0/go.mod h1:Ct6zzQEuGK3WpJs2n4dn+wfJYzd/+hNnxMRTWjGn30M= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.1 h1:SpGay3w+nEwMpfVnbqOLH5gY52/foP8RE8UzTZ1pdSE= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.1/go.mod h1:4UoMYEZOC0yN/sPGH76KPkkU7zgiEWYWL9vwmbnTJPE= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.46.1 h1:aFJWCqJMNjENlcleuuOkGAPH82y0yULBScfXcIEdS24= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.46.1/go.mod h1:sEGXWArGqc3tVa+ekntsN65DmVbVeW+7lTKTjZF3/Fo= go.opentelemetry.io/contrib/propagators/b3 v1.21.1 h1:WPYiUgmw3+b7b3sQ1bFBFAf0q+Di9dvNc3AtYfnT4RQ= diff --git a/config/configgrpc/go.mod b/config/configgrpc/go.mod index 85e358f896b..03136585b30 100644 --- a/config/configgrpc/go.mod +++ b/config/configgrpc/go.mod @@ -15,7 +15,7 @@ require ( go.opentelemetry.io/collector/config/internal v0.90.0 go.opentelemetry.io/collector/extension/auth v0.90.0 go.opentelemetry.io/collector/pdata v1.0.0 - go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.0 + go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.1 go.opentelemetry.io/otel v1.21.0 go.uber.org/zap v1.26.0 google.golang.org/grpc v1.59.0 diff --git a/config/configgrpc/go.sum b/config/configgrpc/go.sum index bd0bf66de39..085301dc870 100644 --- a/config/configgrpc/go.sum +++ b/config/configgrpc/go.sum @@ -277,8 +277,8 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.0 h1:PzIubN4/sjByhDRHLviCjJuweBXWFZWhghjg7cS28+M= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.0/go.mod h1:Ct6zzQEuGK3WpJs2n4dn+wfJYzd/+hNnxMRTWjGn30M= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.1 h1:SpGay3w+nEwMpfVnbqOLH5gY52/foP8RE8UzTZ1pdSE= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.1/go.mod h1:4UoMYEZOC0yN/sPGH76KPkkU7zgiEWYWL9vwmbnTJPE= go.opentelemetry.io/otel v1.21.0 h1:hzLeKBZEL7Okw2mGzZ0cc4k/A7Fta0uoPgaJCr8fsFc= go.opentelemetry.io/otel v1.21.0/go.mod h1:QZzNPQPm1zLX4gZK4cMi+71eaorMSGT3A4znnUvNNEo= go.opentelemetry.io/otel/exporters/prometheus v0.44.0 h1:08qeJgaPC0YEBu2PQMbqU3rogTlyzpjhCI2b58Yn00w= diff --git a/exporter/otlpexporter/go.mod b/exporter/otlpexporter/go.mod index e9675b63259..68a566bd3fe 100644 --- a/exporter/otlpexporter/go.mod +++ b/exporter/otlpexporter/go.mod @@ -56,7 +56,7 @@ require ( go.opentelemetry.io/collector/featuregate v1.0.0 // indirect go.opentelemetry.io/collector/receiver v0.90.0 // indirect go.opentelemetry.io/contrib/config v0.1.1 // indirect - go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.0 // indirect + go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.1 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.46.1 // indirect go.opentelemetry.io/otel v1.21.0 // indirect go.opentelemetry.io/otel/metric v1.21.0 // indirect diff --git a/exporter/otlpexporter/go.sum b/exporter/otlpexporter/go.sum index a3a95abdf88..9f92355181c 100644 --- a/exporter/otlpexporter/go.sum +++ b/exporter/otlpexporter/go.sum @@ -118,8 +118,8 @@ go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= go.opentelemetry.io/contrib/config v0.1.1 h1:lIUTrMWkfDE0GvzBLhwv6ATDB1vntrnTsRvUMkZKnfQ= go.opentelemetry.io/contrib/config v0.1.1/go.mod h1:rDrK4+PS6Cs+WIphU/GO5Sk4TGV36lEQqk/Z1vZkaLI= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.0 h1:PzIubN4/sjByhDRHLviCjJuweBXWFZWhghjg7cS28+M= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.0/go.mod h1:Ct6zzQEuGK3WpJs2n4dn+wfJYzd/+hNnxMRTWjGn30M= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.1 h1:SpGay3w+nEwMpfVnbqOLH5gY52/foP8RE8UzTZ1pdSE= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.1/go.mod h1:4UoMYEZOC0yN/sPGH76KPkkU7zgiEWYWL9vwmbnTJPE= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.46.1 h1:aFJWCqJMNjENlcleuuOkGAPH82y0yULBScfXcIEdS24= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.46.1/go.mod h1:sEGXWArGqc3tVa+ekntsN65DmVbVeW+7lTKTjZF3/Fo= go.opentelemetry.io/otel v1.21.0 h1:hzLeKBZEL7Okw2mGzZ0cc4k/A7Fta0uoPgaJCr8fsFc= diff --git a/exporter/otlphttpexporter/go.mod b/exporter/otlphttpexporter/go.mod index 9e5bbaefbf4..8908029f0d3 100644 --- a/exporter/otlphttpexporter/go.mod +++ b/exporter/otlphttpexporter/go.mod @@ -57,7 +57,7 @@ require ( go.opentelemetry.io/collector/extension/auth v0.90.0 // indirect go.opentelemetry.io/collector/featuregate v1.0.0 // indirect go.opentelemetry.io/contrib/config v0.1.1 // indirect - go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.0 // indirect + go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.1 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.46.1 // indirect go.opentelemetry.io/otel v1.21.0 // indirect go.opentelemetry.io/otel/metric v1.21.0 // indirect diff --git a/exporter/otlphttpexporter/go.sum b/exporter/otlphttpexporter/go.sum index a3a95abdf88..9f92355181c 100644 --- a/exporter/otlphttpexporter/go.sum +++ b/exporter/otlphttpexporter/go.sum @@ -118,8 +118,8 @@ go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= go.opentelemetry.io/contrib/config v0.1.1 h1:lIUTrMWkfDE0GvzBLhwv6ATDB1vntrnTsRvUMkZKnfQ= go.opentelemetry.io/contrib/config v0.1.1/go.mod h1:rDrK4+PS6Cs+WIphU/GO5Sk4TGV36lEQqk/Z1vZkaLI= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.0 h1:PzIubN4/sjByhDRHLviCjJuweBXWFZWhghjg7cS28+M= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.0/go.mod h1:Ct6zzQEuGK3WpJs2n4dn+wfJYzd/+hNnxMRTWjGn30M= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.1 h1:SpGay3w+nEwMpfVnbqOLH5gY52/foP8RE8UzTZ1pdSE= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.1/go.mod h1:4UoMYEZOC0yN/sPGH76KPkkU7zgiEWYWL9vwmbnTJPE= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.46.1 h1:aFJWCqJMNjENlcleuuOkGAPH82y0yULBScfXcIEdS24= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.46.1/go.mod h1:sEGXWArGqc3tVa+ekntsN65DmVbVeW+7lTKTjZF3/Fo= go.opentelemetry.io/otel v1.21.0 h1:hzLeKBZEL7Okw2mGzZ0cc4k/A7Fta0uoPgaJCr8fsFc= diff --git a/internal/tools/go.mod b/internal/tools/go.mod index 3f4cc1edea9..1783fe5cf1d 100644 --- a/internal/tools/go.mod +++ b/internal/tools/go.mod @@ -5,10 +5,10 @@ go 1.20 require ( github.com/a8m/envsubst v1.4.2 github.com/client9/misspell v0.3.4 - github.com/golangci/golangci-lint v1.55.1 + github.com/golangci/golangci-lint v1.55.2 github.com/google/addlicense v1.1.1 github.com/jcchavezs/porto v0.6.0 - github.com/mikefarah/yq/v4 v4.40.2 + github.com/mikefarah/yq/v4 v4.40.3 github.com/pavius/impi v0.0.3 go.opentelemetry.io/build-tools/checkfile v0.12.0 go.opentelemetry.io/build-tools/chloggen v0.12.0 diff --git a/internal/tools/go.sum b/internal/tools/go.sum index 1222ca71840..db441af5172 100644 --- a/internal/tools/go.sum +++ b/internal/tools/go.sum @@ -272,8 +272,8 @@ github.com/golangci/go-misc v0.0.0-20220329215616-d24fe342adfe h1:6RGUuS7EGotKx6 github.com/golangci/go-misc v0.0.0-20220329215616-d24fe342adfe/go.mod h1:gjqyPShc/m8pEMpk0a3SeagVb0kaqvhscv+i9jI5ZhQ= github.com/golangci/gofmt v0.0.0-20231018234816-f50ced29576e h1:ULcKCDV1LOZPFxGZaA6TlQbiM3J2GCPnkx/bGF6sX/g= github.com/golangci/gofmt v0.0.0-20231018234816-f50ced29576e/go.mod h1:Pm5KhLPA8gSnQwrQ6ukebRcapGb/BG9iUkdaiCcGHJM= -github.com/golangci/golangci-lint v1.55.1 h1:DL2j9Eeapg1N3WEkKnQFX5L40SYtjZZJjGVdyEgNrDc= -github.com/golangci/golangci-lint v1.55.1/go.mod h1:z00biPRqjo5MISKV1+RWgONf2KvrPDmfqxHpHKB6bI4= +github.com/golangci/golangci-lint v1.55.2 h1:yllEIsSJ7MtlDBwDJ9IMBkyEUz2fYE0b5B8IUgO1oP8= +github.com/golangci/golangci-lint v1.55.2/go.mod h1:H60CZ0fuqoTwlTvnbyjhpZPWp7KmsjwV2yupIMiMXbM= github.com/golangci/lint-1 v0.0.0-20191013205115-297bf364a8e0 h1:MfyDlzVjl1hoaPzPD4Gpb/QgoRfSBR0jdhwGyAWwMSA= github.com/golangci/lint-1 v0.0.0-20191013205115-297bf364a8e0/go.mod h1:66R6K6P6VWk9I95jvqGxkqJxVWGFy9XlDwLwVz1RCFg= github.com/golangci/maligned v0.0.0-20180506175553-b1d89398deca h1:kNY3/svz5T29MYHubXix4aDDuE3RWHkPvopM/EDv/MA= @@ -436,8 +436,8 @@ github.com/mbilski/exhaustivestruct v1.2.0 h1:wCBmUnSYufAHO6J4AVWY6ff+oxWxsVFrwg github.com/mbilski/exhaustivestruct v1.2.0/go.mod h1:OeTBVxQWoEmB2J2JCHmXWPJ0aksxSUOUy+nvtVEfzXc= github.com/mgechev/revive v1.3.4 h1:k/tO3XTaWY4DEHal9tWBkkUMJYO/dLDVyMmAQxmIMDc= github.com/mgechev/revive v1.3.4/go.mod h1:W+pZCMu9qj8Uhfs1iJMQsEFLRozUfvwFwqVvRbSNLVw= -github.com/mikefarah/yq/v4 v4.40.2 h1:KA+s3fc1sB8GhOJOAzoyJlNJSD6u7+nbXJmcwCSCviU= -github.com/mikefarah/yq/v4 v4.40.2/go.mod h1:TSqdLNAFlwmIGQBQYIzeOX+wDWkCTWfRGWDrxQwGCaQ= +github.com/mikefarah/yq/v4 v4.40.3 h1:pSJua3IGua3O+HFXp5LkMheqEOHMRQAkkCcgVhqi4VY= +github.com/mikefarah/yq/v4 v4.40.3/go.mod h1:TSqdLNAFlwmIGQBQYIzeOX+wDWkCTWfRGWDrxQwGCaQ= github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y= github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= github.com/mitchellh/mapstructure v1.5.1-0.20220423185008-bf980b35cac4 h1:BpfhmLKZf+SjVanKKhCgf3bg+511DmU9eDQTen7LLbY= diff --git a/receiver/otlpreceiver/go.mod b/receiver/otlpreceiver/go.mod index 807fce69392..8abd56a633e 100644 --- a/receiver/otlpreceiver/go.mod +++ b/receiver/otlpreceiver/go.mod @@ -67,7 +67,7 @@ require ( go.opentelemetry.io/collector/extension/auth v0.90.0 // indirect go.opentelemetry.io/collector/featuregate v1.0.0 // indirect go.opentelemetry.io/contrib/config v0.1.1 // indirect - go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.0 // indirect + go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.1 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.46.1 // indirect go.opentelemetry.io/otel v1.21.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.44.0 // indirect diff --git a/receiver/otlpreceiver/go.sum b/receiver/otlpreceiver/go.sum index 3319b4bcd16..7b91f30df9f 100644 --- a/receiver/otlpreceiver/go.sum +++ b/receiver/otlpreceiver/go.sum @@ -283,8 +283,8 @@ go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= go.opentelemetry.io/contrib/config v0.1.1 h1:lIUTrMWkfDE0GvzBLhwv6ATDB1vntrnTsRvUMkZKnfQ= go.opentelemetry.io/contrib/config v0.1.1/go.mod h1:rDrK4+PS6Cs+WIphU/GO5Sk4TGV36lEQqk/Z1vZkaLI= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.0 h1:PzIubN4/sjByhDRHLviCjJuweBXWFZWhghjg7cS28+M= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.0/go.mod h1:Ct6zzQEuGK3WpJs2n4dn+wfJYzd/+hNnxMRTWjGn30M= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.1 h1:SpGay3w+nEwMpfVnbqOLH5gY52/foP8RE8UzTZ1pdSE= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.1/go.mod h1:4UoMYEZOC0yN/sPGH76KPkkU7zgiEWYWL9vwmbnTJPE= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.46.1 h1:aFJWCqJMNjENlcleuuOkGAPH82y0yULBScfXcIEdS24= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.46.1/go.mod h1:sEGXWArGqc3tVa+ekntsN65DmVbVeW+7lTKTjZF3/Fo= go.opentelemetry.io/otel v1.21.0 h1:hzLeKBZEL7Okw2mGzZ0cc4k/A7Fta0uoPgaJCr8fsFc= From 1a4ed9ef1678d5398435c1c36ef720f151b9b270 Mon Sep 17 00:00:00 2001 From: Dmitrii Anoshin Date: Tue, 28 Nov 2023 12:25:19 -0800 Subject: [PATCH 33/52] [chore] [exporterhelper] Remove another redundant field from queueSender (#9008) This should've been part of https://github.com/open-telemetry/opentelemetry-collector/pull/9001. Didn't notice it before --- exporter/exporterhelper/queue_sender.go | 3 --- 1 file changed, 3 deletions(-) diff --git a/exporter/exporterhelper/queue_sender.go b/exporter/exporterhelper/queue_sender.go index a6abaa16ec7..c8e554fce56 100644 --- a/exporter/exporterhelper/queue_sender.go +++ b/exporter/exporterhelper/queue_sender.go @@ -7,7 +7,6 @@ import ( "context" "errors" "fmt" - "sync" "time" "go.opencensus.io/metric/metricdata" @@ -81,7 +80,6 @@ type queueSender struct { logger *zap.Logger meter otelmetric.Meter consumers *internal.QueueConsumers[Request] - stopWG sync.WaitGroup requeuingEnabled bool metricCapacity otelmetric.Int64ObservableGauge @@ -105,7 +103,6 @@ func newQueueSender(config QueueSettings, set exporter.CreateSettings, signal co traceAttribute: attribute.String(obsmetrics.ExporterKey, set.ID.String()), logger: set.TelemetrySettings.Logger, meter: set.TelemetrySettings.MeterProvider.Meter(scopeName), - stopWG: sync.WaitGroup{}, // TODO: this can be further exposed as a config param rather than relying on a type of queue requeuingEnabled: isPersistent, } From 433f7aef923a74df12fb09ef4aadf51028b53ef5 Mon Sep 17 00:00:00 2001 From: Matthew Wear Date: Tue, 28 Nov 2023 12:43:32 -0800 Subject: [PATCH 34/52] Automate status reporting on start (#8836) This is part of the continued component status reporting effort. Currently we have automated status reporting for the following component lifecycle events: `Starting`, `Stopping`, `Stopped` as well as definitive errors that occur in the starting or stopping process (e.g. as determined by an error return value). This leaves the responsibility to the component to report runtime status after start and before stop. We'd like to be able to extend the automatic status reporting to report `StatusOK` if `Start` completes without an error. One complication with this approach is that some components spawn async work (via goroutines) that, depending on the Go scheduler, can report status before `Start` returns. As such, we cannot assume a nil return value from `Start` means the component has started properly. The solution is to detect if the component has already reported status when start returns, if it has, we will use the component-reported status and will not automatically report status. If it hasn't, and `Start` returns without an error, we can report `StatusOK`. Any subsequent reports from the component (async or otherwise) will transition the component status accordingly. The tl;dr is that we cannot control the execution of async code, that's up to the Go scheduler, but we can handle the race, report the status based on the execution, and not clobber status reported from within the component during the startup process. That said, for components with async starts, you may see a `StatusOK` before the component-reported status, or just the component-reported status depending on the actual execution of the code. In both cases, the end status will be same. The work in this PR will allow us to simplify #8684 and #8788 and ultimately choose which direction we want to go for runtime status reporting. **Link to tracking Issue:** #7682 **Testing:** units / manual --------- Co-authored-by: Alex Boten --- .chloggen/automated-status-on-start.yaml | 25 ++++ component/telemetry.go | 41 ++++++- internal/sharedcomponent/sharedcomponent.go | 7 +- otelcol/collector_test.go | 24 +++- service/extensions/extensions.go | 26 +++- service/extensions/extensions_test.go | 8 +- service/internal/graph/graph.go | 27 ++++- service/internal/graph/graph_test.go | 13 +- .../nop_telemetry_settings.go | 5 +- .../nop_telemetry_settings_test.go | 10 +- .../servicetelemetry/telemetry_settings.go | 37 +++++- .../telemetry_settings_test.go | 16 ++- service/internal/status/status.go | 114 ++++++++++-------- service/internal/status/status_test.go | 98 +++++++++++++-- service/service.go | 7 +- 15 files changed, 346 insertions(+), 112 deletions(-) create mode 100755 .chloggen/automated-status-on-start.yaml diff --git a/.chloggen/automated-status-on-start.yaml b/.chloggen/automated-status-on-start.yaml new file mode 100755 index 00000000000..8eb1df926b6 --- /dev/null +++ b/.chloggen/automated-status-on-start.yaml @@ -0,0 +1,25 @@ +# Use this changelog template to create an entry for release notes. + +# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' +change_type: enhancement + +# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver) +component: statusreporting + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: Automates status reporting upon the completion of component.Start(). + +# One or more tracking issues or pull requests related to the change +issues: [7682] + +# (Optional) One or more lines of additional information to render under the primary note. +# These lines will be padded with 2 spaces and then inserted directly into the document. +# Use pipe (|) for multiline entries. +subtext: + +# Optional: The change log or logs in which this entry should be included. +# e.g. '[user]' or '[user, api]' +# Include 'user' if the change is relevant to end users. +# Include 'api' if there is a change to a library API. +# Default: '[user]' +change_logs: [] \ No newline at end of file diff --git a/component/telemetry.go b/component/telemetry.go index 5eb6bcf457a..88438b84eef 100644 --- a/component/telemetry.go +++ b/component/telemetry.go @@ -12,6 +12,43 @@ import ( "go.opentelemetry.io/collector/pdata/pcommon" ) +// TelemetrySettings provides components with APIs to report telemetry. +// +// Note: there is a service version of this struct, servicetelemetry.TelemetrySettings, that mirrors +// this struct with the exception of ReportComponentStatus. When adding or removing anything from +// this struct consider whether or not the same should be done for the service version. +type TelemetrySettings struct { + // Logger that the factory can use during creation and can pass to the created + // component to be used later as well. + Logger *zap.Logger + + // TracerProvider that the factory can pass to other instrumented third-party libraries. + TracerProvider trace.TracerProvider + + // MeterProvider that the factory can pass to other instrumented third-party libraries. + MeterProvider metric.MeterProvider + + // MetricsLevel controls the level of detail for metrics emitted by the collector. + // Experimental: *NOTE* this field is experimental and may be changed or removed. + MetricsLevel configtelemetry.Level + + // Resource contains the resource attributes for the collector's telemetry. + Resource pcommon.Resource + + // ReportComponentStatus allows a component to report runtime changes in status. The service + // will automatically report status for a component during startup and shutdown. Components can + // use this method to report status after start and before shutdown. ReportComponentStatus + // will only return errors if the API used incorrectly. The two scenarios where an error will + // be returned are: + // + // - An illegal state transition + // - Calling this method before component startup + // + // If the API is being used properly, these errors are safe to ignore. + ReportComponentStatus StatusFunc +} + +// Deprecated: [0.91.0] Use TelemetrySettings directly type TelemetrySettingsBase[T any] struct { // Logger that the factory can use during creation and can pass to the created // component to be used later as well. @@ -42,7 +79,3 @@ type TelemetrySettingsBase[T any] struct { // If the API is being used properly, these errors are safe to ignore. ReportComponentStatus T } - -// TelemetrySettings and servicetelemetry.Settings differ in the method signature for -// ReportComponentStatus -type TelemetrySettings TelemetrySettingsBase[StatusFunc] diff --git a/internal/sharedcomponent/sharedcomponent.go b/internal/sharedcomponent/sharedcomponent.go index cddebb59902..23d7d08c79e 100644 --- a/internal/sharedcomponent/sharedcomponent.go +++ b/internal/sharedcomponent/sharedcomponent.go @@ -36,10 +36,11 @@ func (scs *SharedComponents[K, V]) GetOrAdd(key K, create func() (V, error), tel c.seenSettings[telemetrySettings] = struct{}{} prev := c.telemetry.ReportComponentStatus c.telemetry.ReportComponentStatus = func(ev *component.StatusEvent) error { - if err := telemetrySettings.ReportComponentStatus(ev); err != nil { - return err + err := telemetrySettings.ReportComponentStatus(ev) + if prevErr := prev(ev); prevErr != nil { + err = prevErr } - return prev(ev) + return err } } return c, nil diff --git a/otelcol/collector_test.go b/otelcol/collector_test.go index 6d7a336aa18..3b100a34640 100644 --- a/otelcol/collector_test.go +++ b/otelcol/collector_test.go @@ -182,11 +182,24 @@ func TestComponentStatusWatcher(t *testing.T) { // Start the newly created collector. wg := startCollector(context.Background(), t, col) - // An unhealthy processor asynchronously reports a recoverable error. - expectedStatuses := []component.Status{ + // An unhealthy processor asynchronously reports a recoverable error. Depending on the Go + // Scheduler the statuses reported at startup will be one of the two valid sequnces below. + startupStatuses1 := []component.Status{ component.StatusStarting, + component.StatusOK, component.StatusRecoverableError, } + startupStatuses2 := []component.Status{ + component.StatusStarting, + component.StatusRecoverableError, + } + // the modulus of the actual statuses will match the modulus of the startup statuses + startupStatuses := func(actualStatuses []component.Status) []component.Status { + if len(actualStatuses)%2 == 1 { + return startupStatuses1 + } + return startupStatuses2 + } // The "unhealthy" processors will now begin to asynchronously report StatusRecoverableError. // We expect to see these reports. @@ -197,8 +210,8 @@ func TestComponentStatusWatcher(t *testing.T) { for k, v := range changedComponents { // All processors must report a status change with the same ID assert.EqualValues(t, component.NewID(unhealthyProcessorFactory.Type()), k.ID) - // And all must have the expected statuses - assert.Equal(t, expectedStatuses, v) + // And all must have a valid startup sequence + assert.Equal(t, startupStatuses(v), v) } // We have 3 processors with exactly the same ID in otelcol-statuswatcher.yaml // We must have exactly 3 items in our map. This ensures that the "source" argument @@ -212,8 +225,9 @@ func TestComponentStatusWatcher(t *testing.T) { wg.Wait() // Check for additional statuses after Shutdown. - expectedStatuses = append(expectedStatuses, component.StatusStopping, component.StatusStopped) for _, v := range changedComponents { + expectedStatuses := append([]component.Status{}, startupStatuses(v)...) + expectedStatuses = append(expectedStatuses, component.StatusStopping, component.StatusStopped) assert.Equal(t, expectedStatuses, v) } diff --git a/service/extensions/extensions.go b/service/extensions/extensions.go index 1de89ac5c2f..189d553ab6c 100644 --- a/service/extensions/extensions.go +++ b/service/extensions/extensions.go @@ -37,11 +37,18 @@ func (bes *Extensions) Start(ctx context.Context, host component.Host) error { extLogger.Info("Extension is starting...") instanceID := bes.instanceIDs[extID] ext := bes.extMap[extID] - _ = bes.telemetry.ReportComponentStatus(instanceID, component.NewStatusEvent(component.StatusStarting)) + _ = bes.telemetry.Status.ReportComponentStatus( + instanceID, + component.NewStatusEvent(component.StatusStarting), + ) if err := ext.Start(ctx, components.NewHostWrapper(host, extLogger)); err != nil { - _ = bes.telemetry.ReportComponentStatus(instanceID, component.NewPermanentErrorEvent(err)) + _ = bes.telemetry.Status.ReportComponentStatus( + instanceID, + component.NewPermanentErrorEvent(err), + ) return err } + _ = bes.telemetry.Status.ReportComponentOKIfStarting(instanceID) extLogger.Info("Extension started.") } return nil @@ -55,13 +62,22 @@ func (bes *Extensions) Shutdown(ctx context.Context) error { extID := bes.extensionIDs[i] instanceID := bes.instanceIDs[extID] ext := bes.extMap[extID] - _ = bes.telemetry.ReportComponentStatus(instanceID, component.NewStatusEvent(component.StatusStopping)) + _ = bes.telemetry.Status.ReportComponentStatus( + instanceID, + component.NewStatusEvent(component.StatusStopping), + ) if err := ext.Shutdown(ctx); err != nil { - _ = bes.telemetry.ReportComponentStatus(instanceID, component.NewPermanentErrorEvent(err)) + _ = bes.telemetry.Status.ReportComponentStatus( + instanceID, + component.NewPermanentErrorEvent(err), + ) errs = multierr.Append(errs, err) continue } - _ = bes.telemetry.ReportComponentStatus(instanceID, component.NewStatusEvent(component.StatusStopped)) + _ = bes.telemetry.Status.ReportComponentStatus( + instanceID, + component.NewStatusEvent(component.StatusStopped), + ) } return errs diff --git a/service/extensions/extensions_test.go b/service/extensions/extensions_test.go index 4adabbcc1a9..5de04e43165 100644 --- a/service/extensions/extensions_test.go +++ b/service/extensions/extensions_test.go @@ -381,6 +381,7 @@ func TestStatusReportedOnStartupShutdown(t *testing.T) { name: "successful startup/shutdown", expectedStatuses: []*component.StatusEvent{ component.NewStatusEvent(component.StatusStarting), + component.NewStatusEvent(component.StatusOK), component.NewStatusEvent(component.StatusStopping), component.NewStatusEvent(component.StatusStopped), }, @@ -400,6 +401,7 @@ func TestStatusReportedOnStartupShutdown(t *testing.T) { name: "shutdown error", expectedStatuses: []*component.StatusEvent{ component.NewStatusEvent(component.StatusStarting), + component.NewStatusEvent(component.StatusOK), component.NewStatusEvent(component.StatusStopping), component.NewPermanentErrorEvent(assert.AnError), }, @@ -430,11 +432,11 @@ func TestStatusReportedOnStartupShutdown(t *testing.T) { assert.NoError(t, err) var actualStatuses []*component.StatusEvent - init, statusFunc := status.NewServiceStatusFunc(func(id *component.InstanceID, ev *component.StatusEvent) { + rep := status.NewReporter(func(id *component.InstanceID, ev *component.StatusEvent) { actualStatuses = append(actualStatuses, ev) }) - extensions.telemetry.ReportComponentStatus = statusFunc - init() + extensions.telemetry.Status = rep + rep.Ready() assert.Equal(t, tc.startErr, extensions.Start(context.Background(), componenttest.NewNopHost())) if tc.startErr == nil { diff --git a/service/internal/graph/graph.go b/service/internal/graph/graph.go index 902bc3a5afd..1c3c5392bde 100644 --- a/service/internal/graph/graph.go +++ b/service/internal/graph/graph.go @@ -386,12 +386,20 @@ func (g *Graph) StartAll(ctx context.Context, host component.Host) error { } instanceID := g.instanceIDs[node.ID()] - _ = g.telemetry.ReportComponentStatus(instanceID, component.NewStatusEvent(component.StatusStarting)) + _ = g.telemetry.Status.ReportComponentStatus( + instanceID, + component.NewStatusEvent(component.StatusStarting), + ) if compErr := comp.Start(ctx, host); compErr != nil { - _ = g.telemetry.ReportComponentStatus(instanceID, component.NewPermanentErrorEvent(compErr)) + _ = g.telemetry.Status.ReportComponentStatus( + instanceID, + component.NewPermanentErrorEvent(compErr), + ) return compErr } + + _ = g.telemetry.Status.ReportComponentOKIfStarting(instanceID) } return nil } @@ -417,15 +425,24 @@ func (g *Graph) ShutdownAll(ctx context.Context) error { } instanceID := g.instanceIDs[node.ID()] - _ = g.telemetry.ReportComponentStatus(instanceID, component.NewStatusEvent(component.StatusStopping)) + _ = g.telemetry.Status.ReportComponentStatus( + instanceID, + component.NewStatusEvent(component.StatusStopping), + ) if compErr := comp.Shutdown(ctx); compErr != nil { errs = multierr.Append(errs, compErr) - _ = g.telemetry.ReportComponentStatus(instanceID, component.NewPermanentErrorEvent(compErr)) + _ = g.telemetry.Status.ReportComponentStatus( + instanceID, + component.NewPermanentErrorEvent(compErr), + ) continue } - _ = g.telemetry.ReportComponentStatus(instanceID, component.NewStatusEvent(component.StatusStopped)) + _ = g.telemetry.Status.ReportComponentStatus( + instanceID, + component.NewStatusEvent(component.StatusStopped), + ) } return errs } diff --git a/service/internal/graph/graph_test.go b/service/internal/graph/graph_test.go index 168d3832558..b198d3b81e6 100644 --- a/service/internal/graph/graph_test.go +++ b/service/internal/graph/graph_test.go @@ -2163,11 +2163,13 @@ func TestStatusReportedOnStartupShutdown(t *testing.T) { expectedStatuses: map[*component.InstanceID][]*component.StatusEvent{ instanceIDs[rNoErr]: { component.NewStatusEvent(component.StatusStarting), + component.NewStatusEvent(component.StatusOK), component.NewStatusEvent(component.StatusStopping), component.NewStatusEvent(component.StatusStopped), }, instanceIDs[eNoErr]: { component.NewStatusEvent(component.StatusStarting), + component.NewStatusEvent(component.StatusOK), component.NewStatusEvent(component.StatusStopping), component.NewStatusEvent(component.StatusStopped), }, @@ -2194,6 +2196,7 @@ func TestStatusReportedOnStartupShutdown(t *testing.T) { }, instanceIDs[eNoErr]: { component.NewStatusEvent(component.StatusStarting), + component.NewStatusEvent(component.StatusOK), component.NewStatusEvent(component.StatusStopping), component.NewStatusEvent(component.StatusStopped), }, @@ -2206,11 +2209,13 @@ func TestStatusReportedOnStartupShutdown(t *testing.T) { expectedStatuses: map[*component.InstanceID][]*component.StatusEvent{ instanceIDs[rSdErr]: { component.NewStatusEvent(component.StatusStarting), + component.NewStatusEvent(component.StatusOK), component.NewStatusEvent(component.StatusStopping), component.NewPermanentErrorEvent(assert.AnError), }, instanceIDs[eNoErr]: { component.NewStatusEvent(component.StatusStarting), + component.NewStatusEvent(component.StatusOK), component.NewStatusEvent(component.StatusStopping), component.NewStatusEvent(component.StatusStopped), }, @@ -2223,11 +2228,13 @@ func TestStatusReportedOnStartupShutdown(t *testing.T) { expectedStatuses: map[*component.InstanceID][]*component.StatusEvent{ instanceIDs[rNoErr]: { component.NewStatusEvent(component.StatusStarting), + component.NewStatusEvent(component.StatusOK), component.NewStatusEvent(component.StatusStopping), component.NewStatusEvent(component.StatusStopped), }, instanceIDs[eSdErr]: { component.NewStatusEvent(component.StatusStarting), + component.NewStatusEvent(component.StatusOK), component.NewStatusEvent(component.StatusStopping), component.NewPermanentErrorEvent(assert.AnError), }, @@ -2240,12 +2247,12 @@ func TestStatusReportedOnStartupShutdown(t *testing.T) { pg.telemetry = servicetelemetry.NewNopTelemetrySettings() actualStatuses := make(map[*component.InstanceID][]*component.StatusEvent) - init, statusFunc := status.NewServiceStatusFunc(func(id *component.InstanceID, ev *component.StatusEvent) { + rep := status.NewReporter(func(id *component.InstanceID, ev *component.StatusEvent) { actualStatuses[id] = append(actualStatuses[id], ev) }) - pg.telemetry.ReportComponentStatus = statusFunc - init() + pg.telemetry.Status = rep + rep.Ready() e0, e1 := tc.edge[0], tc.edge[1] pg.instanceIDs = map[int64]*component.InstanceID{ diff --git a/service/internal/servicetelemetry/nop_telemetry_settings.go b/service/internal/servicetelemetry/nop_telemetry_settings.go index b0a2cf2b4cf..0ab94ace9f5 100644 --- a/service/internal/servicetelemetry/nop_telemetry_settings.go +++ b/service/internal/servicetelemetry/nop_telemetry_settings.go @@ -11,6 +11,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config/configtelemetry" "go.opentelemetry.io/collector/pdata/pcommon" + "go.opentelemetry.io/collector/service/internal/status" ) // NewNopTelemetrySettings returns a new nop settings for Create* functions. @@ -21,8 +22,6 @@ func NewNopTelemetrySettings() TelemetrySettings { MeterProvider: noopmetric.NewMeterProvider(), MetricsLevel: configtelemetry.LevelNone, Resource: pcommon.NewResource(), - ReportComponentStatus: func(*component.InstanceID, *component.StatusEvent) error { - return nil - }, + Status: status.NewReporter(func(*component.InstanceID, *component.StatusEvent) {}), } } diff --git a/service/internal/servicetelemetry/nop_telemetry_settings_test.go b/service/internal/servicetelemetry/nop_telemetry_settings_test.go index 05d58fbfdd9..1043efece75 100644 --- a/service/internal/servicetelemetry/nop_telemetry_settings_test.go +++ b/service/internal/servicetelemetry/nop_telemetry_settings_test.go @@ -18,7 +18,7 @@ import ( func TestNewNopSettings(t *testing.T) { set := NewNopTelemetrySettings() - + set.Status.Ready() require.NotNil(t, set) require.IsType(t, TelemetrySettings{}, set) require.Equal(t, zap.NewNop(), set.Logger) @@ -26,5 +26,11 @@ func TestNewNopSettings(t *testing.T) { require.Equal(t, noopmetric.NewMeterProvider(), set.MeterProvider) require.Equal(t, configtelemetry.LevelNone, set.MetricsLevel) require.Equal(t, pcommon.NewResource(), set.Resource) - require.NoError(t, set.ReportComponentStatus(&component.InstanceID{}, component.NewStatusEvent(component.StatusStarting))) + require.NoError(t, + set.Status.ReportComponentStatus( + &component.InstanceID{}, + component.NewStatusEvent(component.StatusStarting), + ), + ) + require.NoError(t, set.Status.ReportComponentOKIfStarting(&component.InstanceID{})) } diff --git a/service/internal/servicetelemetry/telemetry_settings.go b/service/internal/servicetelemetry/telemetry_settings.go index 00062764d93..8bbc3cf5b20 100644 --- a/service/internal/servicetelemetry/telemetry_settings.go +++ b/service/internal/servicetelemetry/telemetry_settings.go @@ -4,14 +4,41 @@ package servicetelemetry // import "go.opentelemetry.io/collector/service/internal/servicetelemetry" import ( + "go.opentelemetry.io/otel/metric" + "go.opentelemetry.io/otel/trace" + "go.uber.org/zap" + "go.opentelemetry.io/collector/component" + "go.opentelemetry.io/collector/config/configtelemetry" + "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/service/internal/status" ) -// TelemetrySettings mirrors component.TelemetrySettings except for the method signature of -// ReportComponentStatus. The service level TelemetrySettings is not bound a specific component, and -// therefore takes a component.InstanceID as an argument. -type TelemetrySettings component.TelemetrySettingsBase[status.ServiceStatusFunc] +// TelemetrySettings mirrors component.TelemetrySettings except for the mechanism for reporting +// status. Service-level status reporting has additional methods which can report status for +// components by their InstanceID whereas the component versions are tied to a specific component. +type TelemetrySettings struct { + // Logger that the factory can use during creation and can pass to the created + // component to be used later as well. + Logger *zap.Logger + + // TracerProvider that the factory can pass to other instrumented third-party libraries. + TracerProvider trace.TracerProvider + + // MeterProvider that the factory can pass to other instrumented third-party libraries. + MeterProvider metric.MeterProvider + + // MetricsLevel controls the level of detail for metrics emitted by the collector. + // Experimental: *NOTE* this field is experimental and may be changed or removed. + MetricsLevel configtelemetry.Level + + // Resource contains the resource attributes for the collector's telemetry. + Resource pcommon.Resource + + // Status contains a Reporter that allows the service to report status on behalf of a + // component. + Status *status.Reporter +} // ToComponentTelemetrySettings returns a TelemetrySettings for a specific component derived from // this service level Settings object. @@ -22,6 +49,6 @@ func (s TelemetrySettings) ToComponentTelemetrySettings(id *component.InstanceID MeterProvider: s.MeterProvider, MetricsLevel: s.MetricsLevel, Resource: s.Resource, - ReportComponentStatus: status.NewComponentStatusFunc(id, s.ReportComponentStatus), + ReportComponentStatus: status.NewComponentStatusFunc(id, s.Status.ReportComponentStatus), } } diff --git a/service/internal/servicetelemetry/telemetry_settings_test.go b/service/internal/servicetelemetry/telemetry_settings_test.go index c42951c4a3e..f9f2cfd11f0 100644 --- a/service/internal/servicetelemetry/telemetry_settings_test.go +++ b/service/internal/servicetelemetry/telemetry_settings_test.go @@ -14,6 +14,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config/configtelemetry" "go.opentelemetry.io/collector/pdata/pcommon" + "go.opentelemetry.io/collector/service/internal/status" ) func TestSettings(t *testing.T) { @@ -23,12 +24,17 @@ func TestSettings(t *testing.T) { MeterProvider: noopmetric.NewMeterProvider(), MetricsLevel: configtelemetry.LevelNone, Resource: pcommon.NewResource(), - ReportComponentStatus: func(*component.InstanceID, *component.StatusEvent) error { - return nil - }, + Status: status.NewReporter(func(*component.InstanceID, *component.StatusEvent) {}), } - require.NoError(t, set.ReportComponentStatus(&component.InstanceID{}, component.NewStatusEvent(component.StatusOK))) + set.Status.Ready() + require.NoError(t, + set.Status.ReportComponentStatus( + &component.InstanceID{}, + component.NewStatusEvent(component.StatusStarting), + ), + ) + require.NoError(t, set.Status.ReportComponentOKIfStarting(&component.InstanceID{})) compSet := set.ToComponentTelemetrySettings(&component.InstanceID{}) - require.NoError(t, compSet.ReportComponentStatus(component.NewStatusEvent(component.StatusOK))) + require.NoError(t, compSet.ReportComponentStatus(component.NewStatusEvent(component.StatusStarting))) } diff --git a/service/internal/status/status.go b/service/internal/status/status.go index bbccc6939ae..7592f139bcf 100644 --- a/service/internal/status/status.go +++ b/service/internal/status/status.go @@ -83,32 +83,6 @@ func newFSM(onTransition onTransitionFunc) *fsm { } } -// InitFunc can be used to toggle a ready flag to true -type InitFunc func() - -// readFunc can be used to check the value of a ready flag -type readyFunc func() bool - -// initAndReadyFuncs returns a pair of functions to set and check a boolean ready flag -func initAndReadyFuncs() (InitFunc, readyFunc) { - mu := sync.RWMutex{} - isReady := false - - init := func() { - mu.Lock() - defer mu.Unlock() - isReady = true - } - - ready := func() bool { - mu.RLock() - defer mu.RUnlock() - return isReady - } - - return init, ready -} - // NotifyStatusFunc is the receiver of status events after successful state transitions type NotifyStatusFunc func(*component.InstanceID, *component.StatusEvent) @@ -118,38 +92,74 @@ type ServiceStatusFunc func(*component.InstanceID, *component.StatusEvent) error // errStatusNotReady is returned when trying to report status before service start var errStatusNotReady = errors.New("report component status is not ready until service start") -// NewServiceStatusFunc returns a function to be used as ReportComponentStatus for -// servicetelemetry.Settings, which differs from component.TelemetrySettings in that -// the service version does not correspond to a specific component, and thus needs -// the a component.InstanceID as a parameter. -func NewServiceStatusFunc(notifyStatusChange NotifyStatusFunc) (InitFunc, ServiceStatusFunc) { - init, isReady := initAndReadyFuncs() - // mu synchronizes access to the fsmMap and the underlying fsm during a state transition - mu := sync.Mutex{} - fsmMap := make(map[*component.InstanceID]*fsm) - return init, - func(id *component.InstanceID, ev *component.StatusEvent) error { - if !isReady() { - return errStatusNotReady - } - mu.Lock() - defer mu.Unlock() - fsm, ok := fsmMap[id] - if !ok { - fsm = newFSM(func(ev *component.StatusEvent) { - notifyStatusChange(id, ev) - }) - fsmMap[id] = fsm - } - return fsm.transition(ev) - } +// Reporter handles component status reporting +type Reporter struct { + mu sync.Mutex + ready bool + fsmMap map[*component.InstanceID]*fsm + onStatusChange NotifyStatusFunc +} + +// NewReporter returns a reporter that will invoke the NotifyStatusFunc when a component's status +// has changed. +func NewReporter(onStatusChange NotifyStatusFunc) *Reporter { + return &Reporter{ + fsmMap: make(map[*component.InstanceID]*fsm), + onStatusChange: onStatusChange, + } +} + +// Ready enables status reporting +func (r *Reporter) Ready() { + r.mu.Lock() + defer r.mu.Unlock() + r.ready = true +} + +// ReportComponentStatus reports status for the given InstanceID +func (r *Reporter) ReportComponentStatus( + id *component.InstanceID, + ev *component.StatusEvent, +) error { + r.mu.Lock() + defer r.mu.Unlock() + if !r.ready { + return errStatusNotReady + } + return r.componentFSM(id).transition(ev) +} + +// ReportComponentOkIfStarting reports StatusOK if the component's current status is Starting +func (r *Reporter) ReportComponentOKIfStarting(id *component.InstanceID) error { + r.mu.Lock() + defer r.mu.Unlock() + if !r.ready { + return errStatusNotReady + } + fsm := r.componentFSM(id) + if fsm.current.Status() == component.StatusStarting { + return fsm.transition(component.NewStatusEvent(component.StatusOK)) + } + return nil +} +// Note: a lock must be acquired before calling this method. +func (r *Reporter) componentFSM(id *component.InstanceID) *fsm { + fsm, ok := r.fsmMap[id] + if !ok { + fsm = newFSM(func(ev *component.StatusEvent) { r.onStatusChange(id, ev) }) + r.fsmMap[id] = fsm + } + return fsm } // NewComponentStatusFunc returns a function to be used as ReportComponentStatus for // component.TelemetrySettings, which differs from servicetelemetry.Settings in that // the component version is tied to specific component instance. -func NewComponentStatusFunc(id *component.InstanceID, srvStatus ServiceStatusFunc) component.StatusFunc { +func NewComponentStatusFunc( + id *component.InstanceID, + srvStatus ServiceStatusFunc, +) component.StatusFunc { return func(ev *component.StatusEvent) error { return srvStatus(id, ev) } diff --git a/service/internal/status/status_test.go b/service/internal/status/status_test.go index c439cea39af..a1c238b4b0d 100644 --- a/service/internal/status/status_test.go +++ b/service/internal/status/status_test.go @@ -208,10 +208,10 @@ func TestStatusFuncs(t *testing.T) { id2: statuses2, } - init, serviceStatusFn := NewServiceStatusFunc(statusFunc) - comp1Func := NewComponentStatusFunc(id1, serviceStatusFn) - comp2Func := NewComponentStatusFunc(id2, serviceStatusFn) - init() + rep := NewReporter(statusFunc) + comp1Func := NewComponentStatusFunc(id1, rep.ReportComponentStatus) + comp2Func := NewComponentStatusFunc(id2, rep.ReportComponentStatus) + rep.Ready() for _, st := range statuses1 { require.NoError(t, comp1Func(component.NewStatusEvent(st))) @@ -230,8 +230,8 @@ func TestStatusFuncsConcurrent(t *testing.T) { statusFunc := func(id *component.InstanceID, ev *component.StatusEvent) { count++ } - init, serviceStatusFn := NewServiceStatusFunc(statusFunc) - init() + rep := NewReporter(statusFunc) + rep.Ready() wg := sync.WaitGroup{} wg.Add(len(ids)) @@ -239,7 +239,7 @@ func TestStatusFuncsConcurrent(t *testing.T) { for _, id := range ids { id := id go func() { - compFn := NewComponentStatusFunc(id, serviceStatusFn) + compFn := NewComponentStatusFunc(id, rep.ReportComponentStatus) _ = compFn(component.NewStatusEvent(component.StatusStarting)) for i := 0; i < 1000; i++ { _ = compFn(component.NewStatusEvent(component.StatusRecoverableError)) @@ -253,16 +253,90 @@ func TestStatusFuncsConcurrent(t *testing.T) { require.Equal(t, 8004, count) } -func TestStatusFuncReady(t *testing.T) { +func TestReporterReady(t *testing.T) { statusFunc := func(*component.InstanceID, *component.StatusEvent) {} - init, serviceStatusFn := NewServiceStatusFunc(statusFunc) + rep := NewReporter(statusFunc) id := &component.InstanceID{} - err := serviceStatusFn(id, component.NewStatusEvent(component.StatusStarting)) + err := rep.ReportComponentStatus(id, component.NewStatusEvent(component.StatusStarting)) require.ErrorIs(t, err, errStatusNotReady) - init() + rep.Ready() - err = serviceStatusFn(id, component.NewStatusEvent(component.StatusStarting)) + err = rep.ReportComponentStatus(id, component.NewStatusEvent(component.StatusStarting)) require.NoError(t, err) } + +func TestReportComponentOKIfStarting(t *testing.T) { + for _, tc := range []struct { + name string + initialStatuses []component.Status + expectedStatuses []component.Status + }{ + { + name: "matching condition: StatusStarting", + initialStatuses: []component.Status{ + component.StatusStarting, + }, + expectedStatuses: []component.Status{ + component.StatusStarting, + component.StatusOK, + }, + }, + { + name: "non-matching condition StatusOK", + initialStatuses: []component.Status{ + component.StatusStarting, + component.StatusOK, + }, + expectedStatuses: []component.Status{ + component.StatusStarting, + component.StatusOK, + }, + }, + { + name: "non-matching condition RecoverableError", + initialStatuses: []component.Status{ + component.StatusStarting, + component.StatusRecoverableError, + }, + expectedStatuses: []component.Status{ + component.StatusStarting, + component.StatusRecoverableError, + }, + }, + { + name: "non-matching condition PermanentError", + initialStatuses: []component.Status{ + component.StatusStarting, + component.StatusPermanentError, + }, + expectedStatuses: []component.Status{ + component.StatusStarting, + component.StatusPermanentError, + }, + }, + } { + t.Run(tc.name, func(t *testing.T) { + var receivedStatuses []component.Status + + rep := NewReporter( + func(_ *component.InstanceID, ev *component.StatusEvent) { + receivedStatuses = append(receivedStatuses, ev.Status()) + }, + ) + rep.Ready() + + id := &component.InstanceID{} + for _, status := range tc.initialStatuses { + err := rep.ReportComponentStatus(id, component.NewStatusEvent(status)) + require.NoError(t, err) + } + + err := rep.ReportComponentOKIfStarting(id) + + require.NoError(t, err) + require.Equal(t, tc.expectedStatuses, receivedStatuses) + }) + } +} diff --git a/service/service.go b/service/service.go index 386dddd206d..3963ae6fcd4 100644 --- a/service/service.go +++ b/service/service.go @@ -75,7 +75,6 @@ type Service struct { host *serviceHost telemetryInitializer *telemetryInitializer collectorConf *confmap.Conf - statusInit status.InitFunc } func New(ctx context.Context, set Settings, cfg Config) (*Service, error) { @@ -112,9 +111,9 @@ func New(ctx context.Context, set Settings, cfg Config) (*Service, error) { TracerProvider: srv.telemetry.TracerProvider(), MeterProvider: noop.NewMeterProvider(), MetricsLevel: cfg.Telemetry.Metrics.Level, - // Construct telemetry attributes from build info and config's resource attributes. Resource: pcommonRes, + Status: status.NewReporter(srv.host.notifyComponentStatusChange), } if err = srv.telemetryInitializer.init(res, srv.telemetrySettings, cfg.Telemetry, set.AsyncErrorChannel); err != nil { @@ -122,8 +121,6 @@ func New(ctx context.Context, set Settings, cfg Config) (*Service, error) { } srv.telemetrySettings.MeterProvider = srv.telemetryInitializer.mp srv.telemetrySettings.TracerProvider = srv.telemetryInitializer.tp - srv.statusInit, srv.telemetrySettings.ReportComponentStatus = - status.NewServiceStatusFunc(srv.host.notifyComponentStatusChange) // process the configuration and initialize the pipeline if err = srv.initExtensionsAndPipeline(ctx, set, cfg); err != nil { @@ -151,7 +148,7 @@ func (srv *Service) Start(ctx context.Context) error { ) // enable status reporting - srv.statusInit() + srv.telemetrySettings.Status.Ready() if err := srv.host.serviceExtensions.Start(ctx, srv.host); err != nil { return fmt.Errorf("failed to start extensions: %w", err) From 4d1bd2ec2190937255ef9e42e5c24c7e478f31e3 Mon Sep 17 00:00:00 2001 From: Alex Boten Date: Tue, 28 Nov 2023 13:25:18 -0800 Subject: [PATCH 35/52] [chore] remove dependabot for gomod (#9009) Finally rid us of the hundreds of notifications. Closes https://github.com/open-telemetry/opentelemetry-collector/issues/4885 Closes #8936 --------- Signed-off-by: Alex Boten --- .github/dependabot.yml | 194 --------------------- .github/workflows/build-and-test.yml | 4 - .github/workflows/create-dependabot-pr.yml | 18 -- .github/workflows/scripts/dependabot-pr.sh | 46 ----- Makefile | 24 --- Makefile.Common | 1 + 6 files changed, 1 insertion(+), 286 deletions(-) delete mode 100644 .github/dependabot.yml delete mode 100644 .github/workflows/create-dependabot-pr.yml delete mode 100755 .github/workflows/scripts/dependabot-pr.sh diff --git a/.github/dependabot.yml b/.github/dependabot.yml deleted file mode 100644 index 3614e5e928d..00000000000 --- a/.github/dependabot.yml +++ /dev/null @@ -1,194 +0,0 @@ -# File generated by "make gendependabot"; DO NOT EDIT. - -version: 2 -updates: - - package-ecosystem: "github-actions" - directory: "/" - schedule: - interval: "weekly" - day: "wednesday" - - package-ecosystem: "gomod" - directory: "/" - schedule: - interval: "weekly" - day: "wednesday" - - package-ecosystem: "gomod" - directory: "/cmd/builder" - schedule: - interval: "weekly" - day: "wednesday" - - package-ecosystem: "gomod" - directory: "/cmd/otelcorecol" - schedule: - interval: "weekly" - day: "wednesday" - - package-ecosystem: "gomod" - directory: "/component" - schedule: - interval: "weekly" - day: "wednesday" - - package-ecosystem: "gomod" - directory: "/config/configauth" - schedule: - interval: "weekly" - day: "wednesday" - - package-ecosystem: "gomod" - directory: "/config/configcompression" - schedule: - interval: "weekly" - day: "wednesday" - - package-ecosystem: "gomod" - directory: "/config/configgrpc" - schedule: - interval: "weekly" - day: "wednesday" - - package-ecosystem: "gomod" - directory: "/config/confighttp" - schedule: - interval: "weekly" - day: "wednesday" - - package-ecosystem: "gomod" - directory: "/config/confignet" - schedule: - interval: "weekly" - day: "wednesday" - - package-ecosystem: "gomod" - directory: "/config/configopaque" - schedule: - interval: "weekly" - day: "wednesday" - - package-ecosystem: "gomod" - directory: "/config/configtelemetry" - schedule: - interval: "weekly" - day: "wednesday" - - package-ecosystem: "gomod" - directory: "/config/configtls" - schedule: - interval: "weekly" - day: "wednesday" - - package-ecosystem: "gomod" - directory: "/config/internal" - schedule: - interval: "weekly" - day: "wednesday" - - package-ecosystem: "gomod" - directory: "/confmap" - schedule: - interval: "weekly" - day: "wednesday" - - package-ecosystem: "gomod" - directory: "/connector" - schedule: - interval: "weekly" - day: "wednesday" - - package-ecosystem: "gomod" - directory: "/connector/forwardconnector" - schedule: - interval: "weekly" - day: "wednesday" - - package-ecosystem: "gomod" - directory: "/consumer" - schedule: - interval: "weekly" - day: "wednesday" - - package-ecosystem: "gomod" - directory: "/exporter" - schedule: - interval: "weekly" - day: "wednesday" - - package-ecosystem: "gomod" - directory: "/exporter/debugexporter" - schedule: - interval: "weekly" - day: "wednesday" - - package-ecosystem: "gomod" - directory: "/exporter/loggingexporter" - schedule: - interval: "weekly" - day: "wednesday" - - package-ecosystem: "gomod" - directory: "/exporter/otlpexporter" - schedule: - interval: "weekly" - day: "wednesday" - - package-ecosystem: "gomod" - directory: "/exporter/otlphttpexporter" - schedule: - interval: "weekly" - day: "wednesday" - - package-ecosystem: "gomod" - directory: "/extension" - schedule: - interval: "weekly" - day: "wednesday" - - package-ecosystem: "gomod" - directory: "/extension/auth" - schedule: - interval: "weekly" - day: "wednesday" - - package-ecosystem: "gomod" - directory: "/extension/ballastextension" - schedule: - interval: "weekly" - day: "wednesday" - - package-ecosystem: "gomod" - directory: "/extension/zpagesextension" - schedule: - interval: "weekly" - day: "wednesday" - - package-ecosystem: "gomod" - directory: "/featuregate" - schedule: - interval: "weekly" - day: "wednesday" - - package-ecosystem: "gomod" - directory: "/internal/tools" - schedule: - interval: "weekly" - day: "wednesday" - - package-ecosystem: "gomod" - directory: "/otelcol" - schedule: - interval: "weekly" - day: "wednesday" - - package-ecosystem: "gomod" - directory: "/pdata" - schedule: - interval: "weekly" - day: "wednesday" - - package-ecosystem: "gomod" - directory: "/processor" - schedule: - interval: "weekly" - day: "wednesday" - - package-ecosystem: "gomod" - directory: "/processor/batchprocessor" - schedule: - interval: "weekly" - day: "wednesday" - - package-ecosystem: "gomod" - directory: "/processor/memorylimiterprocessor" - schedule: - interval: "weekly" - day: "wednesday" - - package-ecosystem: "gomod" - directory: "/receiver" - schedule: - interval: "weekly" - day: "wednesday" - - package-ecosystem: "gomod" - directory: "/receiver/otlpreceiver" - schedule: - interval: "weekly" - day: "wednesday" - - package-ecosystem: "gomod" - directory: "/semconv" - schedule: - interval: "weekly" - day: "wednesday" - - package-ecosystem: "gomod" - directory: "/service" - schedule: - interval: "weekly" - day: "wednesday" diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index 64da1baffec..a9ee407ea3f 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -119,10 +119,6 @@ jobs: run: | make genpdata git diff --exit-code || (echo 'Generated code is out of date, please run "make genpdata" and commit the changes in this PR.' && exit 1) - - name: Gen dependabot - run: | - make gendependabot - git diff -s --exit-code || (echo 'ALL_MODULES have been changed, please run "make gendependabot" and commit the changes in this PR.' && exit 1) - name: Gen otelcorecol run: | make genotelcorecol diff --git a/.github/workflows/create-dependabot-pr.yml b/.github/workflows/create-dependabot-pr.yml deleted file mode 100644 index bcc350abc2b..00000000000 --- a/.github/workflows/create-dependabot-pr.yml +++ /dev/null @@ -1,18 +0,0 @@ -name: Automation - Dependabot PR - -on: - workflow_dispatch: - -jobs: - create-pr: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 - - name: Setup Go - uses: actions/setup-go@v4 - with: - go-version: ~1.20.11 - - name: Run dependabot-pr.sh - run: ./.github/workflows/scripts/dependabot-pr.sh - env: - GITHUB_TOKEN: ${{ secrets.OPENTELEMETRYBOT_GITHUB_TOKEN }} diff --git a/.github/workflows/scripts/dependabot-pr.sh b/.github/workflows/scripts/dependabot-pr.sh deleted file mode 100755 index 198b7e81b0f..00000000000 --- a/.github/workflows/scripts/dependabot-pr.sh +++ /dev/null @@ -1,46 +0,0 @@ -#!/bin/bash -ex -# -# Copyright The OpenTelemetry Authors -# SPDX-License-Identifier: Apache-2.0 - -git config user.name opentelemetrybot -git config user.email 107717825+opentelemetrybot@users.noreply.github.com - -PR_NAME=dependabot-prs/$(date +'%Y-%m-%dT%H%M%S') -git checkout -b "$PR_NAME" - -IFS=$'\n' -requests=$( gh pr list --search "author:app/dependabot" --json title --jq '.[].title' | sort ) -message="" -dirs=$(find . -type f -name "go.mod" -exec dirname {} \; | sort ) - -for line in $requests; do - if [[ $line != Bump* ]]; then - continue - fi - - module=$(echo "$line" | cut -f 2 -d " ") - if [[ $module == go.opentelemetry.io/collector* ]]; then - continue - fi - version=$(echo "$line" | cut -f 6 -d " ") - - topdir=$(pwd) - for dir in $dirs; do - echo "checking $dir" - cd "$dir" && if grep -q "$module " go.mod; then go get "$module"@v"$version"; fi - cd "$topdir" - done - message+=$line - message+=$'\n' -done - -make gotidy -make genotelcorecol - -git add --all -git commit -m "dependabot updates $(date) -$message" -git push origin "$PR_NAME" - -gh pr create --title "[chore] dependabot updates $(date)" --body "$message" diff --git a/Makefile b/Makefile index 1f6c48fb240..426af0d5224 100644 --- a/Makefile +++ b/Makefile @@ -148,30 +148,6 @@ ocb: $(MAKE) -C cmd/builder config $(MAKE) -C cmd/builder ocb -DEPENDABOT_PATH=".github/dependabot.yml" -.PHONY: internal-gendependabot -internal-gendependabot: - @echo "Add rule for \"${PACKAGE}\" in \"${DIR}\""; - @echo " - package-ecosystem: \"${PACKAGE}\"" >> ${DEPENDABOT_PATH}; - @echo " directory: \"${DIR}\"" >> ${DEPENDABOT_PATH}; - @echo " schedule:" >> ${DEPENDABOT_PATH}; - @echo " interval: \"weekly\"" >> ${DEPENDABOT_PATH}; - @echo " day: \"wednesday\"" >> ${DEPENDABOT_PATH}; - -# This target should run on /bin/bash since the syntax DIR=$${dir:1} is not supported by /bin/sh. -.PHONY: gendependabot -gendependabot: $(eval SHELL:=/bin/bash) - @echo "Recreating ${DEPENDABOT_PATH} file" - @echo "# File generated by \"make gendependabot\"; DO NOT EDIT." > ${DEPENDABOT_PATH} - @echo "" >> ${DEPENDABOT_PATH} - @echo "version: 2" >> ${DEPENDABOT_PATH} - @echo "updates:" >> ${DEPENDABOT_PATH} - $(MAKE) internal-gendependabot DIR="/" PACKAGE="github-actions" - $(MAKE) internal-gendependabot DIR="/" PACKAGE="gomod" - @set -e; for dir in $(ALL_MODULES); do \ - $(MAKE) internal-gendependabot DIR=$${dir:1} PACKAGE="gomod"; \ - done - # Definitions for ProtoBuf generation. # The source directory for OTLP ProtoBufs. diff --git a/Makefile.Common b/Makefile.Common index 6b51e353ec1..c3a6c156d39 100644 --- a/Makefile.Common +++ b/Makefile.Common @@ -1,3 +1,4 @@ +SHELL = /bin/bash # ALL_PKGS is the list of all packages where ALL_SRC files reside. ALL_PKGS := $(sort $(shell go list ./...)) # COVER_PKGS is the list of packages to include in the coverage From daef971a0b3087ed76ebe9fd4793877b41b65306 Mon Sep 17 00:00:00 2001 From: Antoine Toulme Date: Wed, 29 Nov 2023 01:21:17 -0800 Subject: [PATCH 36/52] [chore] add @atoulme as owner for linux/arm64 (#9012) **Description:** Add @atoulme as owner for linux/arm64 platform. **Link to tracking Issue:** Fixes #9010 --- docs/platform-support.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/platform-support.md b/docs/platform-support.md index 2027bda5913..e8ebe2f84f5 100644 --- a/docs/platform-support.md +++ b/docs/platform-support.md @@ -60,7 +60,7 @@ Tier 3 platforms are currently: |---------------|-------------------------------------------------------------------------------------------------------------| | darwin/amd64 | | | darwin/arm64 | [@MovieStoreGuy](https://github.com/MovieStoreGuy) | -| linux/arm64 | | +| linux/arm64 | [@atoulme](https://github.com/atoulme) | | linux/386 | | | linux/arm | [@Wal8800](https://github.com/Wal8800), [@atoulme](https://github.com/atoulme) | | linux/ppc64le | | From bdeee0940647359a7dfc6cfb27684abcf8e4da67 Mon Sep 17 00:00:00 2001 From: Andreas Gerstmayr Date: Thu, 30 Nov 2023 00:35:06 +0100 Subject: [PATCH 37/52] [docs] Document max_request_body_size setting of HTTPServerSettings (#9014) Document `max_request_body_size` setting of `HTTPServerSettings`: https://github.com/open-telemetry/opentelemetry-collector/blob/daef971a0b3087ed76ebe9fd4793877b41b65306/config/confighttp/confighttp.go#L241 Signed-off-by: Andreas Gerstmayr --- config/confighttp/README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/config/confighttp/README.md b/config/confighttp/README.md index 2249f6c72db..a3794ceeed1 100644 --- a/config/confighttp/README.md +++ b/config/confighttp/README.md @@ -69,6 +69,7 @@ will not be enabled. header, allowing clients to cache the response to CORS preflight requests. If not set, browsers use a default of 5 seconds. - `endpoint`: Valid value syntax available [here](https://github.com/grpc/grpc/blob/master/doc/naming.md) +- `max_request_body_size`: configures the maximum allowed body size in bytes for a single request. Default: `0` (no restriction) - [`tls`](../configtls/README.md) - [`auth`](../configauth/README.md) From cd963da5450f4dd1f382bce87d356789c1129391 Mon Sep 17 00:00:00 2001 From: Antoine Toulme Date: Thu, 30 Nov 2023 11:00:43 -0800 Subject: [PATCH 38/52] [chore] make genotelcorecol (#9020) --- cmd/otelcorecol/go.mod | 5 +++-- cmd/otelcorecol/go.sum | 13 +++++++------ 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/cmd/otelcorecol/go.mod b/cmd/otelcorecol/go.mod index 055f04987af..24b835c59ef 100644 --- a/cmd/otelcorecol/go.mod +++ b/cmd/otelcorecol/go.mod @@ -27,7 +27,7 @@ require ( ) require ( - cloud.google.com/go/compute/metadata v0.2.4-0.20230617002413-005d2dfb6b68 // indirect + cloud.google.com/go/compute v1.23.1 // indirect contrib.go.opencensus.io/exporter/prometheus v0.4.2 // indirect github.com/beorn7/perks v1.0.1 // indirect github.com/cenkalti/backoff/v4 v4.2.1 // indirect @@ -117,9 +117,10 @@ require ( go.uber.org/multierr v1.11.0 // indirect go.uber.org/zap v1.26.0 // indirect golang.org/x/net v0.19.0 // indirect + golang.org/x/oauth2 v0.13.0 // indirect golang.org/x/text v0.14.0 // indirect gonum.org/v1/gonum v0.14.0 // indirect - google.golang.org/genproto/googleapis/api v0.0.0-20230822172742-b8732ec3820d // indirect + google.golang.org/genproto/googleapis/api v0.0.0-20231016165738-49dd2c1f3d0b // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20231127180814-3a041ad873d4 // indirect google.golang.org/grpc v1.59.0 // indirect google.golang.org/protobuf v1.31.0 // indirect diff --git a/cmd/otelcorecol/go.sum b/cmd/otelcorecol/go.sum index ee3c61bc108..8577de3725e 100644 --- a/cmd/otelcorecol/go.sum +++ b/cmd/otelcorecol/go.sum @@ -12,17 +12,17 @@ cloud.google.com/go v0.54.0/go.mod h1:1rq2OEkV3YMf6n/9ZvGWI3GWw0VoqH/1x2nd8Is/bP cloud.google.com/go v0.56.0/go.mod h1:jr7tqZxxKOVYizybht9+26Z/gUq7tiRzu+ACVAMbKVk= 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 h1:Dg9iHVQfrhq82rUNu9ZxUDrJLaxFUe/HlCVaLyRruq8= cloud.google.com/go v0.65.0/go.mod h1:O5N8zS7uWy9vkA9vayVHs65eM1ubvY4h553ofrNHObY= +cloud.google.com/go v0.110.2 h1:sdFPBr6xG9/wkBbfhmUz/JmZC7X6LavQgcrVINrKiVA= cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o= cloud.google.com/go/bigquery v1.3.0/go.mod h1:PjpwJnslEMmckchkHFfq+HTD2DmtT67aNFKH1/VBDHE= cloud.google.com/go/bigquery v1.4.0/go.mod h1:S8dzgnTigyfTmLBfrtrhyYhwRxG72rYxvftPBK2Dvzc= cloud.google.com/go/bigquery v1.5.0/go.mod h1:snEHRnqQbz117VIFhE8bmtwIDY80NLUZUMb4Nv6dBIg= cloud.google.com/go/bigquery v1.7.0/go.mod h1://okPTzCYNXSlb24MZs83e2Do+h+VXtc4gLoIoXIAPc= cloud.google.com/go/bigquery v1.8.0/go.mod h1:J5hqkt3O0uAFnINi6JXValWIb1v0goeZM77hZzJN/fQ= -cloud.google.com/go/compute v1.23.0 h1:tP41Zoavr8ptEqaW6j+LQOnyBBhO7OkOMAGrgLopTwY= +cloud.google.com/go/compute v1.23.1 h1:V97tBoDaZHb6leicZ1G6DLK2BAaZLJ/7+9BB/En3hR0= +cloud.google.com/go/compute v1.23.1/go.mod h1:CqB3xpmPKKt3OJpW2ndFIXnA9A4xAy/F3Xp1ixncW78= cloud.google.com/go/compute/metadata v0.2.4-0.20230617002413-005d2dfb6b68 h1:aRVqY1p2IJaBGStWMsQMpkAa83cPkCDLl80eOj0Rbz4= -cloud.google.com/go/compute/metadata v0.2.4-0.20230617002413-005d2dfb6b68/go.mod h1:1a3eRNYX12fs5UABBIXS8HXVvQbX9hRB/RkEBPORpe8= cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE= cloud.google.com/go/datastore v1.1.0/go.mod h1:umbIZjpQpHh4hmRpGhH4tLFup+FVzqBi1b3c64qFpCk= cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I= @@ -440,7 +440,8 @@ golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod h1:gOpvHmFTYa4Iltr golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20210514164344-f6687ab2804c/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b/go.mod h1:DAh4E804XQdzx2j+YRIaUnCqCV2RuMz24cGBJ5QYIrc= -golang.org/x/oauth2 v0.12.0 h1:smVPGxink+n1ZI5pkQa8y6fZT0RW0MgCO5bFpepy4B4= +golang.org/x/oauth2 v0.13.0 h1:jDDenyj+WgFtmV3zYVoi8aE2BwtXFLWOA67ZfNWftiY= +golang.org/x/oauth2 v0.13.0/go.mod h1:/JMhi4ZRXAf4HG9LiNmxvk+45+96RUlVThiH8FzNBn0= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -615,8 +616,8 @@ google.golang.org/genproto v0.0.0-20200729003335-053ba62fc06f/go.mod h1:FWY/as6D google.golang.org/genproto v0.0.0-20200804131852-c06518451d9c/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20200825200019-8632dd797987/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20231120223509-83a465c0220f h1:Vn+VyHU5guc9KjB5KrjI2q0wCOWEOIh0OEsleqakHJg= -google.golang.org/genproto/googleapis/api v0.0.0-20230822172742-b8732ec3820d h1:DoPTO70H+bcDXcd39vOqb2viZxgqeBeSGtZ55yZU4/Q= -google.golang.org/genproto/googleapis/api v0.0.0-20230822172742-b8732ec3820d/go.mod h1:KjSP20unUpOx5kyQUFa7k4OJg0qeJ7DEZflGDu2p6Bk= +google.golang.org/genproto/googleapis/api v0.0.0-20231016165738-49dd2c1f3d0b h1:CIC2YMXmIhYw6evmhPxBKJ4fmLbOFtXQN/GV3XOZR8k= +google.golang.org/genproto/googleapis/api v0.0.0-20231016165738-49dd2c1f3d0b/go.mod h1:IBQ646DjkDkvUIsVq/cc03FUFQ9wbZu7yE396YcL870= google.golang.org/genproto/googleapis/rpc v0.0.0-20231127180814-3a041ad873d4 h1:DC7wcm+i+P1rN3Ff07vL+OndGg5OhNddHyTA+ocPqYE= google.golang.org/genproto/googleapis/rpc v0.0.0-20231127180814-3a041ad873d4/go.mod h1:eJVxU6o+4G1PSczBr85xmyvSNYAKvAYgkub40YGomFM= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= From cefe1b7d647cd5859f10a7de4e18b46eb3378c5d Mon Sep 17 00:00:00 2001 From: Antoine Toulme Date: Thu, 30 Nov 2023 14:17:22 -0800 Subject: [PATCH 39/52] Remove noisy log statement (#9018) Removes a noisy log statement Fixes #9017 --- .chloggen/remove_noisy_log.yaml | 25 +++++++++++++++++++++++++ exporter/exporterhelper/retry_sender.go | 1 - 2 files changed, 25 insertions(+), 1 deletion(-) create mode 100755 .chloggen/remove_noisy_log.yaml diff --git a/.chloggen/remove_noisy_log.yaml b/.chloggen/remove_noisy_log.yaml new file mode 100755 index 00000000000..f9e3e1beb02 --- /dev/null +++ b/.chloggen/remove_noisy_log.yaml @@ -0,0 +1,25 @@ +# Use this changelog template to create an entry for release notes. + +# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' +change_type: bug_fix + +# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver) +component: exporterhelper + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: Remove noisy log + +# One or more tracking issues or pull requests related to the change +issues: [9017] + +# (Optional) One or more lines of additional information to render under the primary note. +# These lines will be padded with 2 spaces and then inserted directly into the document. +# Use pipe (|) for multiline entries. +subtext: + +# Optional: The change log or logs in which this entry should be included. +# e.g. '[user]' or '[user, api]' +# Include 'user' if the change is relevant to end users. +# Include 'api' if there is a change to a library API. +# Default: '[user]' +change_logs: [] \ No newline at end of file diff --git a/exporter/exporterhelper/retry_sender.go b/exporter/exporterhelper/retry_sender.go index e1ffb7b9388..82ffce4389a 100644 --- a/exporter/exporterhelper/retry_sender.go +++ b/exporter/exporterhelper/retry_sender.go @@ -117,7 +117,6 @@ func (rs *retrySender) send(ctx context.Context, req Request) error { trace.WithAttributes(rs.traceAttribute, attribute.Int64("retry_num", retryNum))) err := rs.nextSender.send(ctx, req) - rs.logger.Info("Exporting finished.", zap.Error(err)) if err == nil { return nil } From da1154eef187dc66cd9df138f1c057ffde0f7f2b Mon Sep 17 00:00:00 2001 From: Dmitrii Anoshin Date: Fri, 1 Dec 2023 09:15:33 -0800 Subject: [PATCH 40/52] Remove noisy log statement (#9026) https://github.com/open-telemetry/opentelemetry-collector/pull/9018 against the patch release branch Co-authored-by: Antoine Toulme --- .chloggen/remove_noisy_log.yaml | 25 +++++++++++++++++++++++++ exporter/exporterhelper/retry_sender.go | 1 - 2 files changed, 25 insertions(+), 1 deletion(-) create mode 100755 .chloggen/remove_noisy_log.yaml diff --git a/.chloggen/remove_noisy_log.yaml b/.chloggen/remove_noisy_log.yaml new file mode 100755 index 00000000000..f9e3e1beb02 --- /dev/null +++ b/.chloggen/remove_noisy_log.yaml @@ -0,0 +1,25 @@ +# Use this changelog template to create an entry for release notes. + +# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' +change_type: bug_fix + +# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver) +component: exporterhelper + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: Remove noisy log + +# One or more tracking issues or pull requests related to the change +issues: [9017] + +# (Optional) One or more lines of additional information to render under the primary note. +# These lines will be padded with 2 spaces and then inserted directly into the document. +# Use pipe (|) for multiline entries. +subtext: + +# Optional: The change log or logs in which this entry should be included. +# e.g. '[user]' or '[user, api]' +# Include 'user' if the change is relevant to end users. +# Include 'api' if there is a change to a library API. +# Default: '[user]' +change_logs: [] \ No newline at end of file diff --git a/exporter/exporterhelper/retry_sender.go b/exporter/exporterhelper/retry_sender.go index e1ffb7b9388..82ffce4389a 100644 --- a/exporter/exporterhelper/retry_sender.go +++ b/exporter/exporterhelper/retry_sender.go @@ -117,7 +117,6 @@ func (rs *retrySender) send(ctx context.Context, req Request) error { trace.WithAttributes(rs.traceAttribute, attribute.Int64("retry_num", retryNum))) err := rs.nextSender.send(ctx, req) - rs.logger.Info("Exporting finished.", zap.Error(err)) if err == nil { return nil } From 469226f9b8dcc09c9fe89f84896ed863c12a20ac Mon Sep 17 00:00:00 2001 From: Dmitrii Anoshin Date: Fri, 1 Dec 2023 09:36:54 -0800 Subject: [PATCH 41/52] Prepare patch release v0.90.1 (#9024) --- .chloggen/remove_noisy_log.yaml | 25 ------------------------ CHANGELOG.md | 6 ++++++ cmd/builder/internal/builder/config.go | 2 +- cmd/builder/test/core.builder.yaml | 8 ++++---- cmd/otelcorecol/builder-config.yaml | 24 +++++++++++------------ cmd/otelcorecol/go.mod | 27 +++++++++++++------------- cmd/otelcorecol/go.sum | 13 +++++++------ cmd/otelcorecol/main.go | 2 +- examples/k8s/otel-config.yaml | 4 ++-- versions.yaml | 2 +- 10 files changed, 48 insertions(+), 65 deletions(-) delete mode 100755 .chloggen/remove_noisy_log.yaml diff --git a/.chloggen/remove_noisy_log.yaml b/.chloggen/remove_noisy_log.yaml deleted file mode 100755 index f9e3e1beb02..00000000000 --- a/.chloggen/remove_noisy_log.yaml +++ /dev/null @@ -1,25 +0,0 @@ -# Use this changelog template to create an entry for release notes. - -# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' -change_type: bug_fix - -# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver) -component: exporterhelper - -# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). -note: Remove noisy log - -# One or more tracking issues or pull requests related to the change -issues: [9017] - -# (Optional) One or more lines of additional information to render under the primary note. -# These lines will be padded with 2 spaces and then inserted directly into the document. -# Use pipe (|) for multiline entries. -subtext: - -# Optional: The change log or logs in which this entry should be included. -# e.g. '[user]' or '[user, api]' -# Include 'user' if the change is relevant to end users. -# Include 'api' if there is a change to a library API. -# Default: '[user]' -change_logs: [] \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md index 91a651b0aba..ad44fca0b99 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,12 @@ If you are looking for developer-facing changes, check out [CHANGELOG-API.md](./ +## v0.90.1 + +### 🧰 Bug fixes 🧰 + +- `exporterhelper`: Remove noisy log (#9017) + ## v1.0.0/v0.90.0 ### 🛑 Breaking changes 🛑 diff --git a/cmd/builder/internal/builder/config.go b/cmd/builder/internal/builder/config.go index ca17b644663..9020170dcbb 100644 --- a/cmd/builder/internal/builder/config.go +++ b/cmd/builder/internal/builder/config.go @@ -16,7 +16,7 @@ import ( "go.uber.org/zap" ) -const defaultOtelColVersion = "0.90.0" +const defaultOtelColVersion = "0.90.1" // ErrInvalidGoMod indicates an invalid gomod var ErrInvalidGoMod = errors.New("invalid gomod specification for module") diff --git a/cmd/builder/test/core.builder.yaml b/cmd/builder/test/core.builder.yaml index 3cd616fcb7d..356f10a73b1 100644 --- a/cmd/builder/test/core.builder.yaml +++ b/cmd/builder/test/core.builder.yaml @@ -1,20 +1,20 @@ dist: module: go.opentelemetry.io/collector/builder/test/core - otelcol_version: 0.90.0 + otelcol_version: 0.90.1 extensions: - import: go.opentelemetry.io/collector/extension/zpagesextension - gomod: go.opentelemetry.io/collector v0.90.0 + gomod: go.opentelemetry.io/collector v0.90.1 path: ${WORKSPACE_DIR} receivers: - import: go.opentelemetry.io/collector/receiver/otlpreceiver - gomod: go.opentelemetry.io/collector v0.90.0 + gomod: go.opentelemetry.io/collector v0.90.1 path: ${WORKSPACE_DIR} exporters: - import: go.opentelemetry.io/collector/exporter/debugexporter - gomod: go.opentelemetry.io/collector v0.90.0 + gomod: go.opentelemetry.io/collector v0.90.1 path: ${WORKSPACE_DIR} replaces: diff --git a/cmd/otelcorecol/builder-config.yaml b/cmd/otelcorecol/builder-config.yaml index a1f3ee6525d..a0aff6c623a 100644 --- a/cmd/otelcorecol/builder-config.yaml +++ b/cmd/otelcorecol/builder-config.yaml @@ -2,24 +2,24 @@ dist: module: go.opentelemetry.io/collector/cmd/otelcorecol name: otelcorecol description: Local OpenTelemetry Collector binary, testing only. - version: 0.90.0-dev - otelcol_version: 0.90.0 + version: 0.90.1-dev + otelcol_version: 0.90.1 receivers: - - gomod: go.opentelemetry.io/collector/receiver/otlpreceiver v0.90.0 + - gomod: go.opentelemetry.io/collector/receiver/otlpreceiver v0.90.1 exporters: - - gomod: go.opentelemetry.io/collector/exporter/debugexporter v0.90.0 - - gomod: go.opentelemetry.io/collector/exporter/loggingexporter v0.90.0 - - gomod: go.opentelemetry.io/collector/exporter/otlpexporter v0.90.0 - - gomod: go.opentelemetry.io/collector/exporter/otlphttpexporter v0.90.0 + - gomod: go.opentelemetry.io/collector/exporter/debugexporter v0.90.1 + - gomod: go.opentelemetry.io/collector/exporter/loggingexporter v0.90.1 + - gomod: go.opentelemetry.io/collector/exporter/otlpexporter v0.90.1 + - gomod: go.opentelemetry.io/collector/exporter/otlphttpexporter v0.90.1 extensions: - - gomod: go.opentelemetry.io/collector/extension/ballastextension v0.90.0 - - gomod: go.opentelemetry.io/collector/extension/zpagesextension v0.90.0 + - gomod: go.opentelemetry.io/collector/extension/ballastextension v0.90.1 + - gomod: go.opentelemetry.io/collector/extension/zpagesextension v0.90.1 processors: - - gomod: go.opentelemetry.io/collector/processor/batchprocessor v0.90.0 - - gomod: go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.90.0 + - gomod: go.opentelemetry.io/collector/processor/batchprocessor v0.90.1 + - gomod: go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.90.1 connectors: - - gomod: go.opentelemetry.io/collector/connector/forwardconnector v0.90.0 + - gomod: go.opentelemetry.io/collector/connector/forwardconnector v0.90.1 replaces: - go.opentelemetry.io/collector => ../../ diff --git a/cmd/otelcorecol/go.mod b/cmd/otelcorecol/go.mod index 667a3d0bd78..a947041d53a 100644 --- a/cmd/otelcorecol/go.mod +++ b/cmd/otelcorecol/go.mod @@ -8,26 +8,26 @@ require ( github.com/stretchr/testify v1.8.4 go.opentelemetry.io/collector/component v0.90.0 go.opentelemetry.io/collector/connector v0.90.0 - go.opentelemetry.io/collector/connector/forwardconnector v0.90.0 + go.opentelemetry.io/collector/connector/forwardconnector v0.90.1 go.opentelemetry.io/collector/exporter v0.90.0 - go.opentelemetry.io/collector/exporter/debugexporter v0.90.0 - go.opentelemetry.io/collector/exporter/loggingexporter v0.90.0 - go.opentelemetry.io/collector/exporter/otlpexporter v0.90.0 - go.opentelemetry.io/collector/exporter/otlphttpexporter v0.90.0 + go.opentelemetry.io/collector/exporter/debugexporter v0.90.1 + go.opentelemetry.io/collector/exporter/loggingexporter v0.90.1 + go.opentelemetry.io/collector/exporter/otlpexporter v0.90.1 + go.opentelemetry.io/collector/exporter/otlphttpexporter v0.90.1 go.opentelemetry.io/collector/extension v0.90.0 - go.opentelemetry.io/collector/extension/ballastextension v0.90.0 - go.opentelemetry.io/collector/extension/zpagesextension v0.90.0 - go.opentelemetry.io/collector/otelcol v0.90.0 + go.opentelemetry.io/collector/extension/ballastextension v0.90.1 + go.opentelemetry.io/collector/extension/zpagesextension v0.90.1 + go.opentelemetry.io/collector/otelcol v0.90.1 go.opentelemetry.io/collector/processor v0.90.0 - go.opentelemetry.io/collector/processor/batchprocessor v0.90.0 - go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.90.0 + go.opentelemetry.io/collector/processor/batchprocessor v0.90.1 + go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.90.1 go.opentelemetry.io/collector/receiver v0.90.0 - go.opentelemetry.io/collector/receiver/otlpreceiver v0.90.0 + go.opentelemetry.io/collector/receiver/otlpreceiver v0.90.1 golang.org/x/sys v0.14.0 ) require ( - cloud.google.com/go/compute/metadata v0.2.4-0.20230617002413-005d2dfb6b68 // indirect + cloud.google.com/go/compute v1.23.1 // indirect contrib.go.opencensus.io/exporter/prometheus v0.4.2 // indirect github.com/beorn7/perks v1.0.1 // indirect github.com/cenkalti/backoff/v4 v4.2.1 // indirect @@ -117,9 +117,10 @@ require ( go.uber.org/multierr v1.11.0 // indirect go.uber.org/zap v1.26.0 // indirect golang.org/x/net v0.18.0 // indirect + golang.org/x/oauth2 v0.13.0 // indirect golang.org/x/text v0.14.0 // indirect gonum.org/v1/gonum v0.14.0 // indirect - google.golang.org/genproto/googleapis/api v0.0.0-20230822172742-b8732ec3820d // indirect + google.golang.org/genproto/googleapis/api v0.0.0-20231016165738-49dd2c1f3d0b // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20231120223509-83a465c0220f // indirect google.golang.org/grpc v1.59.0 // indirect google.golang.org/protobuf v1.31.0 // indirect diff --git a/cmd/otelcorecol/go.sum b/cmd/otelcorecol/go.sum index 5939fea06e2..a097b95c3a3 100644 --- a/cmd/otelcorecol/go.sum +++ b/cmd/otelcorecol/go.sum @@ -12,17 +12,17 @@ cloud.google.com/go v0.54.0/go.mod h1:1rq2OEkV3YMf6n/9ZvGWI3GWw0VoqH/1x2nd8Is/bP cloud.google.com/go v0.56.0/go.mod h1:jr7tqZxxKOVYizybht9+26Z/gUq7tiRzu+ACVAMbKVk= 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 h1:Dg9iHVQfrhq82rUNu9ZxUDrJLaxFUe/HlCVaLyRruq8= cloud.google.com/go v0.65.0/go.mod h1:O5N8zS7uWy9vkA9vayVHs65eM1ubvY4h553ofrNHObY= +cloud.google.com/go v0.110.2 h1:sdFPBr6xG9/wkBbfhmUz/JmZC7X6LavQgcrVINrKiVA= cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o= cloud.google.com/go/bigquery v1.3.0/go.mod h1:PjpwJnslEMmckchkHFfq+HTD2DmtT67aNFKH1/VBDHE= cloud.google.com/go/bigquery v1.4.0/go.mod h1:S8dzgnTigyfTmLBfrtrhyYhwRxG72rYxvftPBK2Dvzc= cloud.google.com/go/bigquery v1.5.0/go.mod h1:snEHRnqQbz117VIFhE8bmtwIDY80NLUZUMb4Nv6dBIg= cloud.google.com/go/bigquery v1.7.0/go.mod h1://okPTzCYNXSlb24MZs83e2Do+h+VXtc4gLoIoXIAPc= cloud.google.com/go/bigquery v1.8.0/go.mod h1:J5hqkt3O0uAFnINi6JXValWIb1v0goeZM77hZzJN/fQ= -cloud.google.com/go/compute v1.23.0 h1:tP41Zoavr8ptEqaW6j+LQOnyBBhO7OkOMAGrgLopTwY= +cloud.google.com/go/compute v1.23.1 h1:V97tBoDaZHb6leicZ1G6DLK2BAaZLJ/7+9BB/En3hR0= +cloud.google.com/go/compute v1.23.1/go.mod h1:CqB3xpmPKKt3OJpW2ndFIXnA9A4xAy/F3Xp1ixncW78= cloud.google.com/go/compute/metadata v0.2.4-0.20230617002413-005d2dfb6b68 h1:aRVqY1p2IJaBGStWMsQMpkAa83cPkCDLl80eOj0Rbz4= -cloud.google.com/go/compute/metadata v0.2.4-0.20230617002413-005d2dfb6b68/go.mod h1:1a3eRNYX12fs5UABBIXS8HXVvQbX9hRB/RkEBPORpe8= cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE= cloud.google.com/go/datastore v1.1.0/go.mod h1:umbIZjpQpHh4hmRpGhH4tLFup+FVzqBi1b3c64qFpCk= cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I= @@ -440,7 +440,8 @@ golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod h1:gOpvHmFTYa4Iltr golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20210514164344-f6687ab2804c/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b/go.mod h1:DAh4E804XQdzx2j+YRIaUnCqCV2RuMz24cGBJ5QYIrc= -golang.org/x/oauth2 v0.12.0 h1:smVPGxink+n1ZI5pkQa8y6fZT0RW0MgCO5bFpepy4B4= +golang.org/x/oauth2 v0.13.0 h1:jDDenyj+WgFtmV3zYVoi8aE2BwtXFLWOA67ZfNWftiY= +golang.org/x/oauth2 v0.13.0/go.mod h1:/JMhi4ZRXAf4HG9LiNmxvk+45+96RUlVThiH8FzNBn0= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -615,8 +616,8 @@ google.golang.org/genproto v0.0.0-20200729003335-053ba62fc06f/go.mod h1:FWY/as6D google.golang.org/genproto v0.0.0-20200804131852-c06518451d9c/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20200825200019-8632dd797987/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20231106174013-bbf56f31fb17 h1:wpZ8pe2x1Q3f2KyT5f8oP/fa9rHAKgFPr/HZdNuS+PQ= -google.golang.org/genproto/googleapis/api v0.0.0-20230822172742-b8732ec3820d h1:DoPTO70H+bcDXcd39vOqb2viZxgqeBeSGtZ55yZU4/Q= -google.golang.org/genproto/googleapis/api v0.0.0-20230822172742-b8732ec3820d/go.mod h1:KjSP20unUpOx5kyQUFa7k4OJg0qeJ7DEZflGDu2p6Bk= +google.golang.org/genproto/googleapis/api v0.0.0-20231016165738-49dd2c1f3d0b h1:CIC2YMXmIhYw6evmhPxBKJ4fmLbOFtXQN/GV3XOZR8k= +google.golang.org/genproto/googleapis/api v0.0.0-20231016165738-49dd2c1f3d0b/go.mod h1:IBQ646DjkDkvUIsVq/cc03FUFQ9wbZu7yE396YcL870= google.golang.org/genproto/googleapis/rpc v0.0.0-20231120223509-83a465c0220f h1:ultW7fxlIvee4HYrtnaRPon9HpEgFk5zYpmfMgtKB5I= google.golang.org/genproto/googleapis/rpc v0.0.0-20231120223509-83a465c0220f/go.mod h1:L9KNLi232K1/xB6f7AlSX692koaRnKaWSR0stBki0Yc= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= diff --git a/cmd/otelcorecol/main.go b/cmd/otelcorecol/main.go index 9a71baf327a..80e552effc5 100644 --- a/cmd/otelcorecol/main.go +++ b/cmd/otelcorecol/main.go @@ -14,7 +14,7 @@ func main() { info := component.BuildInfo{ Command: "otelcorecol", Description: "Local OpenTelemetry Collector binary, testing only.", - Version: "0.90.0-dev", + Version: "0.90.1-dev", } if err := run(otelcol.CollectorSettings{BuildInfo: info, Factories: components}); err != nil { diff --git a/examples/k8s/otel-config.yaml b/examples/k8s/otel-config.yaml index d5383591edd..0bc658fd302 100644 --- a/examples/k8s/otel-config.yaml +++ b/examples/k8s/otel-config.yaml @@ -68,7 +68,7 @@ spec: - command: - "/otelcol" - "--config=/conf/otel-agent-config.yaml" - image: otel/opentelemetry-collector:0.90.0 + image: otel/opentelemetry-collector:0.90.1 name: otel-agent resources: limits: @@ -187,7 +187,7 @@ spec: - command: - "/otelcol" - "--config=/conf/otel-collector-config.yaml" - image: otel/opentelemetry-collector:0.90.0 + image: otel/opentelemetry-collector:0.90.1 name: otel-collector resources: limits: diff --git a/versions.yaml b/versions.yaml index e30bf2ddef3..d5a98856a53 100644 --- a/versions.yaml +++ b/versions.yaml @@ -8,7 +8,7 @@ module-sets: - go.opentelemetry.io/collector/featuregate - go.opentelemetry.io/collector/pdata beta: - version: v0.90.0 + version: v0.90.1 modules: - go.opentelemetry.io/collector - go.opentelemetry.io/collector/cmd/builder From f98f106eb56c6206c74571b80aa2f944cfb6f2ea Mon Sep 17 00:00:00 2001 From: Dmitrii Anoshin Date: Fri, 1 Dec 2023 12:20:54 -0800 Subject: [PATCH 42/52] [chore] [docs] Update the patch release instructions (#9032) --- docs/release.md | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/docs/release.md b/docs/release.md index d83d01987d6..e9f7e3c8cd4 100644 --- a/docs/release.md +++ b/docs/release.md @@ -132,14 +132,19 @@ The OpenTelemetry Collector maintainers will ultimately have the responsibility The following documents the procedure to release a bugfix -1. Create a pull request against the `release/` (e.g. `release/v0.45.x`) branch to apply the fix. -2. Create a pull request to update version number against the `release/` branch. +1. Create a pull request against the `release/` (e.g. `release/v0.90.x`) branch to apply the fix. +2. Make sure you are on `release/`. Prepare release commits with `prepare-release` make target, e.g. `make prepare-release PREVIOUS_VERSION=0.90.0 RELEASE_CANDIDATE=0.90.1 MODSET=beta`, and create a pull request against the `release/` branch. 3. Once those changes have been merged, create a pull request to the `main` branch from the `release/` branch. -4. Enable the **Merge pull request** setting in the repository's **Settings** tab. -5. Tag all the modules with the new release version by running the `make add-tag` command (e.g. `make add-tag TAG=v0.85.0`). Push them to `open-telemetry/opentelemetry-collector` with `make push-tag TAG=v0.85.0`. Wait for the new tag build to pass successfully. -6. **IMPORTANT**: The pull request to bring the changes from the release branch *MUST* be merged using the **Merge pull request** method, and *NOT* squashed using “**Squash and merge**”. This is important as it allows us to ensure the commit SHA from the release branch is also on the main branch. **Not following this step will cause much go dependency sadness.** -7. Once the branch has been merged, it will be auto-deleted. Restore the release branch via GitHub. -8. Once the patch is release, disable the **Merge pull request** setting. +4. If you see merge conflicts when creating the pull request, do the following: + 1. Create a new branch from `origin:main`. + 2. Merge the `release/` branch into the new branch. + 3. Resolve the conflicts. + 4. Create another pull request to the `main` branch from the new branch to replace the pull request from the `release/` branch. +5. Enable the **Merge pull request** setting in the repository's **Settings** tab. +6. Make sure you are on `release/`. Push the new release version tags for a target module set by running `make push-tags MODSET=`. Wait for the new tag build to pass successfully. +7. **IMPORTANT**: The pull request to bring the changes from the release branch *MUST* be merged using the **Merge pull request** method, and *NOT* squashed using “**Squash and merge**”. This is important as it allows us to ensure the commit SHA from the release branch is also on the main branch. **Not following this step will cause much go dependency sadness.** +8. If the pull request was created from the `release/` branch, it will be auto-deleted. Restore the release branch via GitHub. +9. Once the patch is released, disable the **Merge pull request** setting. ## 1.0 release From fcb7012fc292a7708c92bad50d8f25eb81745453 Mon Sep 17 00:00:00 2001 From: Alex Boten Date: Fri, 1 Dec 2023 12:21:13 -0800 Subject: [PATCH 43/52] [service] add resource attributes as labels to otel metrics (#9029) This ensures backwards compatibility with OpenCensus metrics. ### Collector metrics with OpenCensus: ``` # HELP otelcol_exporter_queue_capacity Fixed capacity of the retry queue (in batches) # TYPE otelcol_exporter_queue_capacity gauge otelcol_exporter_queue_capacity{exporter="otlp",service_instance_id="e46d41fd-810a-4685-82d0-b01e177cfe7b",service_name="otelcorecol",service_version="0.90.0-dev"} 1000 # HELP otelcol_exporter_queue_size Current size of the retry queue (in batches) # TYPE otelcol_exporter_queue_size gauge otelcol_exporter_queue_size{exporter="otlp",service_instance_id="e46d41fd-810a-4685-82d0-b01e177cfe7b",service_name="otelcorecol",service_version="0.90.0-dev"} 0 # HELP otelcol_process_cpu_seconds Total CPU user and system time in seconds # TYPE otelcol_process_cpu_seconds counter otelcol_process_cpu_seconds{service_instance_id="e46d41fd-810a-4685-82d0-b01e177cfe7b",service_name="otelcorecol",service_version="0.90.0-dev"} 0.03 # HELP otelcol_process_memory_rss Total physical memory (resident set size) # TYPE otelcol_process_memory_rss gauge otelcol_process_memory_rss{service_instance_id="e46d41fd-810a-4685-82d0-b01e177cfe7b",service_name="otelcorecol",service_version="0.90.0-dev"} 2.70336e+07 # HELP otelcol_process_runtime_heap_alloc_bytes Bytes of allocated heap objects (see 'go doc runtime.MemStats.HeapAlloc') # TYPE otelcol_process_runtime_heap_alloc_bytes gauge otelcol_process_runtime_heap_alloc_bytes{service_instance_id="e46d41fd-810a-4685-82d0-b01e177cfe7b",service_name="otelcorecol",service_version="0.90.0-dev"} 2.445496e+06 # HELP otelcol_process_runtime_total_alloc_bytes Cumulative bytes allocated for heap objects (see 'go doc runtime.MemStats.TotalAlloc') # TYPE otelcol_process_runtime_total_alloc_bytes counter otelcol_process_runtime_total_alloc_bytes{service_instance_id="e46d41fd-810a-4685-82d0-b01e177cfe7b",service_name="otelcorecol",service_version="0.90.0-dev"} 3.96812e+06 # HELP otelcol_process_runtime_total_sys_memory_bytes Total bytes of memory obtained from the OS (see 'go doc runtime.MemStats.Sys') # TYPE otelcol_process_runtime_total_sys_memory_bytes gauge otelcol_process_runtime_total_sys_memory_bytes{service_instance_id="e46d41fd-810a-4685-82d0-b01e177cfe7b",service_name="otelcorecol",service_version="0.90.0-dev"} 1.3601808e+07 # HELP otelcol_process_uptime Uptime of the process # TYPE otelcol_process_uptime counter otelcol_process_uptime{service_instance_id="e46d41fd-810a-4685-82d0-b01e177cfe7b",service_name="otelcorecol",service_version="0.90.0-dev"} 22.446733 ``` ### Collector metrics w/ `useOtelForInternalMetrics` before my this change ``` # HELP otelcol_exporter_queue_capacity Fixed capacity of the retry queue (in batches) # TYPE otelcol_exporter_queue_capacity gauge otelcol_exporter_queue_capacity{exporter="otlp"} 1000 # HELP otelcol_exporter_queue_size Current size of the retry queue (in batches) # TYPE otelcol_exporter_queue_size gauge otelcol_exporter_queue_size{exporter="otlp"} 0 # HELP otelcol_process_cpu_seconds Total CPU user and system time in seconds # TYPE otelcol_process_cpu_seconds counter otelcol_process_cpu_seconds 0.06 # HELP otelcol_process_memory_rss Total physical memory (resident set size) # TYPE otelcol_process_memory_rss gauge otelcol_process_memory_rss 2.9605888e+07 # HELP otelcol_process_runtime_heap_alloc_bytes Bytes of allocated heap objects (see 'go doc runtime.MemStats.HeapAlloc') # TYPE otelcol_process_runtime_heap_alloc_bytes gauge otelcol_process_runtime_heap_alloc_bytes 3.42064e+06 # HELP otelcol_process_runtime_total_alloc_bytes Cumulative bytes allocated for heap objects (see 'go doc runtime.MemStats.TotalAlloc') # TYPE otelcol_process_runtime_total_alloc_bytes counter otelcol_process_runtime_total_alloc_bytes 4.931072e+06 # HELP otelcol_process_runtime_total_sys_memory_bytes Total bytes of memory obtained from the OS (see 'go doc runtime.MemStats.Sys') # TYPE otelcol_process_runtime_total_sys_memory_bytes gauge otelcol_process_runtime_total_sys_memory_bytes 1.2815376e+07 # HELP otelcol_process_uptime Uptime of the process # TYPE otelcol_process_uptime counter otelcol_process_uptime 21.149825 # HELP target_info Target metadata # TYPE target_info gauge target_info{service_instance_id="6ca6db28-5a67-419b-8f0a-a486bba59833",service_name="otelcorecol",service_version="0.90.0-dev"} 1 ``` ### With the change in this PR and using `useOtelForInternalMetrics` ``` # HELP otelcol_exporter_queue_capacity Fixed capacity of the retry queue (in batches) # TYPE otelcol_exporter_queue_capacity gauge otelcol_exporter_queue_capacity{exporter="otlp",service_instance_id="40f4a782-e5ee-47e1-acd0-17cb90bd16f1",service_name="otelcorecol",service_version="0.90.0-dev"} 1000 # HELP otelcol_exporter_queue_size Current size of the retry queue (in batches) # TYPE otelcol_exporter_queue_size gauge otelcol_exporter_queue_size{exporter="otlp",service_instance_id="40f4a782-e5ee-47e1-acd0-17cb90bd16f1",service_name="otelcorecol",service_version="0.90.0-dev"} 0 # HELP otelcol_process_cpu_seconds Total CPU user and system time in seconds # TYPE otelcol_process_cpu_seconds counter otelcol_process_cpu_seconds{service_instance_id="40f4a782-e5ee-47e1-acd0-17cb90bd16f1",service_name="otelcorecol",service_version="0.90.0-dev"} 0.03 # HELP otelcol_process_memory_rss Total physical memory (resident set size) # TYPE otelcol_process_memory_rss gauge otelcol_process_memory_rss{service_instance_id="40f4a782-e5ee-47e1-acd0-17cb90bd16f1",service_name="otelcorecol",service_version="0.90.0-dev"} 2.7508736e+07 # HELP otelcol_process_runtime_heap_alloc_bytes Bytes of allocated heap objects (see 'go doc runtime.MemStats.HeapAlloc') # TYPE otelcol_process_runtime_heap_alloc_bytes gauge otelcol_process_runtime_heap_alloc_bytes{service_instance_id="40f4a782-e5ee-47e1-acd0-17cb90bd16f1",service_name="otelcorecol",service_version="0.90.0-dev"} 2.450768e+06 # HELP otelcol_process_runtime_total_alloc_bytes Cumulative bytes allocated for heap objects (see 'go doc runtime.MemStats.TotalAlloc') # TYPE otelcol_process_runtime_total_alloc_bytes counter otelcol_process_runtime_total_alloc_bytes{service_instance_id="40f4a782-e5ee-47e1-acd0-17cb90bd16f1",service_name="otelcorecol",service_version="0.90.0-dev"} 3.97064e+06 # HELP otelcol_process_runtime_total_sys_memory_bytes Total bytes of memory obtained from the OS (see 'go doc runtime.MemStats.Sys') # TYPE otelcol_process_runtime_total_sys_memory_bytes gauge otelcol_process_runtime_total_sys_memory_bytes{service_instance_id="40f4a782-e5ee-47e1-acd0-17cb90bd16f1",service_name="otelcorecol",service_version="0.90.0-dev"} 1.3339664e+07 # HELP otelcol_process_uptime Uptime of the process # TYPE otelcol_process_uptime counter otelcol_process_uptime{service_instance_id="40f4a782-e5ee-47e1-acd0-17cb90bd16f1",service_name="otelcorecol",service_version="0.90.0-dev"} 3.938331 # HELP target_info Target metadata # TYPE target_info gauge target_info{service_instance_id="40f4a782-e5ee-47e1-acd0-17cb90bd16f1",service_name="otelcorecol",service_version="0.90.0-dev"} 1 ``` --------- Signed-off-by: Alex Boten --- .../codeboten_enable-otel-by-default.yaml | 25 +++++ cmd/otelcorecol/go.mod | 2 +- cmd/otelcorecol/go.sum | 4 +- config/configgrpc/go.mod | 2 +- config/configgrpc/go.sum | 4 +- exporter/debugexporter/go.sum | 2 +- exporter/go.mod | 2 +- exporter/go.sum | 4 +- exporter/loggingexporter/go.sum | 2 +- exporter/otlpexporter/go.sum | 2 +- exporter/otlphttpexporter/go.sum | 2 +- go.mod | 2 +- go.sum | 4 +- otelcol/go.mod | 2 +- otelcol/go.sum | 4 +- processor/batchprocessor/go.mod | 2 +- processor/batchprocessor/go.sum | 4 +- processor/go.mod | 2 +- processor/go.sum | 4 +- processor/memorylimiterprocessor/go.sum | 2 +- receiver/go.mod | 2 +- receiver/go.sum | 4 +- receiver/otlpreceiver/go.mod | 2 +- receiver/otlpreceiver/go.sum | 4 +- service/go.mod | 2 +- service/go.sum | 4 +- service/internal/proctelemetry/config.go | 1 + service/telemetry_test.go | 96 ++++++++++++++----- 28 files changed, 131 insertions(+), 61 deletions(-) create mode 100755 .chloggen/codeboten_enable-otel-by-default.yaml diff --git a/.chloggen/codeboten_enable-otel-by-default.yaml b/.chloggen/codeboten_enable-otel-by-default.yaml new file mode 100755 index 00000000000..08cb36bfe8e --- /dev/null +++ b/.chloggen/codeboten_enable-otel-by-default.yaml @@ -0,0 +1,25 @@ +# Use this changelog template to create an entry for release notes. + +# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' +change_type: enhancement + +# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver) +component: service + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: "add resource attributes as labels to otel metrics to ensures backwards compatibility with OpenCensus metrics." + +# One or more tracking issues or pull requests related to the change +issues: [9029] + +# (Optional) One or more lines of additional information to render under the primary note. +# These lines will be padded with 2 spaces and then inserted directly into the document. +# Use pipe (|) for multiline entries. +subtext: + +# Optional: The change log or logs in which this entry should be included. +# e.g. '[user]' or '[user, api]' +# Include 'user' if the change is relevant to end users. +# Include 'api' if there is a change to a library API. +# Default: '[user]' +change_logs: [] \ No newline at end of file diff --git a/cmd/otelcorecol/go.mod b/cmd/otelcorecol/go.mod index 0c521f0d2c3..3e4f848e9f9 100644 --- a/cmd/otelcorecol/go.mod +++ b/cmd/otelcorecol/go.mod @@ -106,7 +106,7 @@ require ( go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.21.0 // indirect go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.21.0 // indirect go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.21.0 // indirect - go.opentelemetry.io/otel/exporters/prometheus v0.44.0 // indirect + go.opentelemetry.io/otel/exporters/prometheus v0.44.1-0.20231201153405-6027c1ae76f2 // indirect go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v0.44.0 // indirect go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.21.0 // indirect go.opentelemetry.io/otel/metric v1.21.0 // indirect diff --git a/cmd/otelcorecol/go.sum b/cmd/otelcorecol/go.sum index 8577de3725e..81799022399 100644 --- a/cmd/otelcorecol/go.sum +++ b/cmd/otelcorecol/go.sum @@ -340,8 +340,8 @@ go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.21.0 h1:tIqhe go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.21.0/go.mod h1:nUeKExfxAQVbiVFn32YXpXZZHZ61Cc3s3Rn1pDBGAb0= go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.21.0 h1:digkEZCJWobwBqMwC0cwCq8/wkkRy/OowZg5OArWZrM= go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.21.0/go.mod h1:/OpE/y70qVkndM0TrxT4KBoN3RsFZP0QaofcfYrj76I= -go.opentelemetry.io/otel/exporters/prometheus v0.44.0 h1:08qeJgaPC0YEBu2PQMbqU3rogTlyzpjhCI2b58Yn00w= -go.opentelemetry.io/otel/exporters/prometheus v0.44.0/go.mod h1:ERL2uIeBtg4TxZdojHUwzZfIFlUIjZtxubT5p4h1Gjg= +go.opentelemetry.io/otel/exporters/prometheus v0.44.1-0.20231201153405-6027c1ae76f2 h1:TnhkxGJ5qPHAMIMI4r+HPT/BbpoHxqn4xONJrok054o= +go.opentelemetry.io/otel/exporters/prometheus v0.44.1-0.20231201153405-6027c1ae76f2/go.mod h1:ERL2uIeBtg4TxZdojHUwzZfIFlUIjZtxubT5p4h1Gjg= go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v0.44.0 h1:dEZWPjVN22urgYCza3PXRUGEyCB++y1sAqm6guWFesk= go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v0.44.0/go.mod h1:sTt30Evb7hJB/gEk27qLb1+l9n4Tb8HvHkR0Wx3S6CU= go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.21.0 h1:VhlEQAPp9R1ktYfrPk5SOryw1e9LDDTZCbIPFrho0ec= diff --git a/config/configgrpc/go.mod b/config/configgrpc/go.mod index 03136585b30..b268a2dc3d5 100644 --- a/config/configgrpc/go.mod +++ b/config/configgrpc/go.mod @@ -59,7 +59,7 @@ require ( go.opentelemetry.io/collector/confmap v0.90.0 // indirect go.opentelemetry.io/collector/extension v0.90.0 // indirect go.opentelemetry.io/collector/featuregate v1.0.0 // indirect - go.opentelemetry.io/otel/exporters/prometheus v0.44.0 // indirect + go.opentelemetry.io/otel/exporters/prometheus v0.44.1-0.20231201153405-6027c1ae76f2 // indirect go.opentelemetry.io/otel/metric v1.21.0 // indirect go.opentelemetry.io/otel/sdk v1.21.0 // indirect go.opentelemetry.io/otel/sdk/metric v1.21.0 // indirect diff --git a/config/configgrpc/go.sum b/config/configgrpc/go.sum index 085301dc870..181bf07fbb5 100644 --- a/config/configgrpc/go.sum +++ b/config/configgrpc/go.sum @@ -281,8 +281,8 @@ go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.4 go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.1/go.mod h1:4UoMYEZOC0yN/sPGH76KPkkU7zgiEWYWL9vwmbnTJPE= go.opentelemetry.io/otel v1.21.0 h1:hzLeKBZEL7Okw2mGzZ0cc4k/A7Fta0uoPgaJCr8fsFc= go.opentelemetry.io/otel v1.21.0/go.mod h1:QZzNPQPm1zLX4gZK4cMi+71eaorMSGT3A4znnUvNNEo= -go.opentelemetry.io/otel/exporters/prometheus v0.44.0 h1:08qeJgaPC0YEBu2PQMbqU3rogTlyzpjhCI2b58Yn00w= -go.opentelemetry.io/otel/exporters/prometheus v0.44.0/go.mod h1:ERL2uIeBtg4TxZdojHUwzZfIFlUIjZtxubT5p4h1Gjg= +go.opentelemetry.io/otel/exporters/prometheus v0.44.1-0.20231201153405-6027c1ae76f2 h1:TnhkxGJ5qPHAMIMI4r+HPT/BbpoHxqn4xONJrok054o= +go.opentelemetry.io/otel/exporters/prometheus v0.44.1-0.20231201153405-6027c1ae76f2/go.mod h1:ERL2uIeBtg4TxZdojHUwzZfIFlUIjZtxubT5p4h1Gjg= go.opentelemetry.io/otel/metric v1.21.0 h1:tlYWfeo+Bocx5kLEloTjbcDwBuELRrIFxwdQ36PlJu4= go.opentelemetry.io/otel/metric v1.21.0/go.mod h1:o1p3CA8nNHW8j5yuQLdc1eeqEaPfzug24uvsyIEJRWM= go.opentelemetry.io/otel/sdk v1.21.0 h1:FTt8qirL1EysG6sTQRZ5TokkU8d0ugCj8htOgThZXQ8= diff --git a/exporter/debugexporter/go.sum b/exporter/debugexporter/go.sum index 03b3aa75210..33c152afc6c 100644 --- a/exporter/debugexporter/go.sum +++ b/exporter/debugexporter/go.sum @@ -97,7 +97,7 @@ go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= go.opentelemetry.io/otel v1.21.0 h1:hzLeKBZEL7Okw2mGzZ0cc4k/A7Fta0uoPgaJCr8fsFc= go.opentelemetry.io/otel v1.21.0/go.mod h1:QZzNPQPm1zLX4gZK4cMi+71eaorMSGT3A4znnUvNNEo= -go.opentelemetry.io/otel/exporters/prometheus v0.44.0 h1:08qeJgaPC0YEBu2PQMbqU3rogTlyzpjhCI2b58Yn00w= +go.opentelemetry.io/otel/exporters/prometheus v0.44.1-0.20231201153405-6027c1ae76f2 h1:TnhkxGJ5qPHAMIMI4r+HPT/BbpoHxqn4xONJrok054o= go.opentelemetry.io/otel/metric v1.21.0 h1:tlYWfeo+Bocx5kLEloTjbcDwBuELRrIFxwdQ36PlJu4= go.opentelemetry.io/otel/metric v1.21.0/go.mod h1:o1p3CA8nNHW8j5yuQLdc1eeqEaPfzug24uvsyIEJRWM= go.opentelemetry.io/otel/sdk v1.21.0 h1:FTt8qirL1EysG6sTQRZ5TokkU8d0ugCj8htOgThZXQ8= diff --git a/exporter/go.mod b/exporter/go.mod index 16ec311d2be..fb830253e2b 100644 --- a/exporter/go.mod +++ b/exporter/go.mod @@ -54,7 +54,7 @@ require ( github.com/prometheus/procfs v0.11.1 // indirect github.com/prometheus/statsd_exporter v0.22.7 // indirect go.opentelemetry.io/collector/confmap v0.90.0 // indirect - go.opentelemetry.io/otel/exporters/prometheus v0.44.0 // indirect + go.opentelemetry.io/otel/exporters/prometheus v0.44.1-0.20231201153405-6027c1ae76f2 // indirect go.opentelemetry.io/otel/sdk/metric v1.21.0 // indirect golang.org/x/net v0.18.0 // indirect golang.org/x/text v0.14.0 // indirect diff --git a/exporter/go.sum b/exporter/go.sum index 4f88806ced9..9e6cc20522c 100644 --- a/exporter/go.sum +++ b/exporter/go.sum @@ -266,8 +266,8 @@ go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= go.opentelemetry.io/otel v1.21.0 h1:hzLeKBZEL7Okw2mGzZ0cc4k/A7Fta0uoPgaJCr8fsFc= go.opentelemetry.io/otel v1.21.0/go.mod h1:QZzNPQPm1zLX4gZK4cMi+71eaorMSGT3A4znnUvNNEo= -go.opentelemetry.io/otel/exporters/prometheus v0.44.0 h1:08qeJgaPC0YEBu2PQMbqU3rogTlyzpjhCI2b58Yn00w= -go.opentelemetry.io/otel/exporters/prometheus v0.44.0/go.mod h1:ERL2uIeBtg4TxZdojHUwzZfIFlUIjZtxubT5p4h1Gjg= +go.opentelemetry.io/otel/exporters/prometheus v0.44.1-0.20231201153405-6027c1ae76f2 h1:TnhkxGJ5qPHAMIMI4r+HPT/BbpoHxqn4xONJrok054o= +go.opentelemetry.io/otel/exporters/prometheus v0.44.1-0.20231201153405-6027c1ae76f2/go.mod h1:ERL2uIeBtg4TxZdojHUwzZfIFlUIjZtxubT5p4h1Gjg= go.opentelemetry.io/otel/metric v1.21.0 h1:tlYWfeo+Bocx5kLEloTjbcDwBuELRrIFxwdQ36PlJu4= go.opentelemetry.io/otel/metric v1.21.0/go.mod h1:o1p3CA8nNHW8j5yuQLdc1eeqEaPfzug24uvsyIEJRWM= go.opentelemetry.io/otel/sdk v1.21.0 h1:FTt8qirL1EysG6sTQRZ5TokkU8d0ugCj8htOgThZXQ8= diff --git a/exporter/loggingexporter/go.sum b/exporter/loggingexporter/go.sum index 03b3aa75210..33c152afc6c 100644 --- a/exporter/loggingexporter/go.sum +++ b/exporter/loggingexporter/go.sum @@ -97,7 +97,7 @@ go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= go.opentelemetry.io/otel v1.21.0 h1:hzLeKBZEL7Okw2mGzZ0cc4k/A7Fta0uoPgaJCr8fsFc= go.opentelemetry.io/otel v1.21.0/go.mod h1:QZzNPQPm1zLX4gZK4cMi+71eaorMSGT3A4znnUvNNEo= -go.opentelemetry.io/otel/exporters/prometheus v0.44.0 h1:08qeJgaPC0YEBu2PQMbqU3rogTlyzpjhCI2b58Yn00w= +go.opentelemetry.io/otel/exporters/prometheus v0.44.1-0.20231201153405-6027c1ae76f2 h1:TnhkxGJ5qPHAMIMI4r+HPT/BbpoHxqn4xONJrok054o= go.opentelemetry.io/otel/metric v1.21.0 h1:tlYWfeo+Bocx5kLEloTjbcDwBuELRrIFxwdQ36PlJu4= go.opentelemetry.io/otel/metric v1.21.0/go.mod h1:o1p3CA8nNHW8j5yuQLdc1eeqEaPfzug24uvsyIEJRWM= go.opentelemetry.io/otel/sdk v1.21.0 h1:FTt8qirL1EysG6sTQRZ5TokkU8d0ugCj8htOgThZXQ8= diff --git a/exporter/otlpexporter/go.sum b/exporter/otlpexporter/go.sum index 9f92355181c..004f05c9295 100644 --- a/exporter/otlpexporter/go.sum +++ b/exporter/otlpexporter/go.sum @@ -124,7 +124,7 @@ go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.46.1 h1:aFJWCqJ go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.46.1/go.mod h1:sEGXWArGqc3tVa+ekntsN65DmVbVeW+7lTKTjZF3/Fo= go.opentelemetry.io/otel v1.21.0 h1:hzLeKBZEL7Okw2mGzZ0cc4k/A7Fta0uoPgaJCr8fsFc= go.opentelemetry.io/otel v1.21.0/go.mod h1:QZzNPQPm1zLX4gZK4cMi+71eaorMSGT3A4znnUvNNEo= -go.opentelemetry.io/otel/exporters/prometheus v0.44.0 h1:08qeJgaPC0YEBu2PQMbqU3rogTlyzpjhCI2b58Yn00w= +go.opentelemetry.io/otel/exporters/prometheus v0.44.1-0.20231201153405-6027c1ae76f2 h1:TnhkxGJ5qPHAMIMI4r+HPT/BbpoHxqn4xONJrok054o= go.opentelemetry.io/otel/metric v1.21.0 h1:tlYWfeo+Bocx5kLEloTjbcDwBuELRrIFxwdQ36PlJu4= go.opentelemetry.io/otel/metric v1.21.0/go.mod h1:o1p3CA8nNHW8j5yuQLdc1eeqEaPfzug24uvsyIEJRWM= go.opentelemetry.io/otel/sdk v1.21.0 h1:FTt8qirL1EysG6sTQRZ5TokkU8d0ugCj8htOgThZXQ8= diff --git a/exporter/otlphttpexporter/go.sum b/exporter/otlphttpexporter/go.sum index 9f92355181c..004f05c9295 100644 --- a/exporter/otlphttpexporter/go.sum +++ b/exporter/otlphttpexporter/go.sum @@ -124,7 +124,7 @@ go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.46.1 h1:aFJWCqJ go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.46.1/go.mod h1:sEGXWArGqc3tVa+ekntsN65DmVbVeW+7lTKTjZF3/Fo= go.opentelemetry.io/otel v1.21.0 h1:hzLeKBZEL7Okw2mGzZ0cc4k/A7Fta0uoPgaJCr8fsFc= go.opentelemetry.io/otel v1.21.0/go.mod h1:QZzNPQPm1zLX4gZK4cMi+71eaorMSGT3A4znnUvNNEo= -go.opentelemetry.io/otel/exporters/prometheus v0.44.0 h1:08qeJgaPC0YEBu2PQMbqU3rogTlyzpjhCI2b58Yn00w= +go.opentelemetry.io/otel/exporters/prometheus v0.44.1-0.20231201153405-6027c1ae76f2 h1:TnhkxGJ5qPHAMIMI4r+HPT/BbpoHxqn4xONJrok054o= go.opentelemetry.io/otel/metric v1.21.0 h1:tlYWfeo+Bocx5kLEloTjbcDwBuELRrIFxwdQ36PlJu4= go.opentelemetry.io/otel/metric v1.21.0/go.mod h1:o1p3CA8nNHW8j5yuQLdc1eeqEaPfzug24uvsyIEJRWM= go.opentelemetry.io/otel/sdk v1.21.0 h1:FTt8qirL1EysG6sTQRZ5TokkU8d0ugCj8htOgThZXQ8= diff --git a/go.mod b/go.mod index c692e658cfc..526b2f74ec5 100644 --- a/go.mod +++ b/go.mod @@ -21,7 +21,7 @@ require ( go.opentelemetry.io/collector/receiver v0.90.0 go.opentelemetry.io/contrib/config v0.1.1 go.opentelemetry.io/otel v1.21.0 - go.opentelemetry.io/otel/exporters/prometheus v0.44.0 + go.opentelemetry.io/otel/exporters/prometheus v0.44.1-0.20231201153405-6027c1ae76f2 go.opentelemetry.io/otel/sdk v1.21.0 go.opentelemetry.io/otel/sdk/metric v1.21.0 go.uber.org/multierr v1.11.0 diff --git a/go.sum b/go.sum index 2efac08aed8..629c196c0e3 100644 --- a/go.sum +++ b/go.sum @@ -287,8 +287,8 @@ go.opentelemetry.io/contrib/config v0.1.1 h1:lIUTrMWkfDE0GvzBLhwv6ATDB1vntrnTsRv go.opentelemetry.io/contrib/config v0.1.1/go.mod h1:rDrK4+PS6Cs+WIphU/GO5Sk4TGV36lEQqk/Z1vZkaLI= go.opentelemetry.io/otel v1.21.0 h1:hzLeKBZEL7Okw2mGzZ0cc4k/A7Fta0uoPgaJCr8fsFc= go.opentelemetry.io/otel v1.21.0/go.mod h1:QZzNPQPm1zLX4gZK4cMi+71eaorMSGT3A4znnUvNNEo= -go.opentelemetry.io/otel/exporters/prometheus v0.44.0 h1:08qeJgaPC0YEBu2PQMbqU3rogTlyzpjhCI2b58Yn00w= -go.opentelemetry.io/otel/exporters/prometheus v0.44.0/go.mod h1:ERL2uIeBtg4TxZdojHUwzZfIFlUIjZtxubT5p4h1Gjg= +go.opentelemetry.io/otel/exporters/prometheus v0.44.1-0.20231201153405-6027c1ae76f2 h1:TnhkxGJ5qPHAMIMI4r+HPT/BbpoHxqn4xONJrok054o= +go.opentelemetry.io/otel/exporters/prometheus v0.44.1-0.20231201153405-6027c1ae76f2/go.mod h1:ERL2uIeBtg4TxZdojHUwzZfIFlUIjZtxubT5p4h1Gjg= go.opentelemetry.io/otel/metric v1.21.0 h1:tlYWfeo+Bocx5kLEloTjbcDwBuELRrIFxwdQ36PlJu4= go.opentelemetry.io/otel/metric v1.21.0/go.mod h1:o1p3CA8nNHW8j5yuQLdc1eeqEaPfzug24uvsyIEJRWM= go.opentelemetry.io/otel/sdk v1.21.0 h1:FTt8qirL1EysG6sTQRZ5TokkU8d0ugCj8htOgThZXQ8= diff --git a/otelcol/go.mod b/otelcol/go.mod index 46c2c4da1bf..ae937521476 100644 --- a/otelcol/go.mod +++ b/otelcol/go.mod @@ -78,7 +78,7 @@ require ( go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.21.0 // indirect go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.21.0 // indirect go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.21.0 // indirect - go.opentelemetry.io/otel/exporters/prometheus v0.44.0 // indirect + go.opentelemetry.io/otel/exporters/prometheus v0.44.1-0.20231201153405-6027c1ae76f2 // indirect go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v0.44.0 // indirect go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.21.0 // indirect go.opentelemetry.io/otel/metric v1.21.0 // indirect diff --git a/otelcol/go.sum b/otelcol/go.sum index dfce23caa78..4b37695d47e 100644 --- a/otelcol/go.sum +++ b/otelcol/go.sum @@ -317,8 +317,8 @@ go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.21.0 h1:tIqhe go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.21.0/go.mod h1:nUeKExfxAQVbiVFn32YXpXZZHZ61Cc3s3Rn1pDBGAb0= go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.21.0 h1:digkEZCJWobwBqMwC0cwCq8/wkkRy/OowZg5OArWZrM= go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.21.0/go.mod h1:/OpE/y70qVkndM0TrxT4KBoN3RsFZP0QaofcfYrj76I= -go.opentelemetry.io/otel/exporters/prometheus v0.44.0 h1:08qeJgaPC0YEBu2PQMbqU3rogTlyzpjhCI2b58Yn00w= -go.opentelemetry.io/otel/exporters/prometheus v0.44.0/go.mod h1:ERL2uIeBtg4TxZdojHUwzZfIFlUIjZtxubT5p4h1Gjg= +go.opentelemetry.io/otel/exporters/prometheus v0.44.1-0.20231201153405-6027c1ae76f2 h1:TnhkxGJ5qPHAMIMI4r+HPT/BbpoHxqn4xONJrok054o= +go.opentelemetry.io/otel/exporters/prometheus v0.44.1-0.20231201153405-6027c1ae76f2/go.mod h1:ERL2uIeBtg4TxZdojHUwzZfIFlUIjZtxubT5p4h1Gjg= go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v0.44.0 h1:dEZWPjVN22urgYCza3PXRUGEyCB++y1sAqm6guWFesk= go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v0.44.0/go.mod h1:sTt30Evb7hJB/gEk27qLb1+l9n4Tb8HvHkR0Wx3S6CU= go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.21.0 h1:VhlEQAPp9R1ktYfrPk5SOryw1e9LDDTZCbIPFrho0ec= diff --git a/processor/batchprocessor/go.mod b/processor/batchprocessor/go.mod index 283adb20e4f..cdd94538af6 100644 --- a/processor/batchprocessor/go.mod +++ b/processor/batchprocessor/go.mod @@ -17,7 +17,7 @@ require ( go.opentelemetry.io/collector/pdata v1.0.0 go.opentelemetry.io/collector/processor v0.90.0 go.opentelemetry.io/otel v1.21.0 - go.opentelemetry.io/otel/exporters/prometheus v0.44.0 + go.opentelemetry.io/otel/exporters/prometheus v0.44.1-0.20231201153405-6027c1ae76f2 go.opentelemetry.io/otel/metric v1.21.0 go.opentelemetry.io/otel/sdk v1.21.0 go.opentelemetry.io/otel/sdk/metric v1.21.0 diff --git a/processor/batchprocessor/go.sum b/processor/batchprocessor/go.sum index c76932bda35..db23cb0df9e 100644 --- a/processor/batchprocessor/go.sum +++ b/processor/batchprocessor/go.sum @@ -264,8 +264,8 @@ go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= go.opentelemetry.io/otel v1.21.0 h1:hzLeKBZEL7Okw2mGzZ0cc4k/A7Fta0uoPgaJCr8fsFc= go.opentelemetry.io/otel v1.21.0/go.mod h1:QZzNPQPm1zLX4gZK4cMi+71eaorMSGT3A4znnUvNNEo= -go.opentelemetry.io/otel/exporters/prometheus v0.44.0 h1:08qeJgaPC0YEBu2PQMbqU3rogTlyzpjhCI2b58Yn00w= -go.opentelemetry.io/otel/exporters/prometheus v0.44.0/go.mod h1:ERL2uIeBtg4TxZdojHUwzZfIFlUIjZtxubT5p4h1Gjg= +go.opentelemetry.io/otel/exporters/prometheus v0.44.1-0.20231201153405-6027c1ae76f2 h1:TnhkxGJ5qPHAMIMI4r+HPT/BbpoHxqn4xONJrok054o= +go.opentelemetry.io/otel/exporters/prometheus v0.44.1-0.20231201153405-6027c1ae76f2/go.mod h1:ERL2uIeBtg4TxZdojHUwzZfIFlUIjZtxubT5p4h1Gjg= go.opentelemetry.io/otel/metric v1.21.0 h1:tlYWfeo+Bocx5kLEloTjbcDwBuELRrIFxwdQ36PlJu4= go.opentelemetry.io/otel/metric v1.21.0/go.mod h1:o1p3CA8nNHW8j5yuQLdc1eeqEaPfzug24uvsyIEJRWM= go.opentelemetry.io/otel/sdk v1.21.0 h1:FTt8qirL1EysG6sTQRZ5TokkU8d0ugCj8htOgThZXQ8= diff --git a/processor/go.mod b/processor/go.mod index e8f9eb91ddb..34e2df1c366 100644 --- a/processor/go.mod +++ b/processor/go.mod @@ -48,7 +48,7 @@ require ( github.com/prometheus/procfs v0.11.1 // indirect github.com/prometheus/statsd_exporter v0.22.7 // indirect go.opentelemetry.io/collector/confmap v0.90.0 // indirect - go.opentelemetry.io/otel/exporters/prometheus v0.44.0 // indirect + go.opentelemetry.io/otel/exporters/prometheus v0.44.1-0.20231201153405-6027c1ae76f2 // indirect go.opentelemetry.io/otel/sdk v1.21.0 // indirect go.opentelemetry.io/otel/sdk/metric v1.21.0 // indirect golang.org/x/net v0.18.0 // indirect diff --git a/processor/go.sum b/processor/go.sum index 0035c881cf9..240226b9c89 100644 --- a/processor/go.sum +++ b/processor/go.sum @@ -265,8 +265,8 @@ go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= go.opentelemetry.io/otel v1.21.0 h1:hzLeKBZEL7Okw2mGzZ0cc4k/A7Fta0uoPgaJCr8fsFc= go.opentelemetry.io/otel v1.21.0/go.mod h1:QZzNPQPm1zLX4gZK4cMi+71eaorMSGT3A4znnUvNNEo= -go.opentelemetry.io/otel/exporters/prometheus v0.44.0 h1:08qeJgaPC0YEBu2PQMbqU3rogTlyzpjhCI2b58Yn00w= -go.opentelemetry.io/otel/exporters/prometheus v0.44.0/go.mod h1:ERL2uIeBtg4TxZdojHUwzZfIFlUIjZtxubT5p4h1Gjg= +go.opentelemetry.io/otel/exporters/prometheus v0.44.1-0.20231201153405-6027c1ae76f2 h1:TnhkxGJ5qPHAMIMI4r+HPT/BbpoHxqn4xONJrok054o= +go.opentelemetry.io/otel/exporters/prometheus v0.44.1-0.20231201153405-6027c1ae76f2/go.mod h1:ERL2uIeBtg4TxZdojHUwzZfIFlUIjZtxubT5p4h1Gjg= go.opentelemetry.io/otel/metric v1.21.0 h1:tlYWfeo+Bocx5kLEloTjbcDwBuELRrIFxwdQ36PlJu4= go.opentelemetry.io/otel/metric v1.21.0/go.mod h1:o1p3CA8nNHW8j5yuQLdc1eeqEaPfzug24uvsyIEJRWM= go.opentelemetry.io/otel/sdk v1.21.0 h1:FTt8qirL1EysG6sTQRZ5TokkU8d0ugCj8htOgThZXQ8= diff --git a/processor/memorylimiterprocessor/go.sum b/processor/memorylimiterprocessor/go.sum index 69dc6394507..de6b998fc84 100644 --- a/processor/memorylimiterprocessor/go.sum +++ b/processor/memorylimiterprocessor/go.sum @@ -114,7 +114,7 @@ go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= go.opentelemetry.io/otel v1.21.0 h1:hzLeKBZEL7Okw2mGzZ0cc4k/A7Fta0uoPgaJCr8fsFc= go.opentelemetry.io/otel v1.21.0/go.mod h1:QZzNPQPm1zLX4gZK4cMi+71eaorMSGT3A4znnUvNNEo= -go.opentelemetry.io/otel/exporters/prometheus v0.44.0 h1:08qeJgaPC0YEBu2PQMbqU3rogTlyzpjhCI2b58Yn00w= +go.opentelemetry.io/otel/exporters/prometheus v0.44.1-0.20231201153405-6027c1ae76f2 h1:TnhkxGJ5qPHAMIMI4r+HPT/BbpoHxqn4xONJrok054o= go.opentelemetry.io/otel/metric v1.21.0 h1:tlYWfeo+Bocx5kLEloTjbcDwBuELRrIFxwdQ36PlJu4= go.opentelemetry.io/otel/metric v1.21.0/go.mod h1:o1p3CA8nNHW8j5yuQLdc1eeqEaPfzug24uvsyIEJRWM= go.opentelemetry.io/otel/sdk v1.21.0 h1:FTt8qirL1EysG6sTQRZ5TokkU8d0ugCj8htOgThZXQ8= diff --git a/receiver/go.mod b/receiver/go.mod index bca1bd72967..7f59aa433af 100644 --- a/receiver/go.mod +++ b/receiver/go.mod @@ -49,7 +49,7 @@ require ( github.com/prometheus/procfs v0.11.1 // indirect github.com/prometheus/statsd_exporter v0.22.7 // indirect go.opentelemetry.io/collector/confmap v0.90.0 // indirect - go.opentelemetry.io/otel/exporters/prometheus v0.44.0 // indirect + go.opentelemetry.io/otel/exporters/prometheus v0.44.1-0.20231201153405-6027c1ae76f2 // indirect go.opentelemetry.io/otel/sdk/metric v1.21.0 // indirect golang.org/x/net v0.18.0 // indirect golang.org/x/sys v0.15.0 // indirect diff --git a/receiver/go.sum b/receiver/go.sum index 0035c881cf9..240226b9c89 100644 --- a/receiver/go.sum +++ b/receiver/go.sum @@ -265,8 +265,8 @@ go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= go.opentelemetry.io/otel v1.21.0 h1:hzLeKBZEL7Okw2mGzZ0cc4k/A7Fta0uoPgaJCr8fsFc= go.opentelemetry.io/otel v1.21.0/go.mod h1:QZzNPQPm1zLX4gZK4cMi+71eaorMSGT3A4znnUvNNEo= -go.opentelemetry.io/otel/exporters/prometheus v0.44.0 h1:08qeJgaPC0YEBu2PQMbqU3rogTlyzpjhCI2b58Yn00w= -go.opentelemetry.io/otel/exporters/prometheus v0.44.0/go.mod h1:ERL2uIeBtg4TxZdojHUwzZfIFlUIjZtxubT5p4h1Gjg= +go.opentelemetry.io/otel/exporters/prometheus v0.44.1-0.20231201153405-6027c1ae76f2 h1:TnhkxGJ5qPHAMIMI4r+HPT/BbpoHxqn4xONJrok054o= +go.opentelemetry.io/otel/exporters/prometheus v0.44.1-0.20231201153405-6027c1ae76f2/go.mod h1:ERL2uIeBtg4TxZdojHUwzZfIFlUIjZtxubT5p4h1Gjg= go.opentelemetry.io/otel/metric v1.21.0 h1:tlYWfeo+Bocx5kLEloTjbcDwBuELRrIFxwdQ36PlJu4= go.opentelemetry.io/otel/metric v1.21.0/go.mod h1:o1p3CA8nNHW8j5yuQLdc1eeqEaPfzug24uvsyIEJRWM= go.opentelemetry.io/otel/sdk v1.21.0 h1:FTt8qirL1EysG6sTQRZ5TokkU8d0ugCj8htOgThZXQ8= diff --git a/receiver/otlpreceiver/go.mod b/receiver/otlpreceiver/go.mod index 8abd56a633e..98c3bb8462c 100644 --- a/receiver/otlpreceiver/go.mod +++ b/receiver/otlpreceiver/go.mod @@ -70,7 +70,7 @@ require ( go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.1 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.46.1 // indirect go.opentelemetry.io/otel v1.21.0 // indirect - go.opentelemetry.io/otel/exporters/prometheus v0.44.0 // indirect + go.opentelemetry.io/otel/exporters/prometheus v0.44.1-0.20231201153405-6027c1ae76f2 // indirect go.opentelemetry.io/otel/metric v1.21.0 // indirect go.opentelemetry.io/otel/sdk v1.21.0 // indirect go.opentelemetry.io/otel/sdk/metric v1.21.0 // indirect diff --git a/receiver/otlpreceiver/go.sum b/receiver/otlpreceiver/go.sum index 7b91f30df9f..cf51932ee87 100644 --- a/receiver/otlpreceiver/go.sum +++ b/receiver/otlpreceiver/go.sum @@ -289,8 +289,8 @@ go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.46.1 h1:aFJWCqJ go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.46.1/go.mod h1:sEGXWArGqc3tVa+ekntsN65DmVbVeW+7lTKTjZF3/Fo= go.opentelemetry.io/otel v1.21.0 h1:hzLeKBZEL7Okw2mGzZ0cc4k/A7Fta0uoPgaJCr8fsFc= go.opentelemetry.io/otel v1.21.0/go.mod h1:QZzNPQPm1zLX4gZK4cMi+71eaorMSGT3A4znnUvNNEo= -go.opentelemetry.io/otel/exporters/prometheus v0.44.0 h1:08qeJgaPC0YEBu2PQMbqU3rogTlyzpjhCI2b58Yn00w= -go.opentelemetry.io/otel/exporters/prometheus v0.44.0/go.mod h1:ERL2uIeBtg4TxZdojHUwzZfIFlUIjZtxubT5p4h1Gjg= +go.opentelemetry.io/otel/exporters/prometheus v0.44.1-0.20231201153405-6027c1ae76f2 h1:TnhkxGJ5qPHAMIMI4r+HPT/BbpoHxqn4xONJrok054o= +go.opentelemetry.io/otel/exporters/prometheus v0.44.1-0.20231201153405-6027c1ae76f2/go.mod h1:ERL2uIeBtg4TxZdojHUwzZfIFlUIjZtxubT5p4h1Gjg= go.opentelemetry.io/otel/metric v1.21.0 h1:tlYWfeo+Bocx5kLEloTjbcDwBuELRrIFxwdQ36PlJu4= go.opentelemetry.io/otel/metric v1.21.0/go.mod h1:o1p3CA8nNHW8j5yuQLdc1eeqEaPfzug24uvsyIEJRWM= go.opentelemetry.io/otel/sdk v1.21.0 h1:FTt8qirL1EysG6sTQRZ5TokkU8d0ugCj8htOgThZXQ8= diff --git a/service/go.mod b/service/go.mod index 06fd368b57a..9e4f1645d4b 100644 --- a/service/go.mod +++ b/service/go.mod @@ -34,7 +34,7 @@ require ( go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v0.44.0 go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.21.0 go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.21.0 - go.opentelemetry.io/otel/exporters/prometheus v0.44.0 + go.opentelemetry.io/otel/exporters/prometheus v0.44.1-0.20231201153405-6027c1ae76f2 go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v0.44.0 go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.21.0 go.opentelemetry.io/otel/metric v1.21.0 diff --git a/service/go.sum b/service/go.sum index 68ad4efddfc..510dba490d3 100644 --- a/service/go.sum +++ b/service/go.sum @@ -310,8 +310,8 @@ go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.21.0 h1:tIqhe go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.21.0/go.mod h1:nUeKExfxAQVbiVFn32YXpXZZHZ61Cc3s3Rn1pDBGAb0= go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.21.0 h1:digkEZCJWobwBqMwC0cwCq8/wkkRy/OowZg5OArWZrM= go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.21.0/go.mod h1:/OpE/y70qVkndM0TrxT4KBoN3RsFZP0QaofcfYrj76I= -go.opentelemetry.io/otel/exporters/prometheus v0.44.0 h1:08qeJgaPC0YEBu2PQMbqU3rogTlyzpjhCI2b58Yn00w= -go.opentelemetry.io/otel/exporters/prometheus v0.44.0/go.mod h1:ERL2uIeBtg4TxZdojHUwzZfIFlUIjZtxubT5p4h1Gjg= +go.opentelemetry.io/otel/exporters/prometheus v0.44.1-0.20231201153405-6027c1ae76f2 h1:TnhkxGJ5qPHAMIMI4r+HPT/BbpoHxqn4xONJrok054o= +go.opentelemetry.io/otel/exporters/prometheus v0.44.1-0.20231201153405-6027c1ae76f2/go.mod h1:ERL2uIeBtg4TxZdojHUwzZfIFlUIjZtxubT5p4h1Gjg= go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v0.44.0 h1:dEZWPjVN22urgYCza3PXRUGEyCB++y1sAqm6guWFesk= go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v0.44.0/go.mod h1:sTt30Evb7hJB/gEk27qLb1+l9n4Tb8HvHkR0Wx3S6CU= go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.21.0 h1:VhlEQAPp9R1ktYfrPk5SOryw1e9LDDTZCbIPFrho0ec= diff --git a/service/internal/proctelemetry/config.go b/service/internal/proctelemetry/config.go index b815250fd0d..6f1d74f50a4 100644 --- a/service/internal/proctelemetry/config.go +++ b/service/internal/proctelemetry/config.go @@ -213,6 +213,7 @@ func initPrometheusExporter(prometheusConfig *config.Prometheus, asyncErrorChann // This allows us to produce metrics that are backwards compatible w/ opencensus otelprom.WithoutCounterSuffixes(), otelprom.WithNamespace("otelcol"), + otelprom.WithResourceAsConstantLabels(attribute.NewDenyKeysFilter()), ) if err != nil { return nil, nil, fmt.Errorf("error creating otel prometheus exporter: %w", err) diff --git a/service/telemetry_test.go b/service/telemetry_test.go index 07d78687295..4d94205943e 100644 --- a/service/telemetry_test.go +++ b/service/telemetry_test.go @@ -127,26 +127,40 @@ func TestTelemetryInit(t *testing.T) { useOtel: true, expectedMetrics: map[string]metricValue{ metricPrefix + ocPrefix + counterName: { - value: 13, - labels: map[string]string{}, + value: 13, + labels: map[string]string{ + "service_name": "otelcol", + "service_version": "latest", + "service_instance_id": testInstanceID, + }, }, metricPrefix + otelPrefix + counterName: { - value: 13, - labels: map[string]string{}, + value: 13, + labels: map[string]string{ + "service_name": "otelcol", + "service_version": "latest", + "service_instance_id": testInstanceID, + }, }, metricPrefix + grpcPrefix + counterName: { value: 11, labels: map[string]string{ - "net_sock_peer_addr": "", - "net_sock_peer_name": "", - "net_sock_peer_port": "", + "net_sock_peer_addr": "", + "net_sock_peer_name": "", + "net_sock_peer_port": "", + "service_name": "otelcol", + "service_version": "latest", + "service_instance_id": testInstanceID, }, }, metricPrefix + httpPrefix + counterName: { value: 10, labels: map[string]string{ - "net_host_name": "", - "net_host_port": "", + "net_host_name": "", + "net_host_port": "", + "service_name": "otelcol", + "service_version": "latest", + "service_instance_id": testInstanceID, }, }, "target_info": { @@ -165,20 +179,36 @@ func TestTelemetryInit(t *testing.T) { disableHighCard: true, expectedMetrics: map[string]metricValue{ metricPrefix + ocPrefix + counterName: { - value: 13, - labels: map[string]string{}, + value: 13, + labels: map[string]string{ + "service_name": "otelcol", + "service_version": "latest", + "service_instance_id": testInstanceID, + }, }, metricPrefix + otelPrefix + counterName: { - value: 13, - labels: map[string]string{}, + value: 13, + labels: map[string]string{ + "service_name": "otelcol", + "service_version": "latest", + "service_instance_id": testInstanceID, + }, }, metricPrefix + grpcPrefix + counterName: { - value: 11, - labels: map[string]string{}, + value: 11, + labels: map[string]string{ + "service_name": "otelcol", + "service_version": "latest", + "service_instance_id": testInstanceID, + }, }, metricPrefix + httpPrefix + counterName: { - value: 10, - labels: map[string]string{}, + value: 10, + labels: map[string]string{ + "service_name": "otelcol", + "service_version": "latest", + "service_instance_id": testInstanceID, + }, }, "target_info": { value: 0, @@ -214,26 +244,40 @@ func TestTelemetryInit(t *testing.T) { }, expectedMetrics: map[string]metricValue{ metricPrefix + ocPrefix + counterName: { - value: 13, - labels: map[string]string{}, + value: 13, + labels: map[string]string{ + "service_name": "otelcol", + "service_version": "latest", + "service_instance_id": testInstanceID, + }, }, metricPrefix + otelPrefix + counterName: { - value: 13, - labels: map[string]string{}, + value: 13, + labels: map[string]string{ + "service_name": "otelcol", + "service_version": "latest", + "service_instance_id": testInstanceID, + }, }, metricPrefix + grpcPrefix + counterName: { value: 11, labels: map[string]string{ - "net_sock_peer_addr": "", - "net_sock_peer_name": "", - "net_sock_peer_port": "", + "net_sock_peer_addr": "", + "net_sock_peer_name": "", + "net_sock_peer_port": "", + "service_name": "otelcol", + "service_version": "latest", + "service_instance_id": testInstanceID, }, }, metricPrefix + httpPrefix + counterName: { value: 10, labels: map[string]string{ - "net_host_name": "", - "net_host_port": "", + "net_host_name": "", + "net_host_port": "", + "service_name": "otelcol", + "service_version": "latest", + "service_instance_id": testInstanceID, }, }, "target_info": { From f33a65a0a500d94b5a226dac408743e76cfa563b Mon Sep 17 00:00:00 2001 From: Dmitrii Anoshin Date: Fri, 1 Dec 2023 12:50:50 -0800 Subject: [PATCH 44/52] [chore] Update the release schedule (#9034) --- docs/release.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/release.md b/docs/release.md index e9f7e3c8cd4..c93cbcf939e 100644 --- a/docs/release.md +++ b/docs/release.md @@ -156,10 +156,10 @@ Once a module is ready to be released under the `1.x` version scheme, file a PR | Date | Version | Release manager | |------------|---------|-----------------| -| 2023-11-13 | v0.89.0 | @jpkrohling | -| 2023-11-27 | v0.90.0 | @djaglowski | | 2023-12-11 | v0.91.0 | @dmitryax | | 2024-01-08 | v0.92.0 | @codeboten | | 2024-01-22 | v0.93.0 | @bogdandrutu | | 2024-02-05 | v0.94.0 | @Aneurysm9 | -| 2023-02-19 | v0.95.0 | @mx-psi | +| 2024-02-19 | v0.95.0 | @mx-psi | +| 2024-03-04 | v0.96.0 | @jpkrohling | +| 2024-03-18 | v0.97.0 | @djaglowski | From 6e2fdc755b34f88437df2e9551b9a1ce1110820e Mon Sep 17 00:00:00 2001 From: Dmitrii Anoshin Date: Fri, 1 Dec 2023 12:51:46 -0800 Subject: [PATCH 45/52] [chore] Remove unused GH env var from makefile (#9033) The env var is not being used. `gh` command is used directly in the shell scripts, not make targets. --- .github/workflows/scripts/release-prepare-release.sh | 8 ++++---- Makefile.Common | 2 -- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/.github/workflows/scripts/release-prepare-release.sh b/.github/workflows/scripts/release-prepare-release.sh index d7c09ba63af..e26ff155a6d 100755 --- a/.github/workflows/scripts/release-prepare-release.sh +++ b/.github/workflows/scripts/release-prepare-release.sh @@ -26,14 +26,14 @@ git add --all git commit -m "Changelog update ${RELEASE_VERSION}" if [ "${CANDIDATE_STABLE}" != "" ]; then - make prepare-release GH=none PREVIOUS_VERSION="${CURRENT_STABLE}" RELEASE_CANDIDATE="${CANDIDATE_STABLE}" MODSET=stable + make prepare-release PREVIOUS_VERSION="${CURRENT_STABLE}" RELEASE_CANDIDATE="${CANDIDATE_STABLE}" MODSET=stable COMMANDS+=" -- make prepare-release GH=none PREVIOUS_VERSION=${CURRENT_STABLE} RELEASE_CANDIDATE=${CANDIDATE_STABLE} MODSET=stable" +- make prepare-release PREVIOUS_VERSION=${CURRENT_STABLE} RELEASE_CANDIDATE=${CANDIDATE_STABLE} MODSET=stable" fi if [ "${CANDIDATE_BETA}" != "" ]; then - make prepare-release GH=none PREVIOUS_VERSION="${CURRENT_BETA}" RELEASE_CANDIDATE="${CANDIDATE_BETA}" MODSET=beta + make prepare-release PREVIOUS_VERSION="${CURRENT_BETA}" RELEASE_CANDIDATE="${CANDIDATE_BETA}" MODSET=beta COMMANDS+=" -- make prepare-release GH=none PREVIOUS_VERSION=${CURRENT_BETA} RELEASE_CANDIDATE=${CANDIDATE_BETA} MODSET=beta" +- make prepare-release PREVIOUS_VERSION=${CURRENT_BETA} RELEASE_CANDIDATE=${CANDIDATE_BETA} MODSET=beta" fi git push origin "${BRANCH}" diff --git a/Makefile.Common b/Makefile.Common index c3a6c156d39..36e0b527bf1 100644 --- a/Makefile.Common +++ b/Makefile.Common @@ -33,8 +33,6 @@ MULTIMOD := $(TOOLS_BIN_DIR)/multimod PORTO := $(TOOLS_BIN_DIR)/porto YQ := $(TOOLS_BIN_DIR)/yq -GH := $(shell which gh) - .PHONY: install-tools install-tools: $(TOOLS_BIN_NAMES) $(YQ) From 67b1ae9cb3848832022691c89174fc35660ec1f4 Mon Sep 17 00:00:00 2001 From: Dmitrii Anoshin Date: Tue, 5 Dec 2023 05:24:09 -0800 Subject: [PATCH 46/52] [chore] [pdata] Update comments for Value methods (#9038) Resolves https://github.com/open-telemetry/opentelemetry-collector/issues/9025 --- pdata/pcommon/value.go | 26 ++++++++++---------------- pdata/pcommon/value_test.go | 23 +++++++++++++++++++++++ 2 files changed, 33 insertions(+), 16 deletions(-) diff --git a/pdata/pcommon/value.go b/pdata/pcommon/value.go index 2e0443dd3b2..77a84e51758 100644 --- a/pdata/pcommon/value.go +++ b/pdata/pcommon/value.go @@ -129,6 +129,8 @@ func (v Value) getState() *internal.State { return internal.GetValueState(internal.Value(v)) } +// FromRaw sets the value from the given raw value. +// Calling this function on zero-initialized Value will cause a panic. func (v Value) FromRaw(iv any) error { switch tv := iv.(type) { case nil: @@ -198,37 +200,31 @@ func (v Value) Type() ValueType { // Str returns the string value associated with this Value. // The shorter name is used instead of String to avoid implementing fmt.Stringer interface. // If the Type() is not ValueTypeStr then returns empty string. -// Calling this function on zero-initialized Value will cause a panic. func (v Value) Str() string { return v.getOrig().GetStringValue() } // Int returns the int64 value associated with this Value. // If the Type() is not ValueTypeInt then returns int64(0). -// Calling this function on zero-initialized Value will cause a panic. func (v Value) Int() int64 { return v.getOrig().GetIntValue() } // Double returns the float64 value associated with this Value. // If the Type() is not ValueTypeDouble then returns float64(0). -// Calling this function on zero-initialized Value will cause a panic. func (v Value) Double() float64 { return v.getOrig().GetDoubleValue() } // Bool returns the bool value associated with this Value. // If the Type() is not ValueTypeBool then returns false. -// Calling this function on zero-initialized Value will cause a panic. func (v Value) Bool() bool { return v.getOrig().GetBoolValue() } // Map returns the map value associated with this Value. -// If the Type() is not ValueTypeMap then returns an invalid map. Note that using -// such map can cause panic. -// -// Calling this function on zero-initialized Value will cause a panic. +// If the function is called on zero-initialized Value or if the Type() is not ValueTypeMap +// then it returns an invalid map. Note that using such map can cause panic. func (v Value) Map() Map { kvlist := v.getOrig().GetKvlistValue() if kvlist == nil { @@ -238,10 +234,8 @@ func (v Value) Map() Map { } // Slice returns the slice value associated with this Value. -// If the Type() is not ValueTypeSlice then returns an invalid slice. Note that using -// such slice can cause panic. -// -// Calling this function on zero-initialized Value will cause a panic. +// If the function is called on zero-initialized Value or if the Type() is not ValueTypeSlice +// then returns an invalid slice. Note that using such slice can cause panic. func (v Value) Slice() Slice { arr := v.getOrig().GetArrayValue() if arr == nil { @@ -251,10 +245,8 @@ func (v Value) Slice() Slice { } // Bytes returns the ByteSlice value associated with this Value. -// If the Type() is not ValueTypeBytes then returns an invalid ByteSlice object. Note that using -// such slice can cause panic. -// -// Calling this function on zero-initialized Value will cause a panic. +// If the function is called on zero-initialized Value or if the Type() is not ValueTypeBytes +// then returns an invalid ByteSlice object. Note that using such slice can cause panic. func (v Value) Bytes() ByteSlice { bv, ok := v.getOrig().GetValue().(*otlpcommon.AnyValue_BytesValue) if !ok { @@ -325,6 +317,7 @@ func (v Value) SetEmptySlice() Slice { } // CopyTo copies the Value instance overriding the destination. +// Calling this function on zero-initialized Value will cause a panic. func (v Value) CopyTo(dest Value) { dest.getState().AssertMutable() destOrig := dest.getOrig() @@ -370,6 +363,7 @@ func (v Value) CopyTo(dest Value) { // AsString converts an OTLP Value object of any type to its equivalent string // representation. This differs from Str which only returns a non-empty value // if the ValueType is ValueTypeStr. +// Calling this function on zero-initialized Value will cause a panic. func (v Value) AsString() string { switch v.Type() { case ValueTypeEmpty: diff --git a/pdata/pcommon/value_test.go b/pdata/pcommon/value_test.go index 9d2e5f439ee..920bd0b6e96 100644 --- a/pdata/pcommon/value_test.go +++ b/pdata/pcommon/value_test.go @@ -556,6 +556,29 @@ func TestNewValueFromRawInvalid(t *testing.T) { assert.EqualError(t, actual.FromRaw(ValueTypeDouble), "") } +func TestInvalidValue(t *testing.T) { + v := Value{} + assert.Equal(t, false, v.Bool()) + assert.Equal(t, int64(0), v.Int()) + assert.Equal(t, float64(0), v.Double()) + assert.Equal(t, "", v.Str()) + assert.Equal(t, ByteSlice{}, v.Bytes()) + assert.Equal(t, Map{}, v.Map()) + assert.Equal(t, Slice{}, v.Slice()) + assert.Panics(t, func() { v.AsString() }) + assert.Panics(t, func() { v.AsRaw() }) + assert.Panics(t, func() { _ = v.FromRaw(1) }) + assert.Panics(t, func() { v.Type() }) + assert.Panics(t, func() { v.SetStr("") }) + assert.Panics(t, func() { v.SetInt(0) }) + assert.Panics(t, func() { v.SetDouble(0) }) + assert.Panics(t, func() { v.SetBool(false) }) + assert.Panics(t, func() { v.SetEmptyBytes() }) + assert.Panics(t, func() { v.SetEmptyMap() }) + assert.Panics(t, func() { v.SetEmptySlice() }) + assert.Panics(t, func() { v.CopyTo(NewValueEmpty()) }) +} + func generateTestValueMap() Value { ret := NewValueMap() attrMap := ret.Map() From f3a241a14c7d416c7cd7dc097805137ebcc72e18 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 5 Dec 2023 07:38:22 -0800 Subject: [PATCH 47/52] Update all patch dependencies (#9040) 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 | Type | Update | Change | |---|---|---|---| | [github.com/klauspost/compress](https://togithub.com/klauspost/compress) | require | patch | `v1.17.3` -> `v1.17.4` | | [github.com/mikefarah/yq/v4](https://togithub.com/mikefarah/yq) | require | patch | `v4.40.3` -> `v4.40.4` | | [github.com/shirou/gopsutil/v3](https://togithub.com/shirou/gopsutil) | require | patch | `v3.23.10` -> `v3.23.11` | | [go.opentelemetry.io/collector](https://togithub.com/open-telemetry/opentelemetry-collector) | require | patch | `v0.90.0` -> `v0.90.1` | | [go.opentelemetry.io/collector/component](https://togithub.com/open-telemetry/opentelemetry-collector) | require | patch | `v0.90.0` -> `v0.90.1` | | [go.opentelemetry.io/collector/config/configauth](https://togithub.com/open-telemetry/opentelemetry-collector) | require | patch | `v0.90.0` -> `v0.90.1` | | [go.opentelemetry.io/collector/config/configcompression](https://togithub.com/open-telemetry/opentelemetry-collector) | require | patch | `v0.90.0` -> `v0.90.1` | | [go.opentelemetry.io/collector/config/configgrpc](https://togithub.com/open-telemetry/opentelemetry-collector) | require | patch | `v0.90.0` -> `v0.90.1` | | [go.opentelemetry.io/collector/config/confighttp](https://togithub.com/open-telemetry/opentelemetry-collector) | require | patch | `v0.90.0` -> `v0.90.1` | | [go.opentelemetry.io/collector/config/confignet](https://togithub.com/open-telemetry/opentelemetry-collector) | require | patch | `v0.90.0` -> `v0.90.1` | | [go.opentelemetry.io/collector/config/configopaque](https://togithub.com/open-telemetry/opentelemetry-collector) | require | patch | `v0.90.0` -> `v0.90.1` | | [go.opentelemetry.io/collector/config/configtelemetry](https://togithub.com/open-telemetry/opentelemetry-collector) | require | patch | `v0.90.0` -> `v0.90.1` | | [go.opentelemetry.io/collector/config/configtls](https://togithub.com/open-telemetry/opentelemetry-collector) | require | patch | `v0.90.0` -> `v0.90.1` | | [go.opentelemetry.io/collector/config/internal](https://togithub.com/open-telemetry/opentelemetry-collector) | require | patch | `v0.90.0` -> `v0.90.1` | | [go.opentelemetry.io/collector/confmap](https://togithub.com/open-telemetry/opentelemetry-collector) | require | patch | `v0.90.0` -> `v0.90.1` | | [go.opentelemetry.io/collector/connector](https://togithub.com/open-telemetry/opentelemetry-collector) | require | patch | `v0.90.0` -> `v0.90.1` | | [go.opentelemetry.io/collector/consumer](https://togithub.com/open-telemetry/opentelemetry-collector) | require | patch | `v0.90.0` -> `v0.90.1` | | [go.opentelemetry.io/collector/exporter](https://togithub.com/open-telemetry/opentelemetry-collector) | require | patch | `v0.90.0` -> `v0.90.1` | | [go.opentelemetry.io/collector/extension](https://togithub.com/open-telemetry/opentelemetry-collector) | require | patch | `v0.90.0` -> `v0.90.1` | | [go.opentelemetry.io/collector/extension/auth](https://togithub.com/open-telemetry/opentelemetry-collector) | require | patch | `v0.90.0` -> `v0.90.1` | | [go.opentelemetry.io/collector/extension/zpagesextension](https://togithub.com/open-telemetry/opentelemetry-collector) | require | patch | `v0.90.0` -> `v0.90.1` | | [go.opentelemetry.io/collector/processor](https://togithub.com/open-telemetry/opentelemetry-collector) | require | patch | `v0.90.0` -> `v0.90.1` | | [go.opentelemetry.io/collector/receiver](https://togithub.com/open-telemetry/opentelemetry-collector) | require | patch | `v0.90.0` -> `v0.90.1` | | [go.opentelemetry.io/collector/receiver/otlpreceiver](https://togithub.com/open-telemetry/opentelemetry-collector) | require | patch | `v0.90.0` -> `v0.90.1` | | [go.opentelemetry.io/collector/semconv](https://togithub.com/open-telemetry/opentelemetry-collector) | require | patch | `v0.90.0` -> `v0.90.1` | | [go.opentelemetry.io/collector/service](https://togithub.com/open-telemetry/opentelemetry-collector) | require | patch | `v0.90.0` -> `v0.90.1` | --- ### Release Notes
klauspost/compress (github.com/klauspost/compress) ### [`v1.17.4`](https://togithub.com/klauspost/compress/releases/tag/v1.17.4) [Compare Source](https://togithub.com/klauspost/compress/compare/v1.17.3...v1.17.4) #### What's Changed - huff0: Speed up symbol counting by [@​greatroar](https://togithub.com/greatroar) in [https://github.com/klauspost/compress/pull/887](https://togithub.com/klauspost/compress/pull/887) - huff0: Remove byteReader by [@​greatroar](https://togithub.com/greatroar) in [https://github.com/klauspost/compress/pull/886](https://togithub.com/klauspost/compress/pull/886) - gzhttp: Allow overriding decompression on transport by [@​klauspost](https://togithub.com/klauspost) in [https://github.com/klauspost/compress/pull/892](https://togithub.com/klauspost/compress/pull/892) - gzhttp: Clamp compression level by [@​klauspost](https://togithub.com/klauspost) in [https://github.com/klauspost/compress/pull/890](https://togithub.com/klauspost/compress/pull/890) - gzip: Error out if reserved bits are set by [@​klauspost](https://togithub.com/klauspost) in [https://github.com/klauspost/compress/pull/891](https://togithub.com/klauspost/compress/pull/891) #### New Contributors - [@​teikjun](https://togithub.com/teikjun) made their first contribution in [https://github.com/klauspost/compress/pull/889](https://togithub.com/klauspost/compress/pull/889) **Full Changelog**: https://github.com/klauspost/compress/compare/v1.17.3...v1.17.4
mikefarah/yq (github.com/mikefarah/yq/v4) ### [`v4.40.4`](https://togithub.com/mikefarah/yq/compare/v4.40.3...v4.40.4) [Compare Source](https://togithub.com/mikefarah/yq/compare/v4.40.3...v4.40.4)
shirou/gopsutil (github.com/shirou/gopsutil/v3) ### [`v3.23.11`](https://togithub.com/shirou/gopsutil/releases/tag/v3.23.11) [Compare Source](https://togithub.com/shirou/gopsutil/compare/v3.23.10...v3.23.11) #### What's Changed ##### process - feat: use lsof for net_connections on FreeBSD by [@​wolf31o2](https://togithub.com/wolf31o2) in [https://github.com/shirou/gopsutil/pull/1551](https://togithub.com/shirou/gopsutil/pull/1551) #### New Contributors - [@​wolf31o2](https://togithub.com/wolf31o2) made their first contribution in [https://github.com/shirou/gopsutil/pull/1551](https://togithub.com/shirou/gopsutil/pull/1551) **Full Changelog**: https://github.com/shirou/gopsutil/compare/v3.23.10...v3.23.11
open-telemetry/opentelemetry-collector (go.opentelemetry.io/collector) ### [`v0.90.1`](https://togithub.com/open-telemetry/opentelemetry-collector/blob/HEAD/CHANGELOG.md#v0901) [Compare Source](https://togithub.com/open-telemetry/opentelemetry-collector/compare/v0.90.0...v0.90.1) ##### 🧰 Bug fixes 🧰 - `exporterhelper`: Remove noisy log ([#​9017](https://togithub.com/open-telemetry/opentelemetry-collector/issues/9017))
--- ### Configuration 📅 **Schedule**: Branch creation - "on tuesday" (UTC), 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. 👻 **Immortal**: This PR will be recreated if closed unmerged. Get [config help](https://togithub.com/renovatebot/renovate/discussions) if that's undesired. --- - [ ] 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/open-telemetry/opentelemetry-collector). --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: opentelemetrybot <107717825+opentelemetrybot@users.noreply.github.com> --- cmd/otelcorecol/go.mod | 46 ++++++++++++------------- cmd/otelcorecol/go.sum | 9 +++-- component/go.mod | 4 +-- config/configauth/go.mod | 10 +++--- config/configgrpc/go.mod | 24 ++++++------- config/confighttp/go.mod | 24 ++++++------- config/confighttp/go.sum | 4 +-- config/configtls/go.mod | 2 +- connector/forwardconnector/go.mod | 12 +++---- connector/go.mod | 10 +++--- consumer/go.mod | 2 +- exporter/debugexporter/go.mod | 16 ++++----- exporter/go.mod | 14 ++++---- exporter/loggingexporter/go.mod | 16 ++++----- exporter/otlpexporter/go.mod | 38 ++++++++++---------- exporter/otlpexporter/go.sum | 4 +-- exporter/otlphttpexporter/go.mod | 38 ++++++++++---------- exporter/otlphttpexporter/go.sum | 4 +-- extension/auth/go.mod | 8 ++--- extension/ballastextension/go.mod | 12 +++---- extension/ballastextension/go.sum | 5 ++- extension/go.mod | 6 ++-- extension/zpagesextension/go.mod | 12 +++---- go.mod | 20 +++++------ go.sum | 5 ++- internal/tools/go.mod | 2 +- internal/tools/go.sum | 4 +-- otelcol/go.mod | 26 +++++++------- otelcol/go.sum | 5 ++- processor/batchprocessor/go.mod | 12 +++---- processor/go.mod | 10 +++--- processor/memorylimiterprocessor/go.mod | 14 ++++---- processor/memorylimiterprocessor/go.sum | 5 ++- receiver/go.mod | 10 +++--- receiver/otlpreceiver/go.mod | 36 +++++++++---------- receiver/otlpreceiver/go.sum | 4 +-- service/go.mod | 28 +++++++-------- service/go.sum | 5 ++- 38 files changed, 250 insertions(+), 256 deletions(-) diff --git a/cmd/otelcorecol/go.mod b/cmd/otelcorecol/go.mod index 3e4f848e9f9..c3ba7b06441 100644 --- a/cmd/otelcorecol/go.mod +++ b/cmd/otelcorecol/go.mod @@ -6,22 +6,22 @@ go 1.20 require ( github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.90.0 - go.opentelemetry.io/collector/connector v0.90.0 + go.opentelemetry.io/collector/component v0.90.1 + go.opentelemetry.io/collector/connector v0.90.1 go.opentelemetry.io/collector/connector/forwardconnector v0.90.1 - go.opentelemetry.io/collector/exporter v0.90.0 + go.opentelemetry.io/collector/exporter v0.90.1 go.opentelemetry.io/collector/exporter/debugexporter v0.90.1 go.opentelemetry.io/collector/exporter/loggingexporter v0.90.1 go.opentelemetry.io/collector/exporter/otlpexporter v0.90.1 go.opentelemetry.io/collector/exporter/otlphttpexporter v0.90.1 - go.opentelemetry.io/collector/extension v0.90.0 + go.opentelemetry.io/collector/extension v0.90.1 go.opentelemetry.io/collector/extension/ballastextension v0.90.1 go.opentelemetry.io/collector/extension/zpagesextension v0.90.1 go.opentelemetry.io/collector/otelcol v0.90.1 - go.opentelemetry.io/collector/processor v0.90.0 + go.opentelemetry.io/collector/processor v0.90.1 go.opentelemetry.io/collector/processor/batchprocessor v0.90.1 go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.90.1 - go.opentelemetry.io/collector/receiver v0.90.0 + go.opentelemetry.io/collector/receiver v0.90.1 go.opentelemetry.io/collector/receiver/otlpreceiver v0.90.1 golang.org/x/sys v0.15.0 ) @@ -49,7 +49,7 @@ require ( github.com/hashicorp/go-version v1.6.0 // indirect github.com/inconshreveable/mousetrap v1.1.0 // indirect github.com/json-iterator/go v1.1.12 // indirect - github.com/klauspost/compress v1.17.3 // indirect + github.com/klauspost/compress v1.17.4 // indirect github.com/knadh/koanf/maps v0.1.1 // indirect github.com/knadh/koanf/providers/confmap v0.1.0 // indirect github.com/knadh/koanf/v2 v2.0.1 // indirect @@ -69,7 +69,7 @@ require ( github.com/prometheus/procfs v0.11.1 // indirect github.com/prometheus/statsd_exporter v0.22.7 // indirect github.com/rs/cors v1.10.1 // indirect - github.com/shirou/gopsutil/v3 v3.23.10 // indirect + github.com/shirou/gopsutil/v3 v3.23.11 // indirect github.com/shoenig/go-m1cpu v0.1.6 // indirect github.com/spf13/cobra v1.8.0 // indirect github.com/spf13/pflag v1.0.5 // indirect @@ -77,23 +77,23 @@ require ( github.com/tklauser/numcpus v0.6.1 // indirect github.com/yusufpapurcu/wmi v1.2.3 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector v0.90.0 // indirect - go.opentelemetry.io/collector/config/configauth v0.90.0 // indirect - go.opentelemetry.io/collector/config/configcompression v0.90.0 // indirect - go.opentelemetry.io/collector/config/configgrpc v0.90.0 // indirect - go.opentelemetry.io/collector/config/confighttp v0.90.0 // indirect - go.opentelemetry.io/collector/config/confignet v0.90.0 // indirect - go.opentelemetry.io/collector/config/configopaque v0.90.0 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.90.0 // indirect - go.opentelemetry.io/collector/config/configtls v0.90.0 // indirect - go.opentelemetry.io/collector/config/internal v0.90.0 // indirect - go.opentelemetry.io/collector/confmap v0.90.0 // indirect - go.opentelemetry.io/collector/consumer v0.90.0 // indirect - go.opentelemetry.io/collector/extension/auth v0.90.0 // indirect + go.opentelemetry.io/collector v0.90.1 // indirect + go.opentelemetry.io/collector/config/configauth v0.90.1 // indirect + go.opentelemetry.io/collector/config/configcompression v0.90.1 // indirect + go.opentelemetry.io/collector/config/configgrpc v0.90.1 // indirect + go.opentelemetry.io/collector/config/confighttp v0.90.1 // indirect + go.opentelemetry.io/collector/config/confignet v0.90.1 // indirect + go.opentelemetry.io/collector/config/configopaque v0.90.1 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.90.1 // indirect + go.opentelemetry.io/collector/config/configtls v0.90.1 // indirect + go.opentelemetry.io/collector/config/internal v0.90.1 // indirect + go.opentelemetry.io/collector/confmap v0.90.1 // indirect + go.opentelemetry.io/collector/consumer v0.90.1 // indirect + go.opentelemetry.io/collector/extension/auth v0.90.1 // indirect go.opentelemetry.io/collector/featuregate v1.0.0 // indirect go.opentelemetry.io/collector/pdata v1.0.0 // indirect - go.opentelemetry.io/collector/semconv v0.90.0 // indirect - go.opentelemetry.io/collector/service v0.90.0 // indirect + go.opentelemetry.io/collector/semconv v0.90.1 // indirect + go.opentelemetry.io/collector/service v0.90.1 // indirect go.opentelemetry.io/contrib/config v0.1.1 // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.1 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.46.1 // indirect diff --git a/cmd/otelcorecol/go.sum b/cmd/otelcorecol/go.sum index 81799022399..5e76dc6950d 100644 --- a/cmd/otelcorecol/go.sum +++ b/cmd/otelcorecol/go.sum @@ -188,8 +188,8 @@ github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7V github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM= github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= -github.com/klauspost/compress v1.17.3 h1:qkRjuerhUU1EmXLYGkSH6EZL+vPSxIrYjLNAK4slzwA= -github.com/klauspost/compress v1.17.3/go.mod h1:/dCuZOvVtNoHsyb+cuJD3itjs3NbnF6KH9zAO4BDxPM= +github.com/klauspost/compress v1.17.4 h1:Ej5ixsIri7BrIjBkRZLTo6ghwrEtHFk7ijlczPW4fZ4= +github.com/klauspost/compress v1.17.4/go.mod h1:/dCuZOvVtNoHsyb+cuJD3itjs3NbnF6KH9zAO4BDxPM= github.com/knadh/koanf/maps v0.1.1 h1:G5TjmUh2D7G2YWf5SQQqSiHRJEjaicvU0KpypqB3NIs= github.com/knadh/koanf/maps v0.1.1/go.mod h1:npD/QZY3V6ghQDdcQzl1W4ICNVTkohC8E73eI2xW4yI= github.com/knadh/koanf/providers/confmap v0.1.0 h1:gOkxhHkemwG4LezxxN8DMOFopOPghxRVp7JbIvdvqzU= @@ -271,8 +271,8 @@ github.com/rogpeppe/go-internal v1.11.0 h1:cWPaGQEPrBb5/AsnsZesgZZ9yb1OQ+GOISoDN github.com/rs/cors v1.10.1 h1:L0uuZVXIKlI1SShY2nhFfo44TYvDPQ1w4oFkUJNfhyo= github.com/rs/cors v1.10.1/go.mod h1:XyqrcTp5zjWr1wsJ8PIRZssZ8b/WMcMf71DJnit4EMU= github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= -github.com/shirou/gopsutil/v3 v3.23.10 h1:/N42opWlYzegYaVkWejXWJpbzKv2JDy3mrgGzKsh9hM= -github.com/shirou/gopsutil/v3 v3.23.10/go.mod h1:JIE26kpucQi+innVlAUnIEOSBhBUkirr5b44yr55+WE= +github.com/shirou/gopsutil/v3 v3.23.11 h1:i3jP9NjCPUz7FiZKxlMnODZkdSIp2gnzfrvsu9CuWEQ= +github.com/shirou/gopsutil/v3 v3.23.11/go.mod h1:1FrWgea594Jp7qmjHUUPlJDTPgcsb9mGnXDxavtikzM= github.com/shoenig/go-m1cpu v0.1.6 h1:nxdKQNcEB6vzgA2E2bvzKIYRuNj7XNJ4S/aRSwKzFtM= github.com/shoenig/go-m1cpu v0.1.6/go.mod h1:1JJMcUBvfNwpq05QDQVAnx3gUHr9IYF7GNg9SUEw2VQ= github.com/shoenig/test v0.6.4 h1:kVTaSd7WLz5WZ2IaoM0RSzRsUD+m8wRR+5qvntpn4LU= @@ -498,7 +498,6 @@ golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220708085239-5a0f0661e09d/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.15.0 h1:h48lPFYpsTvQJZF4EKyI4aLHaev3CxivZmv7yZig9pc= golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= diff --git a/component/go.mod b/component/go.mod index c58fe1f0e69..9721f92fe15 100644 --- a/component/go.mod +++ b/component/go.mod @@ -4,8 +4,8 @@ go 1.20 require ( github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/config/configtelemetry v0.90.0 - go.opentelemetry.io/collector/confmap v0.90.0 + go.opentelemetry.io/collector/config/configtelemetry v0.90.1 + go.opentelemetry.io/collector/confmap v0.90.1 go.opentelemetry.io/collector/pdata v1.0.0 go.opentelemetry.io/otel/metric v1.21.0 go.opentelemetry.io/otel/trace v1.21.0 diff --git a/config/configauth/go.mod b/config/configauth/go.mod index 30366c91dcc..e4f4440b4bd 100644 --- a/config/configauth/go.mod +++ b/config/configauth/go.mod @@ -4,9 +4,9 @@ go 1.20 require ( github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.90.0 - go.opentelemetry.io/collector/extension v0.90.0 - go.opentelemetry.io/collector/extension/auth v0.90.0 + go.opentelemetry.io/collector/component v0.90.1 + go.opentelemetry.io/collector/extension v0.90.1 + go.opentelemetry.io/collector/extension/auth v0.90.1 ) require ( @@ -21,8 +21,8 @@ require ( github.com/mitchellh/mapstructure v1.5.1-0.20220423185008-bf980b35cac4 // indirect github.com/mitchellh/reflectwalk v1.0.2 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.90.0 // indirect - go.opentelemetry.io/collector/confmap v0.90.0 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.90.1 // indirect + go.opentelemetry.io/collector/confmap v0.90.1 // indirect go.opentelemetry.io/collector/featuregate v1.0.0 // indirect go.opentelemetry.io/collector/pdata v1.0.0 // indirect go.opentelemetry.io/otel v1.21.0 // indirect diff --git a/config/configgrpc/go.mod b/config/configgrpc/go.mod index b268a2dc3d5..9a03fefc4ed 100644 --- a/config/configgrpc/go.mod +++ b/config/configgrpc/go.mod @@ -5,15 +5,15 @@ go 1.20 require ( github.com/mostynb/go-grpc-compression v1.2.2 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector v0.90.0 - go.opentelemetry.io/collector/component v0.90.0 - go.opentelemetry.io/collector/config/configauth v0.90.0 - go.opentelemetry.io/collector/config/configcompression v0.90.0 - go.opentelemetry.io/collector/config/confignet v0.90.0 - go.opentelemetry.io/collector/config/configopaque v0.90.0 - go.opentelemetry.io/collector/config/configtls v0.90.0 - go.opentelemetry.io/collector/config/internal v0.90.0 - go.opentelemetry.io/collector/extension/auth v0.90.0 + go.opentelemetry.io/collector v0.90.1 + go.opentelemetry.io/collector/component v0.90.1 + go.opentelemetry.io/collector/config/configauth v0.90.1 + go.opentelemetry.io/collector/config/configcompression v0.90.1 + go.opentelemetry.io/collector/config/confignet v0.90.1 + go.opentelemetry.io/collector/config/configopaque v0.90.1 + go.opentelemetry.io/collector/config/configtls v0.90.1 + go.opentelemetry.io/collector/config/internal v0.90.1 + go.opentelemetry.io/collector/extension/auth v0.90.1 go.opentelemetry.io/collector/pdata v1.0.0 go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.1 go.opentelemetry.io/otel v1.21.0 @@ -55,9 +55,9 @@ require ( github.com/prometheus/procfs v0.11.1 // indirect github.com/prometheus/statsd_exporter v0.22.7 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.90.0 // indirect - go.opentelemetry.io/collector/confmap v0.90.0 // indirect - go.opentelemetry.io/collector/extension v0.90.0 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.90.1 // indirect + go.opentelemetry.io/collector/confmap v0.90.1 // indirect + go.opentelemetry.io/collector/extension v0.90.1 // indirect go.opentelemetry.io/collector/featuregate v1.0.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.44.1-0.20231201153405-6027c1ae76f2 // indirect go.opentelemetry.io/otel/metric v1.21.0 // indirect diff --git a/config/confighttp/go.mod b/config/confighttp/go.mod index 341910e76ae..7f8860f26ff 100644 --- a/config/confighttp/go.mod +++ b/config/confighttp/go.mod @@ -4,18 +4,18 @@ go 1.20 require ( github.com/golang/snappy v0.0.4 - github.com/klauspost/compress v1.17.3 + github.com/klauspost/compress v1.17.4 github.com/rs/cors v1.10.1 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector v0.90.0 - go.opentelemetry.io/collector/component v0.90.0 - go.opentelemetry.io/collector/config/configauth v0.90.0 - go.opentelemetry.io/collector/config/configcompression v0.90.0 - go.opentelemetry.io/collector/config/configopaque v0.90.0 - go.opentelemetry.io/collector/config/configtelemetry v0.90.0 - go.opentelemetry.io/collector/config/configtls v0.90.0 - go.opentelemetry.io/collector/config/internal v0.90.0 - go.opentelemetry.io/collector/extension/auth v0.90.0 + go.opentelemetry.io/collector v0.90.1 + go.opentelemetry.io/collector/component v0.90.1 + go.opentelemetry.io/collector/config/configauth v0.90.1 + go.opentelemetry.io/collector/config/configcompression v0.90.1 + go.opentelemetry.io/collector/config/configopaque v0.90.1 + go.opentelemetry.io/collector/config/configtelemetry v0.90.1 + go.opentelemetry.io/collector/config/configtls v0.90.1 + go.opentelemetry.io/collector/config/internal v0.90.1 + go.opentelemetry.io/collector/extension/auth v0.90.1 go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.46.1 go.opentelemetry.io/otel v1.21.0 go.uber.org/zap v1.26.0 @@ -38,8 +38,8 @@ require ( github.com/mitchellh/mapstructure v1.5.1-0.20220423185008-bf980b35cac4 // indirect github.com/mitchellh/reflectwalk v1.0.2 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect - go.opentelemetry.io/collector/confmap v0.90.0 // indirect - go.opentelemetry.io/collector/extension v0.90.0 // indirect + go.opentelemetry.io/collector/confmap v0.90.1 // indirect + go.opentelemetry.io/collector/extension v0.90.1 // indirect go.opentelemetry.io/collector/featuregate v1.0.0 // indirect go.opentelemetry.io/collector/pdata v1.0.0 // indirect go.opentelemetry.io/otel/metric v1.21.0 // indirect diff --git a/config/confighttp/go.sum b/config/confighttp/go.sum index 721181594d7..cd1707d6675 100644 --- a/config/confighttp/go.sum +++ b/config/confighttp/go.sum @@ -23,8 +23,8 @@ github.com/hashicorp/go-version v1.6.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09 github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM= github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= -github.com/klauspost/compress v1.17.3 h1:qkRjuerhUU1EmXLYGkSH6EZL+vPSxIrYjLNAK4slzwA= -github.com/klauspost/compress v1.17.3/go.mod h1:/dCuZOvVtNoHsyb+cuJD3itjs3NbnF6KH9zAO4BDxPM= +github.com/klauspost/compress v1.17.4 h1:Ej5ixsIri7BrIjBkRZLTo6ghwrEtHFk7ijlczPW4fZ4= +github.com/klauspost/compress v1.17.4/go.mod h1:/dCuZOvVtNoHsyb+cuJD3itjs3NbnF6KH9zAO4BDxPM= github.com/knadh/koanf/maps v0.1.1 h1:G5TjmUh2D7G2YWf5SQQqSiHRJEjaicvU0KpypqB3NIs= github.com/knadh/koanf/maps v0.1.1/go.mod h1:npD/QZY3V6ghQDdcQzl1W4ICNVTkohC8E73eI2xW4yI= github.com/knadh/koanf/providers/confmap v0.1.0 h1:gOkxhHkemwG4LezxxN8DMOFopOPghxRVp7JbIvdvqzU= diff --git a/config/configtls/go.mod b/config/configtls/go.mod index 6113e3f2f04..a20d4e213e1 100644 --- a/config/configtls/go.mod +++ b/config/configtls/go.mod @@ -5,7 +5,7 @@ go 1.20 require ( github.com/fsnotify/fsnotify v1.7.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/config/configopaque v0.90.0 + go.opentelemetry.io/collector/config/configopaque v0.90.1 ) require ( diff --git a/connector/forwardconnector/go.mod b/connector/forwardconnector/go.mod index 47f25f45125..b8b5ddb99e3 100644 --- a/connector/forwardconnector/go.mod +++ b/connector/forwardconnector/go.mod @@ -4,9 +4,9 @@ go 1.20 require ( github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.90.0 - go.opentelemetry.io/collector/connector v0.90.0 - go.opentelemetry.io/collector/consumer v0.90.0 + go.opentelemetry.io/collector/component v0.90.1 + go.opentelemetry.io/collector/connector v0.90.1 + go.opentelemetry.io/collector/consumer v0.90.1 go.opentelemetry.io/collector/pdata v1.0.0 ) @@ -25,9 +25,9 @@ require ( 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/collector v0.90.0 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.90.0 // indirect - go.opentelemetry.io/collector/confmap v0.90.0 // indirect + go.opentelemetry.io/collector v0.90.1 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.90.1 // indirect + go.opentelemetry.io/collector/confmap v0.90.1 // indirect go.opentelemetry.io/collector/featuregate v1.0.0 // indirect go.opentelemetry.io/otel v1.21.0 // indirect go.opentelemetry.io/otel/metric v1.21.0 // indirect diff --git a/connector/go.mod b/connector/go.mod index 27046adaad5..a22cbd5a17d 100644 --- a/connector/go.mod +++ b/connector/go.mod @@ -4,9 +4,9 @@ go 1.20 require ( github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector v0.90.0 - go.opentelemetry.io/collector/component v0.90.0 - go.opentelemetry.io/collector/consumer v0.90.0 + go.opentelemetry.io/collector v0.90.1 + go.opentelemetry.io/collector/component v0.90.1 + go.opentelemetry.io/collector/consumer v0.90.1 go.opentelemetry.io/collector/pdata v1.0.0 go.uber.org/zap v1.26.0 ) @@ -26,8 +26,8 @@ require ( 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/collector/config/configtelemetry v0.90.0 // indirect - go.opentelemetry.io/collector/confmap v0.90.0 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.90.1 // indirect + go.opentelemetry.io/collector/confmap v0.90.1 // indirect go.opentelemetry.io/collector/featuregate v1.0.0 // indirect go.opentelemetry.io/otel v1.21.0 // indirect go.opentelemetry.io/otel/metric v1.21.0 // indirect diff --git a/consumer/go.mod b/consumer/go.mod index 4f4a164a102..eccc74c3ff1 100644 --- a/consumer/go.mod +++ b/consumer/go.mod @@ -4,7 +4,7 @@ go 1.20 require ( github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector v0.90.0 + go.opentelemetry.io/collector v0.90.1 go.opentelemetry.io/collector/pdata v1.0.0 ) diff --git a/exporter/debugexporter/go.mod b/exporter/debugexporter/go.mod index 8074fbc0690..9e6f2be90aa 100644 --- a/exporter/debugexporter/go.mod +++ b/exporter/debugexporter/go.mod @@ -4,10 +4,10 @@ go 1.20 require ( github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.90.0 - go.opentelemetry.io/collector/config/configtelemetry v0.90.0 - go.opentelemetry.io/collector/confmap v0.90.0 - go.opentelemetry.io/collector/exporter v0.90.0 + go.opentelemetry.io/collector/component v0.90.1 + go.opentelemetry.io/collector/config/configtelemetry v0.90.1 + go.opentelemetry.io/collector/confmap v0.90.1 + go.opentelemetry.io/collector/exporter v0.90.1 ) require ( @@ -27,12 +27,12 @@ require ( github.com/modern-go/reflect2 v1.0.2 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector v0.90.0 // indirect - go.opentelemetry.io/collector/consumer v0.90.0 // indirect - go.opentelemetry.io/collector/extension v0.90.0 // indirect + go.opentelemetry.io/collector v0.90.1 // indirect + go.opentelemetry.io/collector/consumer v0.90.1 // indirect + go.opentelemetry.io/collector/extension v0.90.1 // indirect go.opentelemetry.io/collector/featuregate v1.0.0 // indirect go.opentelemetry.io/collector/pdata v1.0.0 // indirect - go.opentelemetry.io/collector/receiver v0.90.0 // indirect + go.opentelemetry.io/collector/receiver v0.90.1 // indirect go.opentelemetry.io/otel v1.21.0 // indirect go.opentelemetry.io/otel/metric v1.21.0 // indirect go.opentelemetry.io/otel/trace v1.21.0 // indirect diff --git a/exporter/go.mod b/exporter/go.mod index fb830253e2b..8fb69073b20 100644 --- a/exporter/go.mod +++ b/exporter/go.mod @@ -6,14 +6,14 @@ require ( github.com/cenkalti/backoff/v4 v4.2.1 github.com/stretchr/testify v1.8.4 go.opencensus.io v0.24.0 - go.opentelemetry.io/collector v0.90.0 - go.opentelemetry.io/collector/component v0.90.0 - go.opentelemetry.io/collector/config/configtelemetry v0.90.0 - go.opentelemetry.io/collector/consumer v0.90.0 - go.opentelemetry.io/collector/extension v0.90.0 + go.opentelemetry.io/collector v0.90.1 + go.opentelemetry.io/collector/component v0.90.1 + go.opentelemetry.io/collector/config/configtelemetry v0.90.1 + go.opentelemetry.io/collector/consumer v0.90.1 + go.opentelemetry.io/collector/extension v0.90.1 go.opentelemetry.io/collector/featuregate v1.0.0 go.opentelemetry.io/collector/pdata v1.0.0 - go.opentelemetry.io/collector/receiver v0.90.0 + go.opentelemetry.io/collector/receiver v0.90.1 go.opentelemetry.io/otel v1.21.0 go.opentelemetry.io/otel/metric v1.21.0 go.opentelemetry.io/otel/sdk v1.21.0 @@ -53,7 +53,7 @@ require ( github.com/prometheus/common v0.45.0 // indirect github.com/prometheus/procfs v0.11.1 // indirect github.com/prometheus/statsd_exporter v0.22.7 // indirect - go.opentelemetry.io/collector/confmap v0.90.0 // indirect + go.opentelemetry.io/collector/confmap v0.90.1 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.44.1-0.20231201153405-6027c1ae76f2 // indirect go.opentelemetry.io/otel/sdk/metric v1.21.0 // indirect golang.org/x/net v0.18.0 // indirect diff --git a/exporter/loggingexporter/go.mod b/exporter/loggingexporter/go.mod index 0326312a5e3..8f0ea79e762 100644 --- a/exporter/loggingexporter/go.mod +++ b/exporter/loggingexporter/go.mod @@ -5,10 +5,10 @@ go 1.20 require ( github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.90.0 - go.opentelemetry.io/collector/config/configtelemetry v0.90.0 - go.opentelemetry.io/collector/confmap v0.90.0 - go.opentelemetry.io/collector/exporter v0.90.0 + go.opentelemetry.io/collector/component v0.90.1 + go.opentelemetry.io/collector/config/configtelemetry v0.90.1 + go.opentelemetry.io/collector/confmap v0.90.1 + go.opentelemetry.io/collector/exporter v0.90.1 go.uber.org/zap v1.26.0 ) @@ -29,12 +29,12 @@ require ( github.com/modern-go/reflect2 v1.0.2 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector v0.90.0 // indirect - go.opentelemetry.io/collector/consumer v0.90.0 // indirect - go.opentelemetry.io/collector/extension v0.90.0 // indirect + go.opentelemetry.io/collector v0.90.1 // indirect + go.opentelemetry.io/collector/consumer v0.90.1 // indirect + go.opentelemetry.io/collector/extension v0.90.1 // indirect go.opentelemetry.io/collector/featuregate v1.0.0 // indirect go.opentelemetry.io/collector/pdata v1.0.0 // indirect - go.opentelemetry.io/collector/receiver v0.90.0 // indirect + go.opentelemetry.io/collector/receiver v0.90.1 // indirect go.opentelemetry.io/otel v1.21.0 // indirect go.opentelemetry.io/otel/metric v1.21.0 // indirect go.opentelemetry.io/otel/trace v1.21.0 // indirect diff --git a/exporter/otlpexporter/go.mod b/exporter/otlpexporter/go.mod index 68a566bd3fe..b9fe031da6a 100644 --- a/exporter/otlpexporter/go.mod +++ b/exporter/otlpexporter/go.mod @@ -4,18 +4,18 @@ go 1.20 require ( github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector v0.90.0 - go.opentelemetry.io/collector/component v0.90.0 - go.opentelemetry.io/collector/config/configauth v0.90.0 - go.opentelemetry.io/collector/config/configcompression v0.90.0 - go.opentelemetry.io/collector/config/configgrpc v0.90.0 - go.opentelemetry.io/collector/config/configopaque v0.90.0 - go.opentelemetry.io/collector/config/configtls v0.90.0 - go.opentelemetry.io/collector/confmap v0.90.0 - go.opentelemetry.io/collector/consumer v0.90.0 - go.opentelemetry.io/collector/exporter v0.90.0 + go.opentelemetry.io/collector v0.90.1 + go.opentelemetry.io/collector/component v0.90.1 + go.opentelemetry.io/collector/config/configauth v0.90.1 + go.opentelemetry.io/collector/config/configcompression v0.90.1 + go.opentelemetry.io/collector/config/configgrpc v0.90.1 + go.opentelemetry.io/collector/config/configopaque v0.90.1 + go.opentelemetry.io/collector/config/configtls v0.90.1 + go.opentelemetry.io/collector/confmap v0.90.1 + go.opentelemetry.io/collector/consumer v0.90.1 + go.opentelemetry.io/collector/exporter v0.90.1 go.opentelemetry.io/collector/pdata v1.0.0 - go.opentelemetry.io/collector/receiver/otlpreceiver v0.90.0 + go.opentelemetry.io/collector/receiver/otlpreceiver v0.90.1 google.golang.org/genproto/googleapis/rpc v0.0.0-20231127180814-3a041ad873d4 google.golang.org/grpc v1.59.0 google.golang.org/protobuf v1.31.0 @@ -34,7 +34,7 @@ require ( github.com/golang/snappy v0.0.4 // indirect github.com/hashicorp/go-version v1.6.0 // indirect github.com/json-iterator/go v1.1.12 // indirect - github.com/klauspost/compress v1.17.3 // indirect + github.com/klauspost/compress v1.17.4 // indirect github.com/knadh/koanf/maps v0.1.1 // indirect github.com/knadh/koanf/providers/confmap v0.1.0 // indirect github.com/knadh/koanf/v2 v2.0.1 // indirect @@ -47,14 +47,14 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rs/cors v1.10.1 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/config/confighttp v0.90.0 // indirect - go.opentelemetry.io/collector/config/confignet v0.90.0 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.90.0 // indirect - go.opentelemetry.io/collector/config/internal v0.90.0 // indirect - go.opentelemetry.io/collector/extension v0.90.0 // indirect - go.opentelemetry.io/collector/extension/auth v0.90.0 // indirect + go.opentelemetry.io/collector/config/confighttp v0.90.1 // indirect + go.opentelemetry.io/collector/config/confignet v0.90.1 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.90.1 // indirect + go.opentelemetry.io/collector/config/internal v0.90.1 // indirect + go.opentelemetry.io/collector/extension v0.90.1 // indirect + go.opentelemetry.io/collector/extension/auth v0.90.1 // indirect go.opentelemetry.io/collector/featuregate v1.0.0 // indirect - go.opentelemetry.io/collector/receiver v0.90.0 // indirect + go.opentelemetry.io/collector/receiver v0.90.1 // indirect go.opentelemetry.io/contrib/config v0.1.1 // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.1 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.46.1 // indirect diff --git a/exporter/otlpexporter/go.sum b/exporter/otlpexporter/go.sum index 004f05c9295..967095032b5 100644 --- a/exporter/otlpexporter/go.sum +++ b/exporter/otlpexporter/go.sum @@ -68,8 +68,8 @@ github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnr github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo= github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= -github.com/klauspost/compress v1.17.3 h1:qkRjuerhUU1EmXLYGkSH6EZL+vPSxIrYjLNAK4slzwA= -github.com/klauspost/compress v1.17.3/go.mod h1:/dCuZOvVtNoHsyb+cuJD3itjs3NbnF6KH9zAO4BDxPM= +github.com/klauspost/compress v1.17.4 h1:Ej5ixsIri7BrIjBkRZLTo6ghwrEtHFk7ijlczPW4fZ4= +github.com/klauspost/compress v1.17.4/go.mod h1:/dCuZOvVtNoHsyb+cuJD3itjs3NbnF6KH9zAO4BDxPM= github.com/knadh/koanf/maps v0.1.1 h1:G5TjmUh2D7G2YWf5SQQqSiHRJEjaicvU0KpypqB3NIs= github.com/knadh/koanf/maps v0.1.1/go.mod h1:npD/QZY3V6ghQDdcQzl1W4ICNVTkohC8E73eI2xW4yI= github.com/knadh/koanf/providers/confmap v0.1.0 h1:gOkxhHkemwG4LezxxN8DMOFopOPghxRVp7JbIvdvqzU= diff --git a/exporter/otlphttpexporter/go.mod b/exporter/otlphttpexporter/go.mod index 8908029f0d3..be325d3be6f 100644 --- a/exporter/otlphttpexporter/go.mod +++ b/exporter/otlphttpexporter/go.mod @@ -4,18 +4,18 @@ go 1.20 require ( github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector v0.90.0 - go.opentelemetry.io/collector/component v0.90.0 - go.opentelemetry.io/collector/config/configcompression v0.90.0 - go.opentelemetry.io/collector/config/confighttp v0.90.0 - go.opentelemetry.io/collector/config/configopaque v0.90.0 - go.opentelemetry.io/collector/config/configtls v0.90.0 - go.opentelemetry.io/collector/confmap v0.90.0 - go.opentelemetry.io/collector/consumer v0.90.0 - go.opentelemetry.io/collector/exporter v0.90.0 + go.opentelemetry.io/collector v0.90.1 + go.opentelemetry.io/collector/component v0.90.1 + go.opentelemetry.io/collector/config/configcompression v0.90.1 + go.opentelemetry.io/collector/config/confighttp v0.90.1 + go.opentelemetry.io/collector/config/configopaque v0.90.1 + go.opentelemetry.io/collector/config/configtls v0.90.1 + go.opentelemetry.io/collector/confmap v0.90.1 + go.opentelemetry.io/collector/consumer v0.90.1 + go.opentelemetry.io/collector/exporter v0.90.1 go.opentelemetry.io/collector/pdata v1.0.0 - go.opentelemetry.io/collector/receiver v0.90.0 - go.opentelemetry.io/collector/receiver/otlpreceiver v0.90.0 + go.opentelemetry.io/collector/receiver v0.90.1 + go.opentelemetry.io/collector/receiver/otlpreceiver v0.90.1 go.uber.org/zap v1.26.0 google.golang.org/genproto/googleapis/rpc v0.0.0-20231127180814-3a041ad873d4 google.golang.org/grpc v1.59.0 @@ -35,7 +35,7 @@ require ( github.com/golang/snappy v0.0.4 // indirect github.com/hashicorp/go-version v1.6.0 // indirect github.com/json-iterator/go v1.1.12 // indirect - github.com/klauspost/compress v1.17.3 // indirect + github.com/klauspost/compress v1.17.4 // indirect github.com/knadh/koanf/maps v0.1.1 // indirect github.com/knadh/koanf/providers/confmap v0.1.0 // indirect github.com/knadh/koanf/v2 v2.0.1 // indirect @@ -48,13 +48,13 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rs/cors v1.10.1 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/config/configauth v0.90.0 // indirect - go.opentelemetry.io/collector/config/configgrpc v0.90.0 // indirect - go.opentelemetry.io/collector/config/confignet v0.90.0 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.90.0 // indirect - go.opentelemetry.io/collector/config/internal v0.90.0 // indirect - go.opentelemetry.io/collector/extension v0.90.0 // indirect - go.opentelemetry.io/collector/extension/auth v0.90.0 // indirect + go.opentelemetry.io/collector/config/configauth v0.90.1 // indirect + go.opentelemetry.io/collector/config/configgrpc v0.90.1 // indirect + go.opentelemetry.io/collector/config/confignet v0.90.1 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.90.1 // indirect + go.opentelemetry.io/collector/config/internal v0.90.1 // indirect + go.opentelemetry.io/collector/extension v0.90.1 // indirect + go.opentelemetry.io/collector/extension/auth v0.90.1 // indirect go.opentelemetry.io/collector/featuregate v1.0.0 // indirect go.opentelemetry.io/contrib/config v0.1.1 // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.1 // indirect diff --git a/exporter/otlphttpexporter/go.sum b/exporter/otlphttpexporter/go.sum index 004f05c9295..967095032b5 100644 --- a/exporter/otlphttpexporter/go.sum +++ b/exporter/otlphttpexporter/go.sum @@ -68,8 +68,8 @@ github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnr github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo= github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= -github.com/klauspost/compress v1.17.3 h1:qkRjuerhUU1EmXLYGkSH6EZL+vPSxIrYjLNAK4slzwA= -github.com/klauspost/compress v1.17.3/go.mod h1:/dCuZOvVtNoHsyb+cuJD3itjs3NbnF6KH9zAO4BDxPM= +github.com/klauspost/compress v1.17.4 h1:Ej5ixsIri7BrIjBkRZLTo6ghwrEtHFk7ijlczPW4fZ4= +github.com/klauspost/compress v1.17.4/go.mod h1:/dCuZOvVtNoHsyb+cuJD3itjs3NbnF6KH9zAO4BDxPM= github.com/knadh/koanf/maps v0.1.1 h1:G5TjmUh2D7G2YWf5SQQqSiHRJEjaicvU0KpypqB3NIs= github.com/knadh/koanf/maps v0.1.1/go.mod h1:npD/QZY3V6ghQDdcQzl1W4ICNVTkohC8E73eI2xW4yI= github.com/knadh/koanf/providers/confmap v0.1.0 h1:gOkxhHkemwG4LezxxN8DMOFopOPghxRVp7JbIvdvqzU= diff --git a/extension/auth/go.mod b/extension/auth/go.mod index af743158a04..0e6de3b51e4 100644 --- a/extension/auth/go.mod +++ b/extension/auth/go.mod @@ -4,8 +4,8 @@ go 1.20 require ( github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.90.0 - go.opentelemetry.io/collector/extension v0.90.0 + go.opentelemetry.io/collector/component v0.90.1 + go.opentelemetry.io/collector/extension v0.90.1 google.golang.org/grpc v1.59.0 ) @@ -21,8 +21,8 @@ require ( github.com/mitchellh/mapstructure v1.5.1-0.20220423185008-bf980b35cac4 // indirect github.com/mitchellh/reflectwalk v1.0.2 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.90.0 // indirect - go.opentelemetry.io/collector/confmap v0.90.0 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.90.1 // indirect + go.opentelemetry.io/collector/confmap v0.90.1 // indirect go.opentelemetry.io/collector/featuregate v1.0.0 // indirect go.opentelemetry.io/collector/pdata v1.0.0 // indirect go.opentelemetry.io/otel v1.21.0 // indirect diff --git a/extension/ballastextension/go.mod b/extension/ballastextension/go.mod index 12b31d4778d..ea583df9cb1 100644 --- a/extension/ballastextension/go.mod +++ b/extension/ballastextension/go.mod @@ -4,10 +4,10 @@ go 1.20 require ( github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector v0.90.0 - go.opentelemetry.io/collector/component v0.90.0 - go.opentelemetry.io/collector/confmap v0.90.0 - go.opentelemetry.io/collector/extension v0.90.0 + go.opentelemetry.io/collector v0.90.1 + go.opentelemetry.io/collector/component v0.90.1 + go.opentelemetry.io/collector/confmap v0.90.1 + go.opentelemetry.io/collector/extension v0.90.1 go.uber.org/zap v1.26.0 ) @@ -26,11 +26,11 @@ require ( github.com/mitchellh/reflectwalk v1.0.2 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect - github.com/shirou/gopsutil/v3 v3.23.10 // indirect + github.com/shirou/gopsutil/v3 v3.23.11 // indirect github.com/tklauser/go-sysconf v0.3.12 // indirect github.com/tklauser/numcpus v0.6.1 // indirect github.com/yusufpapurcu/wmi v1.2.3 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.90.0 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.90.1 // indirect go.opentelemetry.io/collector/featuregate v1.0.0 // indirect go.opentelemetry.io/collector/pdata v1.0.0 // indirect go.opentelemetry.io/otel v1.21.0 // indirect diff --git a/extension/ballastextension/go.sum b/extension/ballastextension/go.sum index ca39b8f14b6..c846c8bcb83 100644 --- a/extension/ballastextension/go.sum +++ b/extension/ballastextension/go.sum @@ -40,8 +40,8 @@ github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZN github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c h1:ncq/mPwQF4JjgDlrVEn3C11VoGHZN7m8qihwgMEtzYw= github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c/go.mod h1:OmDBASR4679mdNQnz2pUhc2G8CO2JrUAVFDRBDP/hJE= github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ= -github.com/shirou/gopsutil/v3 v3.23.10 h1:/N42opWlYzegYaVkWejXWJpbzKv2JDy3mrgGzKsh9hM= -github.com/shirou/gopsutil/v3 v3.23.10/go.mod h1:JIE26kpucQi+innVlAUnIEOSBhBUkirr5b44yr55+WE= +github.com/shirou/gopsutil/v3 v3.23.11 h1:i3jP9NjCPUz7FiZKxlMnODZkdSIp2gnzfrvsu9CuWEQ= +github.com/shirou/gopsutil/v3 v3.23.11/go.mod h1:1FrWgea594Jp7qmjHUUPlJDTPgcsb9mGnXDxavtikzM= github.com/shoenig/go-m1cpu v0.1.6/go.mod h1:1JJMcUBvfNwpq05QDQVAnx3gUHr9IYF7GNg9SUEw2VQ= github.com/shoenig/test v0.6.4/go.mod h1:byHiCGXqrVaflBLAMq/srcZIHynQPQgeyvkvXnjqq0k= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= @@ -91,7 +91,6 @@ golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20201204225414-ed752295db88/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.15.0 h1:h48lPFYpsTvQJZF4EKyI4aLHaev3CxivZmv7yZig9pc= golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= diff --git a/extension/go.mod b/extension/go.mod index 1cc7e26225d..048623b467f 100644 --- a/extension/go.mod +++ b/extension/go.mod @@ -4,8 +4,8 @@ go 1.20 require ( github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.90.0 - go.opentelemetry.io/collector/confmap v0.90.0 + go.opentelemetry.io/collector/component v0.90.1 + go.opentelemetry.io/collector/confmap v0.90.1 ) require ( @@ -20,7 +20,7 @@ require ( github.com/mitchellh/mapstructure v1.5.1-0.20220423185008-bf980b35cac4 // indirect github.com/mitchellh/reflectwalk v1.0.2 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.90.0 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.90.1 // indirect go.opentelemetry.io/collector/featuregate v1.0.0 // indirect go.opentelemetry.io/collector/pdata v1.0.0 // indirect go.opentelemetry.io/otel v1.21.0 // indirect diff --git a/extension/zpagesextension/go.mod b/extension/zpagesextension/go.mod index b8068c922f4..d4f1710e39a 100644 --- a/extension/zpagesextension/go.mod +++ b/extension/zpagesextension/go.mod @@ -4,11 +4,11 @@ go 1.20 require ( github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector v0.90.0 - go.opentelemetry.io/collector/component v0.90.0 - go.opentelemetry.io/collector/config/confignet v0.90.0 - go.opentelemetry.io/collector/confmap v0.90.0 - go.opentelemetry.io/collector/extension v0.90.0 + go.opentelemetry.io/collector v0.90.1 + go.opentelemetry.io/collector/component v0.90.1 + go.opentelemetry.io/collector/config/confignet v0.90.1 + go.opentelemetry.io/collector/confmap v0.90.1 + go.opentelemetry.io/collector/extension v0.90.1 go.opentelemetry.io/contrib/zpages v0.46.1 go.opentelemetry.io/otel/sdk v1.21.0 go.opentelemetry.io/otel/trace v1.21.0 @@ -29,7 +29,7 @@ require ( github.com/mitchellh/mapstructure v1.5.1-0.20220423185008-bf980b35cac4 // indirect github.com/mitchellh/reflectwalk v1.0.2 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.90.0 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.90.1 // indirect go.opentelemetry.io/collector/featuregate v1.0.0 // indirect go.opentelemetry.io/collector/pdata v1.0.0 // indirect go.opentelemetry.io/contrib/config v0.1.1 // indirect diff --git a/go.mod b/go.mod index 526b2f74ec5..1a230cf62e7 100644 --- a/go.mod +++ b/go.mod @@ -7,18 +7,18 @@ require ( github.com/prometheus/client_golang v1.17.0 github.com/prometheus/client_model v0.5.0 github.com/prometheus/common v0.45.0 - github.com/shirou/gopsutil/v3 v3.23.10 + github.com/shirou/gopsutil/v3 v3.23.11 github.com/stretchr/testify v1.8.4 go.opencensus.io v0.24.0 - go.opentelemetry.io/collector/component v0.90.0 - go.opentelemetry.io/collector/config/configtelemetry v0.90.0 - go.opentelemetry.io/collector/connector v0.90.0 - go.opentelemetry.io/collector/consumer v0.90.0 - go.opentelemetry.io/collector/exporter v0.90.0 + go.opentelemetry.io/collector/component v0.90.1 + go.opentelemetry.io/collector/config/configtelemetry v0.90.1 + go.opentelemetry.io/collector/connector v0.90.1 + go.opentelemetry.io/collector/consumer v0.90.1 + go.opentelemetry.io/collector/exporter v0.90.1 go.opentelemetry.io/collector/featuregate v1.0.0 go.opentelemetry.io/collector/pdata v1.0.0 - go.opentelemetry.io/collector/processor v0.90.0 - go.opentelemetry.io/collector/receiver v0.90.0 + go.opentelemetry.io/collector/processor v0.90.1 + go.opentelemetry.io/collector/receiver v0.90.1 go.opentelemetry.io/contrib/config v0.1.1 go.opentelemetry.io/otel v1.21.0 go.opentelemetry.io/otel/exporters/prometheus v0.44.1-0.20231201153405-6027c1ae76f2 @@ -59,8 +59,8 @@ require ( github.com/tklauser/go-sysconf v0.3.12 // indirect github.com/tklauser/numcpus v0.6.1 // indirect github.com/yusufpapurcu/wmi v1.2.3 // indirect - go.opentelemetry.io/collector/confmap v0.90.0 // indirect - go.opentelemetry.io/collector/extension v0.90.0 // indirect + go.opentelemetry.io/collector/confmap v0.90.1 // indirect + go.opentelemetry.io/collector/extension v0.90.1 // indirect go.opentelemetry.io/otel/metric v1.21.0 // indirect go.opentelemetry.io/otel/trace v1.21.0 // indirect go.uber.org/goleak v1.2.1 // indirect diff --git a/go.sum b/go.sum index 629c196c0e3..949bf77509d 100644 --- a/go.sum +++ b/go.sum @@ -244,8 +244,8 @@ github.com/prometheus/statsd_exporter v0.22.7 h1:7Pji/i2GuhK6Lu7DHrtTkFmNBCudCPT github.com/prometheus/statsd_exporter v0.22.7/go.mod h1:N/TevpjkIh9ccs6nuzY3jQn9dFqnUakOjnEuMPJJJnI= github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ= -github.com/shirou/gopsutil/v3 v3.23.10 h1:/N42opWlYzegYaVkWejXWJpbzKv2JDy3mrgGzKsh9hM= -github.com/shirou/gopsutil/v3 v3.23.10/go.mod h1:JIE26kpucQi+innVlAUnIEOSBhBUkirr5b44yr55+WE= +github.com/shirou/gopsutil/v3 v3.23.11 h1:i3jP9NjCPUz7FiZKxlMnODZkdSIp2gnzfrvsu9CuWEQ= +github.com/shirou/gopsutil/v3 v3.23.11/go.mod h1:1FrWgea594Jp7qmjHUUPlJDTPgcsb9mGnXDxavtikzM= github.com/shoenig/go-m1cpu v0.1.6/go.mod h1:1JJMcUBvfNwpq05QDQVAnx3gUHr9IYF7GNg9SUEw2VQ= github.com/shoenig/test v0.6.4/go.mod h1:byHiCGXqrVaflBLAMq/srcZIHynQPQgeyvkvXnjqq0k= github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= @@ -437,7 +437,6 @@ golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220708085239-5a0f0661e09d/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.15.0 h1:h48lPFYpsTvQJZF4EKyI4aLHaev3CxivZmv7yZig9pc= golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= diff --git a/internal/tools/go.mod b/internal/tools/go.mod index 1783fe5cf1d..c961dd23bb4 100644 --- a/internal/tools/go.mod +++ b/internal/tools/go.mod @@ -8,7 +8,7 @@ require ( github.com/golangci/golangci-lint v1.55.2 github.com/google/addlicense v1.1.1 github.com/jcchavezs/porto v0.6.0 - github.com/mikefarah/yq/v4 v4.40.3 + github.com/mikefarah/yq/v4 v4.40.4 github.com/pavius/impi v0.0.3 go.opentelemetry.io/build-tools/checkfile v0.12.0 go.opentelemetry.io/build-tools/chloggen v0.12.0 diff --git a/internal/tools/go.sum b/internal/tools/go.sum index db441af5172..c2c5eadee62 100644 --- a/internal/tools/go.sum +++ b/internal/tools/go.sum @@ -436,8 +436,8 @@ github.com/mbilski/exhaustivestruct v1.2.0 h1:wCBmUnSYufAHO6J4AVWY6ff+oxWxsVFrwg github.com/mbilski/exhaustivestruct v1.2.0/go.mod h1:OeTBVxQWoEmB2J2JCHmXWPJ0aksxSUOUy+nvtVEfzXc= github.com/mgechev/revive v1.3.4 h1:k/tO3XTaWY4DEHal9tWBkkUMJYO/dLDVyMmAQxmIMDc= github.com/mgechev/revive v1.3.4/go.mod h1:W+pZCMu9qj8Uhfs1iJMQsEFLRozUfvwFwqVvRbSNLVw= -github.com/mikefarah/yq/v4 v4.40.3 h1:pSJua3IGua3O+HFXp5LkMheqEOHMRQAkkCcgVhqi4VY= -github.com/mikefarah/yq/v4 v4.40.3/go.mod h1:TSqdLNAFlwmIGQBQYIzeOX+wDWkCTWfRGWDrxQwGCaQ= +github.com/mikefarah/yq/v4 v4.40.4 h1:xLoMgs3ORN9Qqiq63q86lPZf6VXyPXTuXFhyWaKImFM= +github.com/mikefarah/yq/v4 v4.40.4/go.mod h1:yCG9Y1pdzkpPqWWooozMTcbVb67rslEVaDnigLPhuqg= github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y= github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= github.com/mitchellh/mapstructure v1.5.1-0.20220423185008-bf980b35cac4 h1:BpfhmLKZf+SjVanKKhCgf3bg+511DmU9eDQTen7LLbY= diff --git a/otelcol/go.mod b/otelcol/go.mod index ae937521476..a859a4890e7 100644 --- a/otelcol/go.mod +++ b/otelcol/go.mod @@ -5,16 +5,16 @@ go 1.20 require ( github.com/spf13/cobra v1.8.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.90.0 - go.opentelemetry.io/collector/config/configtelemetry v0.90.0 - go.opentelemetry.io/collector/confmap v0.90.0 - go.opentelemetry.io/collector/connector v0.90.0 - go.opentelemetry.io/collector/exporter v0.90.0 - go.opentelemetry.io/collector/extension v0.90.0 + go.opentelemetry.io/collector/component v0.90.1 + go.opentelemetry.io/collector/config/configtelemetry v0.90.1 + go.opentelemetry.io/collector/confmap v0.90.1 + go.opentelemetry.io/collector/connector v0.90.1 + go.opentelemetry.io/collector/exporter v0.90.1 + go.opentelemetry.io/collector/extension v0.90.1 go.opentelemetry.io/collector/featuregate v1.0.0 - go.opentelemetry.io/collector/processor v0.90.0 - go.opentelemetry.io/collector/receiver v0.90.0 - go.opentelemetry.io/collector/service v0.90.0 + go.opentelemetry.io/collector/processor v0.90.1 + go.opentelemetry.io/collector/receiver v0.90.1 + go.opentelemetry.io/collector/service v0.90.1 go.uber.org/multierr v1.11.0 go.uber.org/zap v1.26.0 golang.org/x/sys v0.15.0 @@ -58,17 +58,17 @@ require ( github.com/prometheus/common v0.45.0 // indirect github.com/prometheus/procfs v0.11.1 // indirect github.com/prometheus/statsd_exporter v0.22.7 // indirect - github.com/shirou/gopsutil/v3 v3.23.10 // indirect + github.com/shirou/gopsutil/v3 v3.23.11 // indirect github.com/shoenig/go-m1cpu v0.1.6 // indirect github.com/spf13/pflag v1.0.5 // indirect github.com/tklauser/go-sysconf v0.3.12 // indirect github.com/tklauser/numcpus v0.6.1 // indirect github.com/yusufpapurcu/wmi v1.2.3 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector v0.90.0 // indirect - go.opentelemetry.io/collector/consumer v0.90.0 // indirect + go.opentelemetry.io/collector v0.90.1 // indirect + go.opentelemetry.io/collector/consumer v0.90.1 // indirect go.opentelemetry.io/collector/pdata v1.0.0 // indirect - go.opentelemetry.io/collector/semconv v0.90.0 // indirect + go.opentelemetry.io/collector/semconv v0.90.1 // indirect go.opentelemetry.io/contrib/config v0.1.1 // indirect go.opentelemetry.io/contrib/propagators/b3 v1.21.1 // indirect go.opentelemetry.io/otel v1.21.0 // indirect diff --git a/otelcol/go.sum b/otelcol/go.sum index 4b37695d47e..72fde5f571c 100644 --- a/otelcol/go.sum +++ b/otelcol/go.sum @@ -253,8 +253,8 @@ github.com/prometheus/statsd_exporter v0.22.7/go.mod h1:N/TevpjkIh9ccs6nuzY3jQn9 github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= github.com/rogpeppe/go-internal v1.11.0 h1:cWPaGQEPrBb5/AsnsZesgZZ9yb1OQ+GOISoDNXVBh4M= github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= -github.com/shirou/gopsutil/v3 v3.23.10 h1:/N42opWlYzegYaVkWejXWJpbzKv2JDy3mrgGzKsh9hM= -github.com/shirou/gopsutil/v3 v3.23.10/go.mod h1:JIE26kpucQi+innVlAUnIEOSBhBUkirr5b44yr55+WE= +github.com/shirou/gopsutil/v3 v3.23.11 h1:i3jP9NjCPUz7FiZKxlMnODZkdSIp2gnzfrvsu9CuWEQ= +github.com/shirou/gopsutil/v3 v3.23.11/go.mod h1:1FrWgea594Jp7qmjHUUPlJDTPgcsb9mGnXDxavtikzM= github.com/shoenig/go-m1cpu v0.1.6 h1:nxdKQNcEB6vzgA2E2bvzKIYRuNj7XNJ4S/aRSwKzFtM= github.com/shoenig/go-m1cpu v0.1.6/go.mod h1:1JJMcUBvfNwpq05QDQVAnx3gUHr9IYF7GNg9SUEw2VQ= github.com/shoenig/test v0.6.4 h1:kVTaSd7WLz5WZ2IaoM0RSzRsUD+m8wRR+5qvntpn4LU= @@ -473,7 +473,6 @@ golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220708085239-5a0f0661e09d/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.15.0 h1:h48lPFYpsTvQJZF4EKyI4aLHaev3CxivZmv7yZig9pc= golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= diff --git a/processor/batchprocessor/go.mod b/processor/batchprocessor/go.mod index cdd94538af6..d35ad1f14df 100644 --- a/processor/batchprocessor/go.mod +++ b/processor/batchprocessor/go.mod @@ -9,13 +9,13 @@ require ( github.com/prometheus/common v0.45.0 github.com/stretchr/testify v1.8.4 go.opencensus.io v0.24.0 - go.opentelemetry.io/collector v0.90.0 - go.opentelemetry.io/collector/component v0.90.0 - go.opentelemetry.io/collector/config/configtelemetry v0.90.0 - go.opentelemetry.io/collector/confmap v0.90.0 - go.opentelemetry.io/collector/consumer v0.90.0 + go.opentelemetry.io/collector v0.90.1 + go.opentelemetry.io/collector/component v0.90.1 + go.opentelemetry.io/collector/config/configtelemetry v0.90.1 + go.opentelemetry.io/collector/confmap v0.90.1 + go.opentelemetry.io/collector/consumer v0.90.1 go.opentelemetry.io/collector/pdata v1.0.0 - go.opentelemetry.io/collector/processor v0.90.0 + go.opentelemetry.io/collector/processor v0.90.1 go.opentelemetry.io/otel v1.21.0 go.opentelemetry.io/otel/exporters/prometheus v0.44.1-0.20231201153405-6027c1ae76f2 go.opentelemetry.io/otel/metric v1.21.0 diff --git a/processor/go.mod b/processor/go.mod index 34e2df1c366..cb96f7d7dbf 100644 --- a/processor/go.mod +++ b/processor/go.mod @@ -5,10 +5,10 @@ go 1.20 require ( github.com/stretchr/testify v1.8.4 go.opencensus.io v0.24.0 - go.opentelemetry.io/collector v0.90.0 - go.opentelemetry.io/collector/component v0.90.0 - go.opentelemetry.io/collector/config/configtelemetry v0.90.0 - go.opentelemetry.io/collector/consumer v0.90.0 + go.opentelemetry.io/collector v0.90.1 + go.opentelemetry.io/collector/component v0.90.1 + go.opentelemetry.io/collector/config/configtelemetry v0.90.1 + go.opentelemetry.io/collector/consumer v0.90.1 go.opentelemetry.io/collector/featuregate v1.0.0 go.opentelemetry.io/collector/pdata v1.0.0 go.opentelemetry.io/otel v1.21.0 @@ -47,7 +47,7 @@ require ( github.com/prometheus/common v0.45.0 // indirect github.com/prometheus/procfs v0.11.1 // indirect github.com/prometheus/statsd_exporter v0.22.7 // indirect - go.opentelemetry.io/collector/confmap v0.90.0 // indirect + go.opentelemetry.io/collector/confmap v0.90.1 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.44.1-0.20231201153405-6027c1ae76f2 // indirect go.opentelemetry.io/otel/sdk v1.21.0 // indirect go.opentelemetry.io/otel/sdk/metric v1.21.0 // indirect diff --git a/processor/memorylimiterprocessor/go.mod b/processor/memorylimiterprocessor/go.mod index 2e534afade8..6040afecec0 100644 --- a/processor/memorylimiterprocessor/go.mod +++ b/processor/memorylimiterprocessor/go.mod @@ -4,13 +4,13 @@ go 1.20 require ( github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector v0.90.0 - go.opentelemetry.io/collector/component v0.90.0 - go.opentelemetry.io/collector/config/configtelemetry v0.90.0 - go.opentelemetry.io/collector/confmap v0.90.0 - go.opentelemetry.io/collector/consumer v0.90.0 + go.opentelemetry.io/collector v0.90.1 + go.opentelemetry.io/collector/component v0.90.1 + go.opentelemetry.io/collector/config/configtelemetry v0.90.1 + go.opentelemetry.io/collector/confmap v0.90.1 + go.opentelemetry.io/collector/consumer v0.90.1 go.opentelemetry.io/collector/pdata v1.0.0 - go.opentelemetry.io/collector/processor v0.90.0 + go.opentelemetry.io/collector/processor v0.90.1 go.uber.org/zap v1.26.0 ) @@ -32,7 +32,7 @@ require ( github.com/modern-go/reflect2 v1.0.2 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect - github.com/shirou/gopsutil/v3 v3.23.10 // indirect + github.com/shirou/gopsutil/v3 v3.23.11 // indirect github.com/tklauser/go-sysconf v0.3.12 // indirect github.com/tklauser/numcpus v0.6.1 // indirect github.com/yusufpapurcu/wmi v1.2.3 // indirect diff --git a/processor/memorylimiterprocessor/go.sum b/processor/memorylimiterprocessor/go.sum index de6b998fc84..5d02440cfbf 100644 --- a/processor/memorylimiterprocessor/go.sum +++ b/processor/memorylimiterprocessor/go.sum @@ -89,8 +89,8 @@ github.com/prometheus/common v0.45.0 h1:2BGz0eBc2hdMDLnO/8n0jeB3oPrt2D08CekT0lne github.com/prometheus/procfs v0.11.1 h1:xRC8Iq1yyca5ypa9n1EZnWZkt7dwcoRPQwX/5gwaUuI= github.com/prometheus/statsd_exporter v0.22.7 h1:7Pji/i2GuhK6Lu7DHrtTkFmNBCudCPT1pX2CziuyQR0= github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ= -github.com/shirou/gopsutil/v3 v3.23.10 h1:/N42opWlYzegYaVkWejXWJpbzKv2JDy3mrgGzKsh9hM= -github.com/shirou/gopsutil/v3 v3.23.10/go.mod h1:JIE26kpucQi+innVlAUnIEOSBhBUkirr5b44yr55+WE= +github.com/shirou/gopsutil/v3 v3.23.11 h1:i3jP9NjCPUz7FiZKxlMnODZkdSIp2gnzfrvsu9CuWEQ= +github.com/shirou/gopsutil/v3 v3.23.11/go.mod h1:1FrWgea594Jp7qmjHUUPlJDTPgcsb9mGnXDxavtikzM= github.com/shoenig/go-m1cpu v0.1.6/go.mod h1:1JJMcUBvfNwpq05QDQVAnx3gUHr9IYF7GNg9SUEw2VQ= github.com/shoenig/test v0.6.4/go.mod h1:byHiCGXqrVaflBLAMq/srcZIHynQPQgeyvkvXnjqq0k= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= @@ -160,7 +160,6 @@ golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20201204225414-ed752295db88/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.15.0 h1:h48lPFYpsTvQJZF4EKyI4aLHaev3CxivZmv7yZig9pc= golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= diff --git a/receiver/go.mod b/receiver/go.mod index 7f59aa433af..6c1c020793d 100644 --- a/receiver/go.mod +++ b/receiver/go.mod @@ -5,10 +5,10 @@ go 1.20 require ( github.com/stretchr/testify v1.8.4 go.opencensus.io v0.24.0 - go.opentelemetry.io/collector v0.90.0 - go.opentelemetry.io/collector/component v0.90.0 - go.opentelemetry.io/collector/config/configtelemetry v0.90.0 - go.opentelemetry.io/collector/consumer v0.90.0 + go.opentelemetry.io/collector v0.90.1 + go.opentelemetry.io/collector/component v0.90.1 + go.opentelemetry.io/collector/config/configtelemetry v0.90.1 + go.opentelemetry.io/collector/consumer v0.90.1 go.opentelemetry.io/collector/featuregate v1.0.0 go.opentelemetry.io/collector/pdata v1.0.0 go.opentelemetry.io/otel v1.21.0 @@ -48,7 +48,7 @@ require ( github.com/prometheus/common v0.45.0 // indirect github.com/prometheus/procfs v0.11.1 // indirect github.com/prometheus/statsd_exporter v0.22.7 // indirect - go.opentelemetry.io/collector/confmap v0.90.0 // indirect + go.opentelemetry.io/collector/confmap v0.90.1 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.44.1-0.20231201153405-6027c1ae76f2 // indirect go.opentelemetry.io/otel/sdk/metric v1.21.0 // indirect golang.org/x/net v0.18.0 // indirect diff --git a/receiver/otlpreceiver/go.mod b/receiver/otlpreceiver/go.mod index 98c3bb8462c..b94dcc70b41 100644 --- a/receiver/otlpreceiver/go.mod +++ b/receiver/otlpreceiver/go.mod @@ -4,20 +4,20 @@ go 1.20 require ( github.com/gogo/protobuf v1.3.2 - github.com/klauspost/compress v1.17.3 + github.com/klauspost/compress v1.17.4 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector v0.90.0 - go.opentelemetry.io/collector/component v0.90.0 - go.opentelemetry.io/collector/config/configgrpc v0.90.0 - go.opentelemetry.io/collector/config/confighttp v0.90.0 - go.opentelemetry.io/collector/config/confignet v0.90.0 - go.opentelemetry.io/collector/config/configtelemetry v0.90.0 - go.opentelemetry.io/collector/config/configtls v0.90.0 - go.opentelemetry.io/collector/confmap v0.90.0 - go.opentelemetry.io/collector/consumer v0.90.0 + go.opentelemetry.io/collector v0.90.1 + go.opentelemetry.io/collector/component v0.90.1 + go.opentelemetry.io/collector/config/configgrpc v0.90.1 + go.opentelemetry.io/collector/config/confighttp v0.90.1 + go.opentelemetry.io/collector/config/confignet v0.90.1 + go.opentelemetry.io/collector/config/configtelemetry v0.90.1 + go.opentelemetry.io/collector/config/configtls v0.90.1 + go.opentelemetry.io/collector/confmap v0.90.1 + go.opentelemetry.io/collector/consumer v0.90.1 go.opentelemetry.io/collector/pdata v1.0.0 - go.opentelemetry.io/collector/receiver v0.90.0 - go.opentelemetry.io/collector/semconv v0.90.0 + go.opentelemetry.io/collector/receiver v0.90.1 + go.opentelemetry.io/collector/semconv v0.90.1 go.uber.org/zap v1.26.0 google.golang.org/genproto/googleapis/rpc v0.0.0-20231127180814-3a041ad873d4 google.golang.org/grpc v1.59.0 @@ -59,12 +59,12 @@ require ( github.com/prometheus/statsd_exporter v0.22.7 // indirect github.com/rs/cors v1.10.1 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/config/configauth v0.90.0 // indirect - go.opentelemetry.io/collector/config/configcompression v0.90.0 // indirect - go.opentelemetry.io/collector/config/configopaque v0.90.0 // indirect - go.opentelemetry.io/collector/config/internal v0.90.0 // indirect - go.opentelemetry.io/collector/extension v0.90.0 // indirect - go.opentelemetry.io/collector/extension/auth v0.90.0 // indirect + go.opentelemetry.io/collector/config/configauth v0.90.1 // indirect + go.opentelemetry.io/collector/config/configcompression v0.90.1 // indirect + go.opentelemetry.io/collector/config/configopaque v0.90.1 // indirect + go.opentelemetry.io/collector/config/internal v0.90.1 // indirect + go.opentelemetry.io/collector/extension v0.90.1 // indirect + go.opentelemetry.io/collector/extension/auth v0.90.1 // indirect go.opentelemetry.io/collector/featuregate v1.0.0 // indirect go.opentelemetry.io/contrib/config v0.1.1 // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.1 // indirect diff --git a/receiver/otlpreceiver/go.sum b/receiver/otlpreceiver/go.sum index cf51932ee87..89b106af39c 100644 --- a/receiver/otlpreceiver/go.sum +++ b/receiver/otlpreceiver/go.sum @@ -174,8 +174,8 @@ github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7V github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM= github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= -github.com/klauspost/compress v1.17.3 h1:qkRjuerhUU1EmXLYGkSH6EZL+vPSxIrYjLNAK4slzwA= -github.com/klauspost/compress v1.17.3/go.mod h1:/dCuZOvVtNoHsyb+cuJD3itjs3NbnF6KH9zAO4BDxPM= +github.com/klauspost/compress v1.17.4 h1:Ej5ixsIri7BrIjBkRZLTo6ghwrEtHFk7ijlczPW4fZ4= +github.com/klauspost/compress v1.17.4/go.mod h1:/dCuZOvVtNoHsyb+cuJD3itjs3NbnF6KH9zAO4BDxPM= github.com/knadh/koanf/maps v0.1.1 h1:G5TjmUh2D7G2YWf5SQQqSiHRJEjaicvU0KpypqB3NIs= github.com/knadh/koanf/maps v0.1.1/go.mod h1:npD/QZY3V6ghQDdcQzl1W4ICNVTkohC8E73eI2xW4yI= github.com/knadh/koanf/providers/confmap v0.1.0 h1:gOkxhHkemwG4LezxxN8DMOFopOPghxRVp7JbIvdvqzU= diff --git a/service/go.mod b/service/go.mod index 9e4f1645d4b..b656e043af8 100644 --- a/service/go.mod +++ b/service/go.mod @@ -8,24 +8,24 @@ require ( github.com/prometheus/client_golang v1.17.0 github.com/prometheus/client_model v0.5.0 github.com/prometheus/common v0.45.0 - github.com/shirou/gopsutil/v3 v3.23.10 + github.com/shirou/gopsutil/v3 v3.23.11 github.com/stretchr/testify v1.8.4 go.opencensus.io v0.24.0 - go.opentelemetry.io/collector v0.90.0 - go.opentelemetry.io/collector/component v0.90.0 - go.opentelemetry.io/collector/config/confignet v0.90.0 - go.opentelemetry.io/collector/config/configtelemetry v0.90.0 - go.opentelemetry.io/collector/confmap v0.90.0 - go.opentelemetry.io/collector/connector v0.90.0 - go.opentelemetry.io/collector/consumer v0.90.0 - go.opentelemetry.io/collector/exporter v0.90.0 - go.opentelemetry.io/collector/extension v0.90.0 - go.opentelemetry.io/collector/extension/zpagesextension v0.90.0 + go.opentelemetry.io/collector v0.90.1 + go.opentelemetry.io/collector/component v0.90.1 + go.opentelemetry.io/collector/config/confignet v0.90.1 + go.opentelemetry.io/collector/config/configtelemetry v0.90.1 + go.opentelemetry.io/collector/confmap v0.90.1 + go.opentelemetry.io/collector/connector v0.90.1 + go.opentelemetry.io/collector/consumer v0.90.1 + go.opentelemetry.io/collector/exporter v0.90.1 + go.opentelemetry.io/collector/extension v0.90.1 + go.opentelemetry.io/collector/extension/zpagesextension v0.90.1 go.opentelemetry.io/collector/featuregate v1.0.0 go.opentelemetry.io/collector/pdata v1.0.0 - go.opentelemetry.io/collector/processor v0.90.0 - go.opentelemetry.io/collector/receiver v0.90.0 - go.opentelemetry.io/collector/semconv v0.90.0 + go.opentelemetry.io/collector/processor v0.90.1 + go.opentelemetry.io/collector/receiver v0.90.1 + go.opentelemetry.io/collector/semconv v0.90.1 go.opentelemetry.io/contrib/config v0.1.1 go.opentelemetry.io/contrib/propagators/b3 v1.21.1 go.opentelemetry.io/otel v1.21.0 diff --git a/service/go.sum b/service/go.sum index 510dba490d3..ae8e59ec70b 100644 --- a/service/go.sum +++ b/service/go.sum @@ -249,8 +249,8 @@ github.com/prometheus/statsd_exporter v0.22.7 h1:7Pji/i2GuhK6Lu7DHrtTkFmNBCudCPT github.com/prometheus/statsd_exporter v0.22.7/go.mod h1:N/TevpjkIh9ccs6nuzY3jQn9dFqnUakOjnEuMPJJJnI= github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= github.com/rogpeppe/go-internal v1.11.0 h1:cWPaGQEPrBb5/AsnsZesgZZ9yb1OQ+GOISoDNXVBh4M= -github.com/shirou/gopsutil/v3 v3.23.10 h1:/N42opWlYzegYaVkWejXWJpbzKv2JDy3mrgGzKsh9hM= -github.com/shirou/gopsutil/v3 v3.23.10/go.mod h1:JIE26kpucQi+innVlAUnIEOSBhBUkirr5b44yr55+WE= +github.com/shirou/gopsutil/v3 v3.23.11 h1:i3jP9NjCPUz7FiZKxlMnODZkdSIp2gnzfrvsu9CuWEQ= +github.com/shirou/gopsutil/v3 v3.23.11/go.mod h1:1FrWgea594Jp7qmjHUUPlJDTPgcsb9mGnXDxavtikzM= github.com/shoenig/go-m1cpu v0.1.6 h1:nxdKQNcEB6vzgA2E2bvzKIYRuNj7XNJ4S/aRSwKzFtM= github.com/shoenig/go-m1cpu v0.1.6/go.mod h1:1JJMcUBvfNwpq05QDQVAnx3gUHr9IYF7GNg9SUEw2VQ= github.com/shoenig/test v0.6.4 h1:kVTaSd7WLz5WZ2IaoM0RSzRsUD+m8wRR+5qvntpn4LU= @@ -466,7 +466,6 @@ golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220708085239-5a0f0661e09d/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.15.0 h1:h48lPFYpsTvQJZF4EKyI4aLHaev3CxivZmv7yZig9pc= golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= From 111037dec631bfdcc198df2c837a2df87cbf3e01 Mon Sep 17 00:00:00 2001 From: Jaime Soriano Pastor Date: Tue, 5 Dec 2023 22:40:29 +0100 Subject: [PATCH 48/52] Fix broken link to metadata schema (#9044) **Description:** Fix a broken link in scrapping receivers documentation. --- docs/scraping-receivers.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/scraping-receivers.md b/docs/scraping-receivers.md index e9fa31f44a2..91e0bd9f292 100644 --- a/docs/scraping-receivers.md +++ b/docs/scraping-receivers.md @@ -24,7 +24,7 @@ defines stability guarantees and provides guidelines for metric updates. Each built-in scraping metrics receiver has a `metadata.yaml` file that MUST define all the metrics emitted by the receiver. The file is being used to generate an API for metrics recording, user settings to customize the emitted metrics and user documentation. The file schema is defined in -https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/main/cmd/mdatagen/metric-metadata.yaml. +https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/main/cmd/mdatagen/metadata-schema.yaml Defining a metric in `metadata.yaml` DOES NOT guarantee that the metric will always be produced by the receiver. In some cases it may be impossible to fetch particular metrics from a system in a particular state. From 034ec43ae6473d40791041ee3d00260fb9d46596 Mon Sep 17 00:00:00 2001 From: Alex Boten Date: Wed, 6 Dec 2023 10:01:38 -0800 Subject: [PATCH 49/52] [exporterhelper] fix missed metric aggregations (#9048) This PR ensures that context cancellation in the exporter doesn't interfere with metric aggregation. The OTel SDK currently returns if there's an error in the context used in `Add` (see https://github.com/open-telemetry/opentelemetry-go/blob/6cee2b4a4c76b581115d0d0ca150ad8b2e683db6/sdk/metric/instrument.go#L241-L243). This means that if there's a cancelled context in an export, the metrics are not recorded. --------- Signed-off-by: Alex Boten --- .chloggen/codeboten_fix-missing-metrics.yaml | 28 ++++++++++++++++++++ exporter/exporterhelper/obsexporter.go | 6 ++--- 2 files changed, 31 insertions(+), 3 deletions(-) create mode 100755 .chloggen/codeboten_fix-missing-metrics.yaml diff --git a/.chloggen/codeboten_fix-missing-metrics.yaml b/.chloggen/codeboten_fix-missing-metrics.yaml new file mode 100755 index 00000000000..656afaec37d --- /dev/null +++ b/.chloggen/codeboten_fix-missing-metrics.yaml @@ -0,0 +1,28 @@ +# Use this changelog template to create an entry for release notes. + +# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' +change_type: bug_fix + +# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver) +component: exporterhelper + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: fix missed metric aggregations + +# One or more tracking issues or pull requests related to the change +issues: [9048] + +# (Optional) One or more lines of additional information to render under the primary note. +# These lines will be padded with 2 spaces and then inserted directly into the document. +# Use pipe (|) for multiline entries. +subtext: | + This ensures that context cancellation in the exporter doesn't interfere with metric aggregation. The OTel + SDK currently returns if there's an error in the context used in `Add`. This means that if there's a + cancelled context in an export, the metrics are now recorded. + +# Optional: The change log or logs in which this entry should be included. +# e.g. '[user]' or '[user, api]' +# Include 'user' if the change is relevant to end users. +# Include 'api' if there is a change to a library API. +# Default: '[user]' +change_logs: [] \ No newline at end of file diff --git a/exporter/exporterhelper/obsexporter.go b/exporter/exporterhelper/obsexporter.go index d04a41f7510..094fc50b165 100644 --- a/exporter/exporterhelper/obsexporter.go +++ b/exporter/exporterhelper/obsexporter.go @@ -154,7 +154,7 @@ func (or *ObsReport) StartTracesOp(ctx context.Context) context.Context { // EndTracesOp completes the export operation that was started with StartTracesOp. func (or *ObsReport) EndTracesOp(ctx context.Context, numSpans int, err error) { numSent, numFailedToSend := toNumItems(numSpans, err) - or.recordMetrics(ctx, component.DataTypeTraces, numSent, numFailedToSend) + or.recordMetrics(noCancellationContext{Context: ctx}, component.DataTypeTraces, numSent, numFailedToSend) endSpan(ctx, err, numSent, numFailedToSend, obsmetrics.SentSpansKey, obsmetrics.FailedToSendSpansKey) } @@ -169,7 +169,7 @@ func (or *ObsReport) StartMetricsOp(ctx context.Context) context.Context { // StartMetricsOp. func (or *ObsReport) EndMetricsOp(ctx context.Context, numMetricPoints int, err error) { numSent, numFailedToSend := toNumItems(numMetricPoints, err) - or.recordMetrics(ctx, component.DataTypeMetrics, numSent, numFailedToSend) + or.recordMetrics(noCancellationContext{Context: ctx}, component.DataTypeMetrics, numSent, numFailedToSend) endSpan(ctx, err, numSent, numFailedToSend, obsmetrics.SentMetricPointsKey, obsmetrics.FailedToSendMetricPointsKey) } @@ -183,7 +183,7 @@ func (or *ObsReport) StartLogsOp(ctx context.Context) context.Context { // EndLogsOp completes the export operation that was started with StartLogsOp. func (or *ObsReport) EndLogsOp(ctx context.Context, numLogRecords int, err error) { numSent, numFailedToSend := toNumItems(numLogRecords, err) - or.recordMetrics(ctx, component.DataTypeLogs, numSent, numFailedToSend) + or.recordMetrics(noCancellationContext{Context: ctx}, component.DataTypeLogs, numSent, numFailedToSend) endSpan(ctx, err, numSent, numFailedToSend, obsmetrics.SentLogRecordsKey, obsmetrics.FailedToSendLogRecordsKey) } From dc28ec1575ab6a91289afdebf5b2dc2e15a0cd46 Mon Sep 17 00:00:00 2001 From: Alex Boten Date: Thu, 7 Dec 2023 09:32:12 -0800 Subject: [PATCH 50/52] [chore] update versions of go (#9052) Signed-off-by: Alex Boten --- .github/workflows/api-compatibility.yml | 2 +- .github/workflows/build-and-test-windows.yaml | 2 +- .github/workflows/build-and-test.yml | 12 ++++++------ .github/workflows/builder-integration-test.yaml | 2 +- .github/workflows/builder-release.yaml | 2 +- .github/workflows/changelog.yml | 2 +- .github/workflows/codeql-analysis.yml | 2 +- .github/workflows/contrib-tests.yml | 2 +- .github/workflows/perf.yml | 2 +- .github/workflows/prepare-release.yml | 2 +- .github/workflows/tidy-dependencies.yml | 2 +- 11 files changed, 16 insertions(+), 16 deletions(-) diff --git a/.github/workflows/api-compatibility.yml b/.github/workflows/api-compatibility.yml index 1872911b271..de8bc0cd469 100644 --- a/.github/workflows/api-compatibility.yml +++ b/.github/workflows/api-compatibility.yml @@ -34,7 +34,7 @@ jobs: - name: Setup Go uses: actions/setup-go@v4 with: - go-version: ~1.20.11 + go-version: ~1.20.12 # Generate apidiff states of Main - name: Generate-States diff --git a/.github/workflows/build-and-test-windows.yaml b/.github/workflows/build-and-test-windows.yaml index b78e5e25018..1a8f6115569 100644 --- a/.github/workflows/build-and-test-windows.yaml +++ b/.github/workflows/build-and-test-windows.yaml @@ -19,7 +19,7 @@ jobs: - name: Setup Go uses: actions/setup-go@v4 with: - go-version: ~1.20.11 + go-version: ~1.20.12 cache: false - name: Cache Go uses: actions/cache@v3 diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index a9ee407ea3f..089b02668b8 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -19,7 +19,7 @@ jobs: - name: Setup Go uses: actions/setup-go@v4 with: - go-version: ~1.20.11 + go-version: ~1.20.12 cache: false - name: Cache Go id: go-cache @@ -42,7 +42,7 @@ jobs: - name: Setup Go uses: actions/setup-go@v4 with: - go-version: ~1.20.11 + go-version: ~1.20.12 cache: false - name: Cache Go id: go-cache @@ -66,7 +66,7 @@ jobs: - name: Setup Go uses: actions/setup-go@v4 with: - go-version: ~1.20.11 + go-version: ~1.20.12 cache: false - name: Cache Go id: go-cache @@ -91,7 +91,7 @@ jobs: - name: Setup Go uses: actions/setup-go@v4 with: - go-version: ~1.20.11 + go-version: ~1.20.12 cache: false - name: Cache Go id: go-cache @@ -133,7 +133,7 @@ jobs: unittest-matrix: strategy: matrix: - go-version: ["~1.21.4", "~1.20.11"] # 1.20 needs quotes otherwise it's interpreted as 1.2 + go-version: ["~1.21.5", "~1.20.12"] # 1.20 needs quotes otherwise it's interpreted as 1.2 runs-on: ubuntu-latest needs: [setup-environment] steps: @@ -253,7 +253,7 @@ jobs: - name: Setup Go uses: actions/setup-go@v4 with: - go-version: ~1.20.11 + go-version: ~1.20.12 cache: false - name: Cache Go id: go-cache diff --git a/.github/workflows/builder-integration-test.yaml b/.github/workflows/builder-integration-test.yaml index 981897de5c6..d6689b1a8de 100644 --- a/.github/workflows/builder-integration-test.yaml +++ b/.github/workflows/builder-integration-test.yaml @@ -30,6 +30,6 @@ jobs: - name: Setup Go uses: actions/setup-go@v4 with: - go-version: ~1.20.11 + go-version: ~1.20.12 - name: Test run: make builder-integration-test diff --git a/.github/workflows/builder-release.yaml b/.github/workflows/builder-release.yaml index 42a8df6df47..51d560f1985 100644 --- a/.github/workflows/builder-release.yaml +++ b/.github/workflows/builder-release.yaml @@ -16,7 +16,7 @@ jobs: - name: Setup Go uses: actions/setup-go@v4 with: - go-version: ~1.20.11 + go-version: ~1.20.12 - name: Run GoReleaser uses: goreleaser/goreleaser-action@v5 with: diff --git a/.github/workflows/changelog.yml b/.github/workflows/changelog.yml index 9e9873b2364..64c11b27d92 100644 --- a/.github/workflows/changelog.yml +++ b/.github/workflows/changelog.yml @@ -29,7 +29,7 @@ jobs: - name: Setup Go uses: actions/setup-go@v4 with: - go-version: ~1.20.11 + go-version: ~1.20.12 - name: Cache Go id: go-cache uses: actions/cache@v3 diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 75b68eb7559..166d65343af 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -19,7 +19,7 @@ jobs: - name: Setup Go uses: actions/setup-go@v4 with: - go-version: ~1.20.11 + go-version: ~1.20.12 # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL diff --git a/.github/workflows/contrib-tests.yml b/.github/workflows/contrib-tests.yml index 7003881e264..c305af13cda 100644 --- a/.github/workflows/contrib-tests.yml +++ b/.github/workflows/contrib-tests.yml @@ -23,7 +23,7 @@ jobs: - name: Setup Go uses: actions/setup-go@v4 with: - go-version: ~1.20.11 + go-version: ~1.20.12 cache: false - name: Run Contrib Tests run: | diff --git a/.github/workflows/perf.yml b/.github/workflows/perf.yml index c56e2e6f7ef..515f56fe4e2 100644 --- a/.github/workflows/perf.yml +++ b/.github/workflows/perf.yml @@ -13,7 +13,7 @@ jobs: - name: Setup Go uses: actions/setup-go@v4 with: - go-version: ~1.20.11 + go-version: ~1.20.12 - name: Run benchmark run: make gobenchmark diff --git a/.github/workflows/prepare-release.yml b/.github/workflows/prepare-release.yml index b0e7f5bdb06..6b7d6d9448c 100644 --- a/.github/workflows/prepare-release.yml +++ b/.github/workflows/prepare-release.yml @@ -53,7 +53,7 @@ jobs: - name: Setup Go uses: actions/setup-go@v4 with: - go-version: ~1.20.11 + go-version: ~1.20.12 # Prepare Core for release. # - Update CHANGELOG.md file, this is done via chloggen # - Run make prepare-release PREVIOUS_VERSION=1.0.0 RELEASE_CANDIDATE=1.1.0 MODSET=stable diff --git a/.github/workflows/tidy-dependencies.yml b/.github/workflows/tidy-dependencies.yml index df374853a40..e4473a3a291 100644 --- a/.github/workflows/tidy-dependencies.yml +++ b/.github/workflows/tidy-dependencies.yml @@ -16,7 +16,7 @@ jobs: ref: ${{ github.head_ref }} - uses: actions/setup-go@v4 with: - go-version: ~1.20.11 + go-version: ~1.20.12 cache: false - name: Cache Go id: go-cache From f9a38b29c7f35f9eb8f4ea00844ef96b8091e14b Mon Sep 17 00:00:00 2001 From: Dani Louca <59848726+dloucasfx@users.noreply.github.com> Date: Fri, 8 Dec 2023 13:10:04 -0500 Subject: [PATCH 51/52] Introduce HTTP2 health check transport options (#9022) **Description:** This PR introduces options to enable `http/2` health check by exposing `HTTP2ReadIdleTimeout` and `HTTP2PingTimeout` The golang issues are: https://github.com/golang/go/issues/59690 https://github.com/golang/go/issues/36026 In summary, if due to environmental issue the underlying tcp connection used by the http/2 client in the exporter became unstable/unusable/unreachable, unlike http/1, the http/2 client does not forcibly close the connection and redial a new one, instead it keeps using it for 15 minutes (default value of OS `tcp_retries2` ) until the OS cleans it up and a new tcp connection gets established. From OTEL user perspective, one will see a spike in export failures/timeouts for ~15 minutes, this will happen for every connection that got into a bad state, after 15 minutes things will recover until next time the tcp connection gets into a bad state. **Testing:** - Run OTEL with one of the exporters that uses HTTP/2 client, example `signalfx` exporter - For simplicity use a single pipeline/exporter - In a different shell, run this to watch the tcp state of the established connection ``` while (true); do echo date; sudo netstat -anp | grep -E '' | sort -k 5; sleep 2; done ``` - From the netstat, take a note of the source port and the source IP address - replace <> from previous step `sudo iptables -A OUTPUT -s -p tcp --sport -j DROP` - Note how the OTEL exporter export starts timing out Expected Result: - A new connection should be established, similarly to http/1 and exports should succeed Actual Result: - The exports keep failing for ~ 15 minutes or for whatever the OS `tcp_retries2` is configured to - After 15 minutes, a new tcp connection is created and exports start working **Documentation:** Readme is updated with new settings Signed-off-by: Dani Louca --- .chloggen/http2ping.yaml | 25 +++++++++ config/confighttp/README.md | 2 + config/confighttp/confighttp.go | 20 +++++++ config/confighttp/confighttp_test.go | 82 +++++++++++++++++++--------- 4 files changed, 102 insertions(+), 27 deletions(-) create mode 100755 .chloggen/http2ping.yaml diff --git a/.chloggen/http2ping.yaml b/.chloggen/http2ping.yaml new file mode 100755 index 00000000000..b6f2223ed7d --- /dev/null +++ b/.chloggen/http2ping.yaml @@ -0,0 +1,25 @@ +# Use this changelog template to create an entry for release notes. + +# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' +change_type: enhancement + +# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver) +component: config/confighttp + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: Exposes http/2 transport settings to enable health check and workaround golang http/2 issue https://github.com/golang/go/issues/59690 + +# One or more tracking issues or pull requests related to the change +issues: [9022] + +# (Optional) One or more lines of additional information to render under the primary note. +# These lines will be padded with 2 spaces and then inserted directly into the document. +# Use pipe (|) for multiline entries. +subtext: + +# Optional: The change log or logs in which this entry should be included. +# e.g. '[user]' or '[user, api]' +# Include 'user' if the change is relevant to end users. +# Include 'api' if there is a change to a library API. +# Default: '[user]' +change_logs: [] \ No newline at end of file diff --git a/config/confighttp/README.md b/config/confighttp/README.md index a3794ceeed1..0cc0503f539 100644 --- a/config/confighttp/README.md +++ b/config/confighttp/README.md @@ -29,6 +29,8 @@ README](../configtls/README.md). - [`idle_conn_timeout`](https://golang.org/pkg/net/http/#Transport) - [`auth`](../configauth/README.md) - [`disable_keep_alives`](https://golang.org/pkg/net/http/#Transport) +- [`http2_read_idle_timeout`](https://pkg.go.dev/golang.org/x/net/http2#Transport) +- [`http2_ping_timeout`](https://pkg.go.dev/golang.org/x/net/http2#Transport) Example: diff --git a/config/confighttp/confighttp.go b/config/confighttp/confighttp.go index c83db25d4b6..e41a64cc124 100644 --- a/config/confighttp/confighttp.go +++ b/config/confighttp/confighttp.go @@ -6,6 +6,7 @@ package confighttp // import "go.opentelemetry.io/collector/config/confighttp" import ( "crypto/tls" "errors" + "fmt" "io" "net" "net/http" @@ -86,6 +87,16 @@ type HTTPClientSettings struct { // connection for every request. Before enabling this option please consider whether changes // to idle connection settings can achieve your goal. DisableKeepAlives bool `mapstructure:"disable_keep_alives"` + + // This is needed in case you run into + // https://github.com/golang/go/issues/59690 + // https://github.com/golang/go/issues/36026 + // HTTP2ReadIdleTimeout if the connection has been idle for the configured value send a ping frame for health check + // 0s means no health check will be performed. + HTTP2ReadIdleTimeout time.Duration `mapstructure:"http2_read_idle_timeout"` + // HTTP2PingTimeout if there's no response to the ping within the configured value, the connection will be closed. + // If not set or set to 0, it defaults to 15s. + HTTP2PingTimeout time.Duration `mapstructure:"http2_ping_timeout"` } // NewDefaultHTTPClientSettings returns HTTPClientSettings type object with @@ -147,6 +158,15 @@ func (hcs *HTTPClientSettings) ToClient(host component.Host, settings component. transport.DisableKeepAlives = hcs.DisableKeepAlives + if hcs.HTTP2ReadIdleTimeout > 0 { + transport2, transportErr := http2.ConfigureTransports(transport) + if transportErr != nil { + return nil, fmt.Errorf("failed to configure http2 transport: %w", transportErr) + } + transport2.ReadIdleTimeout = hcs.HTTP2ReadIdleTimeout + transport2.PingTimeout = hcs.HTTP2PingTimeout + } + clientTransport := (http.RoundTripper)(transport) // The Auth RoundTripper should always be the innermost to ensure that diff --git a/config/confighttp/confighttp_test.go b/config/confighttp/confighttp_test.go index 43a9b865010..3d3bc6d8bc7 100644 --- a/config/confighttp/confighttp_test.go +++ b/config/confighttp/confighttp_test.go @@ -53,6 +53,7 @@ func TestAllHTTPClientSettings(t *testing.T) { maxIdleConnsPerHost := 40 maxConnsPerHost := 45 idleConnTimeout := 30 * time.Second + http2PingTimeout := 5 * time.Second tests := []struct { name string settings HTTPClientSettings @@ -65,15 +66,17 @@ func TestAllHTTPClientSettings(t *testing.T) { TLSSetting: configtls.TLSClientSetting{ Insecure: false, }, - ReadBufferSize: 1024, - WriteBufferSize: 512, - MaxIdleConns: &maxIdleConns, - MaxIdleConnsPerHost: &maxIdleConnsPerHost, - MaxConnsPerHost: &maxConnsPerHost, - IdleConnTimeout: &idleConnTimeout, - CustomRoundTripper: func(next http.RoundTripper) (http.RoundTripper, error) { return next, nil }, - Compression: "", - DisableKeepAlives: true, + ReadBufferSize: 1024, + WriteBufferSize: 512, + MaxIdleConns: &maxIdleConns, + MaxIdleConnsPerHost: &maxIdleConnsPerHost, + MaxConnsPerHost: &maxConnsPerHost, + IdleConnTimeout: &idleConnTimeout, + CustomRoundTripper: func(next http.RoundTripper) (http.RoundTripper, error) { return next, nil }, + Compression: "", + DisableKeepAlives: true, + HTTP2ReadIdleTimeout: idleConnTimeout, + HTTP2PingTimeout: http2PingTimeout, }, shouldError: false, }, @@ -84,15 +87,17 @@ func TestAllHTTPClientSettings(t *testing.T) { TLSSetting: configtls.TLSClientSetting{ Insecure: false, }, - ReadBufferSize: 1024, - WriteBufferSize: 512, - MaxIdleConns: &maxIdleConns, - MaxIdleConnsPerHost: &maxIdleConnsPerHost, - MaxConnsPerHost: &maxConnsPerHost, - IdleConnTimeout: &idleConnTimeout, - CustomRoundTripper: func(next http.RoundTripper) (http.RoundTripper, error) { return next, nil }, - Compression: "none", - DisableKeepAlives: true, + ReadBufferSize: 1024, + WriteBufferSize: 512, + MaxIdleConns: &maxIdleConns, + MaxIdleConnsPerHost: &maxIdleConnsPerHost, + MaxConnsPerHost: &maxConnsPerHost, + IdleConnTimeout: &idleConnTimeout, + CustomRoundTripper: func(next http.RoundTripper) (http.RoundTripper, error) { return next, nil }, + Compression: "none", + DisableKeepAlives: true, + HTTP2ReadIdleTimeout: idleConnTimeout, + HTTP2PingTimeout: http2PingTimeout, }, shouldError: false, }, @@ -103,15 +108,38 @@ func TestAllHTTPClientSettings(t *testing.T) { TLSSetting: configtls.TLSClientSetting{ Insecure: false, }, - ReadBufferSize: 1024, - WriteBufferSize: 512, - MaxIdleConns: &maxIdleConns, - MaxIdleConnsPerHost: &maxIdleConnsPerHost, - MaxConnsPerHost: &maxConnsPerHost, - IdleConnTimeout: &idleConnTimeout, - CustomRoundTripper: func(next http.RoundTripper) (http.RoundTripper, error) { return next, nil }, - Compression: "gzip", - DisableKeepAlives: true, + ReadBufferSize: 1024, + WriteBufferSize: 512, + MaxIdleConns: &maxIdleConns, + MaxIdleConnsPerHost: &maxIdleConnsPerHost, + MaxConnsPerHost: &maxConnsPerHost, + IdleConnTimeout: &idleConnTimeout, + CustomRoundTripper: func(next http.RoundTripper) (http.RoundTripper, error) { return next, nil }, + Compression: "gzip", + DisableKeepAlives: true, + HTTP2ReadIdleTimeout: idleConnTimeout, + HTTP2PingTimeout: http2PingTimeout, + }, + shouldError: false, + }, + { + name: "all_valid_settings_http2_health_check", + settings: HTTPClientSettings{ + Endpoint: "localhost:1234", + TLSSetting: configtls.TLSClientSetting{ + Insecure: false, + }, + ReadBufferSize: 1024, + WriteBufferSize: 512, + MaxIdleConns: &maxIdleConns, + MaxIdleConnsPerHost: &maxIdleConnsPerHost, + MaxConnsPerHost: &maxConnsPerHost, + IdleConnTimeout: &idleConnTimeout, + CustomRoundTripper: func(next http.RoundTripper) (http.RoundTripper, error) { return next, nil }, + Compression: "gzip", + DisableKeepAlives: true, + HTTP2ReadIdleTimeout: idleConnTimeout, + HTTP2PingTimeout: http2PingTimeout, }, shouldError: false, }, From eed3b4e9c5efaf6d6e5073d13fbd3d57991d4d0f Mon Sep 17 00:00:00 2001 From: Alex Boten Date: Fri, 8 Dec 2023 10:32:06 -0800 Subject: [PATCH 52/52] [chore] update gensemconv to use .tools (#9055) Also updating documentation to specify the semantic-conventions repository instead of the spec repo. Signed-off-by: Alex Boten --- Makefile | 8 ++++---- Makefile.Common | 1 + semconv/README.md | 11 ++++++----- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/Makefile b/Makefile index 426af0d5224..c80861ea4d5 100644 --- a/Makefile +++ b/Makefile @@ -227,13 +227,13 @@ genpdata: $(MAKE) fmt # Generate semantic convention constants. Requires a clone of the opentelemetry-specification repo -gensemconv: +gensemconv: $(SEMCONVGEN) @[ "${SPECPATH}" ] || ( echo ">> env var SPECPATH is not set"; exit 1 ) @[ "${SPECTAG}" ] || ( echo ">> env var SPECTAG is not set"; exit 1 ) @echo "Generating semantic convention constants from specification version ${SPECTAG} at ${SPECPATH}" - semconvgen -o semconv/${SPECTAG} -t semconv/template.j2 -s ${SPECTAG} -i ${SPECPATH}/semantic_conventions/. --only=resource -p conventionType=resource -f generated_resource.go - semconvgen -o semconv/${SPECTAG} -t semconv/template.j2 -s ${SPECTAG} -i ${SPECPATH}/semantic_conventions/. --only=event -p conventionType=event -f generated_event.go - semconvgen -o semconv/${SPECTAG} -t semconv/template.j2 -s ${SPECTAG} -i ${SPECPATH}/semantic_conventions/. --only=span -p conventionType=trace -f generated_trace.go + $(SEMCONVGEN) -o semconv/${SPECTAG} -t semconv/template.j2 -s ${SPECTAG} -i ${SPECPATH}/model/. --only=resource -p conventionType=resource -f generated_resource.go + $(SEMCONVGEN) -o semconv/${SPECTAG} -t semconv/template.j2 -s ${SPECTAG} -i ${SPECPATH}/model/. --only=event -p conventionType=event -f generated_event.go + $(SEMCONVGEN) -o semconv/${SPECTAG} -t semconv/template.j2 -s ${SPECTAG} -i ${SPECPATH}/model/. --only=span -p conventionType=trace -f generated_trace.go # Checks that the HEAD of the contrib repo checked out in CONTRIB_PATH compiles # against the current version of this repo. diff --git a/Makefile.Common b/Makefile.Common index 36e0b527bf1..f6095aea562 100644 --- a/Makefile.Common +++ b/Makefile.Common @@ -31,6 +31,7 @@ IMPI := $(TOOLS_BIN_DIR)/impi MISSPELL := $(TOOLS_BIN_DIR)/misspell MULTIMOD := $(TOOLS_BIN_DIR)/multimod PORTO := $(TOOLS_BIN_DIR)/porto +SEMCONVGEN := $(TOOLS_BIN_DIR)/semconvgen YQ := $(TOOLS_BIN_DIR)/yq .PHONY: install-tools diff --git a/semconv/README.md b/semconv/README.md index dcbcc71c797..6c9aea8b422 100644 --- a/semconv/README.md +++ b/semconv/README.md @@ -6,14 +6,15 @@ from definitions in the specification. ## Generation To generate the constants you can use the `gensemconv` make target. You must provide the path to the root of a clone of -the `opentelemetry-specification` repository in the `SPECPATH` variable and the version of the conventions to generate +the `semantic-conventions` repository in the `SPECPATH` variable and the version of the conventions to generate in the `SPECTAG` variable. ```console -$ make gensemconv SPECPATH=~/dev/opentelemetry-specification SPECTAG=v1.5.0 -Generating semantic convention constants from specification version v1.5.0 at ~/dev/opentelemetry-specification -semconvgen -o semconv/v1.5.0 -t semconv/template.j2 -s v1.5.0 -i ~/dev/opentelemetry-specification/semantic_conventions/resource -p conventionType=resource -semconvgen -o semconv/v1.5.0 -t semconv/template.j2 -s v1.5.0 -i ~/dev/opentelemetry-specification/semantic_conventions/trace -p conventionType=trace +$ make gensemconv SPECPATH=/tmp/semantic-conventions SPECTAG=v1.22.0 +Generating semantic convention constants from specification version v1.22.0 at /tmp/semantic-conventions +.tools/semconvgen -o semconv/v1.22.0 -t semconv/template.j2 -s v1.22.0 -i /tmp/semantic-conventions/model/. --only=resource -p conventionType=resource -f generated_resource.go +.tools/semconvgen -o semconv/v1.22.0 -t semconv/template.j2 -s v1.22.0 -i /tmp/semantic-conventions/model/. --only=event -p conventionType=event -f generated_event.go +.tools/semconvgen -o semconv/v1.22.0 -t semconv/template.j2 -s v1.22.0 -i /tmp/semantic-conventions/model/. --only=span -p conventionType=trace -f generated_trace.go ``` When generating the constants for a new version ot the specification it is important to note that only