diff --git a/CHANGELOG.md b/CHANGELOG.md index 96ba1ee..6eef599 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,9 @@ ## Unreleased -* Adding initial instrumentation configuration schema + + * Adding initial instrumentation configuration schema. [#91](https://github.com/open-telemetry/opentelemetry-configuration/pull/91) + * Add exporter `retry` configuration. [#97](https://github.com/open-telemetry/opentelemetry-configuration/pull/97) ## [v0.2.0] - 2024-05-08 diff --git a/examples/anchors.yaml b/examples/anchors.yaml index 1a6d3c7..f83e33b 100644 --- a/examples/anchors.yaml +++ b/examples/anchors.yaml @@ -12,6 +12,8 @@ exporters: api-key: !!str 1234 compression: gzip timeout: 10000 + retry: + disabled: false logger_provider: processors: diff --git a/examples/kitchen-sink.yaml b/examples/kitchen-sink.yaml index b7f1f99..8f08e24 100644 --- a/examples/kitchen-sink.yaml +++ b/examples/kitchen-sink.yaml @@ -91,6 +91,10 @@ logger_provider: # # Environment variable: OTEL_EXPORTER_OTLP_INSECURE, OTEL_EXPORTER_OTLP_LOGS_INSECURE insecure: false + # Configure retry policy. + retry: + # Configure retry disabled. + disabled: false # Configure a simple span processor. - simple: # Configure exporter. @@ -199,6 +203,10 @@ meter_provider: # # Environment variable: OTEL_EXPORTER_OTLP_INSECURE, OTEL_EXPORTER_OTLP_METRICS_INSECURE insecure: false + # Configure retry policy. + retry: + # Configure retry disabled. + disabled: false # Configure temporality preference. # # Environment variable: OTEL_EXPORTER_OTLP_METRICS_TEMPORALITY_PREFERENCE @@ -323,6 +331,10 @@ tracer_provider: # # Environment variable: OTEL_EXPORTER_OTLP_INSECURE, OTEL_EXPORTER_OTLP_TRACES_INSECURE insecure: false + # Configure retry policy. + retry: + # Configure retry disabled. + disabled: false # Configure a batch span processor. - batch: # Configure exporter. @@ -339,6 +351,10 @@ tracer_provider: # # Environment variable: OTEL_EXPORTER_ZIPKIN_TIMEOUT timeout: 10000 + # Configure retry policy. + retry: + # Configure retry disabled. + disabled: false # Configure a simple span processor. - simple: # Configure exporter. diff --git a/schema/common.json b/schema/common.json index 8c488e8..2dbdfda 100644 --- a/schema/common.json +++ b/schema/common.json @@ -63,6 +63,9 @@ }, "insecure": { "type": "boolean" + }, + "retry": { + "$ref": "#/$defs/Retry" } }, "required": [ @@ -74,6 +77,16 @@ "Console": { "type": "object", "additionalProperties": false + }, + "Retry": { + "type": "object", + "additionalProperties": false, + "properties": { + "disabled": { + "type": "boolean", + "default": false + } + } } } } \ No newline at end of file diff --git a/schema/meter_provider.json b/schema/meter_provider.json index 9639a40..c28d491 100644 --- a/schema/meter_provider.json +++ b/schema/meter_provider.json @@ -166,6 +166,12 @@ "type": "integer", "minimum": 0 }, + "insecure": { + "type": "boolean" + }, + "retry": { + "$ref": "common.json#/$defs/Retry" + }, "temporality_preference": { "type": "string" }, @@ -175,9 +181,6 @@ "explicit_bucket_histogram", "base2_exponential_bucket_histogram" ] - }, - "insecure": { - "type": "boolean" } }, "required": [ diff --git a/schema/tracer_provider.json b/schema/tracer_provider.json index 96dfa5c..d5c0c42 100644 --- a/schema/tracer_provider.json +++ b/schema/tracer_provider.json @@ -209,6 +209,9 @@ "timeout": { "type": "integer", "minimum": 0 + }, + "retry": { + "$ref": "common.json#/$defs/Retry" } }, "required": [