Labels cpp

.promu.yml

@@ -18,7 +18,8 @@ build:
             - netgo
             - builtinassets
             - osusergo
-            - stringlabels
+            # - stringlabels
+            - cpplabels
         windows:
             - builtinassets
             - stringlabels

cmd/prometheus/main.go

@@ -284,6 +284,9 @@ func main() {
 		runtime.SetMutexProfileFraction(20)
 	}
 
+	lssctx, cancelLSS := context.WithCancel(context.Background())
+	labels.Storage.Run(lssctx)
+
 	var (
 		oldFlagRetentionDuration model.Duration
 		newFlagRetentionDuration model.Duration
@@ -790,23 +793,23 @@ func main() {
 		os.Exit(1)
 	}
 
-	remoteWriterReadyNotifier := ready.NewNotifiableNotifier()
-	remoteWriter := remotewriter.New(
-		dataDir,
-		headCatalog,
-		clock,
-		remoteWriterReadyNotifier,
-		prometheus.DefaultRegisterer,
-	)
-
 	adapter := pp_pkg_storage.NewAdapter(
 		clock,
 		hManager.Proxy(),
 		hManager.Builder(),
 		hManager.MergeOutOfOrderChunks,
 		prometheus.DefaultRegisterer,
 	)
+	labels.Storage.SetAdapter(adapter)
 
+	remoteWriterReadyNotifier := ready.NewNotifiableNotifier()
+	remoteWriter := remotewriter.New(
+		dataDir,
+		headCatalog,
+		clock,
+		remoteWriterReadyNotifier,
+		prometheus.DefaultRegisterer,
+	)
 	// PP_CHANGES.md: rebuild on cpp end
 
 	var (
@@ -898,6 +901,7 @@ func main() {
 	scrapeManager, err := scrape.NewManager(
 		&cfg.scrape,
 		log.With(logger, "component", "scrape manager"),
+		func(s string) (log.Logger, error) { return logging.NewJSONFileLogger(s) },
 		adapter,
 		prometheus.DefaultRegisterer,
 	)
@@ -1581,6 +1585,8 @@ func main() {
 	if err := queryEngine.Close(); err != nil {
 		level.Warn(logger).Log("msg", "Closing query engine failed", "err", err)
 	}
+
+	cancelLSS()
 	// PP_CHANGES.md: rebuild on cpp end
 
 	level.Info(logger).Log("msg", "See you next time!")

cmd/prometheus/main_test.go

@@ -147,13 +147,14 @@ func TestSendAlerts(t *testing.T) {
 	}{
 		{
 			in: []*rules.Alert{
-				{
-					Labels:      labels.FromStrings("l1", "v1"),
-					Annotations: labels.FromStrings("a2", "v2"),
-					ActiveAt:    time.Unix(1, 0),
-					FiredAt:     time.Unix(2, 0),
-					ValidUntil:  time.Unix(3, 0),
-				},
+				rules.NewAlert(
+					labels.FromStrings("l1", "v1"),
+					labels.FromStrings("a2", "v2"),
+					time.Unix(1, 0),
+					time.Unix(2, 0),
+					time.Time{},
+					time.Unix(3, 0),
+				),
 			},
 			exp: []*notifier.Alert{
 				{
@@ -167,13 +168,14 @@ func TestSendAlerts(t *testing.T) {
 		},
 		{
 			in: []*rules.Alert{
-				{
-					Labels:      labels.FromStrings("l1", "v1"),
-					Annotations: labels.FromStrings("a2", "v2"),
-					ActiveAt:    time.Unix(1, 0),
-					FiredAt:     time.Unix(2, 0),
-					ResolvedAt:  time.Unix(4, 0),
-				},
+				rules.NewAlert(
+					labels.FromStrings("l1", "v1"),
+					labels.FromStrings("a2", "v2"),
+					time.Unix(1, 0),
+					time.Unix(2, 0),
+					time.Unix(4, 0),
+					time.Time{},
+				),
 			},
 			exp: []*notifier.Alert{
 				{
@@ -195,7 +197,8 @@ func TestSendAlerts(t *testing.T) {
 		t.Run(strconv.Itoa(i), func(t *testing.T) {
 			senderFunc := senderFunc(func(alerts ...*notifier.Alert) {
 				require.NotEmpty(t, tc.in, "sender called with 0 alert")
-				require.Equal(t, tc.exp, alerts)
+				require.True(t, tc.exp[0].Equal(alerts[0]))
+				// require.Equal(t, tc.exp, alerts)
 			})
 			rules.SendAlerts(senderFunc, "http://localhost:9090")(context.TODO(), "up", tc.in...)
 		})
@@ -496,7 +499,7 @@ func TestDocumentation(t *testing.T) {
 
 	generatedContent := strings.ReplaceAll(stdout.String(), filepath.Base(promPath), strings.TrimSuffix(filepath.Base(promPath), ".test"))
 
-	expectedContent, err := os.ReadFile(filepath.Join("..", "..", "docs", "command-line", "prometheus.md"))
+	expectedContent, err := os.ReadFile(filepath.Join("..", "..", "docs", "command-line", "prompp.md")) // PP_CHANGES.md: rebuild on cpp
 	require.NoError(t, err)
 
 	require.Equal(t, string(expectedContent), generatedContent, "Generated content does not match documentation. Hint: run `make cli-documentation`.")

cmd/promtool/rules.go

@@ -26,6 +26,7 @@ import (
 	"github.com/prometheus/prometheus/model/labels"
 	"github.com/prometheus/prometheus/model/timestamp"
 	"github.com/prometheus/prometheus/pp-pkg/rules" // PP_CHANGES.md: rebuild on cpp
+	"github.com/prometheus/prometheus/pp/go/cppbridge"
 	"github.com/prometheus/prometheus/storage"
 	"github.com/prometheus/prometheus/tsdb"
 	tsdb_errors "github.com/prometheus/prometheus/tsdb/errors"
@@ -71,7 +72,7 @@ func newRuleImporter(logger log.Logger, config ruleImporterConfig, apiClient que
 
 // loadGroups parses groups from a list of recording rule files.
 func (importer *ruleImporter) loadGroups(_ context.Context, filenames []string) (errs []error) {
-	groups, errs := importer.ruleManager.LoadGroups(importer.config.evalInterval, labels.Labels{}, "", nil, filenames...)
+	groups, errs := importer.ruleManager.LoadGroups(importer.config.evalInterval, cppbridge.Labels{}, "", nil, filenames...) // PP_CHANGES.md: rebuild on cpp
 	if errs != nil {
 		return errs
 	}

cmd/promtool/unittest.go

@@ -37,6 +37,7 @@ import (
 	"github.com/prometheus/prometheus/model/histogram"
 	"github.com/prometheus/prometheus/model/labels"
 	"github.com/prometheus/prometheus/pp-pkg/rules" // PP_CHANGES.md: rebuild on cpp
+	"github.com/prometheus/prometheus/pp/go/cppbridge"
 	"github.com/prometheus/prometheus/promql"
 	"github.com/prometheus/prometheus/promql/parser"
 	"github.com/prometheus/prometheus/promql/promqltest"
@@ -192,7 +193,7 @@ type testGroup struct {
 	InputSeries     []series         `yaml:"input_series"`
 	AlertRuleTests  []alertTestCase  `yaml:"alert_rule_test,omitempty"`
 	PromqlExprTests []promqlTestCase `yaml:"promql_expr_test,omitempty"`
-	ExternalLabels  labels.Labels    `yaml:"external_labels,omitempty"`
+	ExternalLabels  cppbridge.Labels `yaml:"external_labels,omitempty"` // PP_CHANGES.md: rebuild on cpp
 	ExternalURL     string           `yaml:"external_url,omitempty"`
 	TestGroupName   string           `yaml:"name,omitempty"`
 }
@@ -342,8 +343,8 @@ func (tg *testGroup) test(evalInterval time.Duration, groupOrderMap map[string]i
 					for _, a := range ar.ActiveAlerts() {
 						if a.State == rules.StateFiring {
 							alerts = append(alerts, labelAndAnnotation{
-								Labels:      a.Labels.Copy(),
-								Annotations: a.Annotations.Copy(),
+								Labels:      a.Labels().Copy(),      // PP_CHANGES.md: rebuild on cpp
+								Annotations: a.Annotations().Copy(), // PP_CHANGES.md: rebuild on cpp
 							})
 						}
 					}

config/config.go

@@ -34,9 +34,9 @@ import (
 	"gopkg.in/yaml.v2"
 
 	"github.com/prometheus/prometheus/discovery"
-	"github.com/prometheus/prometheus/model/labels"
 	"github.com/prometheus/prometheus/model/relabel"
 	pp_pkg_config "github.com/prometheus/prometheus/pp-pkg/config" // PP_CHANGES.md: rebuild on cpp
+	"github.com/prometheus/prometheus/pp/go/cppbridge"             // PP_CHANGES.md: rebuild on cpp
 	"github.com/prometheus/prometheus/storage/remote/azuread"
 	"github.com/prometheus/prometheus/storage/remote/googleiam"
 )
@@ -90,8 +90,8 @@ func Load(s string, expandExternalLabels bool, logger log.Logger) (*Config, erro
 		return cfg, nil
 	}
 
-	b := labels.NewScratchBuilder(0)
-	cfg.GlobalConfig.ExternalLabels.Range(func(v labels.Label) {
+	b := cppbridge.NewScratchBuilder(cfg.GlobalConfig.ExternalLabels.Len()) // PP_CHANGES.md: rebuild on cpp
+	cfg.GlobalConfig.ExternalLabels.Range(func(v cppbridge.Label) {         // PP_CHANGES.md: rebuild on cpp
 		newV := os.Expand(v.Value, func(s string) string {
 			if s == "$" {
 				return "$"
@@ -442,7 +442,7 @@ type GlobalConfig struct {
 	// File to which scrape failures are logged.
 	ScrapeFailureLogFile string `yaml:"scrape_failure_log_file,omitempty"`
 	// The labels to add to any timeseries that this Prometheus instance scrapes.
-	ExternalLabels labels.Labels `yaml:"external_labels,omitempty"`
+	ExternalLabels cppbridge.Labels `yaml:"external_labels,omitempty"` // PP_CHANGES.md: rebuild on cpp
 	// An uncompressed response body larger than this many bytes will cause the
 	// scrape to fail. 0 means no limit.
 	BodySizeLimit units.Base2Bytes `yaml:"body_size_limit,omitempty"`
@@ -554,7 +554,7 @@ func (c *GlobalConfig) UnmarshalYAML(unmarshal func(interface{}) error) error {
 		return err
 	}
 
-	if err := gc.ExternalLabels.Validate(func(l labels.Label) error {
+	if err := gc.ExternalLabels.Validate(func(l cppbridge.Label) error { // PP_CHANGES.md: rebuild on cpp
 		if !model.LabelName(l.Name).IsValid() {
 			return fmt.Errorf("%q is not a valid label name", l.Name)
 		}

config/config_test.go

@@ -57,8 +57,8 @@ import (
 	"github.com/prometheus/prometheus/discovery/vultr"
 	"github.com/prometheus/prometheus/discovery/xds"
 	"github.com/prometheus/prometheus/discovery/zookeeper"
-	"github.com/prometheus/prometheus/model/labels"
 	"github.com/prometheus/prometheus/model/relabel"
+	"github.com/prometheus/prometheus/pp/go/cppbridge"
 	"github.com/prometheus/prometheus/util/testutil"
 )
 
@@ -89,7 +89,7 @@ var expectedConf = &Config{
 		QueryLogFile:         "testdata/query.log",
 		ScrapeFailureLogFile: globScrapeFailureLogFile,
 
-		ExternalLabels: labels.FromStrings("foo", "bar", "monitor", "codelab"),
+		ExternalLabels: cppbridge.FromStrings("foo", "bar", "monitor", "codelab"), // PP_CHANGES.md: rebuild on cpp
 
 		BodySizeLimit:         globBodySizeLimit,
 		SampleLimit:           globSampleLimit,
@@ -2162,16 +2162,16 @@ func TestExpandExternalLabels(t *testing.T) {
 
 	c, err := LoadFile("testdata/external_labels.good.yml", false, false, log.NewNopLogger())
 	require.NoError(t, err)
-	testutil.RequireEqual(t, labels.FromStrings("bar", "foo", "baz", "foo${TEST}bar", "foo", "${TEST}", "qux", "foo$${TEST}", "xyz", "foo$$bar"), c.GlobalConfig.ExternalLabels)
+	testutil.RequireEqual(t, cppbridge.FromStrings("bar", "foo", "baz", "foo${TEST}bar", "foo", "${TEST}", "qux", "foo$${TEST}", "xyz", "foo$$bar"), c.GlobalConfig.ExternalLabels)
 
 	c, err = LoadFile("testdata/external_labels.good.yml", false, true, log.NewNopLogger())
 	require.NoError(t, err)
-	testutil.RequireEqual(t, labels.FromStrings("bar", "foo", "baz", "foobar", "foo", "", "qux", "foo${TEST}", "xyz", "foo$bar"), c.GlobalConfig.ExternalLabels)
+	testutil.RequireEqual(t, cppbridge.FromStrings("bar", "foo", "baz", "foobar", "foo", "", "qux", "foo${TEST}", "xyz", "foo$bar"), c.GlobalConfig.ExternalLabels)
 
 	os.Setenv("TEST", "TestValue")
 	c, err = LoadFile("testdata/external_labels.good.yml", false, true, log.NewNopLogger())
 	require.NoError(t, err)
-	testutil.RequireEqual(t, labels.FromStrings("bar", "foo", "baz", "fooTestValuebar", "foo", "TestValue", "qux", "foo${TEST}", "xyz", "foo$bar"), c.GlobalConfig.ExternalLabels)
+	testutil.RequireEqual(t, cppbridge.FromStrings("bar", "foo", "baz", "fooTestValuebar", "foo", "TestValue", "qux", "foo${TEST}", "xyz", "foo$bar"), c.GlobalConfig.ExternalLabels)
 }
 
 func TestAgentMode(t *testing.T) {

config/pp_config_test.go

@@ -15,7 +15,6 @@ import (
 	"gopkg.in/yaml.v2"
 
 	"github.com/prometheus/prometheus/config"
-	"github.com/prometheus/prometheus/model/labels"
 	"github.com/prometheus/prometheus/model/relabel"
 	pp_pkg_config "github.com/prometheus/prometheus/pp-pkg/config"
 	"github.com/prometheus/prometheus/pp/go/cppbridge"
@@ -171,7 +170,7 @@ var expectedConf = &config.Config{
 		EvaluationInterval: model.Duration(30 * time.Second),
 		QueryLogFile:       "",
 
-		ExternalLabels: labels.FromStrings("foo", "bar", "monitor", "codelab"),
+		ExternalLabels: cppbridge.FromMap(map[string]string{"foo": "bar", "monitor": "codelab"}),
 
 		BodySizeLimit:         15 * units.MiB,
 		SampleLimit:           1500,

discovery/kubernetes/pod_test.go

@@ -208,6 +208,7 @@ func expectedPodTargetGroups(ns string) map[string]*targetgroup.Group {
 					"__meta_kubernetes_pod_container_port_protocol": "TCP",
 					"__meta_kubernetes_pod_container_init":          "false",
 					"__meta_kubernetes_pod_container_id":            "docker://a1b2c3d4e5f6",
+					"__sample_limit__":                              "", // PP_CHANGES.md: sample limit with annotation
 				},
 			},
 			Labels: model.LabelSet{
@@ -233,6 +234,9 @@ func expectedPodTargetGroupsWithNodeMeta(ns, nodeName string, nodeLabels map[str
 			tg.Labels[model.LabelName("__meta_kubernetes_node_label_"+k)] = lv(v)
 			tg.Labels[model.LabelName("__meta_kubernetes_node_labelpresent_"+k)] = lv("true")
 		}
+		for _, target := range tg.Targets {
+			target["__sample_limit__"] = lv("") // PP_CHANGES.md: override sample limit with annotation
+		}
 	}
 
 	return result
@@ -260,6 +264,7 @@ func TestPodDiscoveryBeforeRun(t *testing.T) {
 						"__meta_kubernetes_pod_container_port_protocol": "TCP",
 						"__meta_kubernetes_pod_container_init":          "false",
 						"__meta_kubernetes_pod_container_id":            "docker://a1b2c3d4e5f6",
+						"__sample_limit__":                              "", // PP_CHANGES.md: sample limit with ann
 					},
 					{
 						"__address__":                                   "1.2.3.4:9001",
@@ -270,13 +275,15 @@ func TestPodDiscoveryBeforeRun(t *testing.T) {
 						"__meta_kubernetes_pod_container_port_protocol": "UDP",
 						"__meta_kubernetes_pod_container_init":          "false",
 						"__meta_kubernetes_pod_container_id":            "docker://a1b2c3d4e5f6",
+						"__sample_limit__":                              "", // PP_CHANGES.md: sample limit with ann
 					},
 					{
 						"__address__":                           "1.2.3.4",
 						"__meta_kubernetes_pod_container_name":  "testcontainer1",
 						"__meta_kubernetes_pod_container_image": "testcontainer1:latest",
 						"__meta_kubernetes_pod_container_init":  "false",
 						"__meta_kubernetes_pod_container_id":    "containerd://6f5e4d3c2b1a",
+						"__sample_limit__":                      "", // PP_CHANGES.md: sample limit with annotation
 					},
 				},
 				Labels: model.LabelSet{
@@ -313,6 +320,7 @@ func TestPodDiscoveryInitContainer(t *testing.T) {
 		"__meta_kubernetes_pod_container_image": "initcontainer:latest",
 		"__meta_kubernetes_pod_container_init":  "true",
 		"__meta_kubernetes_pod_container_id":    "containerd://6f5e4d3c2b1a",
+		"__sample_limit__":                      "", // PP_CHANGES.md: sample limit with annotation
 	})
 	expected[key].Labels["__meta_kubernetes_pod_phase"] = "Pending"
 	expected[key].Labels["__meta_kubernetes_pod_ready"] = "false"