Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@

* **BREAKING**: Move certificate configuration under `tls` block
([#331](https://github.com/open-telemetry/opentelemetry-configuration/pull/331))
* Add `without_target_info` to PrometheusMetricExporter
([#331](https://github.com/open-telemetry/opentelemetry-configuration/pull/376))

## [v1.0.0-rc.2] - 2025-09-26

Expand Down
3 changes: 3 additions & 0 deletions examples/kitchen-sink.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -224,6 +224,9 @@ meter_provider:
# Configure Prometheus Exporter to produce metrics without a scope info metric.
# If omitted or null, false is used.
without_scope_info: false
# Configure Prometheus Exporter to produce metrics without a target info metric for the resource.
# If omitted or null, false is used.
without_target_info: false
# Configure Prometheus Exporter to add resource attributes as metrics attributes, where the resource attribute keys match the patterns.
with_resource_constant_labels:
# Configure list of value patterns to include.
Expand Down
24 changes: 19 additions & 5 deletions schema-docs.md
Original file line number Diff line number Diff line change
Expand Up @@ -2261,6 +2261,7 @@ Usages:
| `translation_strategy` | one of:<br>* `string`<br>* `null`<br> | `false` | No constraints. | Configure how Prometheus metrics are exposed. Values include:<br><br> * UnderscoreEscapingWithSuffixes, the default. This fully escapes metric names for classic Prometheus metric name compatibility, and includes appending type and unit suffixes.<br> * UnderscoreEscapingWithoutSuffixes, metric names will continue to escape special characters to _, but suffixes won't be attached.<br> * NoUTF8EscapingWithSuffixes will disable changing special characters to _. Special suffixes like units and _total for counters will be attached.<br> * NoTranslation. This strategy bypasses all metric and label name translation, passing them through unaltered.<br><br>If omitted or null, UnderscoreEscapingWithSuffixes is used.<br> |
| `with_resource_constant_labels` | [`IncludeExclude`](#includeexclude) | `false` | 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:<br>* `boolean`<br>* `null`<br> | `false` | No constraints. | Configure Prometheus Exporter to produce metrics without a scope info metric.<br>If omitted or null, false is used.<br> |
| `without_target_info` | one of:<br>* `boolean`<br>* `null`<br> | `false` | No constraints. | Configure Prometheus Exporter to produce metrics without a target info metric for the resource.<br>If omitted or null, false is used.<br> |

<details>
<summary>Language support status</summary>
Expand All @@ -2271,7 +2272,8 @@ Usages:
| `port` | supported | unknown | supported | unknown |
| `translation_strategy` | supported | unknown | not_implemented | unknown |
| `with_resource_constant_labels` | supported | unknown | supported | unknown |
| `without_scope_info` | supported | unknown | ignored | unknown |
| `without_scope_info` | unknown | unknown | ignored | unknown |
| `without_target_info` | unknown | unknown | ignored | unknown |
</details>

Constraints:
Expand Down Expand Up @@ -2311,6 +2313,12 @@ Usages:
"null"
]
},
"without_target_info": {
"type": [
"boolean",
"null"
]
},
"with_resource_constant_labels": {
"$ref": "common.json#/$defs/IncludeExclude"
},
Expand Down Expand Up @@ -3877,6 +3885,12 @@ Usages:
"null"
]
},
"without_target_info": {
"type": [
"boolean",
"null"
]
},
"with_resource_constant_labels": {
"$ref": "common.json#/$defs/IncludeExclude"
},
Expand Down Expand Up @@ -7025,7 +7039,7 @@ Latest supported file format: `1.0.0-rc.2`
| [`ExperimentalPeerServiceMapping`](#experimentalpeerservicemapping) | not_implemented | | * `peer`: not_implemented<br>* `service`: not_implemented<br> |
| [`ExperimentalProbabilitySampler`](#experimentalprobabilitysampler) | not_implemented | | * `ratio`: not_implemented<br> |
| [`ExperimentalProcessResourceDetector`](#experimentalprocessresourcedetector) | not_implemented | | |
| [`ExperimentalPrometheusMetricExporter`](#experimentalprometheusmetricexporter) | supported | | * `host`: supported<br>* `port`: supported<br>* `translation_strategy`: supported<br>* `with_resource_constant_labels`: supported<br>* `without_scope_info`: supported<br> |
| [`ExperimentalPrometheusMetricExporter`](#experimentalprometheusmetricexporter) | supported | | * `host`: supported<br>* `port`: supported<br>* `translation_strategy`: supported<br>* `with_resource_constant_labels`: supported<br>* `without_scope_info`: unknown<br>* `without_target_info`: unknown<br> |
| [`ExperimentalResourceDetection`](#experimentalresourcedetection) | not_implemented | | * `attributes`: not_implemented<br>* `detectors`: not_implemented<br> |
| [`ExperimentalResourceDetector`](#experimentalresourcedetector) | not_implemented | | * `container`: not_implemented<br>* `host`: not_implemented<br>* `process`: not_implemented<br>* `service`: not_implemented<br> |
| [`ExperimentalServiceResourceDetector`](#experimentalserviceresourcedetector) | not_implemented | | |
Expand Down Expand Up @@ -7132,7 +7146,7 @@ Latest supported file format: `0.3.0`
| [`ExperimentalPeerServiceMapping`](#experimentalpeerservicemapping) | unknown | | * `peer`: unknown<br>* `service`: unknown<br> |
| [`ExperimentalProbabilitySampler`](#experimentalprobabilitysampler) | unknown | | * `ratio`: unknown<br> |
| [`ExperimentalProcessResourceDetector`](#experimentalprocessresourcedetector) | unknown | | |
| [`ExperimentalPrometheusMetricExporter`](#experimentalprometheusmetricexporter) | unknown | | * `host`: unknown<br>* `port`: unknown<br>* `translation_strategy`: unknown<br>* `with_resource_constant_labels`: unknown<br>* `without_scope_info`: unknown<br> |
| [`ExperimentalPrometheusMetricExporter`](#experimentalprometheusmetricexporter) | unknown | | * `host`: unknown<br>* `port`: unknown<br>* `translation_strategy`: unknown<br>* `with_resource_constant_labels`: unknown<br>* `without_scope_info`: unknown<br>* `without_target_info`: unknown<br> |
| [`ExperimentalResourceDetection`](#experimentalresourcedetection) | unknown | | * `attributes`: unknown<br>* `detectors`: unknown<br> |
| [`ExperimentalResourceDetector`](#experimentalresourcedetector) | unknown | | * `container`: unknown<br>* `host`: unknown<br>* `process`: unknown<br>* `service`: unknown<br> |
| [`ExperimentalServiceResourceDetector`](#experimentalserviceresourcedetector) | unknown | | |
Expand Down Expand Up @@ -7239,7 +7253,7 @@ Latest supported file format: `1.0.0-rc.1`
| [`ExperimentalPeerServiceMapping`](#experimentalpeerservicemapping) | supported | | * `peer`: supported<br>* `service`: supported<br> |
| [`ExperimentalProbabilitySampler`](#experimentalprobabilitysampler) | ignored | | * `ratio`: ignored<br> |
| [`ExperimentalProcessResourceDetector`](#experimentalprocessresourcedetector) | supported | | |
| [`ExperimentalPrometheusMetricExporter`](#experimentalprometheusmetricexporter) | supported | | * `host`: supported<br>* `port`: supported<br>* `translation_strategy`: not_implemented<br>* `with_resource_constant_labels`: supported<br>* `without_scope_info`: ignored<br> |
| [`ExperimentalPrometheusMetricExporter`](#experimentalprometheusmetricexporter) | supported | | * `host`: supported<br>* `port`: supported<br>* `translation_strategy`: not_implemented<br>* `with_resource_constant_labels`: supported<br>* `without_scope_info`: ignored<br>* `without_target_info`: ignored<br> |
| [`ExperimentalResourceDetection`](#experimentalresourcedetection) | supported | | * `attributes`: supported<br>* `detectors`: supported<br> |
| [`ExperimentalResourceDetector`](#experimentalresourcedetector) | supported | | * `container`: supported<br>* `host`: supported<br>* `process`: supported<br>* `service`: supported<br> |
| [`ExperimentalServiceResourceDetector`](#experimentalserviceresourcedetector) | supported | | |
Expand Down Expand Up @@ -7346,7 +7360,7 @@ Latest supported file format: `1.0.0-rc.2`
| [`ExperimentalPeerServiceMapping`](#experimentalpeerservicemapping) | unknown | | * `peer`: unknown<br>* `service`: unknown<br> |
| [`ExperimentalProbabilitySampler`](#experimentalprobabilitysampler) | unknown | | * `ratio`: unknown<br> |
| [`ExperimentalProcessResourceDetector`](#experimentalprocessresourcedetector) | unknown | | |
| [`ExperimentalPrometheusMetricExporter`](#experimentalprometheusmetricexporter) | unknown | | * `host`: unknown<br>* `port`: unknown<br>* `translation_strategy`: unknown<br>* `with_resource_constant_labels`: unknown<br>* `without_scope_info`: unknown<br> |
| [`ExperimentalPrometheusMetricExporter`](#experimentalprometheusmetricexporter) | unknown | | * `host`: unknown<br>* `port`: unknown<br>* `translation_strategy`: unknown<br>* `with_resource_constant_labels`: unknown<br>* `without_scope_info`: unknown<br>* `without_target_info`: unknown<br> |
| [`ExperimentalResourceDetection`](#experimentalresourcedetection) | unknown | | * `attributes`: unknown<br>* `detectors`: unknown<br> |
| [`ExperimentalResourceDetector`](#experimentalresourcedetector) | unknown | | * `container`: unknown<br>* `host`: unknown<br>* `process`: unknown<br>* `service`: unknown<br> |
| [`ExperimentalServiceResourceDetector`](#experimentalserviceresourcedetector) | unknown | | |
Expand Down
6 changes: 5 additions & 1 deletion schema/meta_schema_language_cpp.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,11 @@ typeSupportStatuses:
propertyOverrides: []
- type: ExperimentalPrometheusMetricExporter
status: supported
propertyOverrides: []
propertyOverrides:
- property: without_scope_info
status: unknown
- property: without_target_info
status: unknown
- type: ExperimentalResourceDetection
status: not_implemented
propertyOverrides: []
Expand Down
2 changes: 2 additions & 0 deletions schema/meta_schema_language_java.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -173,6 +173,8 @@ typeSupportStatuses:
status: not_implemented
- property: without_scope_info
status: ignored
- property: without_target_info
status: ignored
- type: ExperimentalResourceDetection
status: supported
propertyOverrides: []
Expand Down
4 changes: 4 additions & 0 deletions schema/meta_schema_types.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -415,6 +415,10 @@
description: |
Configure Prometheus Exporter to produce metrics without a scope info metric.
If omitted or null, false is used.
- property: without_target_info
description: |
Configure Prometheus Exporter to produce metrics without a target info metric for the resource.
If omitted or null, false is used.
isSdkExtensionPlugin: false
- type: ExperimentalResourceDetection
properties:
Expand Down
3 changes: 3 additions & 0 deletions schema/meter_provider.json
Original file line number Diff line number Diff line change
Expand Up @@ -192,6 +192,9 @@
"without_scope_info": {
Comment thread
zeitlinger marked this conversation as resolved.
"type": ["boolean", "null"]
},
"without_target_info": {
"type": ["boolean", "null"]
},
"with_resource_constant_labels": {
Comment thread
jack-berg marked this conversation as resolved.
"$ref": "common.json#/$defs/IncludeExclude"
},
Expand Down
Loading