Skip to content

Commit

Permalink
Starting using weaveworks common fork (#6386)
Browse files Browse the repository at this point in the history
* Starting using weaveworks common fork

Signed-off-by: alanprot <[email protected]>

* update weavewrworks

Signed-off-by: alanprot <[email protected]>

* bring weaveworks common with the workers change

Signed-off-by: alanprot <[email protected]>

* Changelog

Signed-off-by: alanprot <[email protected]>

---------

Signed-off-by: alanprot <[email protected]>
  • Loading branch information
alanprot authored Dec 1, 2024
1 parent 9b1ba23 commit 020cc45
Show file tree
Hide file tree
Showing 22 changed files with 63 additions and 254 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@
* [ENHANCEMENT] StoreGateway: Add new `cortex_bucket_store_chunk_pool_inuse_bytes` metric to track the usage in chunk pool. #6310
* [ENHANCEMENT] Distributor: Add new `cortex_distributor_inflight_client_requests` metric to track number of ingester client inflight requests. #6358
* [ENHANCEMENT] Distributor: Expose `cortex_label_size_bytes` native histogram metric. #6372
* [ENHANCEMENT] Add new option `-server.grpc_server-num-stream-workers` to configure the number of worker goroutines that should be used to process incoming streams. #6386
* [BUGFIX] Runtime-config: Handle absolute file paths when working directory is not / #6224
* [BUGFIX] Ruler: Allow rule evaluation to complete during shutdown. #6326
* [BUGFIX] Ring: update ring with new ip address when instance is lost, rejoins, but heartbeat is disabled #6271
Expand Down
6 changes: 6 additions & 0 deletions docs/configuration/config-file-reference.md
Original file line number Diff line number Diff line change
Expand Up @@ -5417,6 +5417,12 @@ grpc_tls_config:
# CLI flag: -server.grpc-max-concurrent-streams
[grpc_server_max_concurrent_streams: <int> | default = 100]
# Number of worker goroutines that should be used to process incoming
# streams.Setting this 0 (default) will disable workers and spawn a new
# goroutine for each stream.
# CLI flag: -server.grpc_server-num-stream-workers
[grpc_server_num_stream_workers: <int> | default = 0]
# The duration after which an idle connection should be closed. Default:
# infinity
# CLI flag: -server.grpc.keepalive.max-connection-idle
Expand Down
8 changes: 4 additions & 4 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ require (
github.com/bboreham/go-loser v0.0.0-20230920113527-fcc2c21820a3
github.com/cespare/xxhash/v2 v2.3.0
github.com/google/go-cmp v0.6.0
github.com/sercand/kuberesolver/v4 v4.0.0
github.com/sercand/kuberesolver/v5 v5.1.1
go.opentelemetry.io/collector/pdata v1.20.0
golang.org/x/exp v0.0.0-20240613232115-7f521ea00fb8
google.golang.org/protobuf v1.35.2
Expand Down Expand Up @@ -246,6 +246,9 @@ require (
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 // indirect
)

// Using cortex fork of weaveworks/common
replace github.com/weaveworks/common => github.com/cortexproject/weaveworks-common v0.0.0-20241129212437-96019edf21f1

// Override since git.apache.org is down. The docs say to fetch from github.
replace git.apache.org/thrift.git => github.com/apache/thrift v0.0.0-20180902110319-2566ecd5d999

Expand All @@ -270,8 +273,5 @@ replace github.com/google/gnostic => github.com/googleapis/gnostic v0.6.9
// https://github.com/thanos-io/thanos/blob/fdeea3917591fc363a329cbe23af37c6fff0b5f0/go.mod#L265
replace gopkg.in/alecthomas/kingpin.v2 => github.com/alecthomas/kingpin v1.3.8-0.20210301060133-17f40c25f497

// Pin kuberesolver/v5 to support new grpc version. Need to upgrade kuberesolver version on weaveworks/common.
replace github.com/sercand/kuberesolver/v4 => github.com/sercand/kuberesolver/v5 v5.1.1

// gRPC 1.66 introduced memory pooling which breaks Cortex queries. Pin 1.65.0 until we have a fix.
replace google.golang.org/grpc => google.golang.org/grpc v1.65.0
47 changes: 2 additions & 45 deletions go.sum

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion pkg/tracing/tracing.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (

"github.com/go-kit/log/level"
"github.com/pkg/errors"
"github.com/sercand/kuberesolver/v4"
"github.com/sercand/kuberesolver/v5"
"github.com/weaveworks/common/tracing"
"go.opentelemetry.io/contrib/propagators/aws/xray"
"google.golang.org/grpc/credentials"
Expand Down
175 changes: 0 additions & 175 deletions vendor/github.com/weaveworks/common/COPYING.LGPL-3

This file was deleted.

16 changes: 9 additions & 7 deletions vendor/github.com/weaveworks/common/httpgrpc/server/server.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion vendor/github.com/weaveworks/common/logging/format.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 8 additions & 8 deletions vendor/github.com/weaveworks/common/logging/gokit.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion vendor/github.com/weaveworks/common/logging/level.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

20 changes: 15 additions & 5 deletions vendor/github.com/weaveworks/common/middleware/response.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 020cc45

Please sign in to comment.