diff --git a/examples/kitchen-sink.yaml b/examples/kitchen-sink.yaml index 178be270..1adfc2c4 100644 --- a/examples/kitchen-sink.yaml +++ b/examples/kitchen-sink.yaml @@ -94,9 +94,9 @@ meter_provider: counter: 2000 gauge: 2000 histogram: 2000 - observable_counter: 2000 - observable_gauge: 2000 - observable_up_down_counter: 2000 + asynchronous_counter: 2000 + asynchronous_gauge: 2000 + asynchronous_up_down_counter: 2000 up_down_counter: 2000 - periodic: interval: 60000 @@ -124,9 +124,9 @@ meter_provider: counter: 2000 gauge: 2000 histogram: 2000 - observable_counter: 2000 - observable_gauge: 2000 - observable_up_down_counter: 2000 + asynchronous_counter: 2000 + asynchronous_gauge: 2000 + asynchronous_up_down_counter: 2000 up_down_counter: 2000 - periodic: exporter: diff --git a/opentelemetry_configuration.json b/opentelemetry_configuration.json index 6475223a..396f2d6b 100644 --- a/opentelemetry_configuration.json +++ b/opentelemetry_configuration.json @@ -376,29 +376,29 @@ "exclusiveMinimum": 0, "description": "Configure default cardinality limit for histogram instruments.\nIf omitted or null, the value from .default is used.\n" }, - "observable_counter": { + "asynchronous_counter": { "type": [ "integer", "null" ], "exclusiveMinimum": 0, - "description": "Configure default cardinality limit for observable_counter instruments.\nIf omitted or null, the value from .default is used.\n" + "description": "Configure default cardinality limit for asynchronous counter instruments.\nIf omitted or null, the value from .default is used.\n" }, - "observable_gauge": { + "asynchronous_gauge": { "type": [ "integer", "null" ], "exclusiveMinimum": 0, - "description": "Configure default cardinality limit for observable_gauge instruments.\nIf omitted or null, the value from .default is used.\n" + "description": "Configure default cardinality limit for asynchronous gauge instruments.\nIf omitted or null, the value from .default is used.\n" }, - "observable_up_down_counter": { + "asynchronous_up_down_counter": { "type": [ "integer", "null" ], "exclusiveMinimum": 0, - "description": "Configure default cardinality limit for observable_up_down_counter instruments.\nIf omitted or null, the value from .default is used.\n" + "description": "Configure default cardinality limit for asynchronous up down counter instruments.\nIf omitted or null, the value from .default is used.\n" }, "up_down_counter": { "type": [ @@ -1285,9 +1285,9 @@ "counter", "gauge", "histogram", - "observable_counter", - "observable_gauge", - "observable_up_down_counter", + "asynchronous_counter", + "asynchronous_gauge", + "asynchronous_up_down_counter", "up_down_counter" ] }, @@ -2235,7 +2235,7 @@ }, "instrument_type": { "$ref": "#/$defs/InstrumentType", - "description": "Configure instrument type selection criteria.\nValues include: counter, gauge, histogram, observable_counter, observable_gauge, observable_up_down_counter, up_down_counter.\nIf omitted, all instrument types match.\n" + "description": "Configure instrument type selection criteria.\nIf omitted, all instrument types match.\n" }, "unit": { "type": [ diff --git a/schema-docs.md b/schema-docs.md index ec2b5250..ae847cf7 100644 --- a/schema-docs.md +++ b/schema-docs.md @@ -617,13 +617,13 @@ Usages: | Property | Type | Required? | Default and Null Behavior | Constraints | Description | |---|---|---|---|---|---| +| `asynchronous_counter` | one of:
* `integer`
* `null`
| `false` | If omitted or null, the value from .default is used. | * `exclusiveMinimum`: `0`
| Configure default cardinality limit for asynchronous counter instruments.
| +| `asynchronous_gauge` | one of:
* `integer`
* `null`
| `false` | If omitted or null, the value from .default is used. | * `exclusiveMinimum`: `0`
| Configure default cardinality limit for asynchronous gauge instruments.
| +| `asynchronous_up_down_counter` | one of:
* `integer`
* `null`
| `false` | If omitted or null, the value from .default is used. | * `exclusiveMinimum`: `0`
| Configure default cardinality limit for asynchronous up down counter instruments.
| | `counter` | one of:
* `integer`
* `null`
| `false` | If omitted or null, the value from .default is used. | * `exclusiveMinimum`: `0`
| Configure default cardinality limit for counter instruments.
| | `default` | one of:
* `integer`
* `null`
| `false` | If omitted or null, 2000 is used. | * `exclusiveMinimum`: `0`
| Configure default cardinality limit for all instrument types.
Instrument-specific cardinality limits take priority.
| | `gauge` | one of:
* `integer`
* `null`
| `false` | If omitted or null, the value from .default is used. | * `exclusiveMinimum`: `0`
| Configure default cardinality limit for gauge instruments.
| | `histogram` | one of:
* `integer`
* `null`
| `false` | If omitted or null, the value from .default is used. | * `exclusiveMinimum`: `0`
| Configure default cardinality limit for histogram instruments.
| -| `observable_counter` | one of:
* `integer`
* `null`
| `false` | If omitted or null, the value from .default is used. | * `exclusiveMinimum`: `0`
| Configure default cardinality limit for observable_counter instruments.
| -| `observable_gauge` | one of:
* `integer`
* `null`
| `false` | If omitted or null, the value from .default is used. | * `exclusiveMinimum`: `0`
| Configure default cardinality limit for observable_gauge instruments.
| -| `observable_up_down_counter` | one of:
* `integer`
* `null`
| `false` | If omitted or null, the value from .default is used. | * `exclusiveMinimum`: `0`
| Configure default cardinality limit for observable_up_down_counter instruments.
| | `up_down_counter` | one of:
* `integer`
* `null`
| `false` | If omitted or null, the value from .default is used. | * `exclusiveMinimum`: `0`
| Configure default cardinality limit for up_down_counter instruments.
|
@@ -631,13 +631,13 @@ Usages: | Property | [cpp](#cpp) | [go](#go) | [java](#java) | [js](#js) | |---|---|---|---|---| +| `asynchronous_counter` | not_implemented | unknown | supported | unknown | +| `asynchronous_gauge` | not_implemented | unknown | supported | unknown | +| `asynchronous_up_down_counter` | not_implemented | unknown | supported | unknown | | `counter` | not_implemented | unknown | supported | unknown | | `default` | not_implemented | unknown | supported | unknown | | `gauge` | not_implemented | unknown | supported | unknown | | `histogram` | not_implemented | unknown | supported | unknown | -| `observable_counter` | not_implemented | unknown | supported | unknown | -| `observable_gauge` | not_implemented | unknown | supported | unknown | -| `observable_up_down_counter` | not_implemented | unknown | supported | unknown | | `up_down_counter` | not_implemented | unknown | supported | unknown |
@@ -686,21 +686,21 @@ Usages: ], "exclusiveMinimum": 0 }, - "observable_counter": { + "asynchronous_counter": { "type": [ "integer", "null" ], "exclusiveMinimum": 0 }, - "observable_gauge": { + "asynchronous_gauge": { "type": [ "integer", "null" ], "exclusiveMinimum": 0 }, - "observable_up_down_counter": { + "asynchronous_up_down_counter": { "type": [ "integer", "null" @@ -1209,12 +1209,12 @@ This is a enum type. | Value | Description | |---|---| +| `asynchronous_counter` | Asynchronous counter instruments. | +| `asynchronous_gauge` | Asynchronous gauge instruments. | +| `asynchronous_up_down_counter` | Asynchronous up down counter instruments. | | `counter` | Synchronous counter instruments. | | `gauge` | Synchronous gauge instruments. | | `histogram` | Synchronous histogram instruments. | -| `observable_counter` | Asynchronous counter instruments. | -| `observable_gauge` | Asynchronous gauge instruments. | -| `observable_up_down_counter` | Asynchronous up down counter instruments. | | `up_down_counter` | Synchronous up down counter instruments. |
@@ -1222,12 +1222,12 @@ This is a enum type. | Value | [cpp](#cpp) | [go](#go) | [java](#java) | [js](#js) | |---|---|---|---|---| +| `asynchronous_counter` | supported | unknown | supported | unknown | +| `asynchronous_gauge` | supported | unknown | supported | unknown | +| `asynchronous_up_down_counter` | supported | unknown | supported | unknown | | `counter` | supported | unknown | supported | unknown | | `gauge` | supported | unknown | supported | unknown | | `histogram` | supported | unknown | supported | unknown | -| `observable_counter` | supported | unknown | supported | unknown | -| `observable_gauge` | supported | unknown | supported | unknown | -| `observable_up_down_counter` | supported | unknown | supported | unknown | | `up_down_counter` | supported | unknown | supported | unknown |
@@ -1250,9 +1250,9 @@ Usages: "counter", "gauge", "histogram", - "observable_counter", - "observable_gauge", - "observable_up_down_counter", + "asynchronous_counter", + "asynchronous_gauge", + "asynchronous_up_down_counter", "up_down_counter" ] } @@ -3350,7 +3350,7 @@ Usages: | Property | Type | Required? | Default and Null Behavior | Constraints | Description | |---|---|---|---|---|---| | `instrument_name` | one of:
* `string`
* `null`
| `false` | If omitted or null, all instrument names match. | No constraints. | Configure instrument name selection criteria.
| -| `instrument_type` | [`InstrumentType`](#instrumenttype) | `false` | If omitted, all instrument types match. | No constraints. | Configure instrument type selection criteria.
Values include: counter, gauge, histogram, observable_counter, observable_gauge, observable_up_down_counter, up_down_counter.
| +| `instrument_type` | [`InstrumentType`](#instrumenttype) | `false` | If omitted, all instrument types match. | No constraints. | Configure instrument type selection criteria.
| | `meter_name` | one of:
* `string`
* `null`
| `false` | If omitted or null, all meter names match. | No constraints. | Configure meter name selection criteria.
| | `meter_schema_url` | one of:
* `string`
* `null`
| `false` | If omitted or null, all meter schema URLs match. | No constraints. | Configure meter schema url selection criteria.
| | `meter_version` | one of:
* `string`
* `null`
| `false` | If omitted or null, all meter versions match. | No constraints. | Configure meter version selection criteria.
| @@ -5360,7 +5360,7 @@ Latest supported file format: `1.0.0-rc.2` | [`Base2ExponentialBucketHistogramAggregation`](#base2exponentialbuckethistogramaggregation) | supported | | * `max_scale`: supported
* `max_size`: supported
* `record_min_max`: supported
| | [`BatchLogRecordProcessor`](#batchlogrecordprocessor) | supported | | * `export_timeout`: supported
* `exporter`: supported
* `max_export_batch_size`: supported
* `max_queue_size`: supported
* `schedule_delay`: supported
| | [`BatchSpanProcessor`](#batchspanprocessor) | supported | | * `export_timeout`: supported
* `exporter`: supported
* `max_export_batch_size`: supported
* `max_queue_size`: supported
* `schedule_delay`: supported
| -| [`CardinalityLimits`](#cardinalitylimits) | not_implemented | | * `counter`: not_implemented
* `default`: not_implemented
* `gauge`: not_implemented
* `histogram`: not_implemented
* `observable_counter`: not_implemented
* `observable_gauge`: not_implemented
* `observable_up_down_counter`: not_implemented
* `up_down_counter`: not_implemented
| +| [`CardinalityLimits`](#cardinalitylimits) | not_implemented | | * `asynchronous_counter`: not_implemented
* `asynchronous_gauge`: not_implemented
* `asynchronous_up_down_counter`: not_implemented
* `counter`: not_implemented
* `default`: not_implemented
* `gauge`: not_implemented
* `histogram`: not_implemented
* `up_down_counter`: not_implemented
| | [`ConsoleExporter`](#consoleexporter) | supported | | | | [`ConsoleMetricExporter`](#consolemetricexporter) | supported | | * `default_histogram_aggregation`: supported
* `temporality_preference`: supported
| | [`DefaultAggregation`](#defaultaggregation) | supported | | | @@ -5372,7 +5372,7 @@ Latest supported file format: `1.0.0-rc.2` | [`GrpcTls`](#grpctls) | unknown | | * `ca_file`: unknown
* `cert_file`: unknown
* `insecure`: unknown
* `key_file`: unknown
| | [`HttpTls`](#httptls) | unknown | | * `ca_file`: unknown
* `cert_file`: unknown
* `key_file`: unknown
| | [`IncludeExclude`](#includeexclude) | supported | | * `excluded`: supported
* `included`: supported
| -| [`InstrumentType`](#instrumenttype) | supported | | * `counter`: supported
* `gauge`: supported
* `histogram`: supported
* `observable_counter`: supported
* `observable_gauge`: supported
* `observable_up_down_counter`: supported
* `up_down_counter`: supported
| +| [`InstrumentType`](#instrumenttype) | supported | | * `asynchronous_counter`: supported
* `asynchronous_gauge`: supported
* `asynchronous_up_down_counter`: supported
* `counter`: supported
* `gauge`: supported
* `histogram`: supported
* `up_down_counter`: supported
| | [`JaegerPropagator`](#jaegerpropagator) | supported | | | | [`LastValueAggregation`](#lastvalueaggregation) | supported | | | | [`LoggerProvider`](#loggerprovider) | supported | | * `limits`: supported
* `processors`: supported
* `logger_configurator/development`: supported
| @@ -5468,7 +5468,7 @@ Latest supported file format: `0.3.0` | [`Base2ExponentialBucketHistogramAggregation`](#base2exponentialbuckethistogramaggregation) | unknown | | * `max_scale`: unknown
* `max_size`: unknown
* `record_min_max`: unknown
| | [`BatchLogRecordProcessor`](#batchlogrecordprocessor) | unknown | | * `export_timeout`: unknown
* `exporter`: unknown
* `max_export_batch_size`: unknown
* `max_queue_size`: unknown
* `schedule_delay`: unknown
| | [`BatchSpanProcessor`](#batchspanprocessor) | unknown | | * `export_timeout`: unknown
* `exporter`: unknown
* `max_export_batch_size`: unknown
* `max_queue_size`: unknown
* `schedule_delay`: unknown
| -| [`CardinalityLimits`](#cardinalitylimits) | unknown | | * `counter`: unknown
* `default`: unknown
* `gauge`: unknown
* `histogram`: unknown
* `observable_counter`: unknown
* `observable_gauge`: unknown
* `observable_up_down_counter`: unknown
* `up_down_counter`: unknown
| +| [`CardinalityLimits`](#cardinalitylimits) | unknown | | * `asynchronous_counter`: unknown
* `asynchronous_gauge`: unknown
* `asynchronous_up_down_counter`: unknown
* `counter`: unknown
* `default`: unknown
* `gauge`: unknown
* `histogram`: unknown
* `up_down_counter`: unknown
| | [`ConsoleExporter`](#consoleexporter) | unknown | | | | [`ConsoleMetricExporter`](#consolemetricexporter) | unknown | | * `default_histogram_aggregation`: unknown
* `temporality_preference`: unknown
| | [`DefaultAggregation`](#defaultaggregation) | unknown | | | @@ -5480,7 +5480,7 @@ Latest supported file format: `0.3.0` | [`GrpcTls`](#grpctls) | unknown | | * `ca_file`: unknown
* `cert_file`: unknown
* `insecure`: unknown
* `key_file`: unknown
| | [`HttpTls`](#httptls) | unknown | | * `ca_file`: unknown
* `cert_file`: unknown
* `key_file`: unknown
| | [`IncludeExclude`](#includeexclude) | unknown | | * `excluded`: unknown
* `included`: unknown
| -| [`InstrumentType`](#instrumenttype) | unknown | | * `counter`: unknown
* `gauge`: unknown
* `histogram`: unknown
* `observable_counter`: unknown
* `observable_gauge`: unknown
* `observable_up_down_counter`: unknown
* `up_down_counter`: unknown
| +| [`InstrumentType`](#instrumenttype) | unknown | | * `asynchronous_counter`: unknown
* `asynchronous_gauge`: unknown
* `asynchronous_up_down_counter`: unknown
* `counter`: unknown
* `gauge`: unknown
* `histogram`: unknown
* `up_down_counter`: unknown
| | [`JaegerPropagator`](#jaegerpropagator) | unknown | | | | [`LastValueAggregation`](#lastvalueaggregation) | unknown | | | | [`LoggerProvider`](#loggerprovider) | unknown | | * `limits`: unknown
* `processors`: unknown
* `logger_configurator/development`: unknown
| @@ -5576,7 +5576,7 @@ Latest supported file format: `1.0.0-rc.1` | [`Base2ExponentialBucketHistogramAggregation`](#base2exponentialbuckethistogramaggregation) | supported | | * `max_scale`: supported
* `max_size`: supported
* `record_min_max`: not_implemented
| | [`BatchLogRecordProcessor`](#batchlogrecordprocessor) | supported | | * `export_timeout`: supported
* `exporter`: supported
* `max_export_batch_size`: supported
* `max_queue_size`: supported
* `schedule_delay`: supported
| | [`BatchSpanProcessor`](#batchspanprocessor) | supported | | * `export_timeout`: supported
* `exporter`: supported
* `max_export_batch_size`: supported
* `max_queue_size`: supported
* `schedule_delay`: supported
| -| [`CardinalityLimits`](#cardinalitylimits) | supported | | * `counter`: supported
* `default`: supported
* `gauge`: supported
* `histogram`: supported
* `observable_counter`: supported
* `observable_gauge`: supported
* `observable_up_down_counter`: supported
* `up_down_counter`: supported
| +| [`CardinalityLimits`](#cardinalitylimits) | supported | | * `asynchronous_counter`: supported
* `asynchronous_gauge`: supported
* `asynchronous_up_down_counter`: supported
* `counter`: supported
* `default`: supported
* `gauge`: supported
* `histogram`: supported
* `up_down_counter`: supported
| | [`ConsoleExporter`](#consoleexporter) | supported | | | | [`ConsoleMetricExporter`](#consolemetricexporter) | supported | | * `default_histogram_aggregation`: not_implemented
* `temporality_preference`: ignored
| | [`DefaultAggregation`](#defaultaggregation) | supported | | | @@ -5588,7 +5588,7 @@ Latest supported file format: `1.0.0-rc.1` | [`GrpcTls`](#grpctls) | not_implemented | | * `ca_file`: not_implemented
* `cert_file`: not_implemented
* `insecure`: not_implemented
* `key_file`: not_implemented
| | [`HttpTls`](#httptls) | not_implemented | | * `ca_file`: not_implemented
* `cert_file`: not_implemented
* `key_file`: not_implemented
| | [`IncludeExclude`](#includeexclude) | supported | | * `excluded`: supported
* `included`: supported
| -| [`InstrumentType`](#instrumenttype) | supported | | * `counter`: supported
* `gauge`: supported
* `histogram`: supported
* `observable_counter`: supported
* `observable_gauge`: supported
* `observable_up_down_counter`: supported
* `up_down_counter`: supported
| +| [`InstrumentType`](#instrumenttype) | supported | | * `asynchronous_counter`: supported
* `asynchronous_gauge`: supported
* `asynchronous_up_down_counter`: supported
* `counter`: supported
* `gauge`: supported
* `histogram`: supported
* `up_down_counter`: supported
| | [`JaegerPropagator`](#jaegerpropagator) | supported | | | | [`LastValueAggregation`](#lastvalueaggregation) | supported | | | | [`LoggerProvider`](#loggerprovider) | supported | | * `limits`: supported
* `processors`: supported
* `logger_configurator/development`: supported
| @@ -5684,7 +5684,7 @@ Latest supported file format: `1.0.0-rc.2` | [`Base2ExponentialBucketHistogramAggregation`](#base2exponentialbuckethistogramaggregation) | unknown | | * `max_scale`: unknown
* `max_size`: unknown
* `record_min_max`: unknown
| | [`BatchLogRecordProcessor`](#batchlogrecordprocessor) | unknown | | * `export_timeout`: unknown
* `exporter`: unknown
* `max_export_batch_size`: unknown
* `max_queue_size`: unknown
* `schedule_delay`: unknown
| | [`BatchSpanProcessor`](#batchspanprocessor) | unknown | | * `export_timeout`: unknown
* `exporter`: unknown
* `max_export_batch_size`: unknown
* `max_queue_size`: unknown
* `schedule_delay`: unknown
| -| [`CardinalityLimits`](#cardinalitylimits) | unknown | | * `counter`: unknown
* `default`: unknown
* `gauge`: unknown
* `histogram`: unknown
* `observable_counter`: unknown
* `observable_gauge`: unknown
* `observable_up_down_counter`: unknown
* `up_down_counter`: unknown
| +| [`CardinalityLimits`](#cardinalitylimits) | unknown | | * `asynchronous_counter`: unknown
* `asynchronous_gauge`: unknown
* `asynchronous_up_down_counter`: unknown
* `counter`: unknown
* `default`: unknown
* `gauge`: unknown
* `histogram`: unknown
* `up_down_counter`: unknown
| | [`ConsoleExporter`](#consoleexporter) | unknown | | | | [`ConsoleMetricExporter`](#consolemetricexporter) | unknown | | * `default_histogram_aggregation`: unknown
* `temporality_preference`: unknown
| | [`DefaultAggregation`](#defaultaggregation) | unknown | | | @@ -5696,7 +5696,7 @@ Latest supported file format: `1.0.0-rc.2` | [`GrpcTls`](#grpctls) | unknown | | * `ca_file`: unknown
* `cert_file`: unknown
* `insecure`: unknown
* `key_file`: unknown
| | [`HttpTls`](#httptls) | unknown | | * `ca_file`: unknown
* `cert_file`: unknown
* `key_file`: unknown
| | [`IncludeExclude`](#includeexclude) | unknown | | * `excluded`: unknown
* `included`: unknown
| -| [`InstrumentType`](#instrumenttype) | unknown | | * `counter`: unknown
* `gauge`: unknown
* `histogram`: unknown
* `observable_counter`: unknown
* `observable_gauge`: unknown
* `observable_up_down_counter`: unknown
* `up_down_counter`: unknown
| +| [`InstrumentType`](#instrumenttype) | unknown | | * `asynchronous_counter`: unknown
* `asynchronous_gauge`: unknown
* `asynchronous_up_down_counter`: unknown
* `counter`: unknown
* `gauge`: unknown
* `histogram`: unknown
* `up_down_counter`: unknown
| | [`JaegerPropagator`](#jaegerpropagator) | unknown | | | | [`LastValueAggregation`](#lastvalueaggregation) | unknown | | | | [`LoggerProvider`](#loggerprovider) | unknown | | * `limits`: unknown
* `processors`: unknown
* `logger_configurator/development`: unknown
| diff --git a/schema/meter_provider.yaml b/schema/meter_provider.yaml index 3c1ca58d..55e628ea 100644 --- a/schema/meter_provider.yaml +++ b/schema/meter_provider.yaml @@ -137,29 +137,29 @@ $defs: description: | Configure default cardinality limit for histogram instruments. defaultBehavior: the value from .default is used - observable_counter: + asynchronous_counter: type: - integer - "null" exclusiveMinimum: 0 description: | - Configure default cardinality limit for observable_counter instruments. + Configure default cardinality limit for asynchronous counter instruments. defaultBehavior: the value from .default is used - observable_gauge: + asynchronous_gauge: type: - integer - "null" exclusiveMinimum: 0 description: | - Configure default cardinality limit for observable_gauge instruments. + Configure default cardinality limit for asynchronous gauge instruments. defaultBehavior: the value from .default is used - observable_up_down_counter: + asynchronous_up_down_counter: type: - integer - "null" exclusiveMinimum: 0 description: | - Configure default cardinality limit for observable_up_down_counter instruments. + Configure default cardinality limit for asynchronous up down counter instruments. defaultBehavior: the value from .default is used up_down_counter: type: @@ -538,7 +538,6 @@ $defs: $ref: "#/$defs/InstrumentType" description: | Configure instrument type selection criteria. - Values include: counter, gauge, histogram, observable_counter, observable_gauge, observable_up_down_counter, up_down_counter. defaultBehavior: all instrument types match unit: type: @@ -576,17 +575,17 @@ $defs: - counter - gauge - histogram - - observable_counter - - observable_gauge - - observable_up_down_counter + - asynchronous_counter + - asynchronous_gauge + - asynchronous_up_down_counter - up_down_counter enumDescriptions: counter: Synchronous counter instruments. gauge: Synchronous gauge instruments. histogram: Synchronous histogram instruments. - observable_counter: Asynchronous counter instruments. - observable_gauge: Asynchronous gauge instruments. - observable_up_down_counter: Asynchronous up down counter instruments. + asynchronous_counter: Asynchronous counter instruments. + asynchronous_gauge: Asynchronous gauge instruments. + asynchronous_up_down_counter: Asynchronous up down counter instruments. up_down_counter: Synchronous up down counter instruments. ViewStream: type: object