Skip to content

Don't require empty objects #134

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
codeboten merged 2 commits into from
Oct 28, 2024
Merged

Don't require empty objects #134

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
462dca5
Don't require empty objects
jack-berg Oct 21, 2024
6b16c3e
Merge branch 'main' into null-vs-empty
codeboten Oct 28, 2024
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
19 changes: 10 additions & 9 deletions examples/kitchen-sink.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ logger_provider:
# Configure exporter.
exporter:
# Configure exporter to be console.
console: {}
console:
# Configure log record limits. See also attribute_limits.
limits:
# Configure max attribute value size. Overrides .attribute_limits.attribute_value_length_limit.
Expand Down Expand Up @@ -109,7 +109,7 @@ meter_provider:
# Configure metric producers.
producers:
- # Configure metric producer to be opencensus.
opencensus: {}
opencensus:
- # Configure a periodic metric reader.
periodic:
# Configure delay interval (in milliseconds) between start of two consecutive exports.
Expand Down Expand Up @@ -150,13 +150,13 @@ meter_provider:
# Configure metric producers.
producers:
- # Configure metric producer to be prometheus.
prometheus: {}
prometheus:
- # Configure a periodic metric reader.
periodic:
# Configure exporter.
exporter:
# Configure exporter to be console.
console: {}
console:
# Configure views. Each view has a selector which determines the instrument(s) it applies to, and a configuration for the resulting stream(s).
views:
- # Configure view selector.
Expand Down Expand Up @@ -277,7 +277,7 @@ tracer_provider:
# Configure exporter.
exporter:
# Configure exporter to be console.
console: {}
console:
# Configure span limits. See also attribute_limits.
limits:
# Configure max attribute value size. Overrides .attribute_limits.attribute_value_length_limit.
Expand Down Expand Up @@ -305,19 +305,20 @@ tracer_provider:
# Configure remote_parent_sampled sampler.
remote_parent_sampled:
# Configure sampler to be always_on.
always_on: {}
always_on:
# Configure remote_parent_not_sampled sampler.
remote_parent_not_sampled:
# Configure sampler to be always_off.
always_off: {}
always_off:
# Configure local_parent_sampled sampler.
local_parent_sampled:
# Configure sampler to be always_on.
always_on: {}
always_on:
# Configure local_parent_not_sampled sampler.
local_parent_not_sampled:
# Configure sampler to be always_off.
always_off: {}
always_off:


# Configure resource for all signals.
resource:
Expand Down
11 changes: 6 additions & 5 deletions examples/sdk-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,23 +87,24 @@ tracer_provider:
# Configure root sampler.
root:
# Configure sampler to be always_on.
always_on: {}
always_on:
# Configure remote_parent_sampled sampler.
remote_parent_sampled:
# Configure sampler to be always_on.
always_on: {}
always_on:
# Configure remote_parent_not_sampled sampler.
remote_parent_not_sampled:
# Configure sampler to be always_off.
always_off: {}
always_off:
# Configure local_parent_sampled sampler.
local_parent_sampled:
# Configure sampler to be always_on.
always_on: {}
always_on:
# Configure local_parent_not_sampled sampler.
local_parent_not_sampled:
# Configure sampler to be always_off.
always_off: {}
always_off:


# Configure meter provider.
meter_provider:
Expand Down
11 changes: 6 additions & 5 deletions examples/sdk-migration-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,23 +121,24 @@ tracer_provider:
# Configure root sampler.
root:
# Configure sampler to be always_on.
always_on: {}
always_on:
# Configure remote_parent_sampled sampler.
remote_parent_sampled:
# Configure sampler to be always_on.
always_on: {}
always_on:
# Configure remote_parent_not_sampled sampler.
remote_parent_not_sampled:
# Configure sampler to be always_off.
always_off: {}
always_off:
# Configure local_parent_sampled sampler.
local_parent_sampled:
# Configure sampler to be always_on.
always_on: {}
always_on:
# Configure local_parent_not_sampled sampler.
local_parent_not_sampled:
# Configure sampler to be always_off.
always_off: {}
always_off:


# Configure meter provider.
meter_provider:
Expand Down
4 changes: 2 additions & 2 deletions schema/meter_provider.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,13 +103,13 @@
"maxProperties": 1,
"properties": {
"opencensus": {
"type": "object",
"type": ["object", "null"],
"additionalProperties": false
}
},
"patternProperties": {
".*": {
"type": "object"
"type": ["object", "null"]
}
}
},
Expand Down