mirrors/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2025-08-07 06:37:17 +02:00
Code Issues Projects Releases Wiki Activity

Do not require type and unit labels enabled to add temporality label per proposal update

Browse Source 
Signed-off-by: Carrie Edwards <edwrdscarrie@gmail.com>
This commit is contained in:
Carrie Edwards 2025-08-05 10:37:32 -07:00
parent 6c064893e4
commit 1990beabe9
4 changed files with 9 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/prometheus/main.go
View File

@ -308,10 +308,6 @@ func (c *flagConfig) setFeatureListOptions(logger *slog.Logger) error {
return errors.New("cannot enable otlp-deltatocumulative and otlp-native-delta-ingestion features at the same time") return errors.New("cannot enable otlp-deltatocumulative and otlp-native-delta-ingestion features at the same time")
} }
if c.web.NativeOTLPDeltaIngestion && !c.web.EnableTypeAndUnitLabels {
return errors.New("cannot enable otlp-native-delta-ingestion feature without enabling type and unit labels feature")
}
return nil return nil
} }

2
docs/feature_flags.md
View File

@ -239,7 +239,7 @@ Examples of equivalent durations:
`--enable-feature=otlp-native-delta-ingestion` `--enable-feature=otlp-native-delta-ingestion`
When enabled, allows for the native ingestion of delta OTLP metrics, storing the raw sample values without conversion. This cannot be enabled in conjunction with `otlp-deltatocumulative`, and `type-and-unit-labels` must be enabled. When enabled, allows for the native ingestion of delta OTLP metrics, storing the raw sample values without conversion. This cannot be enabled in conjunction with `otlp-deltatocumulative`. It is recommended to enable `type-and-unit-labels`.
Currently, the StartTimeUnixNano field is ignored. Delta metrics are given a `__temporality__` label with a value of "delta" and a `__type__` label with a value of "gauge"/"gaugehistogram". Currently, the StartTimeUnixNano field is ignored. Delta metrics are given a `__temporality__` label with a value of "delta" and a `__type__` label with a value of "gauge"/"gaugehistogram".

18
storage/remote/otlptranslator/prometheusremotewrite/helper.go
View File

@ -211,20 +211,18 @@ func createAttributes(resource pcommon.Resource, attributes pcommon.Map, scope s
unitNamer := otlptranslator.UnitNamer{UTF8Allowed: settings.AllowUTF8} unitNamer := otlptranslator.UnitNamer{UTF8Allowed: settings.AllowUTF8}
if metadata.Type != prompb.MetricMetadata_UNKNOWN { if metadata.Type != prompb.MetricMetadata_UNKNOWN {
typeValue := strings.ToLower(metadata.Type.String()) l["__type__"] = strings.ToLower(metadata.Type.String())
l["__type__"] = typeValue
} }
if metadata.Unit != "" { if metadata.Unit != "" {
l["__unit__"] = unitNamer.Build(metadata.Unit) l["__unit__"] = unitNamer.Build(metadata.Unit)
} }
}
if settings.AllowDeltaTemporality && hasTemporality { if settings.AllowDeltaTemporality && hasTemporality {
switch temporality { switch temporality {
case pmetric.AggregationTemporalityCumulative: case pmetric.AggregationTemporalityCumulative:
l["__temporality__"] = "cumulative" l["__temporality__"] = "cumulative"
case pmetric.AggregationTemporalityDelta: case pmetric.AggregationTemporalityDelta:
l["__temporality__"] = "delta" l["__temporality__"] = "delta"
}
} }
} }

5
storage/remote/write_handler.go
View File

@ -545,11 +545,6 @@ func NewOTLPWriteHandler(logger *slog.Logger, _ prometheus.Registerer, appendabl
panic("cannot enable native delta ingestion and delta2cumulative conversion at the same time") panic("cannot enable native delta ingestion and delta2cumulative conversion at the same time")
} }
if opts.NativeDelta && !opts.EnableTypeAndUnitLabels {
// This should be validated when iterating through feature flags, so not expected to fail here.
panic("cannot enable native delta ingestion without enabling type and unit labels")
}
ex := &rwExporter{ ex := &rwExporter{
writeHandler: &writeHandler{ writeHandler: &writeHandler{
logger: logger, logger: logger,