Skip to content

Commit d7fbfc6

Browse files
committed
addressed comments
Signed-off-by: bwplotka <bwplotka@gmail.com>
1 parent a19a068 commit d7fbfc6

2 files changed

Lines changed: 8 additions & 10 deletions

File tree

docs/instrumenting/exposition_formats.md

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -196,15 +196,13 @@ The payload MUST have `application/vnd.google.protobuf;proto=io.prometheus.clien
196196

197197
All string fields MUST be UTF-8 encoded.
198198

199-
Ingestors SHOULD prioritize scraping Prometheus Proto for the future feature compatibility. This is not true for
200-
Prometheus 3.0, which for backward compatibility prefers OpenMetrics 1.0 unless
201-
* Manually changed in `scrape_protocols` setting
202-
* Certain feature are enabled e.g.:
203-
* `--enable-feature=created-timestamp-zero-ingestion`
204-
* appropriate configuration option (`scrape_native_histograms: true`)
205-
206-
> In Prometheus 2.0, the Protobuf format was marked as deprecated, but since then this decision was reverted. From Prometheus 3.0,
207-
> the Prometheus Proto is actively used and maintained, supplementing text formats.
199+
Prometheus 3.0 [prefers the text-based protocols by default](./content_negotiation.md#default-accept-header) unless:
200+
* Manual preference settings in via `scrape_protocols` setting in Prometheus configuration.
201+
* [Protobuf format first](./content_negotiation.md#protobuf-first-accept-header) when certain features are enabled e.g.:
202+
* `--enable-feature=created-timestamp-zero-ingestion` or `--enable-feature=st-storage`
203+
* Appropriate configuration option (`scrape_native_histograms: true`)
204+
205+
> In Prometheus 2.0, the Protobuf format was marked as deprecated, but since then this decision was reverted. From Prometheus 3.0, the Prometheus Proto is actively used and maintained, supplementing text-based formats.
208206
209207
### Basic info
210208

docs/specs/om/open_metrics_spec_2_0.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -398,7 +398,7 @@ The OpenMetrics formats are Regular Chomsky Grammars, making writing quick and s
398398

399399
Partial or invalid expositions MUST be considered erroneous in their entirety.
400400

401-
> IMPORTANT: Previous versions of [OpenMetrics](https://prometheus.io/docs/specs/om/open_metrics_spec/#protobuf-format) used
401+
> NOTE: Previous versions of [OpenMetrics](https://prometheus.io/docs/specs/om/open_metrics_spec/#protobuf-format) used
402402
> to specify a [OpenMetric protobuf format](https://github.com/prometheus/OpenMetrics/blob/3bb328ab04d26b25ac548d851619f90d15090e5d/proto/openmetrics_data_model.proto). OpenMetrics 2.0 does not include the protobuf representation. For available formats, including the official [Prometheus protobuf wire format](https://prometheus.io/docs/instrumenting/exposition_formats/#protobuf-format), see [exposition formats documentation](https://prometheus.io/docs/instrumenting/exposition_formats).
403403
404404
### Protocol Negotiation

0 commit comments

Comments
 (0)