Skip to content

Commit 6963efc

Browse files
authored
Merge branch 'main' into codeboten/add-log-level
2 parents fd9156e + cc623f7 commit 6963efc

File tree

5 files changed

+15
-1
lines changed

5 files changed

+15
-1
lines changed

examples/kitchen-sink.yaml

+2
Original file line numberDiff line numberDiff line change
@@ -216,6 +216,8 @@ meter_provider:
216216
# Configure list of attribute keys to exclude from the resulting stream(s). Applies after .attribute_keys.included (i.e. excluded has higher priority than included).
217217
excluded:
218218
- key3
219+
# Configure the exemplar filter. Known values include: trace_based, always_on, always_off.
220+
exemplar_filter: trace_based
219221

220222
# Configure text map context propagators.
221223
propagator:

examples/sdk-config.yaml

+2
Original file line numberDiff line numberDiff line change
@@ -142,6 +142,8 @@ meter_provider:
142142
temporality_preference: cumulative
143143
# Configure default histogram aggregation.
144144
default_histogram_aggregation: explicit_bucket_histogram
145+
# Configure the exemplar filter. Known values include: trace_based, always_on, always_off.
146+
exemplar_filter: trace_based
145147

146148
# Configure logger provider.
147149
logger_provider:

examples/sdk-migration-config.yaml

+2-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
# - OTEL_TRACES_EXPORTER
2525
# - OTEL_METRICS_EXPORTER
2626
# - OTEL_LOGS_EXPORTER
27-
# - OTEL_METRICS_EXEMPLAR_FILTER
2827
# - OTEL_EXPORTER_OTLP_PROTOCOL
2928
# - OTEL_EXPORTER_OTLP_ENDPOINT
3029
# - OTEL_EXPORTER_OTLP_INSECURE, OTEL_EXPORTER_OTLP_{SIGNAL}_INSECURE
@@ -179,6 +178,8 @@ meter_provider:
179178
temporality_preference: ${OTEL_EXPORTER_OTLP_METRICS_TEMPORALITY_PREFERENCE:-cumulative}
180179
# Configure default histogram aggregation.
181180
default_histogram_aggregation: ${OTEL_EXPORTER_OTLP_METRICS_DEFAULT_HISTOGRAM_AGGREGATION:-explicit_bucket_histogram}
181+
# Configure the exemplar filter. Known values include: trace_based, always_on, always_off.
182+
exemplar_filter: ${OTEL_METRICS_EXEMPLAR_FILTER:-trace_based}
182183

183184
# Configure logger provider.
184185
logger_provider:

schema/meter_provider.json

+8
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,14 @@
1616
"items": {
1717
"$ref": "#/$defs/View"
1818
}
19+
},
20+
"exemplar_filter": {
21+
"type": ["string", "null"],
22+
"enum": [
23+
"always_on",
24+
"always_off",
25+
"trace_based"
26+
]
1927
}
2028
},
2129
"$defs": {

schema/type_descriptions.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -204,6 +204,7 @@
204204
property_descriptions:
205205
readers: Configure metric readers.
206206
views: Configure views. Each view has a selector which determines the instrument(s) it applies to, and a configuration for the resulting stream(s).
207+
exemplar_filter: "Configure the exemplar filter. Known values include: trace_based, always_on, always_off."
207208
path_patterns:
208209
- .meter_provider
209210

0 commit comments

Comments
 (0)