From 58ae7375ba2710c99837721b9287fcc3b30550b9 Mon Sep 17 00:00:00 2001 From: Yuri Shkuro Date: Tue, 17 Dec 2024 13:43:09 -0400 Subject: [PATCH 1/2] [go.mod] Merge indirect groups into one (#6375) ## Which problem is this PR solving? - Somehow meaningless separation is created by the bots ## Description of the changes - Keep only one group for indirect deps --------- Signed-off-by: Yuri Shkuro Signed-off-by: Yuri Shkuro --- go.mod | 49 +++++++++++++++++++++++-------------------------- 1 file changed, 23 insertions(+), 26 deletions(-) diff --git a/go.mod b/go.mod index a9df79aaca3..d262d6c0671 100644 --- a/go.mod +++ b/go.mod @@ -102,9 +102,12 @@ require ( ) require ( + github.com/IBM/sarama v1.43.3 // indirect + github.com/alecthomas/participle/v2 v2.1.1 // indirect github.com/antchfx/xmlquery v1.4.2 // indirect github.com/antchfx/xpath v1.3.2 // indirect github.com/aws/aws-msk-iam-sasl-signer-go v1.0.0 // indirect + github.com/aws/aws-sdk-go v1.55.5 // indirect github.com/aws/aws-sdk-go-v2 v1.19.0 // indirect github.com/aws/aws-sdk-go-v2/config v1.18.28 // indirect github.com/aws/aws-sdk-go-v2/credentials v1.13.27 // indirect @@ -117,44 +120,21 @@ require ( github.com/aws/aws-sdk-go-v2/service/ssooidc v1.14.13 // indirect github.com/aws/aws-sdk-go-v2/service/sts v1.19.3 // indirect github.com/aws/smithy-go v1.13.5 // indirect - github.com/dgraph-io/ristretto/v2 v2.0.0 // indirect - github.com/ebitengine/purego v0.8.1 // indirect - github.com/expr-lang/expr v1.16.9 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/status v0.116.0 // indirect - go.opentelemetry.io/auto/sdk v1.1.0 // indirect - go.opentelemetry.io/collector/connector/connectortest v0.116.0 // indirect - go.opentelemetry.io/collector/connector/xconnector v0.116.0 // indirect - go.opentelemetry.io/collector/consumer/consumererror v0.116.0 // indirect - go.opentelemetry.io/collector/consumer/consumererror/xconsumererror v0.116.0 // indirect - go.opentelemetry.io/collector/consumer/xconsumer v0.116.0 // indirect - go.opentelemetry.io/collector/exporter/exporterhelper/xexporterhelper v0.116.0 // indirect - go.opentelemetry.io/collector/exporter/xexporter v0.116.0 // indirect - go.opentelemetry.io/collector/internal/fanoutconsumer v0.116.0 // indirect - go.opentelemetry.io/collector/internal/memorylimiter v0.116.0 // indirect - go.opentelemetry.io/collector/internal/sharedcomponent v0.116.0 // indirect - go.opentelemetry.io/collector/pipeline/xpipeline v0.116.0 // indirect - go.opentelemetry.io/collector/processor/xprocessor v0.116.0 // indirect - go.opentelemetry.io/collector/receiver/receivertest v0.116.0 // indirect - go.opentelemetry.io/collector/receiver/xreceiver v0.116.0 // indirect - go.opentelemetry.io/contrib/bridges/otelzap v0.6.0 // indirect -) - -require ( - github.com/IBM/sarama v1.43.3 // indirect - github.com/alecthomas/participle/v2 v2.1.1 // indirect - github.com/aws/aws-sdk-go v1.55.5 // indirect github.com/beorn7/perks v1.0.1 // indirect github.com/cenkalti/backoff/v4 v4.3.0 // indirect github.com/cespare/xxhash/v2 v2.3.0 // indirect github.com/cpuguy83/go-md2man/v2 v2.0.4 // indirect github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect + github.com/dgraph-io/ristretto/v2 v2.0.0 // indirect github.com/dustin/go-humanize v1.0.1 // indirect github.com/eapache/go-resiliency v1.7.0 // indirect github.com/eapache/go-xerial-snappy v0.0.0-20230731223053-c322873962e3 // indirect github.com/eapache/queue v1.1.0 // indirect + github.com/ebitengine/purego v0.8.1 // indirect github.com/elastic/elastic-transport-go/v8 v8.6.0 // indirect github.com/elastic/go-grok v0.3.1 // indirect github.com/elastic/lunes v0.1.0 // indirect + github.com/expr-lang/expr v1.16.9 // indirect github.com/felixge/httpsnoop v1.0.4 // indirect github.com/go-logr/logr v1.4.2 // indirect github.com/go-logr/stdr v1.2.2 // indirect @@ -214,6 +194,7 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl v0.116.0 // indirect github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.116.0 // indirect github.com/open-telemetry/opentelemetry-collector-contrib/pkg/resourcetotelemetry v0.116.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/status v0.116.0 // indirect github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/azure v0.116.0 // indirect github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/prometheus v0.116.0 // indirect github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/zipkin v0.116.0 // indirect @@ -247,6 +228,7 @@ require ( github.com/xdg-go/stringprep v1.0.4 // indirect github.com/yusufpapurcu/wmi v1.2.4 // indirect go.opencensus.io v0.24.0 // indirect + go.opentelemetry.io/auto/sdk v1.1.0 // indirect go.opentelemetry.io/collector v0.116.0 // indirect go.opentelemetry.io/collector/client v1.22.0 // indirect go.opentelemetry.io/collector/config/configcompression v1.22.0 // indirect @@ -254,15 +236,30 @@ require ( go.opentelemetry.io/collector/config/configopaque v1.22.0 go.opentelemetry.io/collector/config/configtelemetry v0.116.0 // indirect go.opentelemetry.io/collector/config/internal v0.116.0 // indirect + go.opentelemetry.io/collector/connector/connectortest v0.116.0 // indirect + go.opentelemetry.io/collector/connector/xconnector v0.116.0 // indirect + go.opentelemetry.io/collector/consumer/consumererror v0.116.0 // indirect + go.opentelemetry.io/collector/consumer/consumererror/xconsumererror v0.116.0 // indirect + go.opentelemetry.io/collector/consumer/xconsumer v0.116.0 // indirect go.opentelemetry.io/collector/exporter/debugexporter v0.116.0 + go.opentelemetry.io/collector/exporter/exporterhelper/xexporterhelper v0.116.0 // indirect + go.opentelemetry.io/collector/exporter/xexporter v0.116.0 // indirect go.opentelemetry.io/collector/extension/auth v0.116.0 // indirect go.opentelemetry.io/collector/extension/experimental/storage v0.116.0 // indirect go.opentelemetry.io/collector/extension/extensioncapabilities v0.116.0 go.opentelemetry.io/collector/featuregate v1.22.0 // indirect + go.opentelemetry.io/collector/internal/fanoutconsumer v0.116.0 // indirect + go.opentelemetry.io/collector/internal/memorylimiter v0.116.0 // indirect + go.opentelemetry.io/collector/internal/sharedcomponent v0.116.0 // indirect go.opentelemetry.io/collector/pdata/pprofile v0.116.0 // indirect go.opentelemetry.io/collector/pdata/testdata v0.116.0 // indirect + go.opentelemetry.io/collector/pipeline/xpipeline v0.116.0 // indirect + go.opentelemetry.io/collector/processor/xprocessor v0.116.0 // indirect + go.opentelemetry.io/collector/receiver/receivertest v0.116.0 // indirect + go.opentelemetry.io/collector/receiver/xreceiver v0.116.0 // indirect go.opentelemetry.io/collector/semconv v0.116.0 // indirect go.opentelemetry.io/collector/service v0.116.0 // indirect + go.opentelemetry.io/contrib/bridges/otelzap v0.6.0 // indirect go.opentelemetry.io/contrib/config v0.10.0 // indirect go.opentelemetry.io/contrib/propagators/b3 v1.31.0 // indirect go.opentelemetry.io/contrib/zpages v0.56.0 // indirect From 34bf4090ad2a6aa6c5dd1be1dd7e1794da9eb3ca Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Tue, 17 Dec 2024 20:36:11 +0100 Subject: [PATCH 2/2] fix(deps): update module github.com/elastic/go-elasticsearch/v8 to v8.17.0 (#6380) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [github.com/elastic/go-elasticsearch/v8](https://redirect.github.com/elastic/go-elasticsearch) | `v8.16.0` -> `v8.17.0` | [![age](https://developer.mend.io/api/mc/badges/age/go/github.com%2felastic%2fgo-elasticsearch%2fv8/v8.17.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/go/github.com%2felastic%2fgo-elasticsearch%2fv8/v8.17.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/go/github.com%2felastic%2fgo-elasticsearch%2fv8/v8.16.0/v8.17.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/go/github.com%2felastic%2fgo-elasticsearch%2fv8/v8.16.0/v8.17.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes
elastic/go-elasticsearch (github.com/elastic/go-elasticsearch/v8) ### [`v8.17.0`](https://redirect.github.com/elastic/go-elasticsearch/releases/tag/v8.17.0) [Compare Source](https://redirect.github.com/elastic/go-elasticsearch/compare/v8.16.0...v8.17.0) - Expose BulkIndexer total flushed bytes metric [#​914](https://redirect.github.com/elastic/go-elasticsearch/pull/914) thanks to [@​aureleoules](https://redirect.github.com/aureleoules) ### API Updated APIs to 8.17.0 ### Typed API Update APIs to latest [elasticsearch-specification 8.17](https://redirect.github.com/elastic/elasticsearch-specification/tree/2f823ff6fcaa7f3f0f9b990dc90512d8901e5d64)
--- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR was generated by [Mend Renovate](https://mend.io/renovate/). View the [repository job log](https://developer.mend.io/github/jaegertracing/jaeger). Signed-off-by: Mend Renovate --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index d262d6c0671..6b053f2933f 100644 --- a/go.mod +++ b/go.mod @@ -12,7 +12,7 @@ require ( github.com/bsm/sarama-cluster v2.1.13+incompatible github.com/crossdock/crossdock-go v0.0.0-20160816171116-049aabb0122b github.com/dgraph-io/badger/v4 v4.5.0 - github.com/elastic/go-elasticsearch/v8 v8.16.0 + github.com/elastic/go-elasticsearch/v8 v8.17.0 github.com/fsnotify/fsnotify v1.8.0 github.com/go-logr/zapr v1.3.0 github.com/gocql/gocql v1.7.0 diff --git a/go.sum b/go.sum index ae7caa88ed5..40e982cb029 100644 --- a/go.sum +++ b/go.sum @@ -140,8 +140,8 @@ github.com/ebitengine/purego v0.8.1 h1:sdRKd6plj7KYW33EH5As6YKfe8m9zbN9JMrOjNVF/ github.com/ebitengine/purego v0.8.1/go.mod h1:iIjxzd6CiRiOG0UyXP+V1+jWqUXVjPKLAI0mRfJZTmQ= github.com/elastic/elastic-transport-go/v8 v8.6.0 h1:Y2S/FBjx1LlCv5m6pWAF2kDJAHoSjSRSJCApolgfthA= github.com/elastic/elastic-transport-go/v8 v8.6.0/go.mod h1:YLHer5cj0csTzNFXoNQ8qhtGY1GTvSqPnKWKaqQE3Hk= -github.com/elastic/go-elasticsearch/v8 v8.16.0 h1:f7bR+iBz8GTAVhwyFO3hm4ixsz2eMaEy0QroYnXV3jE= -github.com/elastic/go-elasticsearch/v8 v8.16.0/go.mod h1:lGMlgKIbYoRvay3xWBeKahAiJOgmFDsjZC39nmO3H64= +github.com/elastic/go-elasticsearch/v8 v8.17.0 h1:e9cWksE/Fr7urDRmGPGp47Nsp4/mvNOrU8As1l2HQQ0= +github.com/elastic/go-elasticsearch/v8 v8.17.0/go.mod h1:lGMlgKIbYoRvay3xWBeKahAiJOgmFDsjZC39nmO3H64= github.com/elastic/go-grok v0.3.1 h1:WEhUxe2KrwycMnlvMimJXvzRa7DoByJB4PVUIE1ZD/U= github.com/elastic/go-grok v0.3.1/go.mod h1:n38ls8ZgOboZRgKcjMY8eFeZFMmcL9n2lP0iHhIDk64= github.com/elastic/lunes v0.1.0 h1:amRtLPjwkWtzDF/RKzcEPMvSsSseLDLW+bnhfNSLRe4=