From fba3b674623a2523d5f16440674c30dadd9b0177 Mon Sep 17 00:00:00 2001
From: Brent Douglas <brent.n.douglas@gmail.com>
Date: Fri, 24 Mar 2023 14:35:03 +0800
Subject: [PATCH] Remove streams from B3Propagator

They are expensive in this context
---
 .../trace/propagation/B3Propagator.java          | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/extensions/trace-propagators/src/main/java/io/opentelemetry/extension/trace/propagation/B3Propagator.java b/extensions/trace-propagators/src/main/java/io/opentelemetry/extension/trace/propagation/B3Propagator.java
index 976670b214b..fb77ce0d2e8 100644
--- a/extensions/trace-propagators/src/main/java/io/opentelemetry/extension/trace/propagation/B3Propagator.java
+++ b/extensions/trace-propagators/src/main/java/io/opentelemetry/extension/trace/propagation/B3Propagator.java
@@ -12,8 +12,6 @@
 import io.opentelemetry.context.propagation.TextMapSetter;
 import java.util.Collection;
 import java.util.Optional;
-import java.util.function.Supplier;
-import java.util.stream.Stream;
 import javax.annotation.Nullable;
 import javax.annotation.concurrent.Immutable;
 
@@ -113,15 +111,11 @@ public <C> void inject(Context context, @Nullable C carrier, TextMapSetter<C> se
 
   @Override
   public <C> Context extract(Context context, @Nullable C carrier, TextMapGetter<C> getter) {
-    return Stream.<Supplier<Optional<Context>>>of(
-            () -> singleHeaderExtractor.extract(context, carrier, getter),
-            () -> multipleHeadersExtractor.extract(context, carrier, getter),
-            () -> Optional.of(context))
-        .map(Supplier::get)
-        .filter(Optional::isPresent)
-        .map(Optional::get)
-        .findFirst()
-        .get();
+    Optional<Context> ctx = singleHeaderExtractor.extract(context, carrier, getter);
+    if (ctx.isPresent()) {
+      return ctx.get();
+    }
+    return multipleHeadersExtractor.extract(context, carrier, getter).orElse(context);
   }
 
   @Override