Skip to content

Update Prometheus to v0.307.2, OTel collector contrib to v0.138.0, OTel to v1.44.0 #5810

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mapno merged 4 commits into from
Oct 28, 2025
Merged

Update Prometheus to v0.307.2, OTel collector contrib to v0.138.0, OTel to v1.44.0 #5810

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b41f1d4
Update Prometheus to v0.307.2
mapno Oct 27, 2025
fac1cb8
Update otel collector
mapno Oct 27, 2025
ae4f41f
Update OTel collector
mapno Oct 27, 2025
d9a1e0d
Merge remote-tracking branch 'origin/main' into update-prometheus
mapno Oct 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
288 changes: 145 additions & 143 deletions go.mod
View file
Open in desktop

Large diffs are not rendered by default.

701 changes: 360 additions & 341 deletions go.sum
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions modules/distributor/receiver/shim.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -275,8 +275,8 @@ func New(receiverCfg map[string]interface{}, pusher TracesPusher, middleware Mid
case "jaeger":
jaegerRecvCfg := cfg.(*jaegerreceiver.Config)

if jaegerRecvCfg.ThriftHTTP != nil {
jaegerRecvCfg.ThriftHTTP.IncludeMetadata = true
if jaegerRecvCfg.ThriftHTTP.HasValue() {
jaegerRecvCfg.ThriftHTTP.Get().IncludeMetadata = true
}

cfg = jaegerRecvCfg
Expand Down
2 changes: 1 addition & 1 deletion modules/generator/storage/instance.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ func New(cfg *Config, o Overrides, tenant string, reg prometheus.Registerer, _ l
startTimeCallback := func() (int64, error) {
return int64(model.Latest), nil
}
remoteStorage := remote.NewStorage(logger.With("component", "remote"), reg, startTimeCallback, walDir, cfg.RemoteWriteFlushDeadline, &noopScrapeManager{})
remoteStorage := remote.NewStorage(logger.With("component", "remote"), reg, startTimeCallback, walDir, cfg.RemoteWriteFlushDeadline, &noopScrapeManager{}, false)

headers := o.MetricsGeneratorRemoteWriteHeaders(tenant)
generateNativeHistograms := o.MetricsGeneratorGenerateNativeHistograms(tenant)
Expand Down
1 change: 1 addition & 0 deletions vendor/github.com/IBM/sarama/.golangci.yml
View file
Open in desktop

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

6 changes: 3 additions & 3 deletions vendor/github.com/IBM/sarama/.pre-commit-config.yaml
View file
Open in desktop

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

3 changes: 3 additions & 0 deletions vendor/github.com/IBM/sarama/.whitesource
View file
Open in desktop

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

27 changes: 6 additions & 21 deletions vendor/github.com/IBM/sarama/Dockerfile.kafka
View file
Open in desktop

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

38 changes: 23 additions & 15 deletions vendor/github.com/IBM/sarama/Makefile
View file
Open in desktop

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

6 changes: 5 additions & 1 deletion vendor/github.com/IBM/sarama/acl_create_request.go
View file
Open in desktop

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

16 changes: 9 additions & 7 deletions vendor/github.com/IBM/sarama/acl_create_response.go
View file
Open in desktop

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

6 changes: 5 additions & 1 deletion vendor/github.com/IBM/sarama/acl_delete_request.go
View file
Open in desktop

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

22 changes: 11 additions & 11 deletions vendor/github.com/IBM/sarama/acl_delete_response.go
View file
Open in desktop

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

6 changes: 5 additions & 1 deletion vendor/github.com/IBM/sarama/acl_describe_request.go
View file
Open in desktop

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

Loading
Loading