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
3 changes: 2 additions & 1 deletion examples/kitchen-sink.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -743,7 +743,8 @@ resource:
# If omitted or null, no resource attributes are added.
attributes_list: "service.namespace=my-namespace,service.version=1.0.0"
# Configure resource detectors.
detectors:
# This type is in development and subject to breaking changes in minor versions.
detectors/development:
# Configure attributes provided by resource detectors.
attributes:
# Configure list of attribute key patterns to include from resource detectors.
Expand Down
6 changes: 3 additions & 3 deletions schema/resource.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
"$ref": "#/$defs/AttributeNameValue"
}
},
"detectors": {
"$ref": "#/$defs/Detectors"
"detectors/development": {
"$ref": "#/$defs/ExperimentalDetectors"
},
"schema_url": {
"type": ["string", "null"]
Expand Down Expand Up @@ -61,7 +61,7 @@
"double_array"
]
},
"Detectors": {
"ExperimentalDetectors": {
"type": "object",
"additionalProperties": false,
"properties": {
Expand Down
9 changes: 6 additions & 3 deletions schema/type_descriptions.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,10 @@
The value is a list of comma separated key-value pairs matching the format of OTEL_RESOURCE_ATTRIBUTES. See https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/configuration/sdk-environment-variables.md#general-sdk-configuration for details.

If omitted or null, no resource attributes are added.
detectors: Configure resource detectors.
detectors/development: >
Configure resource detectors.

This type is in development and subject to breaking changes in minor versions.
schema_url: >
Configure resource schema URL.

Expand All @@ -81,7 +84,7 @@
property_descriptions:
attributes: Configure attributes provided by resource detectors.
path_patterns:
- .resource.detectors
- .resource.detectors/development

- type: DetectorAttributes
property_descriptions:
Expand All @@ -100,7 +103,7 @@
* If the value of the attribute key matches the wildcard pattern, where '?' matches any single character and '*' matches any number of characters including none.
If omitted, .included attributes are included.
path_patterns:
- .resource.detectors.attributes
- .resource.detectors/development.attributes

- type: AttributeLimits
property_descriptions:
Expand Down