Skip to content

Commit 1eb12d5

Browse files
committed
Address review comment: clarify ViewRegistry enabled and advice branches
1 parent 0cbc0cb commit 1eb12d5

1 file changed

Lines changed: 6 additions & 0 deletions

File tree

  • sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/internal/view

‎sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/internal/view/ViewRegistry.java‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,14 +114,20 @@ public List<RegisteredView> findViews(
114114
AggregatorFactory viewAggregatorFactory =
115115
(AggregatorFactory) entry.getView().getAggregation();
116116
if (viewAggregatorFactory.isCompatibleWithInstrument(descriptor)) {
117+
// Drop the stream if the view explicitly sets enabled=false, or if the instrument is
118+
// opt-in and the view does not explicitly set enabled=true.
117119
if (Boolean.FALSE.equals(entry.getEnabled())
118120
|| (descriptor.getAdvice().isOptIn() && !Boolean.TRUE.equals(entry.getEnabled()))) {
119121
result.add(applyDropAggregation(entry));
120122
} else if (Boolean.TRUE.equals(entry.getEnabled())
121123
&& descriptor.getAdvice().hasAttributes()
122124
&& entry.getView().getAttributeFilter().equals(StringPredicates.ALL)) {
125+
// When a view enables an instrument without configuring an attribute filter, apply the
126+
// instrument's attributes advice so enabling an opt-in instrument respects its other
127+
// advisory parameters.
123128
result.add(applyAdviceToDefaultView(entry, descriptor.getAdvice()));
124129
} else {
130+
// Otherwise, use the matched view as configured.
125131
result.add(entry);
126132
}
127133
} else {

0 commit comments

Comments
 (0)