Update to SDK 0.10.0 (#1564)

gradle/dependencies.gradle

@@ -11,10 +11,10 @@ ext {
     // Check https://oss.jfrog.org/libs-snapshot/io/opentelemetry/ for latest snapshot version.
     // Snapshot versions are often split across versions (based on jfrog's whim and relative age of
     // each module), best to keep these separate until GA
-    opentelemetry       : '0.10.0-20201105.031722-157',
+    opentelemetry       : '0.10.0',
-    opentelemetryOther  : '0.10.0-20201105.031722-20',
+    opentelemetryOther  : '0.10.0',
-    opentelemetryAnother: '0.10.0-20201105.031722-156',
+    opentelemetryAnother: '0.10.0',
-    opentelemetryContext: '0.10.0-20201105.031722-128',
+    opentelemetryContext: '0.10.0',
 
     slf4j               : "1.7.30",
     guava               : "20.0", // Last version to support Java 7

instrumentation-core/servlet-2.2/src/main/java/io/opentelemetry/instrumentation/servlet/HttpServletRequestGetter.java

@@ -6,12 +6,18 @@
 package io.opentelemetry.instrumentation.servlet;
 
 import io.opentelemetry.context.propagation.TextMapPropagator;
+import java.util.Collections;
 import javax.servlet.http.HttpServletRequest;
 
 public class HttpServletRequestGetter implements TextMapPropagator.Getter<HttpServletRequest> {
 
   public static final HttpServletRequestGetter GETTER = new HttpServletRequestGetter();
 
+  @Override
+  public Iterable<String> keys(HttpServletRequest carrier) {
+    return Collections.list(carrier.getHeaderNames());
+  }
+
   @Override
   public String get(HttpServletRequest carrier, String key) {
     return carrier.getHeader(key);

instrumentation/akka-http-10.0/src/main/java/io/opentelemetry/javaagent/instrumentation/akkahttp/AkkaHttpServerHeaders.java

@@ -9,11 +9,20 @@ import akka.http.javadsl.model.HttpHeader;
 import akka.http.scaladsl.model.HttpRequest;
 import io.opentelemetry.context.propagation.TextMapPropagator;
 import java.util.Optional;
+import java.util.stream.Collectors;
+import java.util.stream.StreamSupport;
 
 public class AkkaHttpServerHeaders implements TextMapPropagator.Getter<HttpRequest> {
 
   public static final AkkaHttpServerHeaders GETTER = new AkkaHttpServerHeaders();
 
+  @Override
+  public Iterable<String> keys(HttpRequest httpRequest) {
+    return StreamSupport.stream(httpRequest.getHeaders().spliterator(), false)
+        .map(HttpHeader::lowercaseName)
+        .collect(Collectors.toList());
+  }
+
   @Override
   public String get(HttpRequest carrier, String key) {
     Optional<HttpHeader> header = carrier.getHeader(key);

instrumentation/apache-camel-2.20/src/main/java/io/opentelemetry/javaagent/instrumentation/apachecamel/CamelPropagationUtil.java

@@ -31,6 +31,11 @@ final class CamelPropagationUtil {
 
     private static final MapGetter INSTANCE = new MapGetter();
 
+    @Override
+    public Iterable<String> keys(Map<String, Object> map) {
+      return map.keySet();
+    }
+
     @Override
     public String get(Map<String, Object> map, String s) {
       return (map.containsKey(s) ? map.get(s).toString() : null);

instrumentation/armeria-1.0/library/src/main/java/io/opentelemetry/instrumentation/armeria/v1_0/server/ArmeriaServerTracer.java

@@ -8,12 +8,14 @@ package io.opentelemetry.instrumentation.armeria.v1_0.server;
 import com.linecorp.armeria.common.HttpRequest;
 import com.linecorp.armeria.common.logging.RequestLog;
 import com.linecorp.armeria.server.ServiceRequestContext;
+import io.netty.util.AsciiString;
 import io.opentelemetry.api.trace.Tracer;
 import io.opentelemetry.context.Context;
 import io.opentelemetry.context.propagation.TextMapPropagator.Getter;
 import io.opentelemetry.instrumentation.api.tracer.HttpServerTracer;
 import java.net.InetSocketAddress;
 import java.net.SocketAddress;
+import java.util.stream.Collectors;
 import org.checkerframework.checker.nullness.qual.Nullable;
 
 public class ArmeriaServerTracer
@@ -96,6 +98,13 @@ public class ArmeriaServerTracer
 
     private static final ArmeriaGetter INSTANCE = new ArmeriaGetter();
 
+    @Override
+    public Iterable<String> keys(HttpRequest httpRequest) {
+      return httpRequest.headers().names().stream()
+          .map(AsciiString::toString)
+          .collect(Collectors.toList());
+    }
+
     @Override
     @Nullable
     public String get(@Nullable HttpRequest carrier, String key) {

instrumentation/aws-lambda-1.0/library/src/main/java/io/opentelemetry/instrumentation/awslambda/v1_0/AwsLambdaUtil.java

@@ -27,6 +27,11 @@ final class AwsLambdaUtil {
 
     private static final MapGetter INSTANCE = new MapGetter();
 
+    @Override
+    public Iterable<String> keys(Map<String, String> map) {
+      return map.keySet();
+    }
+
     @Override
     public String get(Map<String, String> map, String s) {
       return map.get(s);

instrumentation/grizzly-2.0/src/main/java/io/opentelemetry/javaagent/instrumentation/grizzly/ExtractAdapter.java

@@ -11,6 +11,11 @@ import org.glassfish.grizzly.http.HttpRequestPacket;
 public class ExtractAdapter implements TextMapPropagator.Getter<HttpRequestPacket> {
   public static final ExtractAdapter GETTER = new ExtractAdapter();
 
+  @Override
+  public Iterable<String> keys(HttpRequestPacket request) {
+    return request.getHeaders().names();
+  }
+
   @Override
   public String get(HttpRequestPacket request, String key) {
     return request.getHeader(key);

instrumentation/grpc-1.5/library/src/main/java/io/opentelemetry/instrumentation/grpc/v1_5/server/GrpcExtractAdapter.java

@@ -12,6 +12,11 @@ final class GrpcExtractAdapter implements TextMapPropagator.Getter<Metadata> {
 
   static final GrpcExtractAdapter GETTER = new GrpcExtractAdapter();
 
+  @Override
+  public Iterable<String> keys(Metadata metadata) {
+    return metadata.keys();
+  }
+
   @Override
   public String get(Metadata carrier, String key) {
     return carrier.get(Metadata.Key.of(key, Metadata.ASCII_STRING_MARSHALLER));

instrumentation/jms-1.1/src/main/java/io/opentelemetry/javaagent/instrumentation/jms/MessageExtractAdapter.java

@@ -6,6 +6,7 @@
 package io.opentelemetry.javaagent.instrumentation.jms;
 
 import io.opentelemetry.context.propagation.TextMapPropagator;
+import java.util.Collections;
 import javax.jms.JMSException;
 import javax.jms.Message;
 
@@ -13,6 +14,15 @@ public class MessageExtractAdapter implements TextMapPropagator.Getter<Message>
 
   public static final MessageExtractAdapter GETTER = new MessageExtractAdapter();
 
+  @Override
+  public Iterable<String> keys(Message message) {
+    try {
+      return Collections.list(message.getPropertyNames());
+    } catch (JMSException e) {
+      return Collections.emptyList();
+    }
+  }
+
   @Override
   public String get(Message carrier, String key) {
     String propName = key.replace("-", MessageInjectAdapter.DASH);

instrumentation/kafka-clients-0.11/src/main/java/io/opentelemetry/javaagent/instrumentation/kafkaclients/TextMapExtractAdapter.java

@@ -7,6 +7,8 @@ package io.opentelemetry.javaagent.instrumentation.kafkaclients;
 
 import io.opentelemetry.context.propagation.TextMapPropagator;
 import java.nio.charset.StandardCharsets;
+import java.util.stream.Collectors;
+import java.util.stream.StreamSupport;
 import org.apache.kafka.common.header.Header;
 import org.apache.kafka.common.header.Headers;
 
@@ -14,6 +16,13 @@ public class TextMapExtractAdapter implements TextMapPropagator.Getter<Headers>
 
   public static final TextMapExtractAdapter GETTER = new TextMapExtractAdapter();
 
+  @Override
+  public Iterable<String> keys(Headers headers) {
+    return StreamSupport.stream(headers.spliterator(), false)
+        .map(Header::key)
+        .collect(Collectors.toList());
+  }
+
   @Override
   public String get(Headers headers, String key) {
     Header header = headers.lastHeader(key);

instrumentation/kafka-streams-0.11/src/main/java/io/opentelemetry/javaagent/instrumentation/kafkastreams/TextMapExtractAdapter.java

@@ -7,6 +7,8 @@ package io.opentelemetry.javaagent.instrumentation.kafkastreams;
 
 import io.opentelemetry.context.propagation.TextMapPropagator;
 import java.nio.charset.StandardCharsets;
+import java.util.stream.Collectors;
+import java.util.stream.StreamSupport;
 import org.apache.kafka.common.header.Header;
 import org.apache.kafka.common.header.Headers;
 
@@ -14,6 +16,13 @@ public class TextMapExtractAdapter implements TextMapPropagator.Getter<Headers>
 
   public static final TextMapExtractAdapter GETTER = new TextMapExtractAdapter();
 
+  @Override
+  public Iterable<String> keys(Headers headers) {
+    return StreamSupport.stream(headers.spliterator(), false)
+        .map(Header::key)
+        .collect(Collectors.toList());
+  }
+
   @Override
   public String get(Headers headers, String key) {
     Header header = headers.lastHeader(key);

instrumentation/kafka-streams-0.11/src/test/groovy/KafkaStreamsTest.groovy

@@ -207,6 +207,11 @@ class KafkaStreamsTest extends AgentTestRunner {
     headers.iterator().hasNext()
     def traceparent = new String(headers.headers("traceparent").iterator().next().value())
     Context context = new HttpTraceContext().extract(Context.root(), "", new TextMapPropagator.Getter<String>() {
+      @Override
+      Iterable<String> keys(String carrier) {
+        return Collections.singleton("traceparent")
+      }
+
       @Override
       String get(String carrier, String key) {
         if (key == "traceparent") {

instrumentation/netty/netty-3.8/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v3_8/server/NettyRequestExtractAdapter.java

@@ -12,6 +12,11 @@ public class NettyRequestExtractAdapter implements TextMapPropagator.Getter<Http
 
   public static final NettyRequestExtractAdapter GETTER = new NettyRequestExtractAdapter();
 
+  @Override
+  public Iterable<String> keys(HttpRequest request) {
+    return request.headers().names();
+  }
+
   @Override
   public String get(HttpRequest request, String key) {
     return request.headers().get(key);

instrumentation/netty/netty-4.0/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v4_0/server/NettyRequestExtractAdapter.java

@@ -12,6 +12,11 @@ public class NettyRequestExtractAdapter implements TextMapPropagator.Getter<Http
 
   public static final NettyRequestExtractAdapter GETTER = new NettyRequestExtractAdapter();
 
+  @Override
+  public Iterable<String> keys(HttpRequest request) {
+    return request.headers().names();
+  }
+
   @Override
   public String get(HttpRequest request, String key) {
     return request.headers().get(key);

instrumentation/netty/netty-4.1/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v4_1/server/NettyRequestExtractAdapter.java

@@ -12,6 +12,11 @@ public class NettyRequestExtractAdapter implements TextMapPropagator.Getter<Http
 
   public static final NettyRequestExtractAdapter GETTER = new NettyRequestExtractAdapter();
 
+  @Override
+  public Iterable<String> keys(HttpRequest request) {
+    return request.headers().names();
+  }
+
   @Override
   public String get(HttpRequest request, String key) {
     return request.headers().get(key);

instrumentation/opentelemetry-api-beta/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/context/propagation/ApplicationTextMapPropagator.java

@@ -54,6 +54,11 @@ class ApplicationTextMapPropagator implements TextMapPropagator {
       this.applicationGetter = applicationGetter;
     }
 
+    @Override
+    public Iterable<String> keys(C c) {
+      return applicationGetter.keys(c);
+    }
+
     @Override
     public String get(C carrier, String key) {
       return applicationGetter.get(carrier, key);

instrumentation/rabbitmq-2.7/src/main/java/io/opentelemetry/javaagent/instrumentation/rabbitmq/amqp/TextMapExtractAdapter.java

@@ -12,6 +12,11 @@ public class TextMapExtractAdapter implements TextMapPropagator.Getter<Map<Strin
 
   public static final TextMapExtractAdapter GETTER = new TextMapExtractAdapter();
 
+  @Override
+  public Iterable<String> keys(Map<String, Object> carrier) {
+    return carrier.keySet();
+  }
+
   @Override
   public String get(Map<String, Object> carrier, String key) {
     Object obj = carrier.get(key);

instrumentation/rmi/src/main/java/io/opentelemetry/javaagent/instrumentation/rmi/context/ContextPayload.java

@@ -70,6 +70,11 @@ public class ContextPayload {
   }
 
   public static class ExtractAdapter implements TextMapPropagator.Getter<ContextPayload> {
+    @Override
+    public Iterable<String> keys(ContextPayload contextPayload) {
+      return contextPayload.getSpanContext().keySet();
+    }
+
     @Override
     public String get(ContextPayload carrier, String key) {
       return carrier.getSpanContext().get(key);

javaagent-tooling/src/test/groovy/io/opentelemetry/javaagent/typed/server/SampleHttpServerTypedTracer.java

@@ -34,6 +34,11 @@ public class SampleHttpServerTypedTracer
   @Override
   protected TextMapPropagator.Getter<String> getGetter() {
     return new TextMapPropagator.Getter<String>() {
+      @Override
+      public Iterable<String> keys(String s) {
+        return null;
+      }
+
       @Override
       public String get(String carrier, String key) {
         return null;

testing-common/src/main/java/io/opentelemetry/instrumentation/test/server/http/HttpServletRequestExtractAdapter.java

@@ -6,6 +6,7 @@
 package io.opentelemetry.instrumentation.test.server.http;
 
 import io.opentelemetry.context.propagation.TextMapPropagator;
+import java.util.Collections;
 import javax.servlet.http.HttpServletRequest;
 
 /**
@@ -20,6 +21,11 @@ public class HttpServletRequestExtractAdapter
   public static final HttpServletRequestExtractAdapter GETTER =
       new HttpServletRequestExtractAdapter();
 
+  @Override
+  public Iterable<String> keys(HttpServletRequest carrier) {
+    return Collections.list(carrier.getHeaderNames());
+  }
+
   @Override
   public String get(HttpServletRequest carrier, String key) {
     return carrier.getHeader(key);