feat: update mimir-prometheus to 85aefbca2c90

Update mimir-prometheus to pick up content-addressed Parquet storage
and the ReadSeriesMetadataFromReaderAt API. Replace manual Parquet
row parsing in store-gateway with the new upstream reader, which
handles both flat and content-addressed formats transparently.

- Use ReadSeriesMetadataFromReaderAt with WithNamespaceFilter in
  parseResourceAttributesParquet, removing direct parquet-go usage
- Update test for VersionAt behavior change (no longer falls back
  to first version for timestamps before MinTime)

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>

Author: aknuds1

go.mod

@@ -88,7 +88,6 @@ require (
 	github.com/tylertreat/BoomFilters v0.0.0-20251117164519-53813c36cc1b
 	github.com/xlab/treeprint v1.2.0
 	go.opentelemetry.io/collector/pdata v1.51.0
-	go.opentelemetry.io/collector/pdata/xpdata v0.142.0
 	go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.65.0
 	go.opentelemetry.io/contrib/propagators/jaeger v1.40.0
 	go.opentelemetry.io/otel v1.40.0
@@ -209,6 +208,7 @@ require (
 	go.opentelemetry.io/collector/confmap/xconfmap v0.142.0 // indirect
 	go.opentelemetry.io/collector/consumer v1.48.0 // indirect
 	go.opentelemetry.io/collector/featuregate v1.51.0 // indirect
+	go.opentelemetry.io/collector/pdata/xpdata v0.142.0 // indirect
 	go.opentelemetry.io/collector/pipeline v1.48.0 // indirect
 	go.opentelemetry.io/collector/processor v1.48.0 // indirect
 	go.opentelemetry.io/contrib/bridges/prometheus v0.64.0 // indirect
@@ -368,7 +368,7 @@ require (
 	sigs.k8s.io/yaml v1.6.0 // indirect
 )
 
-replace github.com/prometheus/prometheus => github.com/grafana/mimir-prometheus v1.8.2-0.20260209180056-2ad3cdd58e5e
+replace github.com/prometheus/prometheus => github.com/grafana/mimir-prometheus v1.8.2-0.20260210170232-85aefbca2c90
 
 // Replace memberlist with our fork which includes some changes that haven't been
 // merged upstream yet for years and we don't expect to change anytime soon.

go.sum

@@ -611,8 +611,8 @@ github.com/grafana/memberlist v0.3.1-0.20251126142931-6f9f62ab6f86 h1:aTwfQuroOm
 github.com/grafana/memberlist v0.3.1-0.20251126142931-6f9f62ab6f86/go.mod h1:h60o12SZn/ua/j0B6iKAZezA4eDaGsIuPO70eOaJ6WE=
 github.com/grafana/mimir-otlptranslator v0.0.0-20251017074411-ea1e8f863e1d h1:k4NIVPYPP0sLJoGNzGwoQs2MpnWTvTcgbWPCzfdX66c=
 github.com/grafana/mimir-otlptranslator v0.0.0-20251017074411-ea1e8f863e1d/go.mod h1:vRYWnXvI6aWGpsdY/mOT/cbeVRBlPWtBNDb7kGR3uKM=
-github.com/grafana/mimir-prometheus v1.8.2-0.20260209180056-2ad3cdd58e5e h1:dUm2yWXpx74pYfsCAkUu1WW3WRz+Jc+qNRyycji/oKE=
-github.com/grafana/mimir-prometheus v1.8.2-0.20260209180056-2ad3cdd58e5e/go.mod h1:qMWjZQxsNDV+HrnUg6E3ESyZ9HlS25IgIlUh7ebK3d0=
+github.com/grafana/mimir-prometheus v1.8.2-0.20260210170232-85aefbca2c90 h1:6vPY0iUSycupDsFXv5IFtzIaF/wcuzR1RI3ZDROE9jQ=
+github.com/grafana/mimir-prometheus v1.8.2-0.20260210170232-85aefbca2c90/go.mod h1:qMWjZQxsNDV+HrnUg6E3ESyZ9HlS25IgIlUh7ebK3d0=
 github.com/grafana/opentracing-contrib-go-stdlib v0.0.0-20230509071955-f410e79da956 h1:em1oddjXL8c1tL0iFdtVtPloq2hRPen2MJQKoAWpxu0=
 github.com/grafana/opentracing-contrib-go-stdlib v0.0.0-20230509071955-f410e79da956/go.mod h1:qtI1ogk+2JhVPIXVc6q+NHziSmy2W5GbdQZFUHADCBU=
 github.com/grafana/otel-profiling-go v0.5.1 h1:stVPKAFZSa7eGiqbYuG25VcqYksR6iWvF3YH66t4qL8=

pkg/querier/resource_querier_cache_test.go

@@ -102,7 +102,7 @@ func TestResourceQuerierCache_GetResourceAt(t *testing.T) {
 			},
 		},
 		{
-			name: "timestamp before MinTime returns first version (fallback behavior)",
+			name: "timestamp before MinTime returns not found",
 			fetcherData: []*ResourceAttributesData{
 				{
 					LabelsHash: 12345,
@@ -112,13 +112,8 @@ func TestResourceQuerierCache_GetResourceAt(t *testing.T) {
 				},
 			},
 			labelsHash:  12345,
-			timestamp:   500, // Before MinTime - VersionAt returns first version as fallback
-			expectFound: true,
-			expectVersion: &seriesmetadata.ResourceVersion{
-				MinTime:     1000,
-				MaxTime:     2000,
-				Identifying: map[string]string{"service.name": "test"},
-			},
+			timestamp:   500, // Before MinTime - VersionAt returns nil
+			expectFound: false,
 		},
 	}
 

pkg/storegateway/bucket.go

@@ -11,6 +11,7 @@ import (
 	"context"
 	"fmt"
 	"io"
+	"log/slog"
 	"math"
 	"os"
 	"path"
@@ -29,7 +30,6 @@ import (
 	"github.com/grafana/dskit/runutil"
 	"github.com/grafana/dskit/services"
 	"github.com/oklog/ulid/v2"
-	"github.com/parquet-go/parquet-go"
 	"github.com/pkg/errors"
 	"github.com/prometheus/prometheus/model/labels"
 	"github.com/prometheus/prometheus/storage"
@@ -1731,75 +1731,46 @@ func (s *BucketStore) blockResourceAttributes(ctx context.Context, b *bucketBloc
 // parseResourceAttributesParquet parses a series_metadata.parquet file and returns
 // resource versions indexed by labels hash.
 func parseResourceAttributesParquet(data []byte) (map[uint64][]*storepb.ResourceVersionData, error) {
-	// Use parquet.Read with a bytes.Reader which implements io.ReaderAt
 	reader := bytes.NewReader(data)
-
-	// Define the row type to read - must match the parquet schema
-	type parquetRow struct {
-		Namespace        string                                `parquet:"namespace"`
-		LabelsHash       uint64                                `parquet:"labels_hash"`
-		MinTime          int64                                 `parquet:"mint,optional"`
-		MaxTime          int64                                 `parquet:"maxt,optional"`
-		IdentifyingAttrs []seriesmetadata.EntityAttributeEntry `parquet:"identifying_attrs,list,optional"`
-		DescriptiveAttrs []seriesmetadata.EntityAttributeEntry `parquet:"descriptive_attrs,list,optional"`
-		Entities         []seriesmetadata.EntityRow            `parquet:"entities,list,optional"`
-	}
-
-	rows, err := parquet.Read[parquetRow](reader, int64(len(data)))
+	smReader, err := seriesmetadata.ReadSeriesMetadataFromReaderAt(
+		slog.Default(),
+		reader,
+		int64(len(data)),
+		seriesmetadata.WithNamespaceFilter(
+			seriesmetadata.NamespaceResource,
+			seriesmetadata.NamespaceResourceTable,
+			seriesmetadata.NamespaceResourceMapping,
+		),
+	)
 	if err != nil {
-		return nil, errors.Wrap(err, "read parquet rows")
+		return nil, errors.Wrap(err, "read series metadata")
 	}
+	defer smReader.Close()
 
-	// Build map from labels hash to resource versions
 	resourcesByHash := make(map[uint64][]*storepb.ResourceVersionData)
-
-	for _, row := range rows {
-		if row.Namespace != seriesmetadata.NamespaceResource {
-			// Skip metric metadata rows
-			continue
-		}
-
-		// Convert identifying attributes
-		identifying := make(map[string]string, len(row.IdentifyingAttrs))
-		for _, attr := range row.IdentifyingAttrs {
-			identifying[attr.Key] = attr.Value
-		}
-
-		// Convert descriptive attributes
-		descriptive := make(map[string]string, len(row.DescriptiveAttrs))
-		for _, attr := range row.DescriptiveAttrs {
-			descriptive[attr.Key] = attr.Value
-		}
-
-		// Convert entities
-		var entities []*storepb.EntityData
-		for _, entityRow := range row.Entities {
-			entityID := make(map[string]string, len(entityRow.ID))
-			for _, attr := range entityRow.ID {
-				entityID[attr.Key] = attr.Value
-			}
-			entityDesc := make(map[string]string, len(entityRow.Description))
-			for _, attr := range entityRow.Description {
-				entityDesc[attr.Key] = attr.Value
+	err = smReader.IterVersionedResources(func(labelsHash uint64, resources *seriesmetadata.VersionedResource) error {
+		for _, rv := range resources.Versions {
+			var entities []*storepb.EntityData
+			for _, e := range rv.Entities {
+				entities = append(entities, &storepb.EntityData{
+					Type:        e.Type,
+					Id:          e.ID,
+					Description: e.Description,
+				})
 			}
-			entities = append(entities, &storepb.EntityData{
-				Type:        entityRow.Type,
-				Id:          entityID,
-				Description: entityDesc,
+			resourcesByHash[labelsHash] = append(resourcesByHash[labelsHash], &storepb.ResourceVersionData{
+				Identifying: rv.Identifying,
+				Descriptive: rv.Descriptive,
+				Entities:    entities,
+				MinTimeMs:   rv.MinTime,
+				MaxTimeMs:   rv.MaxTime,
 			})
 		}
-
-		version := &storepb.ResourceVersionData{
-			Identifying: identifying,
-			Descriptive: descriptive,
-			Entities:    entities,
-			MinTimeMs:   row.MinTime,
-			MaxTimeMs:   row.MaxTime,
-		}
-
-		resourcesByHash[row.LabelsHash] = append(resourcesByHash[row.LabelsHash], version)
+		return nil
+	})
+	if err != nil {
+		return nil, errors.Wrap(err, "iterate versioned resources")
 	}
-
 	return resourcesByHash, nil
 }