diff --git a/language-support-status.md b/language-support-status.md index 83c7521d..28736098 100644 --- a/language-support-status.md +++ b/language-support-status.md @@ -114,7 +114,7 @@ Latest supported file format: `1.0.0` | [`ExperimentalOtlpFileMetricExporter`](schema-docs.md#experimentalotlpfilemetricexporter) | supported | | * `default_histogram_aggregation`: supported
* `output_stream`: supported
* `temporality_preference`: supported
| | [`ExperimentalProbabilitySampler`](schema-docs.md#experimentalprobabilitysampler) | not_implemented | | * `ratio`: not_implemented
| | [`ExperimentalProcessResourceDetector`](schema-docs.md#experimentalprocessresourcedetector) | not_implemented | | | -| [`ExperimentalPrometheusMetricExporter`](schema-docs.md#experimentalprometheusmetricexporter) | supported | | * `host`: supported
* `port`: supported
* `translation_strategy`: supported
* `with_resource_constant_labels`: supported
* `without_scope_info`: supported
* `without_target_info/development`: supported
| +| [`ExperimentalPrometheusMetricExporter`](schema-docs.md#experimentalprometheusmetricexporter) | supported | | * `host`: supported
* `port`: supported
* `resource_constant_labels`: supported
* `scope_info_enabled`: supported
* `translation_strategy`: supported
* `target_info_enabled/development`: supported
| | [`ExperimentalPrometheusTranslationStrategy`](schema-docs.md#experimentalprometheustranslationstrategy) | supported | | * `no_translation/development`: not_implemented
* `no_utf8_escaping_with_suffixes/development`: not_implemented
* `underscore_escaping_with_suffixes`: supported
* `underscore_escaping_without_suffixes/development`: supported
| | [`ExperimentalResourceDetection`](schema-docs.md#experimentalresourcedetection) | not_implemented | | * `attributes`: not_implemented
* `detectors`: not_implemented
| | [`ExperimentalResourceDetector`](schema-docs.md#experimentalresourcedetector) | not_implemented | | * `container`: not_implemented
* `host`: not_implemented
* `process`: not_implemented
* `service`: not_implemented
| @@ -233,7 +233,7 @@ Latest supported file format: `1.0.0` | [`ExperimentalOtlpFileMetricExporter`](schema-docs.md#experimentalotlpfilemetricexporter) | not_implemented | | * `default_histogram_aggregation`: not_implemented
* `output_stream`: not_implemented
* `temporality_preference`: not_implemented
| | [`ExperimentalProbabilitySampler`](schema-docs.md#experimentalprobabilitysampler) | not_implemented | | * `ratio`: not_implemented
| | [`ExperimentalProcessResourceDetector`](schema-docs.md#experimentalprocessresourcedetector) | supported | | | -| [`ExperimentalPrometheusMetricExporter`](schema-docs.md#experimentalprometheusmetricexporter) | supported | | * `host`: supported
* `port`: supported
* `translation_strategy`: supported
* `with_resource_constant_labels`: supported
* `without_scope_info`: supported
* `without_target_info/development`: supported
| +| [`ExperimentalPrometheusMetricExporter`](schema-docs.md#experimentalprometheusmetricexporter) | supported | | * `host`: supported
* `port`: supported
* `resource_constant_labels`: supported
* `scope_info_enabled`: supported
* `translation_strategy`: supported
* `target_info_enabled/development`: supported
| | [`ExperimentalPrometheusTranslationStrategy`](schema-docs.md#experimentalprometheustranslationstrategy) | supported | | * `no_translation/development`: supported
* `no_utf8_escaping_with_suffixes/development`: supported
* `underscore_escaping_with_suffixes`: supported
* `underscore_escaping_without_suffixes/development`: supported
| | [`ExperimentalResourceDetection`](schema-docs.md#experimentalresourcedetection) | supported | | * `attributes`: supported
* `detectors`: supported
| | [`ExperimentalResourceDetector`](schema-docs.md#experimentalresourcedetector) | supported | | * `container`: supported
* `host`: supported
* `process`: supported
* `service`: supported
| @@ -352,7 +352,7 @@ Latest supported file format: `1.0.0-rc.3` | [`ExperimentalOtlpFileMetricExporter`](schema-docs.md#experimentalotlpfilemetricexporter) | supported | | * `default_histogram_aggregation`: supported
* `output_stream`: not_implemented
* `temporality_preference`: supported
| | [`ExperimentalProbabilitySampler`](schema-docs.md#experimentalprobabilitysampler) | supported | | * `ratio`: supported
| | [`ExperimentalProcessResourceDetector`](schema-docs.md#experimentalprocessresourcedetector) | supported | | | -| [`ExperimentalPrometheusMetricExporter`](schema-docs.md#experimentalprometheusmetricexporter) | supported | | * `host`: supported
* `port`: supported
* `translation_strategy`: not_implemented
* `with_resource_constant_labels`: supported
* `without_scope_info`: supported
* `without_target_info/development`: supported
| +| [`ExperimentalPrometheusMetricExporter`](schema-docs.md#experimentalprometheusmetricexporter) | supported | | * `host`: supported
* `port`: supported
* `resource_constant_labels`: supported
* `scope_info_enabled`: supported
* `translation_strategy`: not_implemented
* `target_info_enabled/development`: supported
| | [`ExperimentalPrometheusTranslationStrategy`](schema-docs.md#experimentalprometheustranslationstrategy) | not_implemented | | * `no_translation/development`: not_implemented
* `no_utf8_escaping_with_suffixes/development`: not_implemented
* `underscore_escaping_with_suffixes`: not_implemented
* `underscore_escaping_without_suffixes/development`: not_implemented
| | [`ExperimentalResourceDetection`](schema-docs.md#experimentalresourcedetection) | supported | | * `attributes`: supported
* `detectors`: supported
| | [`ExperimentalResourceDetector`](schema-docs.md#experimentalresourcedetector) | supported | | * `container`: supported
* `host`: supported
* `process`: supported
* `service`: supported
| @@ -471,7 +471,7 @@ Latest supported file format: `1.0.0-rc.3` | [`ExperimentalOtlpFileMetricExporter`](schema-docs.md#experimentalotlpfilemetricexporter) | unknown | | * `default_histogram_aggregation`: unknown
* `output_stream`: unknown
* `temporality_preference`: unknown
| | [`ExperimentalProbabilitySampler`](schema-docs.md#experimentalprobabilitysampler) | unknown | | * `ratio`: unknown
| | [`ExperimentalProcessResourceDetector`](schema-docs.md#experimentalprocessresourcedetector) | unknown | | | -| [`ExperimentalPrometheusMetricExporter`](schema-docs.md#experimentalprometheusmetricexporter) | unknown | | * `host`: unknown
* `port`: unknown
* `translation_strategy`: unknown
* `with_resource_constant_labels`: unknown
* `without_scope_info`: unknown
* `without_target_info/development`: unknown
| +| [`ExperimentalPrometheusMetricExporter`](schema-docs.md#experimentalprometheusmetricexporter) | unknown | | * `host`: unknown
* `port`: unknown
* `resource_constant_labels`: unknown
* `scope_info_enabled`: unknown
* `translation_strategy`: unknown
* `target_info_enabled/development`: unknown
| | [`ExperimentalPrometheusTranslationStrategy`](schema-docs.md#experimentalprometheustranslationstrategy) | unknown | | * `no_translation/development`: unknown
* `no_utf8_escaping_with_suffixes/development`: unknown
* `underscore_escaping_with_suffixes`: unknown
* `underscore_escaping_without_suffixes/development`: unknown
| | [`ExperimentalResourceDetection`](schema-docs.md#experimentalresourcedetection) | unknown | | * `attributes`: unknown
* `detectors`: unknown
| | [`ExperimentalResourceDetector`](schema-docs.md#experimentalresourcedetector) | unknown | | * `container`: unknown
* `host`: unknown
* `process`: unknown
* `service`: unknown
| @@ -590,7 +590,7 @@ Latest supported file format: `1.0.0-rc.2` | [`ExperimentalOtlpFileMetricExporter`](schema-docs.md#experimentalotlpfilemetricexporter) | supported | | * `default_histogram_aggregation`: not_implemented
* `output_stream`: supported
* `temporality_preference`: supported
| | [`ExperimentalProbabilitySampler`](schema-docs.md#experimentalprobabilitysampler) | not_implemented | | * `ratio`: not_implemented
| | [`ExperimentalProcessResourceDetector`](schema-docs.md#experimentalprocessresourcedetector) | supported | | | -| [`ExperimentalPrometheusMetricExporter`](schema-docs.md#experimentalprometheusmetricexporter) | not_implemented | | * `host`: not_implemented
* `port`: not_implemented
* `translation_strategy`: not_implemented
* `with_resource_constant_labels`: not_implemented
* `without_scope_info`: not_implemented
* `without_target_info/development`: not_implemented
| +| [`ExperimentalPrometheusMetricExporter`](schema-docs.md#experimentalprometheusmetricexporter) | not_implemented | | * `host`: not_implemented
* `port`: not_implemented
* `resource_constant_labels`: not_implemented
* `scope_info_enabled`: not_implemented
* `translation_strategy`: not_implemented
* `target_info_enabled/development`: not_implemented
| | [`ExperimentalPrometheusTranslationStrategy`](schema-docs.md#experimentalprometheustranslationstrategy) | not_implemented | | * `no_translation/development`: not_implemented
* `no_utf8_escaping_with_suffixes/development`: not_implemented
* `underscore_escaping_with_suffixes`: not_implemented
* `underscore_escaping_without_suffixes/development`: not_implemented
| | [`ExperimentalResourceDetection`](schema-docs.md#experimentalresourcedetection) | supported | | * `attributes`: supported
* `detectors`: supported
| | [`ExperimentalResourceDetector`](schema-docs.md#experimentalresourcedetector) | supported | | * `container`: ignored
* `host`: supported
* `process`: supported
* `service`: supported
| diff --git a/opentelemetry_configuration.json b/opentelemetry_configuration.json index 79342f32..cc6c2269 100644 --- a/opentelemetry_configuration.json +++ b/opentelemetry_configuration.json @@ -1133,21 +1133,21 @@ ], "description": "Configure port.\nIf omitted or null, 9464 is used.\n" }, - "without_scope_info": { + "scope_info_enabled": { "type": [ "boolean", "null" ], - "description": "Configure Prometheus Exporter to produce metrics without scope labels.\nIf omitted or null, false is used.\n" + "description": "Configure Prometheus Exporter to produce metrics with scope labels.\nIf omitted or null, true is used.\n" }, - "without_target_info/development": { + "target_info_enabled/development": { "type": [ "boolean", "null" ], - "description": "Configure Prometheus Exporter to produce metrics without a target info metric for the resource.\nIf omitted or null, false is used.\n" + "description": "Configure Prometheus Exporter to produce metrics with a target info metric for the resource.\nIf omitted or null, true is used.\n" }, - "with_resource_constant_labels": { + "resource_constant_labels": { "$ref": "#/$defs/IncludeExclude", "description": "Configure Prometheus Exporter to add resource attributes as metrics attributes, where the resource attribute keys match the patterns.\nIf omitted, no resource attributes are added.\n" }, diff --git a/schema-docs.md b/schema-docs.md index b5695f02..8d2070de 100644 --- a/schema-docs.md +++ b/schema-docs.md @@ -1336,7 +1336,7 @@ Constraints: Usages: -* [`ExperimentalPrometheusMetricExporter.with_resource_constant_labels`](#experimentalprometheusmetricexporter) +* [`ExperimentalPrometheusMetricExporter.resource_constant_labels`](#experimentalprometheusmetricexporter) * [`ViewStream.attribute_keys`](#viewstream) * [`ExperimentalResourceDetection.attributes`](#experimentalresourcedetection) @@ -6374,10 +6374,10 @@ No snippets. |---|---|---|---|---|---| | `host` | one of:
* `string`
* `null`
| `false` | If omitted or null, localhost is used. | No constraints. | Configure host.
| | `port` | one of:
* `integer`
* `null`
| `false` | If omitted or null, 9464 is used. | No constraints. | Configure port.
| +| `resource_constant_labels` | [`IncludeExclude`](#includeexclude) | `false` | If omitted, no resource attributes are added. | No constraints. | Configure Prometheus Exporter to add resource attributes as metrics attributes, where the resource attribute keys match the patterns. | +| `scope_info_enabled` | one of:
* `boolean`
* `null`
| `false` | If omitted or null, true is used. | No constraints. | Configure Prometheus Exporter to produce metrics with scope labels.
| | `translation_strategy` | [`ExperimentalPrometheusTranslationStrategy`](#experimentalprometheustranslationstrategy) | `false` | If omitted, underscore_escaping_with_suffixes is used. | No constraints. | Configure how metric names are translated to Prometheus metric names. | -| `with_resource_constant_labels` | [`IncludeExclude`](#includeexclude) | `false` | If omitted, no resource attributes are added. | No constraints. | Configure Prometheus Exporter to add resource attributes as metrics attributes, where the resource attribute keys match the patterns. | -| `without_scope_info` | one of:
* `boolean`
* `null`
| `false` | If omitted or null, false is used. | No constraints. | Configure Prometheus Exporter to produce metrics without scope labels.
| -| `without_target_info/development`
**WARNING:** This property is [experimental](VERSIONING.md#experimental-features). | one of:
* `boolean`
* `null`
| `false` | If omitted or null, false is used. | No constraints. | Configure Prometheus Exporter to produce metrics without a target info metric for the resource.
| +| `target_info_enabled/development`
**WARNING:** This property is [experimental](VERSIONING.md#experimental-features). | one of:
* `boolean`
* `null`
| `false` | If omitted or null, true is used. | No constraints. | Configure Prometheus Exporter to produce metrics with a target info metric for the resource.
|
Language support status @@ -6386,10 +6386,10 @@ No snippets. |---|---|---|---|---|---| | `host` | supported | supported | supported | unknown | not_implemented | | `port` | supported | supported | supported | unknown | not_implemented | +| `resource_constant_labels` | supported | supported | supported | unknown | not_implemented | +| `scope_info_enabled` | supported | supported | supported | unknown | not_implemented | | `translation_strategy` | supported | supported | not_implemented | unknown | not_implemented | -| `with_resource_constant_labels` | supported | supported | supported | unknown | not_implemented | -| `without_scope_info` | supported | supported | supported | unknown | not_implemented | -| `without_target_info/development` | supported | supported | supported | unknown | not_implemented | +| `target_info_enabled/development` | supported | supported | supported | unknown | not_implemented |
Constraints: @@ -6409,9 +6409,9 @@ Snippets: ```yaml host: localhost port: 9464 -without_scope_info: false -without_target_info/development: false -with_resource_constant_labels: +scope_info_enabled: true +target_info_enabled/development: true +resource_constant_labels: included: - "service*" excluded: @@ -6445,21 +6445,21 @@ translation_strategy: underscore_escaping_with_suffixes ], "description": "Configure port.\nIf omitted or null, 9464 is used.\n" }, - "without_scope_info": { + "scope_info_enabled": { "type": [ "boolean", "null" ], - "description": "Configure Prometheus Exporter to produce metrics without scope labels.\nIf omitted or null, false is used.\n" + "description": "Configure Prometheus Exporter to produce metrics with scope labels.\nIf omitted or null, true is used.\n" }, - "without_target_info/development": { + "target_info_enabled/development": { "type": [ "boolean", "null" ], - "description": "Configure Prometheus Exporter to produce metrics without a target info metric for the resource.\nIf omitted or null, false is used.\n" + "description": "Configure Prometheus Exporter to produce metrics with a target info metric for the resource.\nIf omitted or null, true is used.\n" }, - "with_resource_constant_labels": { + "resource_constant_labels": { "$ref": "#/$defs/IncludeExclude", "description": "Configure Prometheus Exporter to add resource attributes as metrics attributes, where the resource attribute keys match the patterns.\nIf omitted, no resource attributes are added.\n" }, diff --git a/schema/meter_provider.yaml b/schema/meter_provider.yaml index 603f35a2..89d839b2 100644 --- a/schema/meter_provider.yaml +++ b/schema/meter_provider.yaml @@ -260,21 +260,21 @@ $defs: description: | Configure port. defaultBehavior: 9464 is used - without_scope_info: + scope_info_enabled: type: - boolean - "null" description: | - Configure Prometheus Exporter to produce metrics without scope labels. - defaultBehavior: false is used - without_target_info/development: + Configure Prometheus Exporter to produce metrics with scope labels. + defaultBehavior: true is used + target_info_enabled/development: type: - boolean - "null" description: | - Configure Prometheus Exporter to produce metrics without a target info metric for the resource. - defaultBehavior: false is used - with_resource_constant_labels: + Configure Prometheus Exporter to produce metrics with a target info metric for the resource. + defaultBehavior: true is used + resource_constant_labels: $ref: common.yaml#/$defs/IncludeExclude description: Configure Prometheus Exporter to add resource attributes as metrics attributes, where the resource attribute keys match the patterns. defaultBehavior: no resource attributes are added diff --git a/snippets/ExperimentalPrometheusMetricExporter_kitchen_sink.yaml b/snippets/ExperimentalPrometheusMetricExporter_kitchen_sink.yaml index 8f9411de..db53418b 100644 --- a/snippets/ExperimentalPrometheusMetricExporter_kitchen_sink.yaml +++ b/snippets/ExperimentalPrometheusMetricExporter_kitchen_sink.yaml @@ -8,9 +8,9 @@ meter_provider: # SNIPPET_START host: localhost port: 9464 - without_scope_info: false - without_target_info/development: false - with_resource_constant_labels: + scope_info_enabled: true + target_info_enabled/development: true + resource_constant_labels: included: - "service*" excluded: