Skip to content

Commit 67810cd

Browse files
committed
Re-introduce HeaderNamesIterator helper class
Reverts the previous revert. Local clean rebuilds confirm muzzle correctly scans the lambda body and includes the nested class in getMuzzleHelperClassNames(). The CI failure was a build-cache fingerprinting issue, not a muzzle scanning gap. Investigating the cache issue separately.
1 parent 11e904b commit 67810cd

1 file changed

Lines changed: 20 additions & 4 deletions

File tree

  • instrumentation/armeria/armeria-1.3/library/src/main/java/io/opentelemetry/instrumentation/armeria/v1_3/internal

instrumentation/armeria/armeria-1.3/library/src/main/java/io/opentelemetry/instrumentation/armeria/v1_3/internal/RequestContextGetter.java

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
package io.opentelemetry.instrumentation.armeria.v1_3.internal;
77

88
import static java.util.Collections.emptyIterator;
9-
import static java.util.stream.Collectors.toList;
109

1110
import com.linecorp.armeria.server.ServiceRequestContext;
1211
import io.netty.util.AsciiString;
@@ -18,9 +17,7 @@ final class RequestContextGetter implements TextMapGetter<ServiceRequestContext>
1817

1918
@Override
2019
public Iterable<String> keys(ServiceRequestContext carrier) {
21-
return carrier.request().headers().names().stream()
22-
.map(AsciiString::toString)
23-
.collect(toList());
20+
return () -> new HeaderNamesIterator(carrier.request().headers().names().iterator());
2421
}
2522

2623
@Override
@@ -39,4 +36,23 @@ public Iterator<String> getAll(@Nullable ServiceRequestContext carrier, String k
3936
}
4037
return carrier.request().headers().valueIterator(key);
4138
}
39+
40+
private static final class HeaderNamesIterator implements Iterator<String> {
41+
42+
private final Iterator<AsciiString> delegate;
43+
44+
private HeaderNamesIterator(Iterator<AsciiString> delegate) {
45+
this.delegate = delegate;
46+
}
47+
48+
@Override
49+
public boolean hasNext() {
50+
return delegate.hasNext();
51+
}
52+
53+
@Override
54+
public String next() {
55+
return delegate.next().toString();
56+
}
57+
}
4258
}

0 commit comments

Comments
 (0)