Skip to content

Commit d337cf7

Browse files
committed
- move logging to agent
- use sdk style discriminator for logging - use common "enabled" for "default-enabled"
1 parent bc30ab5 commit d337cf7

File tree

1 file changed

+13
-5
lines changed

1 file changed

+13
-5
lines changed

docs/misc/declarative-configuration/config.yaml

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,13 @@
33
# This list does not contain all properties, but those that
44
# are different from what the config bridge already does.
55

6-
# Based on https://github.com/open-telemetry/opentelemetry-configuration/blob/main/examples/kitchen-sink.yaml
6+
# Also see
7+
# - https://github.com/open-telemetry/opentelemetry-configuration/blob/main/examples/sdk-migration-config.yaml
8+
# - https://github.com/open-telemetry/opentelemetry-configuration/blob/main/examples/sdk-config.yaml
79

810
# Re-use this flag to disable the Agent/Spring starter as well as the SDK.
11+
# Note that the Agent/Spring starter still keeps the convention to use "enabled" -
12+
# this is just an exception to the rule.
913
disabled: false # was: "otel.javaagent.enabled"
1014
# Re-use this flag from the SDK: if value is "debug", we trigger the behavior of "otel.javaagent.debug"
1115
log_level: info # was: "otel.javaagent.debug"
@@ -50,14 +54,18 @@ instrumentation/development:
5054
exclude_class_loaders: # was "otel.javaagent.exclude-class-loaders"
5155
- a
5256
- b
57+
logging:
58+
# was "otel.javaagent.logging"
59+
output:
60+
application:
61+
logs_buffer_max_records: 1000 # can only be used with "type: application"
62+
simple: # mutually exclusive with "application"
5363
common:
64+
default:
65+
enabled: true # was "otel.instrumentation.common.default-enabled"
5466
db_statement_sanitizer:
5567
enabled: true # already exists - just for reference
5668
thread_details:
5769
# disabled by default
5870
# enabled applies to both spans and logs (but not metrics due to high cardinality)
5971
enabled: true # was "otel.javaagent.add-thread-details" = "true"
60-
logging:
61-
application:
62-
logs_buffer_max_records: 1000 # can only be used with "type: application"
63-
type: application or simple # was "otel.javaagent.logging"

0 commit comments

Comments
 (0)