⬆️ Upgrade otel 1.11.0 (#360)

* ⬆️ upgrade otel and handle compile errors for otel java extensions

* 🐛 remove usage of ClientSpan API

* 🐛 remove usage of internal API

* ♻️ disable metrics exporter for instrumentation test suite

* ✅ treat compiler warnigns as erros in main source sets

* ✅ add back in assertions about queueSize and processedSpans

Author: ryandens

build.gradle.kts

@@ -15,6 +15,11 @@ allprojects {
         targetCompatibility = JavaVersion.VERSION_1_8
     }
 
+    tasks.compileJava {
+        options.compilerArgs.add("-Werror")
+    }
+
+
     tasks.withType<JavaCompile> {
         options.compilerArgs.add("-Xlint:unchecked")
         options.isDeprecation = true
@@ -34,11 +39,11 @@ subprojects {
     extra.set("versions", mapOf(
             // when updating these values, some values must also be updated in buildSrc as this map
             // cannot be accessed there
-            "opentelemetry" to "1.10.1",
+            "opentelemetry" to "1.11.0",
             "opentelemetry_proto" to "0.11.0-alpha",
-            "opentelemetry_java_agent" to "1.10.1-alpha",
-            "opentelemetry_java_agent_all" to "1.10.1",
-            "opentelemetry_gradle_plugin" to "1.10.1-alpha",
+            "opentelemetry_java_agent" to "1.11.0-alpha",
+            "opentelemetry_java_agent_all" to "1.11.0",
+            "opentelemetry_gradle_plugin" to "1.11.0-alpha",
             "byte_buddy" to "1.12.6",
                 "slf4j" to "1.7.32"
     ))

buildSrc/build.gradle.kts

@@ -27,7 +27,7 @@ repositories {
 dependencies {
   implementation(gradleApi())
   implementation(localGroovy())
-  val otelInstrumentationVersion = "1.10.1-alpha"
+  val otelInstrumentationVersion = "1.11.0-alpha"
   implementation("io.opentelemetry.javaagent:opentelemetry-muzzle:$otelInstrumentationVersion")
   implementation("io.opentelemetry.instrumentation.muzzle-generation:io.opentelemetry.instrumentation.muzzle-generation.gradle.plugin:$otelInstrumentationVersion")
   implementation("io.opentelemetry.instrumentation.muzzle-check:io.opentelemetry.instrumentation.muzzle-check.gradle.plugin:$otelInstrumentationVersion")

instrumentation/apache-httpasyncclient-4.1/src/main/java/io/opentelemetry/javaagent/instrumentation/hypertrace/apachehttpasyncclient/ApacheAsyncClientInstrumentationModule.java

@@ -27,7 +27,6 @@
 import com.google.auto.service.AutoService;
 import io.opentelemetry.api.trace.Span;
 import io.opentelemetry.context.Context;
-import io.opentelemetry.instrumentation.api.tracer.ClientSpan;
 import io.opentelemetry.javaagent.extension.instrumentation.InstrumentationModule;
 import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
 import io.opentelemetry.javaagent.extension.instrumentation.TypeTransformer;
@@ -173,7 +172,7 @@ public HttpRequest generateRequest() throws IOException, HttpException {
         Object getContextResult = getContext.invoke(wrappedFutureCallback);
         if (getContextResult instanceof Context) {
           Context context = (Context) getContextResult;
-          Span clientSpan = ClientSpan.fromContextOrNull(context);
+          Span clientSpan = Span.fromContextOrNull(context);
           bodyCaptureDelegatingCallback.clientContext = context;
           ApacheHttpClientUtils.traceRequest(clientSpan, request);
         }

instrumentation/netty/netty-4.0/src/main/java/io/opentelemetry/javaagent/instrumentation/hypertrace/netty/v4_0/client/HttpClientResponseTracingHandler.java

@@ -26,9 +26,9 @@
 import io.netty.handler.codec.http.LastHttpContent;
 import io.netty.util.Attribute;
 import io.opentelemetry.api.trace.Span;
+import io.opentelemetry.api.trace.StatusCode;
 import io.opentelemetry.context.Context;
 import io.opentelemetry.context.Scope;
-import io.opentelemetry.instrumentation.api.instrumenter.http.HttpStatusConverter;
 import io.opentelemetry.javaagent.instrumentation.hypertrace.netty.v4_0.AttributeKeys;
 import io.opentelemetry.javaagent.instrumentation.hypertrace.netty.v4_0.DataCaptureUtils;
 import io.opentelemetry.javaagent.instrumentation.netty.v4_0.client.NettyClientSingletons;
@@ -100,9 +100,9 @@ public void channelRead(ChannelHandlerContext ctx, Object msg) {
     }
     if (msg instanceof HttpResponse) {
       HttpResponse httpResponse = (HttpResponse) msg;
-      span.setAttribute(SemanticAttributes.HTTP_STATUS_CODE, httpResponse.getStatus().code());
-      span.setStatus(
-          HttpStatusConverter.CLIENT.statusFromHttpStatus(httpResponse.getStatus().code()));
+      int code = httpResponse.getStatus().code();
+      span.setAttribute(SemanticAttributes.HTTP_STATUS_CODE, code);
+      span.setStatus(code >= 100 && code < 400 ? StatusCode.UNSET : StatusCode.ERROR);
     }
     if (msg instanceof LastHttpContent) {
       span.end();

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

@@ -26,9 +26,9 @@
 import io.netty.handler.codec.http.LastHttpContent;
 import io.netty.util.Attribute;
 import io.opentelemetry.api.trace.Span;
+import io.opentelemetry.api.trace.StatusCode;
 import io.opentelemetry.context.Context;
 import io.opentelemetry.context.Scope;
-import io.opentelemetry.instrumentation.api.instrumenter.http.HttpStatusConverter;
 import io.opentelemetry.javaagent.instrumentation.hypertrace.netty.v4_0.AttributeKeys;
 import io.opentelemetry.javaagent.instrumentation.hypertrace.netty.v4_0.DataCaptureUtils;
 import io.opentelemetry.javaagent.instrumentation.netty.v4_0.server.NettyServerSingletons;
@@ -99,9 +99,9 @@ public void write(ChannelHandlerContext ctx, Object msg, ChannelPromise prm) {
     }
     if (msg instanceof HttpResponse) {
       HttpResponse httpResponse = (HttpResponse) msg;
-      span.setAttribute(SemanticAttributes.HTTP_STATUS_CODE, httpResponse.getStatus().code());
-      span.setStatus(
-          HttpStatusConverter.SERVER.statusFromHttpStatus(httpResponse.getStatus().code()));
+      int code = httpResponse.getStatus().code();
+      span.setAttribute(SemanticAttributes.HTTP_STATUS_CODE, code);
+      span.setStatus(code >= 100 && code < 500 ? StatusCode.UNSET : StatusCode.ERROR);
     }
     if (msg instanceof LastHttpContent) {
       span.end();

instrumentation/netty/netty-4.1/src/main/java/io/opentelemetry/javaagent/instrumentation/hypertrace/netty/v4_1/client/HttpClientResponseTracingHandler.java

@@ -26,9 +26,9 @@
 import io.netty.handler.codec.http.LastHttpContent;
 import io.netty.util.Attribute;
 import io.opentelemetry.api.trace.Span;
+import io.opentelemetry.api.trace.StatusCode;
 import io.opentelemetry.context.Context;
 import io.opentelemetry.context.Scope;
-import io.opentelemetry.instrumentation.api.instrumenter.http.HttpStatusConverter;
 import io.opentelemetry.javaagent.instrumentation.hypertrace.netty.v4_1.AttributeKeys;
 import io.opentelemetry.javaagent.instrumentation.hypertrace.netty.v4_1.DataCaptureUtils;
 import io.opentelemetry.javaagent.instrumentation.netty.v4_1.client.NettyClientSingletons;
@@ -100,9 +100,9 @@ public void channelRead(ChannelHandlerContext ctx, Object msg) {
     }
     if (msg instanceof HttpResponse) {
       HttpResponse httpResponse = (HttpResponse) msg;
-      span.setAttribute(SemanticAttributes.HTTP_STATUS_CODE, httpResponse.getStatus().code());
-      span.setStatus(
-          HttpStatusConverter.CLIENT.statusFromHttpStatus(httpResponse.getStatus().code()));
+      int code = httpResponse.status().code();
+      span.setAttribute(SemanticAttributes.HTTP_STATUS_CODE, code);
+      span.setStatus(code >= 100 && code < 400 ? StatusCode.UNSET : StatusCode.ERROR);
     }
     if (msg instanceof LastHttpContent) {
       span.end();

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

@@ -26,9 +26,9 @@
 import io.netty.handler.codec.http.LastHttpContent;
 import io.netty.util.Attribute;
 import io.opentelemetry.api.trace.Span;
+import io.opentelemetry.api.trace.StatusCode;
 import io.opentelemetry.context.Context;
 import io.opentelemetry.context.Scope;
-import io.opentelemetry.instrumentation.api.instrumenter.http.HttpStatusConverter;
 import io.opentelemetry.javaagent.instrumentation.hypertrace.netty.v4_1.AttributeKeys;
 import io.opentelemetry.javaagent.instrumentation.hypertrace.netty.v4_1.DataCaptureUtils;
 import io.opentelemetry.javaagent.instrumentation.netty.v4_1.server.NettyServerSingletons;
@@ -99,8 +99,9 @@ public void write(ChannelHandlerContext ctx, Object msg, ChannelPromise prm) {
     }
     if (msg instanceof HttpResponse) {
       HttpResponse httpResponse = (HttpResponse) msg;
-      span.setAttribute(SemanticAttributes.HTTP_STATUS_CODE, httpResponse.status().code());
-      span.setStatus(HttpStatusConverter.SERVER.statusFromHttpStatus(httpResponse.status().code()));
+      int code = httpResponse.status().code();
+      span.setAttribute(SemanticAttributes.HTTP_STATUS_CODE, code);
+      span.setStatus(code >= 100 && code < 500 ? StatusCode.UNSET : StatusCode.ERROR);
     }
     if (msg instanceof LastHttpContent) {
       span.end();

otel-extensions/src/main/java/org/hypertrace/agent/otel/extensions/FilterComponentInstaller.java

@@ -19,6 +19,7 @@
 import com.google.auto.service.AutoService;
 import io.opentelemetry.instrumentation.api.config.Config;
 import io.opentelemetry.javaagent.extension.AgentListener;
+import io.opentelemetry.sdk.autoconfigure.AutoConfiguredOpenTelemetrySdk;
 import java.util.List;
 import java.util.stream.Collectors;
 import org.hypertrace.agent.config.v1.Config.AgentConfig;
@@ -29,7 +30,8 @@
 public class FilterComponentInstaller implements AgentListener {
 
   @Override
-  public void beforeAgent(Config config) {
+  public void beforeAgent(
+      Config config, AutoConfiguredOpenTelemetrySdk autoConfiguredOpenTelemetrySdk) {
     AgentConfig agentConfig = HypertraceConfig.get();
     List<String> jarPaths =
         agentConfig.getJavaagent().getFilterJarPathsList().stream()
@@ -38,7 +40,4 @@ public void beforeAgent(Config config) {
     // resolves filter via service loader resolution
     FilterRegistry.initialize(jarPaths);
   }
-
-  @Override
-  public void afterAgent(Config config) {}
 }

otel-extensions/src/main/java/org/hypertrace/agent/otel/extensions/config/InstrumentationConfigInstaller.java

@@ -19,14 +19,16 @@
 import com.google.auto.service.AutoService;
 import io.opentelemetry.instrumentation.api.config.Config;
 import io.opentelemetry.javaagent.extension.AgentListener;
+import io.opentelemetry.sdk.autoconfigure.AutoConfiguredOpenTelemetrySdk;
 import org.hypertrace.agent.core.config.InstrumentationConfig.ConfigProvider;
 
 @AutoService(AgentListener.class)
 public class InstrumentationConfigInstaller implements AgentListener {
 
   @Override
-  public void beforeAgent(Config config) {
-    // get initializes singleton
+  public void beforeAgent(
+      Config config,
+      AutoConfiguredOpenTelemetrySdk autoConfiguredOpenTelemetrySdk) { // get initializes singleton
     ConfigProvider.get();
   }
 }

otel-extensions/src/main/java/org/hypertrace/agent/otel/extensions/processor/HypertraceTracerCustomizer.java renamed to otel-extensions/src/main/java/org/hypertrace/agent/otel/extensions/processor/HypertraceCustomizerProvider.java

@@ -17,9 +17,8 @@
 package org.hypertrace.agent.otel.extensions.processor;
 
 import com.google.auto.service.AutoService;
-import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties;
-import io.opentelemetry.sdk.autoconfigure.spi.traces.SdkTracerProviderConfigurer;
-import io.opentelemetry.sdk.trace.SdkTracerProviderBuilder;
+import io.opentelemetry.sdk.autoconfigure.spi.AutoConfigurationCustomizer;
+import io.opentelemetry.sdk.autoconfigure.spi.AutoConfigurationCustomizerProvider;
 
 /**
  * This is a workaround to add container ID tags to spans when Zipkin exporter is used. Zipkin
@@ -29,12 +28,13 @@
  * <p>Remove this once we migrate to OTEL exporter
  * https://github.com/hypertrace/javaagent/issues/132
  */
-@AutoService(SdkTracerProviderConfigurer.class)
-public class HypertraceTracerCustomizer implements SdkTracerProviderConfigurer {
+@AutoService(AutoConfigurationCustomizerProvider.class)
+public class HypertraceCustomizerProvider implements AutoConfigurationCustomizerProvider {
 
   @Override
-  public void configure(
-      SdkTracerProviderBuilder tracerProvider, ConfigProperties configProperties) {
-    tracerProvider.addSpanProcessor(new AddTagsSpanProcessor());
+  public void customize(AutoConfigurationCustomizer autoConfiguration) {
+    autoConfiguration.addTracerProviderCustomizer(
+        (sdkTracerProviderBuilder, configProperties) ->
+            sdkTracerProviderBuilder.addSpanProcessor(new AddTagsSpanProcessor()));
   }
 }

smoke-tests/src/test/java/org/hypertrace/agent/smoketest/SpringBootSmokeTest.java

@@ -175,12 +175,8 @@ public void postJson() throws IOException, InterruptedException {
     ArrayList<ExportMetricsServiceRequest> metrics = new ArrayList<>(waitForMetrics());
     Assertions.assertTrue(hasMetricNamed("otlp.exporter.seen", metrics));
     Assertions.assertTrue(hasMetricNamed("otlp.exporter.exported", metrics));
-    /*
-    These metrics stopped being reported in OTEL SDK 1.10.0, due to a bug in the OpenTelemetry SDK
-    Autoconfigure project https://github.com/open-telemetry/opentelemetry-java/issues/4109
     Assertions.assertTrue(hasMetricNamed("processedSpans", metrics));
     Assertions.assertTrue(hasMetricNamed("queueSize", metrics));
-     */
     Assertions.assertTrue(hasMetricNamed("runtime.jvm.gc.count", metrics));
     Assertions.assertTrue(hasMetricNamed("runtime.jvm.gc.time", metrics));
     Assertions.assertTrue(hasMetricNamed("runtime.jvm.memory.pool", metrics));

testing-common/src/testFixtures/java/org/hypertrace/agent/testing/AbstractInstrumenterTest.java

@@ -64,6 +64,7 @@ public abstract class AbstractInstrumenterTest {
     System.setProperty("otel.internal.failOnContextLeak", "true");
     System.setProperty("io.opentelemetry.javaagent.slf4j.simpleLogger.log.muzzleMatcher", "warn");
     System.setProperty("otel.traces.exporter", "none");
+    System.setProperty("otel.metrics.exporter", "none");
 
     INSTRUMENTATION = ByteBuddyAgent.install();
     InstrumentationHolder.setInstrumentation(INSTRUMENTATION);

testing-common/src/testFixtures/java/org/hypertrace/agent/testing/TestSdkTracerProviderConfigurer.java

@@ -17,15 +17,16 @@
 package org.hypertrace.agent.testing;
 
 import com.google.auto.service.AutoService;
-import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties;
-import io.opentelemetry.sdk.autoconfigure.spi.traces.SdkTracerProviderConfigurer;
-import io.opentelemetry.sdk.trace.SdkTracerProviderBuilder;
+import io.opentelemetry.sdk.autoconfigure.spi.AutoConfigurationCustomizer;
+import io.opentelemetry.sdk.autoconfigure.spi.AutoConfigurationCustomizerProvider;
 
-@AutoService(SdkTracerProviderConfigurer.class)
-public final class TestSdkTracerProviderConfigurer implements SdkTracerProviderConfigurer {
+@AutoService(AutoConfigurationCustomizerProvider.class)
+public final class TestSdkTracerProviderConfigurer implements AutoConfigurationCustomizerProvider {
 
   @Override
-  public void configure(SdkTracerProviderBuilder tracerProviderBuilder, ConfigProperties config) {
-    tracerProviderBuilder.addSpanProcessor(AbstractInstrumenterTest.TEST_WRITER);
+  public void customize(AutoConfigurationCustomizer autoConfiguration) {
+    autoConfiguration.addTracerProviderCustomizer(
+        (sdkTracerProviderBuilder, configProperties) ->
+            sdkTracerProviderBuilder.addSpanProcessor(AbstractInstrumenterTest.TEST_WRITER));
   }
 }