Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
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
11 changes: 11 additions & 0 deletions examples/kitchen-sink.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -180,6 +180,7 @@ logger_provider:
# Configure the default logger config used there is no matching entry in .logger_configurator/development.loggers.
default_config:
# Configure if the logger is enabled or not.
# If omitted or null, false is used.
disabled: true
# Configure loggers.
loggers:
Expand All @@ -191,7 +192,17 @@ logger_provider:
# The logger config.
config:
# Configure if the logger is enabled or not.
# If omitted or null, false is used.
disabled: false
# Configure severity filtering.
# Log records with an non-zero (i.e. unspecified) severity number which is less than minimum_severity are not processed.
# Values include: TRACE, TRACE2, TRACE3, TRACE4, DEBUG, DEBUG2, DEBUG3, DEBUG4, INFO, INFO2, INFO3, INFO4, WARN, WARN2, WARN3, WARN4, ERROR, ERROR2, ERROR3, ERROR4, FATAL, FATAL2, FATAL3, FATAL4.
# If omitted or null, severity filtering is not applied.
minimum_severity: INFO
# Configure trace based filtering.
# If true, log records associated with unsampled trace contexts traces are not processed. If false, or if a log record is not associated with a trace context, trace based filtering is not applied.
# If omitted or null, trace based filtering is not applied.
trace_based: true
# Configure meter provider.
# If omitted, a noop meter provider is used.
meter_provider:
Expand Down
183 changes: 176 additions & 7 deletions schema-docs.md

Large diffs are not rendered by default.

