Bump OTEL dependency to 0.17.0 (#280)

pavolloffay · web-flow · commit 8e5e87a76d51 · 2021-03-03T19:06:45.000+01:00
* Bump OTEL to 0.17.0

Signed-off-by: Pavol Loffay &lt;p.loffay@gmail.com&gt;

* Fix smoke tests

Signed-off-by: Pavol Loffay &lt;p.loffay@gmail.com&gt;

* Revert path

Signed-off-by: Pavol Loffay &lt;p.loffay@gmail.com&gt;

* Rename image

Signed-off-by: Pavol Loffay &lt;p.loffay@gmail.com&gt;

* remove

Signed-off-by: Pavol Loffay &lt;p.loffay@gmail.com&gt;

* Fix

Signed-off-by: Pavol Loffay &lt;p.loffay@gmail.com&gt;

* fmt

Signed-off-by: Pavol Loffay &lt;p.loffay@gmail.com&gt;

* Fix traces exporter env var

Signed-off-by: Pavol Loffay &lt;p.loffay@gmail.com&gt;

* Fix

Signed-off-by: Pavol Loffay &lt;p.loffay@gmail.com&gt;

* Fix grpc test

Signed-off-by: Pavol Loffay &lt;p.loffay@gmail.com&gt;

* Small revert

Signed-off-by: Pavol Loffay &lt;p.loffay@gmail.com&gt;

* enable test

Signed-off-by: Pavol Loffay &lt;p.loffay@gmail.com&gt;

* Fix propagators

Signed-off-by: Pavol Loffay &lt;p.loffay@gmail.com&gt;

* x2

Signed-off-by: Pavol Loffay &lt;p.loffay@gmail.com&gt;
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -29,9 +29,10 @@ subprojects {
     description = "Hypertrace OpenTelemetry Javaagent"
 
     extra.set("versions", mapOf(
-            "opentelemetry" to "0.15.0",
-            "opentelemetry_java_agent" to "0.15.1",
-            "byte_buddy" to "1.10.18",
+            "opentelemetry" to "0.17.1",
+            "opentelemetry_java_agent" to "0.17.0-alpha",
+        "opentelemetry_java_agent_all" to "0.17.0",
+        "byte_buddy" to "1.10.18",
             "slf4j" to "1.7.30"
     ))
 
diff --git a/instrumentation/build.gradle.kts b/instrumentation/build.gradle.kts
@@ -83,6 +83,6 @@ tasks {
         relocate("io.opentelemetry.spi", "io.opentelemetry.javaagent.shaded.io.opentelemetry.spi")
         relocate("io.opentelemetry.context", "io.opentelemetry.javaagent.shaded.io.opentelemetry.context")
         relocate("io.opentelemetry.extension.kotlin", "io.opentelemetry.javaagent.shaded.io.opentelemetry.extension.kotlin")
-        relocate ("io.opentelemetry.extension.trace.propagation", "io.opentelemetry.javaagent.shaded.io.opentelemetry.extension.trace.propagation")
+        relocate("io.opentelemetry.extension.aws", "io.opentelemetry.javaagent.shaded.io.opentelemetry.extension.aws")
     }
 }
diff --git a/instrumentation/netty/netty-4.1/src/main/java/io/opentelemetry/javaagent/instrumentation/hypertrace/netty/v4_1/client/HttpClientRequestTracingHandler.java b/instrumentation/netty/netty-4.1/src/main/java/io/opentelemetry/javaagent/instrumentation/hypertrace/netty/v4_1/client/HttpClientRequestTracingHandler.java
@@ -51,8 +51,7 @@ public void write(ChannelHandlerContext ctx, Object msg, ChannelPromise prm) {
     Channel channel = ctx.channel();
     Context context =
         channel
-            .attr(
-                io.opentelemetry.javaagent.instrumentation.netty.v4_1.AttributeKeys.CLIENT_CONTEXT)
+            .attr(io.opentelemetry.instrumentation.netty.v4_1.AttributeKeys.CLIENT_CONTEXT)
             .get();
     if (context == null) {
       ctx.write(msg, prm);
diff --git a/instrumentation/netty/netty-4.1/src/main/java/io/opentelemetry/javaagent/instrumentation/hypertrace/netty/v4_1/client/HttpClientResponseTracingHandler.java b/instrumentation/netty/netty-4.1/src/main/java/io/opentelemetry/javaagent/instrumentation/hypertrace/netty/v4_1/client/HttpClientResponseTracingHandler.java
@@ -54,8 +54,7 @@ public void channelRead(ChannelHandlerContext ctx, Object msg) {
     Channel channel = ctx.channel();
     Context context =
         channel
-            .attr(
-                io.opentelemetry.javaagent.instrumentation.netty.v4_1.AttributeKeys.CLIENT_CONTEXT)
+            .attr(io.opentelemetry.instrumentation.netty.v4_1.AttributeKeys.CLIENT_CONTEXT)
             .get();
     if (context == null) {
       ctx.fireChannelRead(msg);
diff --git a/javaagent/build.gradle.kts b/javaagent/build.gradle.kts
@@ -11,7 +11,7 @@ dependencies {
     // update the dependencies also in the instrumentations sub-projects
     // https://oss.jfrog.org/artifactory/oss-snapshot-local/io/opentelemetry/instrumentation/auto/
     // https://dl.bintray.com/open-telemetry/maven/
-    implementation("io.opentelemetry.javaagent", "opentelemetry-javaagent", version = "${versions["opentelemetry_java_agent"]}", classifier = "all")
+    implementation("io.opentelemetry.javaagent", "opentelemetry-javaagent", version = "${versions["opentelemetry_java_agent_all"]}", classifier = "all")
     implementation(project(":filter-api"))
 }
 
@@ -60,7 +60,7 @@ tasks {
         relocate("io.opentelemetry.spi", "io.opentelemetry.javaagent.shaded.io.opentelemetry.spi")
         relocate("io.opentelemetry.context", "io.opentelemetry.javaagent.shaded.io.opentelemetry.context")
         relocate("io.opentelemetry.extension.kotlin", "io.opentelemetry.javaagent.shaded.io.opentelemetry.extension.kotlin")
-        relocate("io.opentelemetry.extension.trace.propagation", "io.opentelemetry.javaagent.shaded.io.opentelemetry.extension.trace.propagation")
+        relocate("io.opentelemetry.extension.aws", "io.opentelemetry.javaagent.shaded.io.opentelemetry.extension.aws")
 
         mergeServiceFiles {
             include("inst/META-INF/services/*")
diff --git a/otel-extensions/build.gradle.kts b/otel-extensions/build.gradle.kts
@@ -16,5 +16,6 @@ dependencies {
     implementation("net.bytebuddy:byte-buddy:${versions["byte_buddy"]}")
     annotationProcessor("com.google.auto.service:auto-service:1.0-rc7")
 
+    testImplementation("io.opentelemetry:opentelemetry-sdk-extension-autoconfigure:${versions["opentelemetry"]}-alpha")
     testImplementation("io.opentelemetry:opentelemetry-sdk:${versions["opentelemetry"]}")
 }
diff --git a/otel-extensions/src/main/java/org/hypertrace/agent/otel/extensions/HypertraceAgentConfiguration.java b/otel-extensions/src/main/java/org/hypertrace/agent/otel/extensions/HypertraceAgentConfiguration.java
@@ -32,7 +32,7 @@
 public class HypertraceAgentConfiguration implements PropertySource {
 
   // https://github.com/open-telemetry/opentelemetry-specification/blob/master/specification/sdk-environment-variables.md
-  private static final String OTEL_TRACE_EXPORTER = "otel.trace.exporter";
+  private static final String OTEL_TRACE_EXPORTER = "otel.traces.exporter";
   private static final String OTEL_METRICS_EXPORTER = "otel.metrics.exporter";
   private static final String OTEL_PROPAGATORS = "otel.propagators";
   private static final String OTEL_EXPORTER_ZIPKIN_ENDPOINT = "otel.exporter.zipkin.endpoint";
diff --git a/otel-extensions/src/main/java/org/hypertrace/agent/otel/extensions/HypertraceResourceProvider.java b/otel-extensions/src/main/java/org/hypertrace/agent/otel/extensions/HypertraceResourceProvider.java
@@ -19,25 +19,27 @@
 import com.google.auto.service.AutoService;
 import io.opentelemetry.api.common.Attributes;
 import io.opentelemetry.api.common.AttributesBuilder;
-import io.opentelemetry.sdk.resources.ResourceAttributes;
-import io.opentelemetry.sdk.resources.ResourceProvider;
+import io.opentelemetry.sdk.autoconfigure.ConfigProperties;
+import io.opentelemetry.sdk.autoconfigure.spi.ResourceProvider;
+import io.opentelemetry.sdk.resources.Resource;
+import io.opentelemetry.semconv.resource.attributes.ResourceAttributes;
 import org.hypertrace.agent.config.Config.AgentConfig;
 import org.hypertrace.agent.core.config.HypertraceConfig;
 
 @AutoService(ResourceProvider.class)
-public class HypertraceResourceProvider extends ResourceProvider {
+public class HypertraceResourceProvider implements ResourceProvider {
 
   private final CgroupsReader cgroupsReader = new CgroupsReader();
   private final AgentConfig agentConfig = HypertraceConfig.get();
 
   @Override
-  protected Attributes getAttributes() {
+  public Resource createResource(ConfigProperties config) {
     AttributesBuilder builder = Attributes.builder();
     String containerId = this.cgroupsReader.readContainerId();
     if (containerId != null && !containerId.isEmpty()) {
       builder.put(ResourceAttributes.CONTAINER_ID, containerId);
     }
     builder.put(ResourceAttributes.SERVICE_NAME, agentConfig.getServiceName().getValue());
-    return builder.build();
+    return Resource.create(builder.build());
   }
 }
diff --git a/otel-extensions/src/main/java/org/hypertrace/agent/otel/extensions/processor/AddTagsSpanProcessor.java b/otel-extensions/src/main/java/org/hypertrace/agent/otel/extensions/processor/AddTagsSpanProcessor.java
@@ -18,10 +18,10 @@
 
 import io.opentelemetry.context.Context;
 import io.opentelemetry.sdk.common.CompletableResultCode;
-import io.opentelemetry.sdk.resources.ResourceAttributes;
 import io.opentelemetry.sdk.trace.ReadWriteSpan;
 import io.opentelemetry.sdk.trace.ReadableSpan;
 import io.opentelemetry.sdk.trace.SpanProcessor;
+import io.opentelemetry.semconv.resource.attributes.ResourceAttributes;
 import org.hypertrace.agent.otel.extensions.CgroupsReader;
 
 public class AddTagsSpanProcessor implements SpanProcessor {
diff --git a/smoke-tests/build.gradle.kts b/smoke-tests/build.gradle.kts
@@ -37,4 +37,4 @@ tasks.test {
     doFirst {
         jvmArgs("-Dsmoketest.javaagent.path=${shadowTask.archiveFile.get()}")
     }
-}
+}
diff --git a/smoke-tests/src/test/groovy/org/hypertrace/agent/smoketest/AppServerTest.groovy b/smoke-tests/src/test/groovy/org/hypertrace/agent/smoketest/AppServerTest.groovy
@@ -7,6 +7,7 @@ package org.hypertrace.agent.smoketest
 
 import okhttp3.MediaType
 import okhttp3.RequestBody
+import spock.lang.Ignore
 
 import static org.junit.Assume.assumeTrue
 
@@ -358,4 +359,4 @@ abstract class AppServerTest extends SmokeTest {
             [serverVersion, jdk]
     ]
   }
-}
+}
diff --git a/smoke-tests/src/test/groovy/org/hypertrace/agent/smoketest/GrpcSmokeTest.groovy b/smoke-tests/src/test/groovy/org/hypertrace/agent/smoketest/GrpcSmokeTest.groovy
@@ -13,7 +13,7 @@ import spock.lang.Unroll
 class GrpcSmokeTest extends SmokeTest {
 
   protected String getTargetImage(String jdk, String serverVersion) {
-    "ghcr.io/open-telemetry/java-test-containers:smoke-grpc-jdk$jdk-20210129.520311770"
+    "ghcr.io/open-telemetry/java-test-containers:smoke-grpc-jdk$jdk-20210218.577304952"
   }
 
   @Unroll
diff --git a/smoke-tests/src/test/groovy/org/hypertrace/agent/smoketest/JettySmokeTest.groovy b/smoke-tests/src/test/groovy/org/hypertrace/agent/smoketest/JettySmokeTest.groovy
@@ -20,14 +20,7 @@ class JettySmokeTest extends AppServerTest {
   }
 
   def getJettySpanName() {
-    if (serverVersion == "9.4.35") {
-      //this need to be present till we sync HT java agent with at least v.0.18.x of OTEL which uniformly returns
-      //HandlerWrapper.handle
-      "HandlerCollection.handle"
-    }
-    else {
-      "HandlerList.handle"
-    }
+    "HandlerWrapper.handle"
   }
 
   @Override
@@ -39,4 +32,4 @@ class JettySmokeTest extends AppServerTest {
     }
     return path
   }
-}
+}
diff --git a/smoke-tests/src/test/groovy/org/hypertrace/agent/smoketest/PropagationTest.groovy b/smoke-tests/src/test/groovy/org/hypertrace/agent/smoketest/PropagationTest.groovy
@@ -14,7 +14,7 @@ abstract class PropagationTest extends SmokeTest {
 
   @Override
   protected String getTargetImage(String jdk, String serverVersion) {
-    "ghcr.io/open-telemetry/java-test-containers:smoke-springboot-jdk$jdk-20210129.520311771"
+    "ghcr.io/open-telemetry/java-test-containers:smoke-springboot-jdk$jdk-20210218.577304949"
   }
 
   def "Should propagate test"() {
@@ -78,7 +78,7 @@ class JaegerPropagationTest extends PropagationTest {
 class OtTracerPropagationTest extends SmokeTest {
   @Override
   protected String getTargetImage(String jdk, String serverVersion) {
-    "ghcr.io/open-telemetry/java-test-containers:smoke-springboot-jdk$jdk-20210129.520311771"
+    "ghcr.io/open-telemetry/java-test-containers:smoke-springboot-jdk$jdk-20210218.577304949"
   }
 
   // OtTracer only propagates lower half of trace ID so we have to mangle the trace IDs similar to
@@ -109,7 +109,7 @@ class OtTracerPropagationTest extends SmokeTest {
 
   @Override
   protected Map<String, String> getExtraEnv() {
-    return ["otel.propagators": "ottracer"]
+    return ["otel.propagators": "ottrace"]
   }
 }
 
diff --git a/smoke-tests/src/test/groovy/org/hypertrace/agent/smoketest/SmokeTest.groovy b/smoke-tests/src/test/groovy/org/hypertrace/agent/smoketest/SmokeTest.groovy
@@ -42,7 +42,8 @@ abstract class SmokeTest extends Specification {
   private Backend backend = Backend.getInstance()
 
   @Shared
-  protected String agentPath = System.getProperty("smoketest.javaagent.path")
+//  protected String agentPath = "/Users/ploffay/projects/hypertrace/javaagent/javaagent/build/libs/hypertrace-agent-0.10.4-SNAPSHOT-all.jar"// System.getProperty("smoketest.javaagent.path")
+  protected String agentPath =  System.getProperty("smoketest.javaagent.path")
 
   @Shared
   protected GenericContainer target
@@ -84,7 +85,7 @@ abstract class SmokeTest extends Specification {
             .withEnv("OTEL_EXPORTER_OTLP_ENDPOINT", "http://collector:55680")
             .withEnv("HT_SERVICE_NAME", "CIService")
             .withEnv("HT_REPORTING_ENDPOINT", "http://collector:9411/api/v2/spans")
-            .withEnv("OTEL_TRACE_EXPORTER", "otlp")
+            .withEnv("OTEL_TRACES_EXPORTER", "otlp")
             .withImagePullPolicy(PullPolicy.alwaysPull())
             .withEnv(extraEnv)
     customizeContainer(target)
@@ -278,4 +279,4 @@ abstract class SmokeTest extends Specification {
       network?.close()
     }
   }
-}
+}
diff --git a/smoke-tests/src/test/java/org/hypertrace/agent/smoketest/SpringBootDiabledAgentSmokeTest.java b/smoke-tests/src/test/java/org/hypertrace/agent/smoketest/SpringBootDiabledAgentSmokeTest.java
@@ -33,7 +33,7 @@ public class SpringBootDiabledAgentSmokeTest extends AbstractSmokeTest {
   protected String getTargetImage(int jdk) {
     return "ghcr.io/open-telemetry/java-test-containers:smoke-springboot-jdk"
         + jdk
-        + "-20210209.550405798";
+        + "-20210218.577304949";
   }
 
   private GenericContainer app;
diff --git a/smoke-tests/src/test/java/org/hypertrace/agent/smoketest/SpringBootDisabledBodyCaptureSmokeTest.java b/smoke-tests/src/test/java/org/hypertrace/agent/smoketest/SpringBootDisabledBodyCaptureSmokeTest.java
@@ -38,7 +38,7 @@ public class SpringBootDisabledBodyCaptureSmokeTest extends AbstractSmokeTest {
   protected String getTargetImage(int jdk) {
     return "ghcr.io/open-telemetry/java-test-containers:smoke-springboot-jdk"
         + jdk
-        + "-20210209.550405798";
+        + "-20210218.577304949";
   }
 
   private GenericContainer app;
diff --git a/smoke-tests/src/test/java/org/hypertrace/agent/smoketest/SpringBootSmokeTest.java b/smoke-tests/src/test/java/org/hypertrace/agent/smoketest/SpringBootSmokeTest.java
@@ -17,7 +17,7 @@
 package org.hypertrace.agent.smoketest;
 
 import io.opentelemetry.proto.collector.trace.v1.ExportTraceServiceRequest;
-import io.opentelemetry.sdk.resources.ResourceAttributes;
+import io.opentelemetry.semconv.resource.attributes.ResourceAttributes;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -35,14 +35,14 @@
 //    key = "SMOKETEST_JAVAAGENT_PATH",
 //    value =
 //
-// "/Users/ploffay/projects/hypertrace/javaagent/javaagent/build/libs/hypertrace-agent-0.3.3-SNAPSHOT-all.jar")
+// "/Users/ploffay/projects/hypertrace/javaagent/javaagent/build/libs/hypertrace-agent-0.10.4-SNAPSHOT-all.jar")
 public class SpringBootSmokeTest extends AbstractSmokeTest {
 
   @Override
   protected String getTargetImage(int jdk) {
     return "ghcr.io/open-telemetry/java-test-containers:smoke-springboot-jdk"
         + jdk
-        + "-20210209.550405798";
+        + "-20210218.577304949";
   }
 
   private static GenericContainer app;
diff --git a/testing-common/src/main/java/org/hypertrace/agent/testing/InMemoryExporter.java b/testing-common/src/main/java/org/hypertrace/agent/testing/InMemoryExporter.java
@@ -75,8 +75,7 @@ public void onStart(Context context, ReadWriteSpan readWriteSpan) {
         sd.getParentSpanId(),
         sd.getInstrumentationLibraryInfo());
     synchronized (tracesLock) {
-      spanOrders.put(
-          readWriteSpan.getSpanContext().getSpanIdAsHexString(), nextSpanOrder.getAndIncrement());
+      spanOrders.put(readWriteSpan.getSpanContext().getSpanId(), nextSpanOrder.getAndIncrement());
     }
   }
 

Original file line number	Diff line number	Diff line change
`@@ -83,6 +83,6 @@ tasks {`
`83`	`83`	`relocate("io.opentelemetry.spi", "io.opentelemetry.javaagent.shaded.io.opentelemetry.spi")`
`84`	`84`	`relocate("io.opentelemetry.context", "io.opentelemetry.javaagent.shaded.io.opentelemetry.context")`
`85`	`85`	`relocate("io.opentelemetry.extension.kotlin", "io.opentelemetry.javaagent.shaded.io.opentelemetry.extension.kotlin")`
`86`		`- relocate ("io.opentelemetry.extension.trace.propagation", "io.opentelemetry.javaagent.shaded.io.opentelemetry.extension.trace.propagation")`
	`86`	`+ relocate("io.opentelemetry.extension.aws", "io.opentelemetry.javaagent.shaded.io.opentelemetry.extension.aws")`
`87`	`87`	`}`
`88`	`88`	`}`
Original file line number	Diff line number	Diff line change
`@@ -16,5 +16,6 @@ dependencies {`
`16`	`16`	`implementation("net.bytebuddy:byte-buddy:${versions["byte_buddy"]}")`
`17`	`17`	`annotationProcessor("com.google.auto.service:auto-service:1.0-rc7")`
`18`	`18`
	`19`	`+ testImplementation("io.opentelemetry:opentelemetry-sdk-extension-autoconfigure:${versions["opentelemetry"]}-alpha")`
`19`	`20`	`testImplementation("io.opentelemetry:opentelemetry-sdk:${versions["opentelemetry"]}")`
`20`	`21`	`}`
Original file line number	Diff line number	Diff line change
`@@ -37,4 +37,4 @@ tasks.test {`
`37`	`37`	`doFirst {`
`38`	`38`	`jvmArgs("-Dsmoketest.javaagent.path=${shadowTask.archiveFile.get()}")`
`39`	`39`	`}`
`40`		`-}`
	`40`	`+}`