From 0d22a91267e5520cdf130517cbcfbcb5b6088318 Mon Sep 17 00:00:00 2001
From: George Krajcsovits <krajorama@users.noreply.github.com>
Date: Mon, 9 Sep 2024 13:41:08 +0200
Subject: [PATCH 1/9] Merge pull request #14874 from
 krajorama/fix-panic-in-ooo-query2

BUGFIX: TSDB: panic in chunk querier
---
 tsdb/head_test.go     | 64 +++++++++++++++++++++++++++++++++++--------
 tsdb/ooo_head_read.go |  9 ++++++
 2 files changed, 61 insertions(+), 12 deletions(-)

diff --git a/tsdb/head_test.go b/tsdb/head_test.go
index c338ddadd..7b5349cfc 100644
--- a/tsdb/head_test.go
+++ b/tsdb/head_test.go
@@ -3493,6 +3493,56 @@ func TestWaitForPendingReadersInTimeRange(t *testing.T) {
 }
 
 func TestQueryOOOHeadDuringTruncate(t *testing.T) {
+	testQueryOOOHeadDuringTruncate(t,
+		func(db *DB, minT, maxT int64) (storage.LabelQuerier, error) {
+			return db.Querier(minT, maxT)
+		},
+		func(t *testing.T, lq storage.LabelQuerier, minT, _ int64) {
+			// Samples
+			q, ok := lq.(storage.Querier)
+			require.True(t, ok)
+			ss := q.Select(context.Background(), false, nil, labels.MustNewMatcher(labels.MatchEqual, "a", "b"))
+			require.True(t, ss.Next())
+			s := ss.At()
+			require.False(t, ss.Next()) // One series.
+			it := s.Iterator(nil)
+			require.NotEqual(t, chunkenc.ValNone, it.Next()) // Has some data.
+			require.Equal(t, minT, it.AtT())                 // It is an in-order sample.
+			require.NotEqual(t, chunkenc.ValNone, it.Next()) // Has some data.
+			require.Equal(t, minT+50, it.AtT())              // it is an out-of-order sample.
+			require.NoError(t, it.Err())
+		},
+	)
+}
+
+func TestChunkQueryOOOHeadDuringTruncate(t *testing.T) {
+	testQueryOOOHeadDuringTruncate(t,
+		func(db *DB, minT, maxT int64) (storage.LabelQuerier, error) {
+			return db.ChunkQuerier(minT, maxT)
+		},
+		func(t *testing.T, lq storage.LabelQuerier, minT, _ int64) {
+			// Chunks
+			q, ok := lq.(storage.ChunkQuerier)
+			require.True(t, ok)
+			ss := q.Select(context.Background(), false, nil, labels.MustNewMatcher(labels.MatchEqual, "a", "b"))
+			require.True(t, ss.Next())
+			s := ss.At()
+			require.False(t, ss.Next()) // One series.
+			metaIt := s.Iterator(nil)
+			require.True(t, metaIt.Next())
+			meta := metaIt.At()
+			// Samples
+			it := meta.Chunk.Iterator(nil)
+			require.NotEqual(t, chunkenc.ValNone, it.Next()) // Has some data.
+			require.Equal(t, minT, it.AtT())                 // It is an in-order sample.
+			require.NotEqual(t, chunkenc.ValNone, it.Next()) // Has some data.
+			require.Equal(t, minT+50, it.AtT())              // it is an out-of-order sample.
+			require.NoError(t, it.Err())
+		},
+	)
+}
+
+func testQueryOOOHeadDuringTruncate(t *testing.T, makeQuerier func(db *DB, minT, maxT int64) (storage.LabelQuerier, error), verify func(t *testing.T, q storage.LabelQuerier, minT, maxT int64)) {
 	const maxT int64 = 6000
 
 	dir := t.TempDir()
@@ -3545,7 +3595,7 @@ func TestQueryOOOHeadDuringTruncate(t *testing.T) {
 	// Wait for the compaction to start.
 	<-allowQueryToStart
 
-	q, err := db.Querier(1500, 2500)
+	q, err := makeQuerier(db, 1500, 2500)
 	require.NoError(t, err)
 	queryStarted <- struct{}{} // Unblock the compaction.
 	ctx := context.Background()
@@ -3562,17 +3612,7 @@ func TestQueryOOOHeadDuringTruncate(t *testing.T) {
 	require.Empty(t, annots)
 	require.Equal(t, []string{"b"}, res)
 
-	// Samples
-	ss := q.Select(ctx, false, nil, labels.MustNewMatcher(labels.MatchEqual, "a", "b"))
-	require.True(t, ss.Next())
-	s := ss.At()
-	require.False(t, ss.Next()) // One series.
-	it := s.Iterator(nil)
-	require.NotEqual(t, chunkenc.ValNone, it.Next()) // Has some data.
-	require.Equal(t, int64(1500), it.AtT())          // It is an in-order sample.
-	require.NotEqual(t, chunkenc.ValNone, it.Next()) // Has some data.
-	require.Equal(t, int64(1550), it.AtT())          // it is an out-of-order sample.
-	require.NoError(t, it.Err())
+	verify(t, q, 1500, 2500)
 
 	require.NoError(t, q.Close()) // Cannot be deferred as the compaction waits for queries to close before finishing.
 
diff --git a/tsdb/ooo_head_read.go b/tsdb/ooo_head_read.go
index a3c959bc4..66ae93325 100644
--- a/tsdb/ooo_head_read.go
+++ b/tsdb/ooo_head_read.go
@@ -586,15 +586,24 @@ func NewHeadAndOOOChunkQuerier(mint, maxt int64, head *Head, oooIsoState *oooIso
 }
 
 func (q *HeadAndOOOChunkQuerier) LabelValues(ctx context.Context, name string, hints *storage.LabelHints, matchers ...*labels.Matcher) ([]string, annotations.Annotations, error) {
+	if q.querier == nil {
+		return nil, nil, nil
+	}
 	return q.querier.LabelValues(ctx, name, hints, matchers...)
 }
 
 func (q *HeadAndOOOChunkQuerier) LabelNames(ctx context.Context, hints *storage.LabelHints, matchers ...*labels.Matcher) ([]string, annotations.Annotations, error) {
+	if q.querier == nil {
+		return nil, nil, nil
+	}
 	return q.querier.LabelNames(ctx, hints, matchers...)
 }
 
 func (q *HeadAndOOOChunkQuerier) Close() error {
 	q.chunkr.Close()
+	if q.querier == nil {
+		return nil
+	}
 	return q.querier.Close()
 }
 

From 5e68360dc8d7a40540794ad7f13aacf4ae23b3c8 Mon Sep 17 00:00:00 2001
From: Julius Volz <julius.volz@gmail.com>
Date: Tue, 10 Sep 2024 09:06:51 +0200
Subject: [PATCH 2/9] Fix error flood by downgrading OTel dependencies (#14884)

Fixes #14859, although we'll have to see about a long-term fix. Hopefully it'll
be fixed upstream with a follow-up version.

Signed-off-by: Julius Volz <julius.volz@gmail.com>
---
 go.mod | 4 ++--
 go.sum | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/go.mod b/go.mod
index 845e3277b..4a2dd1c77 100644
--- a/go.mod
+++ b/go.mod
@@ -64,7 +64,7 @@ require (
 	github.com/vultr/govultr/v2 v2.17.2
 	go.opentelemetry.io/collector/pdata v1.14.1
 	go.opentelemetry.io/collector/semconv v0.108.1
-	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.54.0
+	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0
 	go.opentelemetry.io/otel v1.29.0
 	go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.29.0
 	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.29.0
@@ -81,7 +81,7 @@ require (
 	golang.org/x/text v0.18.0
 	golang.org/x/time v0.6.0
 	golang.org/x/tools v0.24.0
-	google.golang.org/api v0.196.0
+	google.golang.org/api v0.195.0
 	google.golang.org/genproto/googleapis/api v0.0.0-20240827150818-7e3bb234dfed
 	google.golang.org/grpc v1.66.0
 	google.golang.org/protobuf v1.34.2
diff --git a/go.sum b/go.sum
index edb5b650b..4fc4f93bd 100644
--- a/go.sum
+++ b/go.sum
@@ -736,8 +736,8 @@ go.opentelemetry.io/collector/pdata v1.14.1 h1:wXZjtQA7Vy5HFqco+yA95ENyMQU5heBB1
 go.opentelemetry.io/collector/pdata v1.14.1/go.mod h1:z1dTjwwtcoXxZx2/nkHysjxMeaxe9pEmYTEr4SMNIx8=
 go.opentelemetry.io/collector/semconv v0.108.1 h1:Txk9tauUnamZaxS5vlf1O0uZ4VD6nioRBR0nX8L/fU4=
 go.opentelemetry.io/collector/semconv v0.108.1/go.mod h1:zCJ5njhWpejR+A40kiEoeFm1xq1uzyZwMnRNX6/D82A=
-go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.54.0 h1:TT4fX+nBOA/+LUkobKGW1ydGcn+G3vRw9+g5HwCphpk=
-go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.54.0/go.mod h1:L7UH0GbB0p47T4Rri3uHjbpCFYrVrwc1I25QhNPiGK8=
+go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0 h1:4K4tsIXefpVJtvA/8srF4V4y0akAoPHkIslgAkjixJA=
+go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0/go.mod h1:jjdQuTGVsXV4vSs+CJ2qYDeDPf9yIJV23qlIzBm73Vg=
 go.opentelemetry.io/otel v1.29.0 h1:PdomN/Al4q/lN6iBJEN3AwPvUiHPMlt93c8bqTG5Llw=
 go.opentelemetry.io/otel v1.29.0/go.mod h1:N/WtXPs1CNCUEx+Agz5uouwCba+i+bJGFicT8SR4NP8=
 go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.29.0 h1:dIIDULZJpgdiHz5tXrTgKIMLkus6jEFa7x5SOKcyR7E=
@@ -1056,8 +1056,8 @@ google.golang.org/api v0.20.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/
 google.golang.org/api v0.22.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE=
 google.golang.org/api v0.24.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE=
 google.golang.org/api v0.28.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE=
-google.golang.org/api v0.196.0 h1:k/RafYqebaIJBO3+SMnfEGtFVlvp5vSgqTUF54UN/zg=
-google.golang.org/api v0.196.0/go.mod h1:g9IL21uGkYgvQ5BZg6BAtoGJQIm8r6EgaAbpNey5wBE=
+google.golang.org/api v0.195.0 h1:Ude4N8FvTKnnQJHU48RFI40jOBgIrL8Zqr3/QeST6yU=
+google.golang.org/api v0.195.0/go.mod h1:DOGRWuv3P8TU8Lnz7uQc4hyNqrBpMtD9ppW3wBJurgc=
 google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
 google.golang.org/appengine v1.2.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
 google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=

From 5ccb0694146d666e49068e82c159300fedef6b76 Mon Sep 17 00:00:00 2001
From: Ganesh Vernekar <ganeshvern@gmail.com>
Date: Wed, 18 Sep 2024 10:26:31 -0400
Subject: [PATCH 3/9] Backward compatibility with upcoming index v3

Signed-off-by: Ganesh Vernekar <ganeshvern@gmail.com>
---
 tsdb/index/index.go | 28 ++++++++++++++++------------
 1 file changed, 16 insertions(+), 12 deletions(-)

diff --git a/tsdb/index/index.go b/tsdb/index/index.go
index 0e0e35371..db0b9b88b 100644
--- a/tsdb/index/index.go
+++ b/tsdb/index/index.go
@@ -43,10 +43,12 @@ const (
 	// HeaderLen represents number of bytes reserved of index for header.
 	HeaderLen = 5
 
-	// FormatV1 represents 1 version of index.
+	// FormatV1 represents version 1 of index.
 	FormatV1 = 1
-	// FormatV2 represents 2 version of index.
+	// FormatV2 represents version 2 of index.
 	FormatV2 = 2
+	// FormatV3 represents version 3 of index.
+	FormatV3 = 3
 
 	indexFilename = "index"
 
@@ -1193,7 +1195,9 @@ func newReader(b ByteSlice, c io.Closer) (*Reader, error) {
 	}
 	r.version = int(r.b.Range(4, 5)[0])
 
-	if r.version != FormatV1 && r.version != FormatV2 {
+	switch r.version {
+	case FormatV1, FormatV2, FormatV3:
+	default:
 		return nil, fmt.Errorf("unknown index file version %d", r.version)
 	}
 
@@ -1351,7 +1355,9 @@ func (s Symbols) Lookup(o uint32) (string, error) {
 		B: s.bs.Range(0, s.bs.Len()),
 	}
 
-	if s.version == FormatV2 {
+	if s.version == FormatV1 {
+		d.Skip(int(o))
+	} else {
 		if int(o) >= s.seen {
 			return "", fmt.Errorf("unknown symbol offset %d", o)
 		}
@@ -1360,8 +1366,6 @@ func (s Symbols) Lookup(o uint32) (string, error) {
 		for i := o - (o / symbolFactor * symbolFactor); i > 0; i-- {
 			d.UvarintBytes()
 		}
-	} else {
-		d.Skip(int(o))
 	}
 	sym := d.UvarintStr()
 	if d.Err() != nil {
@@ -1407,10 +1411,10 @@ func (s Symbols) ReverseLookup(sym string) (uint32, error) {
 	if lastSymbol != sym {
 		return 0, fmt.Errorf("unknown symbol %q", sym)
 	}
-	if s.version == FormatV2 {
-		return uint32(res), nil
+	if s.version == FormatV1 {
+		return uint32(s.bs.Len() - lastLen), nil
 	}
-	return uint32(s.bs.Len() - lastLen), nil
+	return uint32(res), nil
 }
 
 func (s Symbols) Size() int {
@@ -1569,7 +1573,7 @@ func (r *Reader) LabelNamesFor(ctx context.Context, postings Postings) ([]string
 		offset := id
 		// In version 2 series IDs are no longer exact references but series are 16-byte padded
 		// and the ID is the multiple of 16 of the actual position.
-		if r.version == FormatV2 {
+		if r.version != FormatV1 {
 			offset = id * seriesByteAlign
 		}
 
@@ -1608,7 +1612,7 @@ func (r *Reader) LabelValueFor(ctx context.Context, id storage.SeriesRef, label
 	offset := id
 	// In version 2 series IDs are no longer exact references but series are 16-byte padded
 	// and the ID is the multiple of 16 of the actual position.
-	if r.version == FormatV2 {
+	if r.version != FormatV1 {
 		offset = id * seriesByteAlign
 	}
 	d := encoding.NewDecbufUvarintAt(r.b, int(offset), castagnoliTable)
@@ -1634,7 +1638,7 @@ func (r *Reader) Series(id storage.SeriesRef, builder *labels.ScratchBuilder, ch
 	offset := id
 	// In version 2 series IDs are no longer exact references but series are 16-byte padded
 	// and the ID is the multiple of 16 of the actual position.
-	if r.version == FormatV2 {
+	if r.version != FormatV1 {
 		offset = id * seriesByteAlign
 	}
 	d := encoding.NewDecbufUvarintAt(r.b, int(offset), castagnoliTable)

From 81b9407f15a149bb6afdfd5ccf30a8c5de9c9885 Mon Sep 17 00:00:00 2001
From: Bryan Boreham <bjboreham@gmail.com>
Date: Tue, 17 Sep 2024 17:03:22 +0100
Subject: [PATCH 4/9] Prepare release 2.55.0-rc.0

Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
---
 CHANGELOG.md                                 | 35 ++++++++++++++++++--
 RELEASE.md                                   |  1 +
 VERSION                                      |  2 +-
 web/ui/module/codemirror-promql/package.json |  4 +--
 web/ui/module/lezer-promql/package.json      |  2 +-
 web/ui/package-lock.json                     | 14 ++++----
 web/ui/package.json                          |  2 +-
 web/ui/react-app/package.json                |  4 +--
 8 files changed, 47 insertions(+), 17 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ff222790f..e183f894b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,10 +2,39 @@
 
 ## unreleased
 
-* [FEATURE] OTLP receiver: Add new option `otlp.promote_resource_attributes`, for any OTel resource attributes that should be promoted to metric labels. #14200
-* [ENHANCEMENT] OTLP receiver: Warn when encountering exponential histograms with zero count and non-zero sum. #14706
+## 2.55.0-rc.0 / 2024-09-17
+
+* [FEATURE] Support UTF-8 characters in label names - feature flag `utf8-names`. #14482, #14880, #14736, #14727
+* [FEATURE] Support config reload automatically - feature flag `auto-reload-config`. #14769
+* [FEATURE] Scraping: Add the ability to set custom `http_headers` in config. #14817
+* [FEATURE] Scraping: Support feature flag `created-timestamp-zero-ingestion` in OpenMetrics. #14356, #14815
+* [FEATURE] Scraping: `scrape_failure_log_file` option to log failures to a file. #14734
+* [FEATURE] PromQL: Delay removal of `__name__` label - feature flag `promql-delayed-name-removal`. #14477
+* [FEATURE] OTLP receiver: Optional promotion of resource attributes to series labels. #14200
+* [FEATURE] API: Support multiple `--web.listen-address`. #14665
+* [FEATURE] Remote-Write: Support Google Cloud Monitoring authorization. #14346
+* [FEATURE] Promtool: `tsdb create-blocks` new option to add labels. #14403
+* [FEATURE] Promtool: `promtool test` adds `--junit` flag to format results. #14506
+* [ENHANCEMENT] OTLP receiver: Warn on exponential histograms with zero count and non-zero sum. #14706
 * [ENHANCEMENT] OTLP receiver: Interrupt translation on context cancellation/timeout. #14612
-* [BUGFIX] tsdb/wlog.Watcher.readSegmentForGC: Only count unknown record types against record_decode_failures_total metric. #14042
+* [ENHANCEMENT] PromQL: Improve detail in distributed tracing. #14816
+* [ENHANCEMENT] PromQL: Experimental `sort_by_label` and `sort_by_label_desc` sort by all labels when label is equal. #14655
+* [ENHANCEMENT] PromQL: Clarify error message logged when Go runtime panic occurs during query evaluation. #14621
+* [ENHANCEMENT] PromQL: Use Kahan summation for better accuracy in `avg` and `avg_over_time`. #14413
+* [ENHANCEMENT] TSDB: Backward compatibility with upcoming index v3. #14934
+* [PERF] Remote-Read: Support streaming mode. #11379
+* [PERF] TSDB: Query in-order and out-of-order series together. #14354, #14693, #14714, #14831, #14874
+* [PERF] TSDB: Streamline reading of overlapping out-of-order head chunks. #14729
+* [BUGFIX] SD: Fix dropping targets (with feature flag `new-service-discovery-manager`). #13147
+* [BUGFIX] SD: Stop storing stale targets (with feature flag `new-service-discovery-manager`). #13622
+* [BUGFIX] fix(utf8): propagate validationScheme config to scraping options. #14880
+* [BUGFIX] PromQL: Experimental Native Histograms: Do not re-use spans between histograms. #14771
+* [BUGFIX] Scraping: exemplars could be dropped in protobuf scraping. #14810
+* [BUGFIX] Remote-Write: fix metadata sending for experimental Remote-Write V2. #14766
+* [BUGFIX] Remote-Write: Return 4xx not 5xx when timeseries has duplicate label. #14716
+* [BUGFIX] Experimental Native Histograms: many fixes for incorrect results, panics, warnings. #14598, #14611, #14609, #14575, #14513
+* [BUGFIX] TSDB: Only count unknown record types in `record_decode_failures_total` metric. #14042
+* [ENHANCEMENT] Remote-Write: Don't reshard if we haven't successfully sent a sample since last update. #14450
 
 ## 2.54.1 / 2024-08-27
 
diff --git a/RELEASE.md b/RELEASE.md
index 0d3f7456c..b978a3c22 100644
--- a/RELEASE.md
+++ b/RELEASE.md
@@ -59,6 +59,7 @@ Release cadence of first pre-releases being cut is 6 weeks.
 | v2.52          | 2024-04-22                                 | Arthur Silva Sens (GitHub: @ArthurSens)     |
 | v2.53 LTS      | 2024-06-03                                 | George Krajcsovits (GitHub: @krajorama)     |
 | v2.54          | 2024-07-17                                 | Bryan Boreham (GitHub: @bboreham)           |
+| v2.55          | 2024-09-17                                 | Bryan Boreham (GitHub: @bboreham)           |
 
 If you are interested in volunteering please create a pull request against the [prometheus/prometheus](https://github.com/prometheus/prometheus) repository and propose yourself for the release series of your choice.
 
diff --git a/VERSION b/VERSION
index 3a40665f5..95a9e5028 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.54.1
+2.55.0-rc.0
diff --git a/web/ui/module/codemirror-promql/package.json b/web/ui/module/codemirror-promql/package.json
index 1e52207f3..1589781dc 100644
--- a/web/ui/module/codemirror-promql/package.json
+++ b/web/ui/module/codemirror-promql/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@prometheus-io/codemirror-promql",
-  "version": "0.54.1",
+  "version": "0.55.0-rc.0",
   "description": "a CodeMirror mode for the PromQL language",
   "types": "dist/esm/index.d.ts",
   "module": "dist/esm/index.js",
@@ -29,7 +29,7 @@
   },
   "homepage": "https://github.com/prometheus/prometheus/blob/main/web/ui/module/codemirror-promql/README.md",
   "dependencies": {
-    "@prometheus-io/lezer-promql": "0.54.1",
+    "@prometheus-io/lezer-promql": "0.55.0-rc.0",
     "lru-cache": "^7.18.3"
   },
   "devDependencies": {
diff --git a/web/ui/module/lezer-promql/package.json b/web/ui/module/lezer-promql/package.json
index d863cd1c0..ba68d5622 100644
--- a/web/ui/module/lezer-promql/package.json
+++ b/web/ui/module/lezer-promql/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@prometheus-io/lezer-promql",
-  "version": "0.54.1",
+  "version": "0.55.0-rc.0",
   "description": "lezer-based PromQL grammar",
   "main": "dist/index.cjs",
   "type": "module",
diff --git a/web/ui/package-lock.json b/web/ui/package-lock.json
index d425ecc9a..99a6516bf 100644
--- a/web/ui/package-lock.json
+++ b/web/ui/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "prometheus-io",
-  "version": "0.54.1",
+  "version": "0.55.0-rc.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "prometheus-io",
-      "version": "0.54.1",
+      "version": "0.55.0-rc.0",
       "workspaces": [
         "react-app",
         "module/*"
@@ -30,10 +30,10 @@
     },
     "module/codemirror-promql": {
       "name": "@prometheus-io/codemirror-promql",
-      "version": "0.54.1",
+      "version": "0.55.0-rc.0",
       "license": "Apache-2.0",
       "dependencies": {
-        "@prometheus-io/lezer-promql": "0.54.1",
+        "@prometheus-io/lezer-promql": "0.55.0-rc.0",
         "lru-cache": "^7.18.3"
       },
       "devDependencies": {
@@ -69,7 +69,7 @@
     },
     "module/lezer-promql": {
       "name": "@prometheus-io/lezer-promql",
-      "version": "0.54.1",
+      "version": "0.55.0-rc.0",
       "license": "Apache-2.0",
       "devDependencies": {
         "@lezer/generator": "^1.7.1",
@@ -19352,7 +19352,7 @@
     },
     "react-app": {
       "name": "@prometheus-io/app",
-      "version": "0.54.1",
+      "version": "0.55.0-rc.0",
       "dependencies": {
         "@codemirror/autocomplete": "^6.17.0",
         "@codemirror/commands": "^6.6.0",
@@ -19370,7 +19370,7 @@
         "@lezer/lr": "^1.4.2",
         "@nexucis/fuzzy": "^0.4.1",
         "@nexucis/kvsearch": "^0.8.1",
-        "@prometheus-io/codemirror-promql": "0.54.1",
+        "@prometheus-io/codemirror-promql": "0.55.0-rc.0",
         "bootstrap": "^4.6.2",
         "css.escape": "^1.5.1",
         "downshift": "^9.0.6",
diff --git a/web/ui/package.json b/web/ui/package.json
index f97d7098b..2525d295c 100644
--- a/web/ui/package.json
+++ b/web/ui/package.json
@@ -28,5 +28,5 @@
     "ts-jest": "^29.2.2",
     "typescript": "^4.9.5"
   },
-  "version": "0.54.1"
+  "version": "0.55.0-rc.0"
 }
diff --git a/web/ui/react-app/package.json b/web/ui/react-app/package.json
index 8f29b7c14..5cf490496 100644
--- a/web/ui/react-app/package.json
+++ b/web/ui/react-app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@prometheus-io/app",
-  "version": "0.54.1",
+  "version": "0.55.0-rc.0",
   "private": true,
   "dependencies": {
     "@codemirror/autocomplete": "^6.17.0",
@@ -19,7 +19,7 @@
     "@lezer/lr": "^1.4.2",
     "@nexucis/fuzzy": "^0.4.1",
     "@nexucis/kvsearch": "^0.8.1",
-    "@prometheus-io/codemirror-promql": "0.54.1",
+    "@prometheus-io/codemirror-promql": "0.55.0-rc.0",
     "bootstrap": "^4.6.2",
     "css.escape": "^1.5.1",
     "downshift": "^9.0.6",

From 1639450172d060d467c429ab953f7deb3d37edbd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Rabenstein?= <beorn@grafana.com>
Date: Tue, 10 Sep 2024 15:23:00 +0200
Subject: [PATCH 5/9] Merge pull request #14821 from
 charleskorn/nh-negative-multiplication-division

promql: correctly handle unary negation of native histograms and add tests for multiplication and division of native histograms by negative scalars
Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
---
 model/histogram/float_histogram_test.go       |  96 +++++++++++
 promql/engine.go                              |   3 +
 promql/parser/generated_parser.y              |   8 +-
 promql/parser/generated_parser.y.go           | 156 +++++++++---------
 promql/parser/lex.go                          |   3 +
 promql/parser/parse_test.go                   |  24 ++-
 .../testdata/native_histograms.test           |  26 ++-
 7 files changed, 223 insertions(+), 93 deletions(-)

diff --git a/model/histogram/float_histogram_test.go b/model/histogram/float_histogram_test.go
index 1558a6d67..cf370a313 100644
--- a/model/histogram/float_histogram_test.go
+++ b/model/histogram/float_histogram_test.go
@@ -131,6 +131,54 @@ func TestFloatHistogramMul(t *testing.T) {
 				NegativeBuckets: []float64{9, 3, 15, 18},
 			},
 		},
+		{
+			"negation",
+			&FloatHistogram{
+				ZeroThreshold:   0.01,
+				ZeroCount:       11,
+				Count:           30,
+				Sum:             23,
+				PositiveSpans:   []Span{{-2, 2}, {1, 3}},
+				PositiveBuckets: []float64{1, 0, 3, 4, 7},
+				NegativeSpans:   []Span{{3, 2}, {3, 2}},
+				NegativeBuckets: []float64{3, 1, 5, 6},
+			},
+			-1,
+			&FloatHistogram{
+				ZeroThreshold:   0.01,
+				ZeroCount:       -11,
+				Count:           -30,
+				Sum:             -23,
+				PositiveSpans:   []Span{{-2, 2}, {1, 3}},
+				PositiveBuckets: []float64{-1, 0, -3, -4, -7},
+				NegativeSpans:   []Span{{3, 2}, {3, 2}},
+				NegativeBuckets: []float64{-3, -1, -5, -6},
+			},
+		},
+		{
+			"negative multiplier",
+			&FloatHistogram{
+				ZeroThreshold:   0.01,
+				ZeroCount:       11,
+				Count:           30,
+				Sum:             23,
+				PositiveSpans:   []Span{{-2, 2}, {1, 3}},
+				PositiveBuckets: []float64{1, 0, 3, 4, 7},
+				NegativeSpans:   []Span{{3, 2}, {3, 2}},
+				NegativeBuckets: []float64{3, 1, 5, 6},
+			},
+			-2,
+			&FloatHistogram{
+				ZeroThreshold:   0.01,
+				ZeroCount:       -22,
+				Count:           -60,
+				Sum:             -46,
+				PositiveSpans:   []Span{{-2, 2}, {1, 3}},
+				PositiveBuckets: []float64{-2, 0, -6, -8, -14},
+				NegativeSpans:   []Span{{3, 2}, {3, 2}},
+				NegativeBuckets: []float64{-6, -2, -10, -12},
+			},
+		},
 		{
 			"no-op with custom buckets",
 			&FloatHistogram{
@@ -409,6 +457,54 @@ func TestFloatHistogramDiv(t *testing.T) {
 				NegativeBuckets: []float64{1.5, 0.5, 2.5, 3},
 			},
 		},
+		{
+			"negation",
+			&FloatHistogram{
+				ZeroThreshold:   0.01,
+				ZeroCount:       5.5,
+				Count:           3493.3,
+				Sum:             2349209.324,
+				PositiveSpans:   []Span{{-2, 1}, {2, 3}},
+				PositiveBuckets: []float64{1, 3.3, 4.2, 0.1},
+				NegativeSpans:   []Span{{3, 2}, {3, 2}},
+				NegativeBuckets: []float64{3.1, 3, 1.234e5, 1000},
+			},
+			-1,
+			&FloatHistogram{
+				ZeroThreshold:   0.01,
+				ZeroCount:       -5.5,
+				Count:           -3493.3,
+				Sum:             -2349209.324,
+				PositiveSpans:   []Span{{-2, 1}, {2, 3}},
+				PositiveBuckets: []float64{-1, -3.3, -4.2, -0.1},
+				NegativeSpans:   []Span{{3, 2}, {3, 2}},
+				NegativeBuckets: []float64{-3.1, -3, -1.234e5, -1000},
+			},
+		},
+		{
+			"negative half",
+			&FloatHistogram{
+				ZeroThreshold:   0.01,
+				ZeroCount:       11,
+				Count:           30,
+				Sum:             23,
+				PositiveSpans:   []Span{{-2, 2}, {1, 3}},
+				PositiveBuckets: []float64{1, 0, 3, 4, 7},
+				NegativeSpans:   []Span{{3, 2}, {3, 2}},
+				NegativeBuckets: []float64{3, 1, 5, 6},
+			},
+			-2,
+			&FloatHistogram{
+				ZeroThreshold:   0.01,
+				ZeroCount:       -5.5,
+				Count:           -15,
+				Sum:             -11.5,
+				PositiveSpans:   []Span{{-2, 2}, {1, 3}},
+				PositiveBuckets: []float64{-0.5, 0, -1.5, -2, -3.5},
+				NegativeSpans:   []Span{{3, 2}, {3, 2}},
+				NegativeBuckets: []float64{-1.5, -0.5, -2.5, -3},
+			},
+		},
 		{
 			"no-op with custom buckets",
 			&FloatHistogram{
diff --git a/promql/engine.go b/promql/engine.go
index e55f154d2..b583e12d5 100644
--- a/promql/engine.go
+++ b/promql/engine.go
@@ -1815,6 +1815,9 @@ func (ev *evaluator) eval(ctx context.Context, expr parser.Expr) (parser.Value,
 				for j := range mat[i].Floats {
 					mat[i].Floats[j].F = -mat[i].Floats[j].F
 				}
+				for j := range mat[i].Histograms {
+					mat[i].Histograms[j].H = mat[i].Histograms[j].H.Copy().Mul(-1)
+				}
 			}
 			if !ev.enableDelayedNameRemoval && mat.ContainsSameLabelset() {
 				ev.errorf("vector cannot contain metrics with the same labelset")
diff --git a/promql/parser/generated_parser.y b/promql/parser/generated_parser.y
index da24be0c4..befb9bdf3 100644
--- a/promql/parser/generated_parser.y
+++ b/promql/parser/generated_parser.y
@@ -818,12 +818,12 @@ histogram_desc_item
                    $$ = yylex.(*parser).newMap()
                    $$["sum"] = $3
                 }
-                | COUNT_DESC COLON number
+                | COUNT_DESC COLON signed_or_unsigned_number
                 {
                    $$ = yylex.(*parser).newMap()
                    $$["count"] = $3
                 }
-                | ZERO_BUCKET_DESC COLON number
+                | ZERO_BUCKET_DESC COLON signed_or_unsigned_number
                 {
                    $$ = yylex.(*parser).newMap()
                    $$["z_bucket"] = $3
@@ -875,11 +875,11 @@ bucket_set      : LEFT_BRACKET bucket_set_list SPACE RIGHT_BRACKET
                 }
                 ;
 
-bucket_set_list : bucket_set_list SPACE number
+bucket_set_list : bucket_set_list SPACE signed_or_unsigned_number
                 {
                   $$ = append($1, $3)
                 }
-                | number
+                | signed_or_unsigned_number
                 {
                   $$ = []float64{$1}
                 }
diff --git a/promql/parser/generated_parser.y.go b/promql/parser/generated_parser.y.go
index 22231f73e..ad58a5297 100644
--- a/promql/parser/generated_parser.y.go
+++ b/promql/parser/generated_parser.y.go
@@ -410,55 +410,55 @@ const yyPrivate = 57344
 const yyLast = 799
 
 var yyAct = [...]int16{
-	155, 334, 332, 276, 339, 152, 226, 39, 192, 44,
-	291, 290, 156, 118, 82, 178, 229, 107, 106, 346,
-	347, 348, 349, 109, 108, 198, 239, 199, 133, 110,
-	105, 60, 245, 121, 6, 329, 325, 111, 328, 228,
-	200, 201, 160, 119, 304, 267, 293, 128, 260, 160,
-	151, 261, 159, 302, 358, 311, 122, 55, 89, 159,
-	196, 241, 242, 259, 113, 243, 114, 54, 98, 99,
-	302, 112, 101, 256, 104, 88, 230, 232, 234, 235,
+	152, 334, 332, 155, 339, 226, 39, 192, 276, 44,
+	291, 290, 118, 82, 178, 229, 107, 106, 346, 347,
+	348, 349, 109, 108, 198, 239, 199, 156, 110, 105,
+	6, 245, 200, 201, 133, 325, 111, 329, 228, 60,
+	357, 293, 328, 304, 267, 160, 266, 128, 55, 151,
+	302, 311, 302, 196, 340, 159, 55, 89, 54, 356,
+	241, 242, 355, 113, 243, 114, 54, 98, 99, 265,
+	112, 101, 256, 104, 88, 230, 232, 234, 235, 236,
+	244, 246, 249, 250, 251, 252, 253, 257, 258, 105,
+	333, 231, 233, 237, 238, 240, 247, 248, 103, 115,
+	109, 254, 255, 324, 150, 218, 110, 264, 111, 270,
+	77, 35, 7, 149, 188, 163, 322, 321, 173, 320,
+	167, 170, 323, 165, 271, 166, 2, 3, 4, 5,
+	263, 101, 194, 104, 180, 184, 197, 187, 186, 319,
+	272, 202, 203, 204, 205, 206, 207, 208, 209, 210,
+	211, 212, 213, 214, 215, 216, 195, 299, 103, 318,
+	217, 36, 298, 1, 190, 219, 220, 317, 160, 160,
+	316, 193, 160, 154, 182, 196, 229, 297, 159, 159,
+	160, 358, 159, 268, 181, 183, 239, 260, 296, 262,
+	159, 315, 245, 129, 314, 55, 225, 313, 161, 228,
+	161, 161, 259, 312, 161, 54, 86, 295, 310, 288,
+	289, 8, 161, 292, 162, 37, 162, 162, 49, 269,
+	162, 241, 242, 309, 179, 243, 180, 127, 162, 126,
+	308, 223, 294, 256, 48, 222, 230, 232, 234, 235,
 	236, 244, 246, 249, 250, 251, 252, 253, 257, 258,
-	160, 115, 231, 233, 237, 238, 240, 247, 248, 103,
-	159, 109, 254, 255, 324, 150, 357, 110, 333, 218,
-	111, 340, 310, 149, 77, 163, 7, 105, 35, 173,
-	167, 170, 161, 323, 165, 356, 166, 309, 355, 194,
-	2, 3, 4, 5, 308, 322, 184, 197, 162, 186,
-	321, 195, 202, 203, 204, 205, 206, 207, 208, 209,
-	210, 211, 212, 213, 214, 215, 216, 229, 129, 101,
-	217, 104, 219, 220, 190, 266, 270, 239, 160, 121,
-	268, 193, 264, 245, 55, 196, 154, 225, 159, 119,
-	228, 271, 188, 160, 54, 161, 103, 117, 265, 84,
-	262, 299, 122, 159, 320, 263, 298, 272, 10, 83,
-	161, 162, 241, 242, 269, 187, 243, 185, 79, 288,
-	289, 297, 319, 292, 256, 161, 162, 230, 232, 234,
-	235, 236, 244, 246, 249, 250, 251, 252, 253, 257,
-	258, 162, 294, 231, 233, 237, 238, 240, 247, 248,
-	318, 317, 316, 254, 255, 180, 315, 134, 135, 136,
-	137, 138, 139, 140, 141, 142, 143, 144, 145, 146,
-	147, 148, 157, 158, 169, 105, 314, 296, 300, 301,
-	303, 223, 305, 313, 55, 222, 179, 168, 180, 84,
-	306, 307, 177, 125, 54, 182, 295, 176, 124, 83,
-	221, 312, 87, 89, 8, 181, 183, 81, 37, 86,
-	175, 123, 36, 98, 99, 326, 327, 101, 102, 104,
-	88, 127, 331, 126, 50, 336, 337, 338, 182, 335,
-	78, 1, 342, 341, 344, 343, 49, 48, 181, 183,
-	350, 351, 47, 55, 103, 352, 53, 77, 164, 56,
-	46, 354, 22, 54, 59, 55, 172, 9, 9, 57,
-	132, 45, 43, 130, 171, 54, 359, 42, 131, 41,
-	40, 51, 191, 353, 273, 75, 85, 189, 224, 80,
-	345, 18, 19, 120, 153, 20, 58, 227, 52, 116,
+	221, 169, 231, 233, 237, 238, 240, 247, 248, 157,
+	158, 164, 254, 255, 168, 10, 182, 300, 55, 301,
+	303, 47, 305, 46, 132, 79, 181, 183, 54, 306,
+	307, 45, 134, 135, 136, 137, 138, 139, 140, 141,
+	142, 143, 144, 145, 146, 147, 148, 43, 59, 50,
+	84, 9, 9, 121, 326, 78, 327, 130, 171, 121,
+	83, 42, 131, 119, 335, 336, 337, 331, 185, 119,
+	338, 261, 342, 341, 344, 343, 122, 117, 41, 177,
+	350, 351, 122, 55, 176, 352, 53, 77, 40, 56,
+	125, 354, 22, 54, 84, 124, 172, 175, 51, 57,
+	191, 353, 273, 85, 83, 189, 359, 224, 123, 80,
+	345, 120, 81, 153, 58, 75, 227, 52, 116, 0,
+	0, 18, 19, 0, 0, 20, 0, 0, 0, 0,
 	0, 76, 0, 0, 0, 0, 61, 62, 63, 64,
 	65, 66, 67, 68, 69, 70, 71, 72, 73, 74,
 	0, 0, 0, 13, 0, 0, 0, 24, 0, 30,
-	0, 0, 31, 32, 55, 38, 0, 53, 77, 0,
+	0, 0, 31, 32, 55, 38, 105, 53, 77, 0,
 	56, 275, 0, 22, 54, 0, 0, 0, 274, 0,
 	57, 0, 278, 279, 277, 284, 286, 283, 285, 280,
-	281, 282, 287, 0, 0, 0, 75, 0, 0, 0,
-	0, 0, 18, 19, 0, 0, 20, 0, 0, 0,
-	0, 0, 76, 0, 0, 0, 0, 61, 62, 63,
+	281, 282, 287, 87, 89, 0, 75, 0, 0, 0,
+	0, 0, 18, 19, 98, 99, 20, 0, 101, 102,
+	104, 88, 76, 0, 0, 0, 0, 61, 62, 63,
 	64, 65, 66, 67, 68, 69, 70, 71, 72, 73,
-	74, 0, 0, 0, 13, 0, 0, 0, 24, 0,
+	74, 0, 0, 0, 13, 103, 0, 0, 24, 0,
 	30, 0, 55, 31, 32, 53, 77, 0, 56, 330,
 	0, 22, 54, 0, 0, 0, 0, 0, 57, 0,
 	278, 279, 277, 284, 286, 283, 285, 280, 281, 282,
@@ -493,51 +493,51 @@ var yyAct = [...]int16{
 }
 
 var yyPact = [...]int16{
-	32, 106, 569, 569, 405, 526, -1000, -1000, -1000, 105,
+	28, 102, 569, 569, 405, 526, -1000, -1000, -1000, 98,
 	-1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000,
 	-1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000,
-	-1000, -1000, -1000, -1000, -1000, 277, -1000, 297, -1000, 650,
+	-1000, -1000, -1000, -1000, -1000, 342, -1000, 204, -1000, 650,
 	-1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000,
-	-1000, -1000, 22, 95, -1000, -1000, 483, -1000, 483, 101,
+	-1000, -1000, 21, 93, -1000, -1000, 483, -1000, 483, 97,
 	-1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000,
-	-1000, -1000, -1000, -1000, -1000, -1000, -1000, 167, -1000, -1000,
-	281, -1000, -1000, 309, -1000, 23, -1000, -50, -50, -50,
-	-50, -50, -50, -50, -50, -50, -50, -50, -50, -50,
-	-50, -50, -50, 48, 174, 336, 95, -56, -1000, 262,
-	262, 324, -1000, 631, 103, -1000, 280, -1000, -1000, 274,
-	241, -1000, -1000, -1000, 187, -1000, 180, -1000, 159, 483,
-	-1000, -57, -40, -1000, 483, 483, 483, 483, 483, 483,
+	-1000, -1000, -1000, -1000, -1000, -1000, -1000, 307, -1000, -1000,
+	338, -1000, -1000, 225, -1000, 23, -1000, -44, -44, -44,
+	-44, -44, -44, -44, -44, -44, -44, -44, -44, -44,
+	-44, -44, -44, 47, 171, 259, 93, -57, -1000, 249,
+	249, 324, -1000, 631, 75, -1000, 327, -1000, -1000, 222,
+	130, -1000, -1000, -1000, 298, -1000, 112, -1000, 159, 483,
+	-1000, -58, -48, -1000, 483, 483, 483, 483, 483, 483,
 	483, 483, 483, 483, 483, 483, 483, 483, 483, -1000,
-	165, -1000, -1000, 94, -1000, -1000, -1000, -1000, -1000, -1000,
-	-1000, 40, 40, 269, -1000, -1000, -1000, -1000, 155, -1000,
-	-1000, 41, -1000, 650, -1000, -1000, 31, -1000, 170, -1000,
-	-1000, -1000, -1000, -1000, 163, -1000, -1000, -1000, -1000, -1000,
-	19, 144, 140, -1000, -1000, -1000, 404, 16, 262, 262,
-	262, 262, 103, 103, 251, 251, 251, 715, 696, 251,
-	251, 715, 103, 103, 251, 103, 16, -1000, 24, -1000,
-	-1000, -1000, 265, -1000, 189, -1000, -1000, -1000, -1000, -1000,
+	39, -1000, -1000, 90, -1000, -1000, -1000, -1000, -1000, -1000,
+	-1000, 36, 36, 229, -1000, -1000, -1000, -1000, 174, -1000,
+	-1000, 180, -1000, 650, -1000, -1000, 301, -1000, 105, -1000,
+	-1000, -1000, -1000, -1000, 44, -1000, -1000, -1000, -1000, -1000,
+	18, 157, 83, -1000, -1000, -1000, 404, 15, 249, 249,
+	249, 249, 75, 75, 402, 402, 402, 715, 696, 402,
+	402, 715, 75, 75, 402, 75, 15, -1000, 19, -1000,
+	-1000, -1000, 186, -1000, 155, -1000, -1000, -1000, -1000, -1000,
 	-1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000,
 	-1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000,
 	-1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000,
-	483, -1000, -1000, -1000, -1000, -1000, -1000, 34, 34, 18,
-	34, 44, 44, 110, 38, -1000, -1000, 285, 267, 260,
-	240, 236, 235, 234, 206, 188, 134, 129, -1000, -1000,
-	-1000, -1000, -1000, -1000, 102, -1000, -1000, -1000, 14, -1000,
-	650, -1000, -1000, -1000, 34, -1000, 12, 9, 482, -1000,
-	-1000, -1000, 51, 81, 40, 40, 40, 97, 97, 51,
-	97, 51, -73, -1000, -1000, -1000, -1000, -1000, 34, 34,
-	-1000, -1000, -1000, 34, -1000, -1000, -1000, -1000, -1000, -1000,
-	40, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000,
-	-1000, -1000, -1000, 104, -1000, 33, -1000, -1000, -1000, -1000,
+	483, -1000, -1000, -1000, -1000, -1000, -1000, 31, 31, 17,
+	31, 37, 37, 206, 34, -1000, -1000, 197, 191, 188,
+	185, 164, 161, 153, 133, 113, 111, 110, -1000, -1000,
+	-1000, -1000, -1000, -1000, 101, -1000, -1000, -1000, 13, -1000,
+	650, -1000, -1000, -1000, 31, -1000, 16, 11, 482, -1000,
+	-1000, -1000, 33, 163, 163, 163, 36, 40, 40, 33,
+	40, 33, -74, -1000, -1000, -1000, -1000, -1000, 31, 31,
+	-1000, -1000, -1000, 31, -1000, -1000, -1000, -1000, -1000, -1000,
+	163, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000,
+	-1000, -1000, -1000, 38, -1000, 160, -1000, -1000, -1000, -1000,
 }
 
 var yyPgo = [...]int16{
-	0, 379, 13, 378, 6, 15, 377, 344, 376, 374,
-	373, 370, 198, 294, 369, 14, 368, 10, 11, 367,
-	366, 8, 364, 3, 4, 363, 2, 1, 0, 362,
-	12, 5, 361, 360, 18, 158, 359, 358, 7, 357,
-	354, 17, 353, 31, 352, 9, 351, 350, 340, 332,
-	327, 326, 314, 321, 302,
+	0, 368, 12, 367, 5, 14, 366, 298, 364, 363,
+	361, 360, 265, 211, 359, 13, 357, 10, 11, 355,
+	353, 7, 352, 8, 4, 351, 2, 1, 3, 350,
+	27, 0, 348, 338, 17, 193, 328, 312, 6, 311,
+	308, 16, 307, 39, 297, 9, 281, 274, 273, 271,
+	234, 218, 299, 163, 161,
 }
 
 var yyR1 = [...]int8{
@@ -630,9 +630,9 @@ var yyChk = [...]int16{
 	-38, -27, 19, -27, 26, -27, -21, -21, 24, 17,
 	2, 17, 6, 6, 6, 6, 6, 6, 6, 6,
 	6, 6, 6, 21, 2, 22, -4, -27, 26, 26,
-	17, -23, -26, 57, -27, -31, -28, -28, -28, -24,
+	17, -23, -26, 57, -27, -31, -31, -31, -28, -24,
 	14, -24, -26, -24, -26, -11, 92, 93, 94, 95,
-	-27, -27, -27, -25, -28, 24, 21, 2, 21, -28,
+	-27, -27, -27, -25, -31, 24, 21, 2, 21, -31,
 }
 
 var yyDef = [...]int16{
diff --git a/promql/parser/lex.go b/promql/parser/lex.go
index d031e8330..82bf0367b 100644
--- a/promql/parser/lex.go
+++ b/promql/parser/lex.go
@@ -610,6 +610,9 @@ func lexBuckets(l *Lexer) stateFn {
 	case isSpace(r):
 		l.emit(SPACE)
 		return lexSpace
+	case r == '-':
+		l.emit(SUB)
+		return lexNumber
 	case isDigit(r):
 		l.backup()
 		return lexNumber
diff --git a/promql/parser/parse_test.go b/promql/parser/parse_test.go
index 37748323c..d9956e745 100644
--- a/promql/parser/parse_test.go
+++ b/promql/parser/parse_test.go
@@ -4084,17 +4084,17 @@ func TestParseHistogramSeries(t *testing.T) {
 		},
 		{
 			name:  "all properties used",
-			input: `{} {{schema:1 sum:-0.3 count:3.1 z_bucket:7.1 z_bucket_w:0.05 buckets:[5.1 10 7] offset:-3 n_buckets:[4.1 5] n_offset:-5 counter_reset_hint:gauge}}`,
+			input: `{} {{schema:1 sum:0.3 count:3.1 z_bucket:7.1 z_bucket_w:0.05 buckets:[5.1 10 7] offset:3 n_buckets:[4.1 5] n_offset:5 counter_reset_hint:gauge}}`,
 			expected: []histogram.FloatHistogram{{
 				Schema:           1,
-				Sum:              -0.3,
+				Sum:              0.3,
 				Count:            3.1,
 				ZeroCount:        7.1,
 				ZeroThreshold:    0.05,
 				PositiveBuckets:  []float64{5.1, 10, 7},
-				PositiveSpans:    []histogram.Span{{Offset: -3, Length: 3}},
+				PositiveSpans:    []histogram.Span{{Offset: 3, Length: 3}},
 				NegativeBuckets:  []float64{4.1, 5},
-				NegativeSpans:    []histogram.Span{{Offset: -5, Length: 2}},
+				NegativeSpans:    []histogram.Span{{Offset: 5, Length: 2}},
 				CounterResetHint: histogram.GaugeType,
 			}},
 		},
@@ -4114,6 +4114,22 @@ func TestParseHistogramSeries(t *testing.T) {
 				CounterResetHint: histogram.GaugeType,
 			}},
 		},
+		{
+			name:  "all properties used, with negative values where supported",
+			input: `{} {{schema:1 sum:-0.3 count:-3.1 z_bucket:-7.1 z_bucket_w:0.05 buckets:[-5.1 -10 -7] offset:-3 n_buckets:[-4.1 -5] n_offset:-5 counter_reset_hint:gauge}}`,
+			expected: []histogram.FloatHistogram{{
+				Schema:           1,
+				Sum:              -0.3,
+				Count:            -3.1,
+				ZeroCount:        -7.1,
+				ZeroThreshold:    0.05,
+				PositiveBuckets:  []float64{-5.1, -10, -7},
+				PositiveSpans:    []histogram.Span{{Offset: -3, Length: 3}},
+				NegativeBuckets:  []float64{-4.1, -5},
+				NegativeSpans:    []histogram.Span{{Offset: -5, Length: 2}},
+				CounterResetHint: histogram.GaugeType,
+			}},
+		},
 		{
 			name:  "static series",
 			input: `{} {{buckets:[5 10 7] schema:1}}x2`,
diff --git a/promql/promqltest/testdata/native_histograms.test b/promql/promqltest/testdata/native_histograms.test
index 71e102dce..7d2eec32c 100644
--- a/promql/promqltest/testdata/native_histograms.test
+++ b/promql/promqltest/testdata/native_histograms.test
@@ -720,27 +720,39 @@ eval instant at 10m histogram_sum(scalar(histogram_fraction(-Inf, +Inf, sum(hist
 
 # Apply multiplication and division operator to histogram.
 load 10m
-    histogram_mul_div {{schema:0 count:21 sum:33 z_bucket:3 z_bucket_w:0.001 buckets:[3 3 3] n_buckets:[3 3 3]}}x1
+    histogram_mul_div {{schema:0 count:30 sum:33 z_bucket:3 z_bucket_w:0.001 buckets:[3 3 3] n_buckets:[6 6 6]}}x1
     float_series_3 3+0x1
     float_series_0 0+0x1
 
 eval instant at 10m histogram_mul_div*3
-    {} {{schema:0 count:63 sum:99 z_bucket:9 z_bucket_w:0.001 buckets:[9 9 9] n_buckets:[9 9 9]}}
+    {} {{schema:0 count:90 sum:99 z_bucket:9 z_bucket_w:0.001 buckets:[9 9 9] n_buckets:[18 18 18]}}
+
+eval instant at 10m histogram_mul_div*-1
+    {} {{schema:0 count:-30 sum:-33 z_bucket:-3 z_bucket_w:0.001 buckets:[-3 -3 -3] n_buckets:[-6 -6 -6]}}
+
+eval instant at 10m -histogram_mul_div
+    {} {{schema:0 count:-30 sum:-33 z_bucket:-3 z_bucket_w:0.001 buckets:[-3 -3 -3] n_buckets:[-6 -6 -6]}}
+
+eval instant at 10m histogram_mul_div*-3
+    {} {{schema:0 count:-90 sum:-99 z_bucket:-9 z_bucket_w:0.001 buckets:[-9 -9 -9] n_buckets:[-18 -18 -18]}}
 
 eval instant at 10m 3*histogram_mul_div
-    {} {{schema:0 count:63 sum:99 z_bucket:9 z_bucket_w:0.001 buckets:[9 9 9] n_buckets:[9 9 9]}}
+    {} {{schema:0 count:90 sum:99 z_bucket:9 z_bucket_w:0.001 buckets:[9 9 9] n_buckets:[18 18 18]}}
 
 eval instant at 10m histogram_mul_div*float_series_3
-    {} {{schema:0 count:63 sum:99 z_bucket:9 z_bucket_w:0.001 buckets:[9 9 9] n_buckets:[9 9 9]}}
+    {} {{schema:0 count:90 sum:99 z_bucket:9 z_bucket_w:0.001 buckets:[9 9 9] n_buckets:[18 18 18]}}
 
 eval instant at 10m float_series_3*histogram_mul_div
-    {} {{schema:0 count:63 sum:99 z_bucket:9 z_bucket_w:0.001 buckets:[9 9 9] n_buckets:[9 9 9]}}
+    {} {{schema:0 count:90 sum:99 z_bucket:9 z_bucket_w:0.001 buckets:[9 9 9] n_buckets:[18 18 18]}}
 
 eval instant at 10m histogram_mul_div/3
-    {} {{schema:0 count:7 sum:11 z_bucket:1 z_bucket_w:0.001 buckets:[1 1 1] n_buckets:[1 1 1]}}
+    {} {{schema:0 count:10 sum:11 z_bucket:1 z_bucket_w:0.001 buckets:[1 1 1] n_buckets:[2 2 2]}}
+
+eval instant at 10m histogram_mul_div/-3
+    {} {{schema:0 count:-10 sum:-11 z_bucket:-1 z_bucket_w:0.001 buckets:[-1 -1 -1] n_buckets:[-2 -2 -2]}}
 
 eval instant at 10m histogram_mul_div/float_series_3
-    {} {{schema:0 count:7 sum:11 z_bucket:1 z_bucket_w:0.001 buckets:[1 1 1] n_buckets:[1 1 1]}}
+    {} {{schema:0 count:10 sum:11 z_bucket:1 z_bucket_w:0.001 buckets:[1 1 1] n_buckets:[2 2 2]}}
 
 eval instant at 10m histogram_mul_div*0
     {} {{schema:0 count:0 sum:0 z_bucket:0 z_bucket_w:0.001 buckets:[0 0 0] n_buckets:[0 0 0]}}

From 06022a65099f40e915484b9ce2499ba02e1fcbac Mon Sep 17 00:00:00 2001
From: Bryan Boreham <bjboreham@gmail.com>
Date: Thu, 19 Sep 2024 14:03:54 +0100
Subject: [PATCH 6/9] CHANGELOG: Add #14821

Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e183f894b..65642d37c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -32,7 +32,7 @@
 * [BUGFIX] Scraping: exemplars could be dropped in protobuf scraping. #14810
 * [BUGFIX] Remote-Write: fix metadata sending for experimental Remote-Write V2. #14766
 * [BUGFIX] Remote-Write: Return 4xx not 5xx when timeseries has duplicate label. #14716
-* [BUGFIX] Experimental Native Histograms: many fixes for incorrect results, panics, warnings. #14598, #14611, #14609, #14575, #14513
+* [BUGFIX] Experimental Native Histograms: many fixes for incorrect results, panics, warnings. #14598, #14611, #14609, #14575, #14513, #14821
 * [BUGFIX] TSDB: Only count unknown record types in `record_decode_failures_total` metric. #14042
 * [ENHANCEMENT] Remote-Write: Don't reshard if we haven't successfully sent a sample since last update. #14450
 

From 6f0d6038b7f9430f023f3cddd9ea5b5e5e3c03cb Mon Sep 17 00:00:00 2001
From: Bryan Boreham <bjboreham@gmail.com>
Date: Fri, 20 Sep 2024 17:40:17 +0100
Subject: [PATCH 7/9] [BUGFIX] TSDB: Only query chunks up to truncation time
 (#14948)

If the query overlaps the range currently undergoing compaction, we
should only fetch chunks up to that time. Need to store that min time
in `HeadAndOOOIndexReader`.

Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
---
 tsdb/db.go                 |  8 ++++++--
 tsdb/ooo_head_read.go      | 23 ++++++++++++-----------
 tsdb/ooo_head_read_test.go |  8 ++++----
 tsdb/querier_test.go       |  2 +-
 4 files changed, 23 insertions(+), 18 deletions(-)

diff --git a/tsdb/db.go b/tsdb/db.go
index a5b3a5e60..2d2759b61 100644
--- a/tsdb/db.go
+++ b/tsdb/db.go
@@ -2043,6 +2043,7 @@ func (db *DB) Querier(mint, maxt int64) (_ storage.Querier, err error) {
 
 	overlapsOOO := overlapsClosedInterval(mint, maxt, db.head.MinOOOTime(), db.head.MaxOOOTime())
 	var headQuerier storage.Querier
+	inoMint := mint
 	if maxt >= db.head.MinTime() || overlapsOOO {
 		rh := NewRangeHead(db.head, mint, maxt)
 		var err error
@@ -2067,13 +2068,14 @@ func (db *DB) Querier(mint, maxt int64) (_ storage.Querier, err error) {
 			if err != nil {
 				return nil, fmt.Errorf("open block querier for head while getting new querier %s: %w", rh, err)
 			}
+			inoMint = newMint
 		}
 	}
 
 	if overlapsOOO {
 		// We need to fetch from in-order and out-of-order chunks: wrap the headQuerier.
 		isoState := db.head.oooIso.TrackReadAfter(db.lastGarbageCollectedMmapRef)
-		headQuerier = NewHeadAndOOOQuerier(mint, maxt, db.head, isoState, headQuerier)
+		headQuerier = NewHeadAndOOOQuerier(inoMint, mint, maxt, db.head, isoState, headQuerier)
 	}
 
 	if headQuerier != nil {
@@ -2119,6 +2121,7 @@ func (db *DB) blockChunkQuerierForRange(mint, maxt int64) (_ []storage.ChunkQuer
 
 	overlapsOOO := overlapsClosedInterval(mint, maxt, db.head.MinOOOTime(), db.head.MaxOOOTime())
 	var headQuerier storage.ChunkQuerier
+	inoMint := mint
 	if maxt >= db.head.MinTime() || overlapsOOO {
 		rh := NewRangeHead(db.head, mint, maxt)
 		headQuerier, err = db.blockChunkQuerierFunc(rh, mint, maxt)
@@ -2142,13 +2145,14 @@ func (db *DB) blockChunkQuerierForRange(mint, maxt int64) (_ []storage.ChunkQuer
 			if err != nil {
 				return nil, fmt.Errorf("open querier for head while getting new querier %s: %w", rh, err)
 			}
+			inoMint = newMint
 		}
 	}
 
 	if overlapsOOO {
 		// We need to fetch from in-order and out-of-order chunks: wrap the headQuerier.
 		isoState := db.head.oooIso.TrackReadAfter(db.lastGarbageCollectedMmapRef)
-		headQuerier = NewHeadAndOOOChunkQuerier(mint, maxt, db.head, isoState, headQuerier)
+		headQuerier = NewHeadAndOOOChunkQuerier(inoMint, mint, maxt, db.head, isoState, headQuerier)
 	}
 
 	if headQuerier != nil {
diff --git a/tsdb/ooo_head_read.go b/tsdb/ooo_head_read.go
index 66ae93325..6b54aeb7d 100644
--- a/tsdb/ooo_head_read.go
+++ b/tsdb/ooo_head_read.go
@@ -35,6 +35,7 @@ var _ IndexReader = &HeadAndOOOIndexReader{}
 
 type HeadAndOOOIndexReader struct {
 	*headIndexReader            // A reference to the headIndexReader so we can reuse as many interface implementation as possible.
+	inoMint                     int64
 	lastGarbageCollectedMmapRef chunks.ChunkDiskMapperRef
 }
 
@@ -49,13 +50,13 @@ func (o mergedOOOChunks) Iterator(iterator chunkenc.Iterator) chunkenc.Iterator
 	return storage.ChainSampleIteratorFromIterables(iterator, o.chunkIterables)
 }
 
-func NewHeadAndOOOIndexReader(head *Head, mint, maxt int64, lastGarbageCollectedMmapRef chunks.ChunkDiskMapperRef) *HeadAndOOOIndexReader {
+func NewHeadAndOOOIndexReader(head *Head, inoMint, mint, maxt int64, lastGarbageCollectedMmapRef chunks.ChunkDiskMapperRef) *HeadAndOOOIndexReader {
 	hr := &headIndexReader{
 		head: head,
 		mint: mint,
 		maxt: maxt,
 	}
-	return &HeadAndOOOIndexReader{hr, lastGarbageCollectedMmapRef}
+	return &HeadAndOOOIndexReader{hr, inoMint, lastGarbageCollectedMmapRef}
 }
 
 func (oh *HeadAndOOOIndexReader) Series(ref storage.SeriesRef, builder *labels.ScratchBuilder, chks *[]chunks.Meta) error {
@@ -76,9 +77,9 @@ func (oh *HeadAndOOOIndexReader) Series(ref storage.SeriesRef, builder *labels.S
 	*chks = (*chks)[:0]
 
 	if s.ooo != nil {
-		return getOOOSeriesChunks(s, oh.mint, oh.maxt, oh.lastGarbageCollectedMmapRef, 0, true, chks)
+		return getOOOSeriesChunks(s, oh.mint, oh.maxt, oh.lastGarbageCollectedMmapRef, 0, true, oh.inoMint, chks)
 	}
-	*chks = appendSeriesChunks(s, oh.mint, oh.maxt, *chks)
+	*chks = appendSeriesChunks(s, oh.inoMint, oh.maxt, *chks)
 	return nil
 }
 
@@ -87,7 +88,7 @@ func (oh *HeadAndOOOIndexReader) Series(ref storage.SeriesRef, builder *labels.S
 //
 // maxMmapRef tells upto what max m-map chunk that we can consider. If it is non-0, then
 // the oooHeadChunk will not be considered.
-func getOOOSeriesChunks(s *memSeries, mint, maxt int64, lastGarbageCollectedMmapRef, maxMmapRef chunks.ChunkDiskMapperRef, includeInOrder bool, chks *[]chunks.Meta) error {
+func getOOOSeriesChunks(s *memSeries, mint, maxt int64, lastGarbageCollectedMmapRef, maxMmapRef chunks.ChunkDiskMapperRef, includeInOrder bool, inoMint int64, chks *[]chunks.Meta) error {
 	tmpChks := make([]chunks.Meta, 0, len(s.ooo.oooMmappedChunks))
 
 	addChunk := func(minT, maxT int64, ref chunks.ChunkRef, chunk chunkenc.Chunk) {
@@ -128,7 +129,7 @@ func getOOOSeriesChunks(s *memSeries, mint, maxt int64, lastGarbageCollectedMmap
 	}
 
 	if includeInOrder {
-		tmpChks = appendSeriesChunks(s, mint, maxt, tmpChks)
+		tmpChks = appendSeriesChunks(s, inoMint, maxt, tmpChks)
 	}
 
 	// There is nothing to do if we did not collect any chunk.
@@ -476,7 +477,7 @@ func (ir *OOOCompactionHeadIndexReader) Series(ref storage.SeriesRef, builder *l
 		return nil
 	}
 
-	return getOOOSeriesChunks(s, ir.ch.mint, ir.ch.maxt, 0, ir.ch.lastMmapRef, false, chks)
+	return getOOOSeriesChunks(s, ir.ch.mint, ir.ch.maxt, 0, ir.ch.lastMmapRef, false, 0, chks)
 }
 
 func (ir *OOOCompactionHeadIndexReader) SortedLabelValues(_ context.Context, name string, matchers ...*labels.Matcher) ([]string, error) {
@@ -516,7 +517,7 @@ type HeadAndOOOQuerier struct {
 	querier    storage.Querier // Used for LabelNames, LabelValues, but may be nil if head was truncated in the mean time, in which case we ignore it and not close it in the end.
 }
 
-func NewHeadAndOOOQuerier(mint, maxt int64, head *Head, oooIsoState *oooIsolationState, querier storage.Querier) storage.Querier {
+func NewHeadAndOOOQuerier(inoMint, mint, maxt int64, head *Head, oooIsoState *oooIsolationState, querier storage.Querier) storage.Querier {
 	cr := &headChunkReader{
 		head:     head,
 		mint:     mint,
@@ -527,7 +528,7 @@ func NewHeadAndOOOQuerier(mint, maxt int64, head *Head, oooIsoState *oooIsolatio
 		mint:    mint,
 		maxt:    maxt,
 		head:    head,
-		index:   NewHeadAndOOOIndexReader(head, mint, maxt, oooIsoState.minRef),
+		index:   NewHeadAndOOOIndexReader(head, inoMint, mint, maxt, oooIsoState.minRef),
 		chunkr:  NewHeadAndOOOChunkReader(head, mint, maxt, cr, oooIsoState, 0),
 		querier: querier,
 	}
@@ -568,7 +569,7 @@ type HeadAndOOOChunkQuerier struct {
 	querier    storage.ChunkQuerier
 }
 
-func NewHeadAndOOOChunkQuerier(mint, maxt int64, head *Head, oooIsoState *oooIsolationState, querier storage.ChunkQuerier) storage.ChunkQuerier {
+func NewHeadAndOOOChunkQuerier(inoMint, mint, maxt int64, head *Head, oooIsoState *oooIsolationState, querier storage.ChunkQuerier) storage.ChunkQuerier {
 	cr := &headChunkReader{
 		head:     head,
 		mint:     mint,
@@ -579,7 +580,7 @@ func NewHeadAndOOOChunkQuerier(mint, maxt int64, head *Head, oooIsoState *oooIso
 		mint:    mint,
 		maxt:    maxt,
 		head:    head,
-		index:   NewHeadAndOOOIndexReader(head, mint, maxt, oooIsoState.minRef),
+		index:   NewHeadAndOOOIndexReader(head, inoMint, mint, maxt, oooIsoState.minRef),
 		chunkr:  NewHeadAndOOOChunkReader(head, mint, maxt, cr, oooIsoState, 0),
 		querier: querier,
 	}
diff --git a/tsdb/ooo_head_read_test.go b/tsdb/ooo_head_read_test.go
index 40e37043b..b9f2133ea 100644
--- a/tsdb/ooo_head_read_test.go
+++ b/tsdb/ooo_head_read_test.go
@@ -360,7 +360,7 @@ func TestOOOHeadIndexReader_Series(t *testing.T) {
 						})
 					}
 
-					ir := NewHeadAndOOOIndexReader(h, tc.queryMinT, tc.queryMaxT, 0)
+					ir := NewHeadAndOOOIndexReader(h, tc.queryMinT, tc.queryMinT, tc.queryMaxT, 0)
 
 					var chks []chunks.Meta
 					var b labels.ScratchBuilder
@@ -450,7 +450,7 @@ func testOOOHeadChunkReader_LabelValues(t *testing.T, scenario sampleTypeScenari
 	for _, tc := range cases {
 		t.Run(tc.name, func(t *testing.T) {
 			// We first want to test using a head index reader that covers the biggest query interval
-			oh := NewHeadAndOOOIndexReader(head, tc.queryMinT, tc.queryMaxT, 0)
+			oh := NewHeadAndOOOIndexReader(head, tc.queryMinT, tc.queryMinT, tc.queryMaxT, 0)
 			matchers := []*labels.Matcher{labels.MustNewMatcher(labels.MatchEqual, "foo", "bar1")}
 			values, err := oh.LabelValues(ctx, "foo", matchers...)
 			sort.Strings(values)
@@ -854,7 +854,7 @@ func testOOOHeadChunkReader_Chunk(t *testing.T, scenario sampleTypeScenario) {
 
 			// The Series method populates the chunk metas, taking a copy of the
 			// head OOO chunk if necessary. These are then used by the ChunkReader.
-			ir := NewHeadAndOOOIndexReader(db.head, tc.queryMinT, tc.queryMaxT, 0)
+			ir := NewHeadAndOOOIndexReader(db.head, tc.queryMinT, tc.queryMinT, tc.queryMaxT, 0)
 			var chks []chunks.Meta
 			var b labels.ScratchBuilder
 			err = ir.Series(s1Ref, &b, &chks)
@@ -1023,7 +1023,7 @@ func testOOOHeadChunkReader_Chunk_ConsistentQueryResponseDespiteOfHeadExpanding(
 
 			// The Series method populates the chunk metas, taking a copy of the
 			// head OOO chunk if necessary. These are then used by the ChunkReader.
-			ir := NewHeadAndOOOIndexReader(db.head, tc.queryMinT, tc.queryMaxT, 0)
+			ir := NewHeadAndOOOIndexReader(db.head, tc.queryMinT, tc.queryMinT, tc.queryMaxT, 0)
 			var chks []chunks.Meta
 			var b labels.ScratchBuilder
 			err = ir.Series(s1Ref, &b, &chks)
diff --git a/tsdb/querier_test.go b/tsdb/querier_test.go
index 50525f65f..858b70793 100644
--- a/tsdb/querier_test.go
+++ b/tsdb/querier_test.go
@@ -3170,7 +3170,7 @@ func BenchmarkQueries(b *testing.B) {
 					qHead, err := NewBlockQuerier(NewRangeHead(head, 1, nSamples), 1, nSamples)
 					require.NoError(b, err)
 					isoState := head.oooIso.TrackReadAfter(0)
-					qOOOHead := NewHeadAndOOOQuerier(1, nSamples, head, isoState, qHead)
+					qOOOHead := NewHeadAndOOOQuerier(1, 1, nSamples, head, isoState, qHead)
 
 					queryTypes = append(queryTypes, qt{
 						fmt.Sprintf("_Head_oooPercent:%d", oooPercentage), qOOOHead,

From e3617cbd2cd48801a4c6a9e24b6e6ef8c610b879 Mon Sep 17 00:00:00 2001
From: Bryan Boreham <bjboreham@gmail.com>
Date: Fri, 20 Sep 2024 17:47:37 +0100
Subject: [PATCH 8/9] Add #14948 to CHANGELOG

Also update the date of the RC which hasn't gone out yet.

Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
---
 CHANGELOG.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 65642d37c..a84526edd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,7 +2,7 @@
 
 ## unreleased
 
-## 2.55.0-rc.0 / 2024-09-17
+## 2.55.0-rc.0 / 2024-09-20
 
 * [FEATURE] Support UTF-8 characters in label names - feature flag `utf8-names`. #14482, #14880, #14736, #14727
 * [FEATURE] Support config reload automatically - feature flag `auto-reload-config`. #14769
@@ -23,7 +23,7 @@
 * [ENHANCEMENT] PromQL: Use Kahan summation for better accuracy in `avg` and `avg_over_time`. #14413
 * [ENHANCEMENT] TSDB: Backward compatibility with upcoming index v3. #14934
 * [PERF] Remote-Read: Support streaming mode. #11379
-* [PERF] TSDB: Query in-order and out-of-order series together. #14354, #14693, #14714, #14831, #14874
+* [PERF] TSDB: Query in-order and out-of-order series together. #14354, #14693, #14714, #14831, #14874, #14948
 * [PERF] TSDB: Streamline reading of overlapping out-of-order head chunks. #14729
 * [BUGFIX] SD: Fix dropping targets (with feature flag `new-service-discovery-manager`). #13147
 * [BUGFIX] SD: Stop storing stale targets (with feature flag `new-service-discovery-manager`). #13622

From e3f5c7c2a07995adc9d73d2e7ae483e39dbca7ca Mon Sep 17 00:00:00 2001
From: Bryan Boreham <bjboreham@gmail.com>
Date: Sun, 22 Sep 2024 17:42:04 +0100
Subject: [PATCH 9/9] [Release 2.55] Update CHANGELOG

Make text more consistent with 3.0 branch

Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
---
 CHANGELOG.md | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a84526edd..64618d552 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,32 +9,30 @@
 * [FEATURE] Scraping: Add the ability to set custom `http_headers` in config. #14817
 * [FEATURE] Scraping: Support feature flag `created-timestamp-zero-ingestion` in OpenMetrics. #14356, #14815
 * [FEATURE] Scraping: `scrape_failure_log_file` option to log failures to a file. #14734
-* [FEATURE] PromQL: Delay removal of `__name__` label - feature flag `promql-delayed-name-removal`. #14477
 * [FEATURE] OTLP receiver: Optional promotion of resource attributes to series labels. #14200
-* [FEATURE] API: Support multiple `--web.listen-address`. #14665
 * [FEATURE] Remote-Write: Support Google Cloud Monitoring authorization. #14346
 * [FEATURE] Promtool: `tsdb create-blocks` new option to add labels. #14403
 * [FEATURE] Promtool: `promtool test` adds `--junit` flag to format results. #14506
 * [ENHANCEMENT] OTLP receiver: Warn on exponential histograms with zero count and non-zero sum. #14706
 * [ENHANCEMENT] OTLP receiver: Interrupt translation on context cancellation/timeout. #14612
-* [ENHANCEMENT] PromQL: Improve detail in distributed tracing. #14816
+* [ENHANCEMENT] Remote Read client: Enable streaming remote read if the server supports it. #11379
+* [ENHANCEMENT] Remote-Write: Don't reshard if we haven't successfully sent a sample since last update. #14450
+* [ENHANCEMENT] PromQL: Delay deletion of `__name__` label to the end of the query evaluation. This is **experimental** and enabled under the feature-flag `promql-delayed-name-removal`. #14477
 * [ENHANCEMENT] PromQL: Experimental `sort_by_label` and `sort_by_label_desc` sort by all labels when label is equal. #14655
 * [ENHANCEMENT] PromQL: Clarify error message logged when Go runtime panic occurs during query evaluation. #14621
 * [ENHANCEMENT] PromQL: Use Kahan summation for better accuracy in `avg` and `avg_over_time`. #14413
+* [ENHANCEMENT] Tracing: Improve PromQL tracing, including showing the operation performed for aggregates, operators, and calls. #14816
+* [ENHANCEMENT] API: Support multiple listening addresses. #14665
 * [ENHANCEMENT] TSDB: Backward compatibility with upcoming index v3. #14934
-* [PERF] Remote-Read: Support streaming mode. #11379
 * [PERF] TSDB: Query in-order and out-of-order series together. #14354, #14693, #14714, #14831, #14874, #14948
 * [PERF] TSDB: Streamline reading of overlapping out-of-order head chunks. #14729
 * [BUGFIX] SD: Fix dropping targets (with feature flag `new-service-discovery-manager`). #13147
 * [BUGFIX] SD: Stop storing stale targets (with feature flag `new-service-discovery-manager`). #13622
-* [BUGFIX] fix(utf8): propagate validationScheme config to scraping options. #14880
-* [BUGFIX] PromQL: Experimental Native Histograms: Do not re-use spans between histograms. #14771
 * [BUGFIX] Scraping: exemplars could be dropped in protobuf scraping. #14810
 * [BUGFIX] Remote-Write: fix metadata sending for experimental Remote-Write V2. #14766
 * [BUGFIX] Remote-Write: Return 4xx not 5xx when timeseries has duplicate label. #14716
-* [BUGFIX] Experimental Native Histograms: many fixes for incorrect results, panics, warnings. #14598, #14611, #14609, #14575, #14513, #14821
+* [BUGFIX] Experimental Native Histograms: many fixes for incorrect results, panics, warnings. #14513, #14575, #14598, #14609, #14611, #14771, #14821
 * [BUGFIX] TSDB: Only count unknown record types in `record_decode_failures_total` metric. #14042
-* [ENHANCEMENT] Remote-Write: Don't reshard if we haven't successfully sent a sample since last update. #14450
 
 ## 2.54.1 / 2024-08-27