37 changes: 36 additions & 1 deletion schema/logger_provider.json
Original file line number Diff line number Diff line change
Expand Up @@ -146,9 +146,44 @@
"additionalProperties": false,
"properties": {
"disabled": {
"type": ["boolean"]
"type": ["boolean", "null"]
Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

Now that there are multiple parameters, it makes sense to allow this to be null because a user might want to specify minimum_severity and/or trace_based and leave disabled to be the default value.

Downside is that this is now inconsistent with TracerConfig / MeterConfig.

},
"minimum_severity": {
"$ref": "#/$defs/ExperimentalSeverityNumber"
},
"trace_based": {
"type": ["boolean", "null"]
}
}
},
"ExperimentalSeverityNumber": {
"type": ["string", "null"],
"enum": [
"TRACE",
"TRACE2",
"TRACE3",
"TRACE4",
"DEBUG",
"DEBUG2",
"DEBUG3",
"DEBUG4",
"INFO",
"INFO2",
"INFO3",
"INFO4",
"WARN",
"WARN2",
"WARN3",
"WARN4",
"ERROR",
"ERROR2",
"ERROR3",
"ERROR4",
"FATAL",
"FATAL2",
"FATAL3",
"FATAL4"
]
}
}
}
3 changes: 3 additions & 0 deletions schema/meta_schema_language_cpp.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,9 @@ typeSupportStatuses:
- type: ExperimentalServiceResourceDetector
status: not_implemented
propertyOverrides: []
- type: ExperimentalSeverityNumber
status: unknown
enumOverrides: []
- type: ExperimentalTracerConfig
status: not_implemented
propertyOverrides: []
Expand Down
3 changes: 3 additions & 0 deletions schema/meta_schema_language_go.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,9 @@ typeSupportStatuses:
- type: ExperimentalServiceResourceDetector
status: unknown
propertyOverrides: []
- type: ExperimentalSeverityNumber
status: unknown
enumOverrides: []
- type: ExperimentalTracerConfig
status: unknown
propertyOverrides: []
Expand Down
9 changes: 8 additions & 1 deletion schema/meta_schema_language_java.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,11 @@ typeSupportStatuses:
propertyOverrides: []
- type: ExperimentalLoggerConfig
status: supported
propertyOverrides: []
propertyOverrides:
- property: minimum_severity
status: not_implemented
- property: trace_based
status: not_implemented
- type: ExperimentalLoggerConfigurator
status: supported
propertyOverrides: []
Expand Down Expand Up @@ -178,6 +182,9 @@ typeSupportStatuses:
- type: ExperimentalServiceResourceDetector
status: supported
propertyOverrides: []
- type: ExperimentalSeverityNumber
status: unknown
enumOverrides: []
- type: ExperimentalTracerConfig
status: supported
propertyOverrides: []
Expand Down
3 changes: 3 additions & 0 deletions schema/meta_schema_language_js.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,9 @@ typeSupportStatuses:
- type: ExperimentalServiceResourceDetector
status: unknown
propertyOverrides: []
- type: ExperimentalSeverityNumber
status: unknown
enumOverrides: []
- type: ExperimentalTracerConfig
status: unknown
propertyOverrides: []
Expand Down
66 changes: 65 additions & 1 deletion schema/meta_schema_types.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -281,7 +281,20 @@
- type: ExperimentalLoggerConfig
properties:
- property: disabled
description: Configure if the logger is enabled or not.
description: |
Configure if the logger is enabled or not.
If omitted or null, false is used.
- property: minimum_severity
description: |
Configure severity filtering.
Log records with an non-zero (i.e. unspecified) severity number which is less than minimum_severity are not processed.
Values include: TRACE, TRACE2, TRACE3, TRACE4, DEBUG, DEBUG2, DEBUG3, DEBUG4, INFO, INFO2, INFO3, INFO4, WARN, WARN2, WARN3, WARN4, ERROR, ERROR2, ERROR3, ERROR4, FATAL, FATAL2, FATAL3, FATAL4.
If omitted or null, severity filtering is not applied.
- property: trace_based
description: |
Configure trace based filtering.
If true, log records associated with unsampled trace contexts traces are not processed. If false, or if a log record is not associated with a trace context, trace based filtering is not applied.
If omitted or null, trace based filtering is not applied.
isSdkExtensionPlugin: false
- type: ExperimentalLoggerConfigurator
properties:
Expand Down Expand Up @@ -1200,3 +1213,54 @@
Configure ratio.
If omitted or null, 1.0 is used.
isSdkExtensionPlugin: false
- type: ExperimentalSeverityNumber
enumValues:
- enumValue: DEBUG
description: DEBUG, severity number 5.
- enumValue: DEBUG2
description: DEBUG2, severity number 6.
- enumValue: DEBUG3
description: DEBUG3, severity number 7.
- enumValue: DEBUG4
description: DEBUG4, severity number 8.
- enumValue: ERROR
description: ERROR, severity number 17.
- enumValue: ERROR2
description: ERROR2, severity number 18.
- enumValue: ERROR3
description: ERROR3, severity number 19.
- enumValue: ERROR4
description: ERROR4, severity number 20.
- enumValue: FATAL
description: FATAL, severity number 21.
- enumValue: FATAL2
description: FATAL2, severity number 22.
- enumValue: FATAL3
description: FATAL3, severity number 23.
- enumValue: FATAL4
description: FATAL4, severity number 24.
- enumValue: INFO
description: INFO, severity number 9.
- enumValue: INFO2
description: INFO2, severity number 10.
- enumValue: INFO3
description: INFO3, severity number 11.
- enumValue: INFO4
description: INFO4, severity number 12.
- enumValue: TRACE
description: TRACE, severity number 1.
- enumValue: TRACE2
description: TRACE2, severity number 2.
- enumValue: TRACE3
description: TRACE3, severity number 3.
- enumValue: TRACE4
description: TRACE4, severity number 4.
- enumValue: WARN
description: WARN, severity number 13.
- enumValue: WARN2
description: WARN2, severity number 14.
- enumValue: WARN3
description: WARN3, severity number 15.
- enumValue: WARN4
description: WARN4, severity number 16.
isSdkExtensionPlugin: false
Loading