Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
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
10 changes: 8 additions & 2 deletions examples/kitchen-sink.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -804,8 +804,14 @@ tracer_provider:
# Configure local_parent_sampled sampler.
# If omitted or null, always_on is used.
local_parent_sampled:
# Configure sampler to be always_on.
always_on:
# Configure sampler to be composite.
# This property is experimental and subject to breaking changes in minor versions.
composite/development:
# Configure sampler to be probability.
probability:
# Configure ratio.
# If omitted or null, 1.0 is used.
ratio: 0.001
# Configure local_parent_not_sampled sampler.
# If omitted or null, always_off is used.
local_parent_not_sampled:
Expand Down
208 changes: 204 additions & 4 deletions schema-docs.md

Large diffs are not rendered by default.

8 changes: 8 additions & 0 deletions schema/meta_schema_language_cpp.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,14 @@ typeSupportStatuses:
status: not_implemented
notes: ""
enumOverrides: []
- type: ExperimentalComposableParentBasedSampler
status: unknown
notes: ""
propertyOverrides: []
- type: ExperimentalComposableSampler
status: unknown
notes: ""
propertyOverrides: []
- type: ExperimentalContainerResourceDetector
status: not_implemented
notes: ""
Expand Down
8 changes: 8 additions & 0 deletions schema/meta_schema_language_go.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,14 @@ typeSupportStatuses:
status: unknown
notes: ""
enumOverrides: []
- type: ExperimentalComposableParentBasedSampler
status: unknown
notes: ""
propertyOverrides: []
- type: ExperimentalComposableSampler
status: unknown
notes: ""
propertyOverrides: []
- type: ExperimentalContainerResourceDetector
status: unknown
notes: ""
Expand Down
8 changes: 8 additions & 0 deletions schema/meta_schema_language_java.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,14 @@ typeSupportStatuses:
status: supported
notes: ""
enumOverrides: []
- type: ExperimentalComposableParentBasedSampler
status: unknown
notes: ""
propertyOverrides: []
- type: ExperimentalComposableSampler
status: unknown
notes: ""
propertyOverrides: []
- type: ExperimentalContainerResourceDetector
status: supported
notes: ""
Expand Down
8 changes: 8 additions & 0 deletions schema/meta_schema_language_js.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,14 @@ typeSupportStatuses:
status: unknown
notes: ""
enumOverrides: []
- type: ExperimentalComposableParentBasedSampler
status: unknown
notes: ""
propertyOverrides: []
- type: ExperimentalComposableSampler
status: unknown
notes: ""
propertyOverrides: []
- type: ExperimentalContainerResourceDetector
status: unknown
notes: ""
Expand Down
26 changes: 26 additions & 0 deletions schema/meta_schema_types.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -960,6 +960,8 @@
description: Configure sampler to be probability.
- property: jaeger_remote/development
description: TODO
- property: composite/development
description: Configure sampler to be composite.
isSdkExtensionPlugin: true
- type: SimpleLogRecordProcessor
properties:
Expand Down Expand Up @@ -1161,3 +1163,27 @@
- property: initial_sampler
description: TODO
isSdkExtensionPlugin: false
- type: ExperimentalComposableSampler
properties:
- property: always_off
description: Configure sampler to be always_off.
- property: always_on
description: Configure sampler to be always_on.
- property: probability
description: Configure sampler to be probability.
- property: parent_based
description: Configure sampler to be parent_based.
isSdkExtensionPlugin: false
- type: ExperimentalComposableParentBasedSampler
properties:
- property: root
description: Configures the sampler for spans with no parent.
- property: remote_parent_sampled
description: Configures the sampler for spans with a remote parent that is sampled.
- property: remote_parent_not_sampled
description: Configures the sampler for spans with a remote parent that is not sampled.
- property: local_parent_sampled
description: Configures the sampler for spans with a local parent that is sampled.
- property: local_parent_not_sampled
description: Configures the sampler for spans with a local parent that is not sampled.
isSdkExtensionPlugin: false
46 changes: 46 additions & 0 deletions schema/tracer_provider.json
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,9 @@
"always_on": {
"$ref": "#/$defs/AlwaysOnSampler"
},
"composite/development": {
"$ref": "#/$defs/ExperimentalComposableSampler"
},
"jaeger_remote/development": {
"$ref": "#/$defs/ExperimentalJaegerRemoteSampler"
},
Expand All @@ -89,6 +92,28 @@
"type": ["object", "null"],
"additionalProperties": false
},
"ExperimentalComposableSampler": {
"type": "object",
"additionalProperties": {
"type": ["object", "null"]
},
"minProperties": 1,
"maxProperties": 1,
"properties": {
"always_off": {
"$ref": "#/$defs/AlwaysOffSampler"

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Consistency with ExperimentalComposableParentBasedSampler would suggest separate ExperimentalComposableAlwaysOn/ExperimentalComposableAlwaysOff sampler as defined in the spec, but it seems silly at the same time.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Indeed felt a bit silly but went with it - from a configuration standpoint it shouldn't matter, but we could imagine implementations in SDKs that map these types to actual SDK types in which case the mapping would be incorrect.

},
"always_on": {
"$ref": "#/$defs/AlwaysOnSampler"
},
"parent_based": {
"$ref": "#/$defs/ExperimentalComposableParentBasedSampler"
},
"probability": {
"$ref": "#/$defs/ExperimentalProbabilitySampler"
}
}
},
"ExperimentalJaegerRemoteSampler": {
"type": ["object", "null"],
"additionalProperties": false,
Expand Down Expand Up @@ -126,6 +151,27 @@
}
}
},
"ExperimentalComposableParentBasedSampler": {
"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"
}
}
},
"ExperimentalProbabilitySampler": {
"type": ["object", "null"],
"additionalProperties": false,
Expand Down
Loading