From e9255cb5c2f2a71a9fabdd6a62a23b6032ddea40 Mon Sep 17 00:00:00 2001 From: Marc Alff Date: Wed, 7 Aug 2024 00:55:16 +0200 Subject: [PATCH 1/3] Fixed #109 --- schema/meter_provider.json | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/schema/meter_provider.json b/schema/meter_provider.json index 511920b..44bd71b 100644 --- a/schema/meter_provider.json +++ b/schema/meter_provider.json @@ -32,7 +32,7 @@ "minimum": 0 }, "exporter": { - "$ref": "#/$defs/MetricExporter" + "$ref": "#/$defs/PushMetricExporter" } }, "required": [ @@ -45,7 +45,7 @@ "additionalProperties": false, "properties": { "exporter": { - "$ref": "#/$defs/MetricExporter" + "$ref": "#/$defs/PullMetricExporter" } }, "required": [ @@ -53,7 +53,7 @@ ], "title": "PullMetricReader" }, - "MetricExporter": { + "PushMetricExporter": { "type": ["object", "null"], "additionalProperties": true, "minProperties": 1, @@ -64,7 +64,20 @@ }, "console": { "$ref": "common.json#/$defs/Console" - }, + } + }, + "patternProperties": { + ".*": { + "type": ["object", "null"] + } + } + }, + "PullMetricExporter": { + "type": ["object", "null"], + "additionalProperties": true, + "minProperties": 1, + "maxProperties": 1, + "properties": { "prometheus": { "$ref": "#/$defs/Prometheus" } From 224317e5907854f979b2b18cc0280d791febe6d3 Mon Sep 17 00:00:00 2001 From: Marc Alff Date: Wed, 7 Aug 2024 01:08:16 +0200 Subject: [PATCH 2/3] CHANGELOG --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 96ba1ee..81beb24 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ ## Unreleased * Adding initial instrumentation configuration schema +* [SCHEMA] The MetricExporter schema is unsafe [#110](https://github.com/open-telemetry/opentelemetry-configuration/pull/110) ## [v0.2.0] - 2024-05-08 From 7cf6f9cb5704b3685f8683c102d31dd8a26d2361 Mon Sep 17 00:00:00 2001 From: Marc Alff Date: Sat, 10 Aug 2024 01:08:12 +0200 Subject: [PATCH 3/3] Update CHANGELOG.md Co-authored-by: jack-berg <34418638+jack-berg@users.noreply.github.com> --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 81beb24..6f08390 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,7 +3,7 @@ ## Unreleased * Adding initial instrumentation configuration schema -* [SCHEMA] The MetricExporter schema is unsafe [#110](https://github.com/open-telemetry/opentelemetry-configuration/pull/110) +* Split MetricExporter into PullMetricExporter and PushMetricExporter and ensure only PushMetricExporters can be associated with PeriodicMetricReader [#110](https://github.com/open-telemetry/opentelemetry-configuration/pull/110) ## [v0.2.0] - 2024-05-08