semconv: Versioned Read feature.

Signed-off-by: bwplotka <[email protected]>

Author: bwplotka

cmd/prometheus/main.go

@@ -71,6 +71,7 @@ import (
 	"github.com/prometheus/prometheus/promql/parser"
 	"github.com/prometheus/prometheus/rules"
 	"github.com/prometheus/prometheus/scrape"
+	"github.com/prometheus/prometheus/semconv"
 	"github.com/prometheus/prometheus/storage"
 	"github.com/prometheus/prometheus/storage/remote"
 	"github.com/prometheus/prometheus/tracing"
@@ -217,6 +218,8 @@ type flagConfig struct {
 	promqlEnableDelayedNameRemoval bool
 
 	promslogConfig promslog.Config
+
+	enableSemconvVersionedRead bool
 }
 
 // setFeatureListOptions sets the corresponding options from the featureList.
@@ -297,6 +300,9 @@ func (c *flagConfig) setFeatureListOptions(logger *slog.Logger) error {
 			case "use-uncached-io":
 				c.tsdb.UseUncachedIO = true
 				logger.Info("Experimental Uncached IO is enabled.")
+			case "semconv-versioned-read":
+				c.enableSemconvVersionedRead = true
+				logger.Info("Experimental semconv versioned read enabled")
 			default:
 				logger.Warn("Unknown option for --enable-feature", "option", o)
 			}
@@ -798,12 +804,17 @@ func main() {
 	)
 
 	var (
-		localStorage  = &readyStorage{stats: tsdb.NewDBStats()}
-		scraper       = &readyScrapeManager{}
-		remoteStorage = remote.NewStorage(logger.With("component", "remote"), prometheus.DefaultRegisterer, localStorage.StartTime, localStoragePath, time.Duration(cfg.RemoteFlushDeadline), scraper, cfg.scrape.EnableTypeAndUnitLabels)
-		fanoutStorage = storage.NewFanout(logger, localStorage, remoteStorage)
+		localStorage    = &readyStorage{stats: tsdb.NewDBStats()}
+		scraper         = &readyScrapeManager{}
+		remoteStorage   = remote.NewStorage(logger.With("component", "remote"), prometheus.DefaultRegisterer, localStorage.StartTime, localStoragePath, time.Duration(cfg.RemoteFlushDeadline), scraper, cfg.scrape.EnableTypeAndUnitLabels)
+		fanoutStorage   = storage.NewFanout(logger, localStorage, remoteStorage)
+		semconvReloader func(*config.Config) error
 	)
 
+	if cfg.enableSemconvVersionedRead {
+		fanoutStorage, semconvReloader = semconv.AwareStorage(fanoutStorage)
+	}
+
 	var (
 		ctxWeb, cancelWeb = context.WithCancel(context.Background())
 		ctxRule           = context.Background()
@@ -1014,6 +1025,14 @@ func main() {
 				}
 				return discoveryManagerNotify.ApplyConfig(c)
 			},
+		}, {
+			name: "semconv",
+			reloader: func(c *config.Config) error {
+				if !cfg.enableSemconvVersionedRead {
+					return nil
+				}
+				return semconvReloader(c)
+			},
 		}, {
 			name: "rules",
 			reloader: func(cfg *config.Config) error {

config/config.go

@@ -288,10 +288,28 @@ type Config struct {
 	RemoteWriteConfigs []*RemoteWriteConfig `yaml:"remote_write,omitempty"`
 	RemoteReadConfigs  []*RemoteReadConfig  `yaml:"remote_read,omitempty"`
 	OTLPConfig         OTLPConfig           `yaml:"otlp,omitempty"`
+	SemConv            SemConvConfig        `yaml:"semconv,omitempty"`
 
 	loaded bool // Certain methods require configuration to use Load validation.
 }
 
+// SemConvConfig represents semconv package runtime configuration.
+type SemConvConfig struct {
+	// SchemaOverrides is a local mapping from the schema base URL (identifying schema
+	// registries) to an alternative schema base URL. URLs are considered local
+	// (within the process local filesystem) if they don't start with "http" prefix.
+	//
+	// This option is useful when manual adjustments to schema are needed or
+	// for when reaching the Internet is not an option (local cache).
+	//
+	// For example, imagine data that uses a schema URL like https://bwplotka.dev/semconv/1.1.0.
+	// Setting an override with "https://bwplotka.dev/semconv" -> "./semconv" will
+	// cause Prometheus to look for the schema artifacts (e.g.in the current implementation
+	// "./semconv/changelog.yaml" and "./semconv/ids.yaml" files) in the local
+	// filesystem.
+	SchemaOverrides map[string]string `yaml:"schema_overrides,omitempty"`
+}
+
 // SetDirectory joins any relative file paths with dir.
 // This method writes to config, and it's not concurrency safe.
 func (c *Config) SetDirectory(dir string) {

go.mod

@@ -184,6 +184,7 @@ require (
 	github.com/knadh/koanf/v2 v2.3.0 // indirect
 	github.com/kylelemons/godebug v1.1.0 // indirect
 	github.com/mailru/easyjson v0.7.7 // indirect
+	github.com/maruel/natural v1.1.1
 	github.com/mattn/go-colorable v0.1.13 // indirect
 	github.com/mattn/go-isatty v0.0.20 // indirect
 	github.com/mdlayher/socket v0.4.1 // indirect

go.sum

@@ -342,6 +342,8 @@ github.com/linode/linodego v1.60.0 h1:SgsebJFRCi+lSmYy+C40wmKZeJllGGm+W12Qw4+yVd
 github.com/linode/linodego v1.60.0/go.mod h1:1+Bt0oTz5rBnDOJbGhccxn7LYVytXTIIfAy7QYmijDs=
 github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0=
 github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc=
+github.com/maruel/natural v1.1.1 h1:Hja7XhhmvEFhcByqDoHz9QZbkWey+COd9xWfCfn1ioo=
+github.com/maruel/natural v1.1.1/go.mod h1:v+Rfd79xlw1AgVBjbO0BEQmptqb5HvL/k9GRHB7ZKEg=
 github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU=
 github.com/mattn/go-colorable v0.1.4/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE=
 github.com/mattn/go-colorable v0.1.6/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=

schema/labels.go

@@ -14,6 +14,8 @@
 package schema
 
 import (
+	"strings"
+
 	"github.com/prometheus/common/model"
 
 	"github.com/prometheus/prometheus/model/labels"
@@ -134,6 +136,21 @@ func (m Metadata) NewIgnoreOverriddenMetadataLabelScratchBuilder(b *labels.Scrat
 	return &IgnoreOverriddenMetadataLabelScratchBuilder{ScratchBuilder: b, overwrite: m}
 }
 
+// String returns a string representation of the Metadata.
+func (m Metadata) String() string {
+	var b strings.Builder
+	b.WriteString(m.Name)
+	if m.Unit != "" {
+		b.WriteString("~")
+		b.WriteString(m.Unit)
+	}
+	if m.Type != "" && m.Type != model.MetricTypeUnknown {
+		b.WriteString(".")
+		b.WriteString(string(m.Type))
+	}
+	return b.String()
+}
+
 // IgnoreOverriddenMetadataLabelScratchBuilder is a wrapper over labels.ScratchBuilder
 // that ignores label additions that would collide with non-empty Overwrite Metadata fields.
 type IgnoreOverriddenMetadataLabelScratchBuilder struct {