diff --git a/opentelemetry_configuration.json b/opentelemetry_configuration.json index 3ae275ea..5b83ed9f 100644 --- a/opentelemetry_configuration.json +++ b/opentelemetry_configuration.json @@ -473,35 +473,6 @@ ], "additionalProperties": false }, - "ExperimentalComposableParentBasedSampler": { - "type": [ - "object", - "null" - ], - "additionalProperties": false, - "properties": { - "root": { - "$ref": "#/$defs/ExperimentalComposableSampler", - "description": "Configures the sampler for spans with no parent." - }, - "remote_parent_sampled": { - "$ref": "#/$defs/ExperimentalComposableSampler", - "description": "Configures the sampler for spans with a remote parent that is sampled." - }, - "remote_parent_not_sampled": { - "$ref": "#/$defs/ExperimentalComposableSampler", - "description": "Configures the sampler for spans with a remote parent that is not sampled." - }, - "local_parent_sampled": { - "$ref": "#/$defs/ExperimentalComposableSampler", - "description": "Configures the sampler for spans with a local parent that is sampled." - }, - "local_parent_not_sampled": { - "$ref": "#/$defs/ExperimentalComposableSampler", - "description": "Configures the sampler for spans with a local parent that is not sampled." - } - } - }, "ExperimentalComposableProbabilitySampler": { "type": [ "object", @@ -539,9 +510,9 @@ "$ref": "#/$defs/ExperimentalComposableAlwaysOnSampler", "description": "Configure sampler to be always_on." }, - "parent_based": { - "$ref": "#/$defs/ExperimentalComposableParentBasedSampler", - "description": "Configure sampler to be parent_based." + "parent_threshold": { + "$ref": "#/$defs/ExperimentalComposableSampler", + "description": "Configure sampler to be parent_threshold, delegating to the configured sampler when there is no parent.\n" }, "probability": { "$ref": "#/$defs/ExperimentalComposableProbabilitySampler", diff --git a/schema-docs.md b/schema-docs.md index f950e60a..6e211185 100644 --- a/schema-docs.md +++ b/schema-docs.md @@ -3599,69 +3599,6 @@ Usages: } -## ExperimentalComposableParentBasedSampler - -> [!WARNING] -> This type is [experimental](README.md#experimental-features). - -| Property | Type | Required? | Constraints | Description | -|---|---|---|---|---| -| `local_parent_not_sampled` | [`ExperimentalComposableSampler`](#experimentalcomposablesampler) | `false` | No constraints. | Configures the sampler for spans with a local parent that is not sampled. | -| `local_parent_sampled` | [`ExperimentalComposableSampler`](#experimentalcomposablesampler) | `false` | No constraints. | Configures the sampler for spans with a local parent that is sampled. | -| `remote_parent_not_sampled` | [`ExperimentalComposableSampler`](#experimentalcomposablesampler) | `false` | No constraints. | Configures the sampler for spans with a remote parent that is not sampled. | -| `remote_parent_sampled` | [`ExperimentalComposableSampler`](#experimentalcomposablesampler) | `false` | No constraints. | Configures the sampler for spans with a remote parent that is sampled. | -| `root` | [`ExperimentalComposableSampler`](#experimentalcomposablesampler) | `false` | No constraints. | Configures the sampler for spans with no parent. | - -
-Language support status - -| Property | [cpp](#cpp) | [go](#go) | [java](#java) | [js](#js) | -|---|---|---|---|---| -| `local_parent_not_sampled` | unknown | unknown | unknown | unknown | -| `local_parent_sampled` | unknown | unknown | unknown | unknown | -| `remote_parent_not_sampled` | unknown | unknown | unknown | unknown | -| `remote_parent_sampled` | unknown | unknown | unknown | unknown | -| `root` | unknown | unknown | unknown | unknown | -
- -Constraints: - -* `additionalProperties`: `false` - -Usages: - -* [`ExperimentalComposableSampler.parent_based`](#experimentalcomposablesampler) - -
-JSON Schema - -[JSON Schema Source File](./schema/tracer_provider.yaml) -
{
-  "type": [
-    "object",
-    "null"
-  ],
-  "additionalProperties": false,
-  "properties": {
-    "root": {
-      "$ref": "#/$defs/ExperimentalComposableSampler"
-    },
-    "remote_parent_sampled": {
-      "$ref": "#/$defs/ExperimentalComposableSampler"
-    },
-    "remote_parent_not_sampled": {
-      "$ref": "#/$defs/ExperimentalComposableSampler"
-    },
-    "local_parent_sampled": {
-      "$ref": "#/$defs/ExperimentalComposableSampler"
-    },
-    "local_parent_not_sampled": {
-      "$ref": "#/$defs/ExperimentalComposableSampler"
-    }
-  }
-}
-
- ## ExperimentalComposableProbabilitySampler > [!WARNING] @@ -3719,7 +3656,7 @@ Usages: |---|---|---|---|---| | `always_off` | [`ExperimentalComposableAlwaysOffSampler`](#experimentalcomposablealwaysoffsampler) | `false` | No constraints. | Configure sampler to be always_off. | | `always_on` | [`ExperimentalComposableAlwaysOnSampler`](#experimentalcomposablealwaysonsampler) | `false` | No constraints. | Configure sampler to be always_on. | -| `parent_based` | [`ExperimentalComposableParentBasedSampler`](#experimentalcomposableparentbasedsampler) | `false` | No constraints. | Configure sampler to be parent_based. | +| `parent_threshold` | [`ExperimentalComposableSampler`](#experimentalcomposablesampler) | `false` | No constraints. | Configure sampler to be parent_threshold, delegating to the configured sampler when there is no parent.
| | `probability` | [`ExperimentalComposableProbabilitySampler`](#experimentalcomposableprobabilitysampler) | `false` | No constraints. | Configure sampler to be probability. |
@@ -3729,7 +3666,7 @@ Usages: |---|---|---|---|---| | `always_off` | unknown | unknown | unknown | unknown | | `always_on` | unknown | unknown | unknown | unknown | -| `parent_based` | unknown | unknown | unknown | unknown | +| `parent_threshold` | unknown | unknown | unknown | unknown | | `probability` | unknown | unknown | unknown | unknown |
@@ -3742,11 +3679,7 @@ Constraints: Usages: * [`Sampler.composite/development`](#sampler) -* [`ExperimentalComposableParentBasedSampler.root`](#experimentalcomposableparentbasedsampler) -* [`ExperimentalComposableParentBasedSampler.remote_parent_sampled`](#experimentalcomposableparentbasedsampler) -* [`ExperimentalComposableParentBasedSampler.remote_parent_not_sampled`](#experimentalcomposableparentbasedsampler) -* [`ExperimentalComposableParentBasedSampler.local_parent_sampled`](#experimentalcomposableparentbasedsampler) -* [`ExperimentalComposableParentBasedSampler.local_parent_not_sampled`](#experimentalcomposableparentbasedsampler) +* [`ExperimentalComposableSampler.parent_threshold`](#experimentalcomposablesampler)
JSON Schema @@ -3769,8 +3702,8 @@ Usages: "always_on": { "$ref": "#/$defs/ExperimentalComposableAlwaysOnSampler" }, - "parent_based": { - "$ref": "#/$defs/ExperimentalComposableParentBasedSampler" + "parent_threshold": { + "$ref": "#/$defs/ExperimentalComposableSampler" }, "probability": { "$ref": "#/$defs/ExperimentalComposableProbabilitySampler" @@ -5415,9 +5348,8 @@ Latest supported file format: `1.0.0-rc.2` | [`ZipkinSpanExporter`](#zipkinspanexporter) | supported | | * `endpoint`: supported
* `timeout`: supported
| | [`ExperimentalComposableAlwaysOffSampler`](#experimentalcomposablealwaysoffsampler) | unknown | | | | [`ExperimentalComposableAlwaysOnSampler`](#experimentalcomposablealwaysonsampler) | unknown | | | -| [`ExperimentalComposableParentBasedSampler`](#experimentalcomposableparentbasedsampler) | unknown | | * `local_parent_not_sampled`: unknown
* `local_parent_sampled`: unknown
* `remote_parent_not_sampled`: unknown
* `remote_parent_sampled`: unknown
* `root`: unknown
| | [`ExperimentalComposableProbabilitySampler`](#experimentalcomposableprobabilitysampler) | unknown | | * `ratio`: unknown
| -| [`ExperimentalComposableSampler`](#experimentalcomposablesampler) | unknown | | * `always_off`: unknown
* `always_on`: unknown
* `parent_based`: unknown
* `probability`: unknown
| +| [`ExperimentalComposableSampler`](#experimentalcomposablesampler) | unknown | | * `always_off`: unknown
* `always_on`: unknown
* `parent_threshold`: unknown
* `probability`: unknown
| | [`ExperimentalContainerResourceDetector`](#experimentalcontainerresourcedetector) | not_implemented | | | | [`ExperimentalGeneralInstrumentation`](#experimentalgeneralinstrumentation) | not_applicable | | * `http`: not_applicable
* `peer`: not_applicable
| | [`ExperimentalHostResourceDetector`](#experimentalhostresourcedetector) | not_implemented | | | @@ -5523,9 +5455,8 @@ Latest supported file format: `0.3.0` | [`ZipkinSpanExporter`](#zipkinspanexporter) | unknown | | * `endpoint`: unknown
* `timeout`: unknown
| | [`ExperimentalComposableAlwaysOffSampler`](#experimentalcomposablealwaysoffsampler) | unknown | | | | [`ExperimentalComposableAlwaysOnSampler`](#experimentalcomposablealwaysonsampler) | unknown | | | -| [`ExperimentalComposableParentBasedSampler`](#experimentalcomposableparentbasedsampler) | unknown | | * `local_parent_not_sampled`: unknown
* `local_parent_sampled`: unknown
* `remote_parent_not_sampled`: unknown
* `remote_parent_sampled`: unknown
* `root`: unknown
| | [`ExperimentalComposableProbabilitySampler`](#experimentalcomposableprobabilitysampler) | unknown | | * `ratio`: unknown
| -| [`ExperimentalComposableSampler`](#experimentalcomposablesampler) | unknown | | * `always_off`: unknown
* `always_on`: unknown
* `parent_based`: unknown
* `probability`: unknown
| +| [`ExperimentalComposableSampler`](#experimentalcomposablesampler) | unknown | | * `always_off`: unknown
* `always_on`: unknown
* `parent_threshold`: unknown
* `probability`: unknown
| | [`ExperimentalContainerResourceDetector`](#experimentalcontainerresourcedetector) | unknown | | | | [`ExperimentalGeneralInstrumentation`](#experimentalgeneralinstrumentation) | unknown | | * `http`: unknown
* `peer`: unknown
| | [`ExperimentalHostResourceDetector`](#experimentalhostresourcedetector) | unknown | | | @@ -5631,9 +5562,8 @@ Latest supported file format: `1.0.0-rc.1` | [`ZipkinSpanExporter`](#zipkinspanexporter) | supported | | * `endpoint`: supported
* `timeout`: supported
| | [`ExperimentalComposableAlwaysOffSampler`](#experimentalcomposablealwaysoffsampler) | unknown | | | | [`ExperimentalComposableAlwaysOnSampler`](#experimentalcomposablealwaysonsampler) | unknown | | | -| [`ExperimentalComposableParentBasedSampler`](#experimentalcomposableparentbasedsampler) | unknown | | * `local_parent_not_sampled`: unknown
* `local_parent_sampled`: unknown
* `remote_parent_not_sampled`: unknown
* `remote_parent_sampled`: unknown
* `root`: unknown
| | [`ExperimentalComposableProbabilitySampler`](#experimentalcomposableprobabilitysampler) | unknown | | * `ratio`: unknown
| -| [`ExperimentalComposableSampler`](#experimentalcomposablesampler) | unknown | | * `always_off`: unknown
* `always_on`: unknown
* `parent_based`: unknown
* `probability`: unknown
| +| [`ExperimentalComposableSampler`](#experimentalcomposablesampler) | unknown | | * `always_off`: unknown
* `always_on`: unknown
* `parent_threshold`: unknown
* `probability`: unknown
| | [`ExperimentalContainerResourceDetector`](#experimentalcontainerresourcedetector) | supported | | | | [`ExperimentalGeneralInstrumentation`](#experimentalgeneralinstrumentation) | supported | | * `http`: supported
* `peer`: supported
| | [`ExperimentalHostResourceDetector`](#experimentalhostresourcedetector) | supported | | | @@ -5739,9 +5669,8 @@ Latest supported file format: `1.0.0-rc.2` | [`ZipkinSpanExporter`](#zipkinspanexporter) | unknown | | * `endpoint`: unknown
* `timeout`: unknown
| | [`ExperimentalComposableAlwaysOffSampler`](#experimentalcomposablealwaysoffsampler) | unknown | | | | [`ExperimentalComposableAlwaysOnSampler`](#experimentalcomposablealwaysonsampler) | unknown | | | -| [`ExperimentalComposableParentBasedSampler`](#experimentalcomposableparentbasedsampler) | unknown | | * `local_parent_not_sampled`: unknown
* `local_parent_sampled`: unknown
* `remote_parent_not_sampled`: unknown
* `remote_parent_sampled`: unknown
* `root`: unknown
| | [`ExperimentalComposableProbabilitySampler`](#experimentalcomposableprobabilitysampler) | unknown | | * `ratio`: unknown
| -| [`ExperimentalComposableSampler`](#experimentalcomposablesampler) | unknown | | * `always_off`: unknown
* `always_on`: unknown
* `parent_based`: unknown
* `probability`: unknown
| +| [`ExperimentalComposableSampler`](#experimentalcomposablesampler) | unknown | | * `always_off`: unknown
* `always_on`: unknown
* `parent_threshold`: unknown
* `probability`: unknown
| | [`ExperimentalContainerResourceDetector`](#experimentalcontainerresourcedetector) | unknown | | | | [`ExperimentalGeneralInstrumentation`](#experimentalgeneralinstrumentation) | unknown | | * `http`: unknown
* `peer`: unknown
| | [`ExperimentalHostResourceDetector`](#experimentalhostresourcedetector) | unknown | | | diff --git a/schema/meta_schema_language_cpp.yaml b/schema/meta_schema_language_cpp.yaml index 949d52c4..63666668 100644 --- a/schema/meta_schema_language_cpp.yaml +++ b/schema/meta_schema_language_cpp.yaml @@ -201,9 +201,6 @@ typeSupportStatuses: - type: ExperimentalComposableAlwaysOnSampler status: unknown propertyOverrides: [] - - type: ExperimentalComposableParentBasedSampler - status: unknown - propertyOverrides: [] - type: ExperimentalComposableProbabilitySampler status: unknown propertyOverrides: [] diff --git a/schema/meta_schema_language_go.yaml b/schema/meta_schema_language_go.yaml index d33e0d4b..dcd35fe2 100644 --- a/schema/meta_schema_language_go.yaml +++ b/schema/meta_schema_language_go.yaml @@ -201,9 +201,6 @@ typeSupportStatuses: - type: ExperimentalComposableAlwaysOnSampler status: unknown propertyOverrides: [] - - type: ExperimentalComposableParentBasedSampler - status: unknown - propertyOverrides: [] - type: ExperimentalComposableProbabilitySampler status: unknown propertyOverrides: [] diff --git a/schema/meta_schema_language_java.yaml b/schema/meta_schema_language_java.yaml index 39bedc87..e1fc6b02 100644 --- a/schema/meta_schema_language_java.yaml +++ b/schema/meta_schema_language_java.yaml @@ -235,9 +235,6 @@ typeSupportStatuses: - type: ExperimentalComposableAlwaysOnSampler status: unknown propertyOverrides: [] - - type: ExperimentalComposableParentBasedSampler - status: unknown - propertyOverrides: [] - type: ExperimentalComposableProbabilitySampler status: unknown propertyOverrides: [] diff --git a/schema/meta_schema_language_js.yaml b/schema/meta_schema_language_js.yaml index 03e18f57..cfec0dbb 100644 --- a/schema/meta_schema_language_js.yaml +++ b/schema/meta_schema_language_js.yaml @@ -201,9 +201,6 @@ typeSupportStatuses: - type: ExperimentalComposableAlwaysOnSampler status: unknown propertyOverrides: [] - - type: ExperimentalComposableParentBasedSampler - status: unknown - propertyOverrides: [] - type: ExperimentalComposableProbabilitySampler status: unknown propertyOverrides: [] diff --git a/schema/tracer_provider.yaml b/schema/tracer_provider.yaml index 0163ac1d..9b3867e4 100644 --- a/schema/tracer_provider.yaml +++ b/schema/tracer_provider.yaml @@ -197,27 +197,6 @@ $defs: - object - "null" additionalProperties: false - ExperimentalComposableParentBasedSampler: - type: - - object - - "null" - additionalProperties: false - properties: - root: - $ref: "#/$defs/ExperimentalComposableSampler" - description: Configures the sampler for spans with no parent. - remote_parent_sampled: - $ref: "#/$defs/ExperimentalComposableSampler" - description: Configures the sampler for spans with a remote parent that is sampled. - remote_parent_not_sampled: - $ref: "#/$defs/ExperimentalComposableSampler" - description: Configures the sampler for spans with a remote parent that is not sampled. - local_parent_sampled: - $ref: "#/$defs/ExperimentalComposableSampler" - description: Configures the sampler for spans with a local parent that is sampled. - local_parent_not_sampled: - $ref: "#/$defs/ExperimentalComposableSampler" - description: Configures the sampler for spans with a local parent that is not sampled. ExperimentalComposableProbabilitySampler: type: - object @@ -248,9 +227,10 @@ $defs: always_on: $ref: "#/$defs/ExperimentalComposableAlwaysOnSampler" description: Configure sampler to be always_on. - parent_based: - $ref: "#/$defs/ExperimentalComposableParentBasedSampler" - description: Configure sampler to be parent_based. + parent_threshold: + $ref: "#/$defs/ExperimentalComposableSampler" + description: | + Configure sampler to be parent_threshold, delegating to the configured sampler when there is no parent. probability: $ref: "#/$defs/ExperimentalComposableProbabilitySampler" description: Configure sampler to be probability.