diff --git a/CHANGELOG.md b/CHANGELOG.md index 82d9bff42724..c7996e476403 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -34,6 +34,11 @@ Main (unreleased) - Flow: Fix an issue within S3 Module where the S3 path was not parsed correctly when the path consists of a parent directory. (@jastisriradheshyam) +- Flow: Fix an issue on Windows where `prometheus.remote_write` failed to read + WAL checkpoints. This issue led to memory leaks once the initial checkpoint + was created, and prevented a fresh process from being able to deliver metrics + at all. (@rfratto) + v0.33.1 (2023-05-01) -------------------- diff --git a/go.mod b/go.mod index a4daffa3cf5c..3fbe80a03ac1 100644 --- a/go.mod +++ b/go.mod @@ -210,7 +210,7 @@ require ( github.com/Azure/azure-storage-blob-go v0.15.0 // indirect github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect github.com/Azure/go-autorest v14.2.0+incompatible // indirect - github.com/Azure/go-autorest/autorest v0.11.28 // indirect + github.com/Azure/go-autorest/autorest v0.11.28 github.com/Azure/go-autorest/autorest/adal v0.9.22 // indirect github.com/Azure/go-autorest/autorest/azure/auth v0.5.12 // indirect github.com/Azure/go-autorest/autorest/azure/cli v0.4.6 // indirect @@ -320,7 +320,7 @@ require ( github.com/gabriel-vasile/mimetype v1.4.1 // indirect github.com/go-git/gcfg v1.5.0 // indirect github.com/go-git/go-billy/v5 v5.3.1 // indirect - github.com/go-git/go-git/v5 v5.4.2 // indirect + github.com/go-git/go-git/v5 v5.4.2 github.com/go-kit/kit v0.12.0 // indirect github.com/go-logr/stdr v1.2.2 // indirect github.com/go-ole/go-ole v1.2.6 // indirect @@ -631,7 +631,13 @@ replace ( github.com/satori/go.uuid => github.com/satori/go.uuid v1.2.0 ) -replace github.com/prometheus/prometheus => github.com/grafana/prometheus v1.8.2-0.20230328154716-1d0e5416a0de // release-2.42.0-grafana branch +// TODO(rfratto): remove replace directive once: +// +// * We remove our dependency on Cortex, which forces Prometheus to an older +// version since Go thinks v1 is newer than v0. +// * There is a release of Prometheus which contains prometheus/prometheus#12349. +// * We upgrade our OpenTelemetry dependency which will allow us to update Prometheus. +replace github.com/prometheus/prometheus => github.com/grafana/prometheus v1.8.2-0.20230511183519-ed907fa469ea // v2.42.0 replace gopkg.in/yaml.v2 => github.com/rfratto/go-yaml v0.0.0-20211119180816-77389c3526dc diff --git a/go.sum b/go.sum index 52814c4c625a..09c0304a73b2 100644 --- a/go.sum +++ b/go.sum @@ -1860,8 +1860,8 @@ github.com/grafana/phlare/api v0.1.2 h1:1jrwd3KnsXMzj/tJih9likx5EvbY3pbvLbDqAAYe github.com/grafana/phlare/api v0.1.2/go.mod h1:29vcLwFDmZBDce2jwFIMtzvof7fzPadT8VMKw9ks7FU= github.com/grafana/postgres_exporter v0.8.1-0.20210722175051-db35d7c2f520 h1:HnFWqxhoSF3WC7sKAdMZ+SRXvHLVZlZ3sbQjuUlTqkw= github.com/grafana/postgres_exporter v0.8.1-0.20210722175051-db35d7c2f520/go.mod h1:+HPXgiOV0InDHcZ2jNijL1SOKvo0eEPege5fQA0+ICI= -github.com/grafana/prometheus v1.8.2-0.20230328154716-1d0e5416a0de h1:HjEfLfBCMlZktx4tGEtMSbTZNdHrhzaCouRsXkh13ps= -github.com/grafana/prometheus v1.8.2-0.20230328154716-1d0e5416a0de/go.mod h1:Pfqb/MLnnR2KK+0vchiaH39jXxvLMBk+3lnIGP4N7Vk= +github.com/grafana/prometheus v1.8.2-0.20230511183519-ed907fa469ea h1:1zkC0y/rTqMc/dkQ785yKqsqgE0eOeOESkJkD3JIJZo= +github.com/grafana/prometheus v1.8.2-0.20230511183519-ed907fa469ea/go.mod h1:Pfqb/MLnnR2KK+0vchiaH39jXxvLMBk+3lnIGP4N7Vk= github.com/grafana/prometheus-common v0.39.1-0.20230411174203-bcb00f1c26d7 h1:xFCw/hvc6lOmFjTvjcnvoWJrgnx2VxF1wz+lR+eYBLo= github.com/grafana/prometheus-common v0.39.1-0.20230411174203-bcb00f1c26d7/go.mod h1:xBwqVerjNdUDjgODMpudtOMwlOwf2SaTr1yjz4b7Zbc= github.com/grafana/regexp v0.0.0-20221122212121-6b5c0a4cb7fd h1:PpuIBO5P3e9hpqBD0O/HjhShYuM6XE0i/lbE6J94kww= @@ -2903,8 +2903,6 @@ github.com/remeh/sizedwaitgroup v1.0.0/go.mod h1:3j2R4OIe/SeS6YDhICBy22RWjJC5eNC github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo= github.com/renier/xmlrpc v0.0.0-20170708154548-ce4a1a486c03 h1:Wdi9nwnhFNAlseAOekn6B5G/+GMtks9UKbvRU/CMM/o= github.com/renier/xmlrpc v0.0.0-20170708154548-ce4a1a486c03/go.mod h1:gRAiPF5C5Nd0eyyRdqIu9qTiFSoZzpTq727b5B8fkkU= -github.com/rfratto/ckit v0.0.0-20230410121755-15c17e2c0d9b h1:/xBe/W3pG3t9A0qtS1+OTsZheTgQMmPWNNifY8PRFac= -github.com/rfratto/ckit v0.0.0-20230410121755-15c17e2c0d9b/go.mod h1:759U3a/8xE3OO/uSYy72K/XKH3wnDnGU5KSUS7g0Jx0= github.com/rfratto/ckit v0.0.0-20230413073832-e0725e49faea h1:nYh9V3NKy2rOsIZl7jEWxKJPNvFveGhIK8wbgJ3ZJgc= github.com/rfratto/ckit v0.0.0-20230413073832-e0725e49faea/go.mod h1:9DKdYk48N1SdIXVsk/MStJHv3Xm0M2Tcvgbp+UCnreY= github.com/rfratto/go-yaml v0.0.0-20211119180816-77389c3526dc h1:g196Usc63pWDzWallipxVhsEjDdh/+RLc/Oz7q3ihW4=