Skip to content

Commit 22f7d25

Browse files
committed
addess review comments
1 parent 7c126b4 commit 22f7d25

File tree

2 files changed

+6
-4
lines changed
  • instrumentation
    • restlet/restlet-2.0/library/src/main/java/io/opentelemetry/instrumentation/restlet/v2_0/internal
    • spring/spring-webflux/spring-webflux-5.3/library/src/main/java/io/opentelemetry/instrumentation/spring/webflux/v5_3

2 files changed

+6
-4
lines changed

instrumentation/restlet/restlet-2.0/library/src/main/java/io/opentelemetry/instrumentation/restlet/v2_0/internal/RestletHeadersGetter.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
import java.lang.invoke.MethodHandles;
1313
import java.lang.invoke.MethodType;
1414
import java.util.Arrays;
15+
import java.util.Collections;
1516
import java.util.Iterator;
1617
import java.util.Map;
1718
import java.util.concurrent.ConcurrentMap;
@@ -61,7 +62,7 @@ public String get(Request carrier, String key) {
6162
public Iterator<String> getAll(Request carrier, String key) {
6263
Series<?> headers = getHeaders(carrier);
6364
return headers == null
64-
? null
65+
? Collections.emptyIterator()
6566
: Arrays.asList(headers.getValuesArray(key, /* ignoreCase= */ true)).iterator();
6667
}
6768

instrumentation/spring/spring-webflux/spring-webflux-5.3/library/src/main/java/io/opentelemetry/instrumentation/spring/webflux/v5_3/WebfluxTextMapGetter.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,9 @@
55

66
package io.opentelemetry.instrumentation.spring.webflux.v5_3;
77

8+
import static java.util.Collections.emptyIterator;
9+
810
import io.opentelemetry.context.propagation.internal.ExtendedTextMapGetter;
9-
import java.util.Collections;
1011
import java.util.Iterator;
1112
import java.util.List;
1213
import javax.annotation.Nullable;
@@ -32,9 +33,9 @@ public String get(@Nullable ServerWebExchange exchange, String key) {
3233
@Override
3334
public Iterator<String> getAll(@Nullable ServerWebExchange exchange, String key) {
3435
if (exchange == null) {
35-
return Collections.emptyIterator();
36+
return emptyIterator();
3637
}
3738
List<String> list = exchange.getRequest().getHeaders().get(key);
38-
return list != null ? list.iterator() : Collections.emptyIterator();
39+
return list != null ? list.iterator() : emptyIterator();
3940
}
4041
}

0 commit comments

Comments
 (0)