Add OTLP

quarkusio · Jun 3, 2021 · c2b7c5e · c2b7c5e
1 parent cc94f11
commit c2b7c5e
Show file tree

Hide file tree

Showing 33 changed files with 708 additions and 16 deletions.
diff --git a/bom/application/pom.xml b/bom/application/pom.xml
@@ -2459,6 +2459,16 @@
                 <artifactId>quarkus-opentelemetry-rest-client</artifactId>
                 <version>${project.version}</version>
             </dependency>
+            <dependency>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-opentelemetry-exporter-common-deployment</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-opentelemetry-exporter-common</artifactId>
+                <version>${project.version}</version>
+            </dependency>
             <dependency>
                 <groupId>io.quarkus</groupId>
                 <artifactId>quarkus-opentelemetry-exporter-jaeger-deployment</artifactId>
@@ -2469,6 +2479,16 @@
                 <artifactId>quarkus-opentelemetry-exporter-jaeger</artifactId>
                 <version>${project.version}</version>
             </dependency>
+            <dependency>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-opentelemetry-exporter-otlp-deployment</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-opentelemetry-exporter-otlp</artifactId>
+                <version>${project.version}</version>
+            </dependency>
 
             <!-- Quarkus test dependencies -->
             <dependency>

diff --git a/core/deployment/src/main/java/io/quarkus/deployment/Feature.java b/core/deployment/src/main/java/io/quarkus/deployment/Feature.java
@@ -80,6 +80,7 @@ public enum Feature {
     OPENSHIFT_CLIENT,
     OPENTELEMETRY,
     OPENTELEMETRY_JAEGER_EXPORTER,
+    OPENTELEMETRY_OTLP_EXPORTER,
     PICOCLI,
     QUARTZ,
     QUTE,

diff --git a/devtools/bom-descriptor-json/pom.xml b/devtools/bom-descriptor-json/pom.xml
@@ -1657,6 +1657,19 @@
                         </exclusion>
                     </exclusions>
                 </dependency>
+                <dependency>
+                    <groupId>io.quarkus</groupId>
+                    <artifactId>quarkus-opentelemetry-exporter-common</artifactId>
+                    <version>${project.version}</version>
+                    <type>pom</type>
+                    <scope>test</scope>
+                    <exclusions>
+                        <exclusion>
+                            <groupId>*</groupId>
+                            <artifactId>*</artifactId>
+                        </exclusion>
+                    </exclusions>
+                </dependency>
                 <dependency>
                     <groupId>io.quarkus</groupId>
                     <artifactId>quarkus-opentelemetry-exporter-jaeger</artifactId>
@@ -1670,6 +1683,19 @@
                         </exclusion>
                     </exclusions>
                 </dependency>
+                <dependency>
+                    <groupId>io.quarkus</groupId>
+                    <artifactId>quarkus-opentelemetry-exporter-otlp</artifactId>
+                    <version>${project.version}</version>
+                    <type>pom</type>
+                    <scope>test</scope>
+                    <exclusions>
+                        <exclusion>
+                            <groupId>*</groupId>
+                            <artifactId>*</artifactId>
+                        </exclusion>
+                    </exclusions>
+                </dependency>
                 <dependency>
                     <groupId>io.quarkus</groupId>
                     <artifactId>quarkus-opentelemetry-rest-client</artifactId>

diff --git a/docs/pom.xml b/docs/pom.xml
@@ -1618,6 +1618,19 @@
                 </exclusion>
             </exclusions>
         </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-opentelemetry-exporter-common-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-opentelemetry-exporter-jaeger-deployment</artifactId>
@@ -1631,6 +1644,19 @@
                 </exclusion>
             </exclusions>
         </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-opentelemetry-exporter-otlp-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-opentelemetry-rest-client-deployment</artifactId>

diff --git a/extensions/opentelemetry/opentelemetry-exporter-common/deployment/pom.xml b/extensions/opentelemetry/opentelemetry-exporter-common/deployment/pom.xml
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>io.quarkus</groupId>
+        <artifactId>quarkus-opentelemetry-exporter-common-parent</artifactId>
+        <version>999-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>quarkus-opentelemetry-exporter-common-deployment</artifactId>
+    <name>Quarkus - OpenTelemetry Exporter - Deployment</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-opentelemetry-exporter-common</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-opentelemetry-deployment</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-junit5-internal</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.rest-assured</groupId>
+            <artifactId>rest-assured</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.awaitility</groupId>
+            <artifactId>awaitility</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.assertj</groupId>
+            <artifactId>assertj-core</artifactId>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <annotationProcessorPaths>
+                        <path>
+                            <groupId>io.quarkus</groupId>
+                            <artifactId>quarkus-extension-processor</artifactId>
+                            <version>${project.version}</version>
+                        </path>
+                    </annotationProcessorPaths>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>
diff --git a/...eployment/src/main/java/io/quarkus/opentelemetry/exporter/deployment/DummyForJavadoc.java b/...eployment/src/main/java/io/quarkus/opentelemetry/exporter/deployment/DummyForJavadoc.java
@@ -0,0 +1,7 @@
+package io.quarkus.opentelemetry.exporter.deployment;
+
+/**
+ * Quick workaround to have at least one public class and generate a Javadoc jar.
+ */
+public class DummyForJavadoc {
+}
diff --git a/extensions/opentelemetry/opentelemetry-exporter-common/pom.xml b/extensions/opentelemetry/opentelemetry-exporter-common/pom.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>quarkus-opentelemetry-parent-aggregator</artifactId>
+        <groupId>io.quarkus</groupId>
+        <version>999-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>quarkus-opentelemetry-exporter-common-parent</artifactId>
+    <name>Quarkus - OpenTelemetry Exporter Common</name>
+    <packaging>pom</packaging>
+    <modules>
+        <module>deployment</module>
+        <module>runtime</module>
+    </modules>
+</project>
diff --git a/extensions/opentelemetry/opentelemetry-exporter-common/runtime/pom.xml b/extensions/opentelemetry/opentelemetry-exporter-common/runtime/pom.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>io.quarkus</groupId>
+        <artifactId>quarkus-opentelemetry-exporter-common-parent</artifactId>
+        <version>999-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>quarkus-opentelemetry-exporter-common</artifactId>
+    <name>Quarkus - OpenTelemetry Exporter - Runtime</name>
+    <description>Exporter base for OpenTelemetry</description>
+
+    <dependencies>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-arc</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-opentelemetry</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-grpc-common</artifactId>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-bootstrap-maven-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <annotationProcessorPaths>
+                        <path>
+                            <groupId>io.quarkus</groupId>
+                            <artifactId>quarkus-extension-processor</artifactId>
+                            <version>${project.version}</version>
+                        </path>
+                    </annotationProcessorPaths>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/.../runtime/LateBoundBatchSpanProcessor.java → .../runtime/LateBoundBatchSpanProcessor.java b/.../runtime/LateBoundBatchSpanProcessor.java → .../runtime/LateBoundBatchSpanProcessor.java
@@ -1,4 +1,4 @@
-package io.quarkus.opentelemetry.exporter.jaeger.runtime;
+package io.quarkus.opentelemetry.exporter.runtime;
 
 import org.jboss.logging.Logger;
 
@@ -14,8 +14,8 @@
  * is started, enabling Quarkus to instantiate a {@link io.opentelemetry.api.trace.TracerProvider}
  * during static initialization and set a {@link BatchSpanProcessor} delegate during runtime initialization.
  */
-public class LateBoundBatchSpanProcessor implements SpanProcessor {
-    private static final Logger log = Logger.getLogger(LateBoundBatchSpanProcessor.class);
+public abstract class LateBoundBatchSpanProcessor implements SpanProcessor {
+    private final Logger log = Logger.getLogger(getClass());
 
     private boolean warningLogged = false;
     private BatchSpanProcessor delegate;

diff --git a/.../opentelemetry-exporter-common/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/.../opentelemetry-exporter-common/runtime/src/main/resources/META-INF/quarkus-extension.yaml
@@ -0,0 +1,5 @@
+---
+artifact: ${project.groupId}:${project.artifactId}:${project.version}
+name: "OpenTelemetry Exporter Common"
+metadata:
+  unlisted: true
diff --git a/extensions/opentelemetry/opentelemetry-exporter-jaeger/deployment/pom.xml b/extensions/opentelemetry/opentelemetry-exporter-jaeger/deployment/pom.xml
@@ -23,6 +23,11 @@
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-opentelemetry-deployment</artifactId>
         </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-opentelemetry-exporter-common-deployment</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-grpc-common-deployment</artifactId>

diff --git a/.../java/io/quarkus/opentelemetry/exporter/jaeger/deployment/JaegerExporterDisabledTest.java b/.../java/io/quarkus/opentelemetry/exporter/jaeger/deployment/JaegerExporterDisabledTest.java
@@ -10,7 +10,7 @@
 import org.junit.jupiter.api.extension.RegisterExtension;
 
 import io.opentelemetry.api.OpenTelemetry;
-import io.quarkus.opentelemetry.exporter.jaeger.runtime.LateBoundBatchSpanProcessor;
+import io.quarkus.opentelemetry.exporter.runtime.LateBoundBatchSpanProcessor;
 import io.quarkus.test.QuarkusUnitTest;
 
 public class JaegerExporterDisabledTest {

diff --git a/extensions/opentelemetry/opentelemetry-exporter-jaeger/runtime/pom.xml b/extensions/opentelemetry/opentelemetry-exporter-jaeger/runtime/pom.xml
@@ -28,6 +28,10 @@
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-opentelemetry</artifactId>
         </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-opentelemetry-exporter-common</artifactId>
+        </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-grpc-common</artifactId>

diff --git a/...rc/main/java/io/quarkus/opentelemetry/exporter/jaeger/runtime/JaegerExporterProvider.java b/...rc/main/java/io/quarkus/opentelemetry/exporter/jaeger/runtime/JaegerExporterProvider.java
@@ -10,7 +10,7 @@ public class JaegerExporterProvider {
     @Produces
     @Singleton
     @DefaultBean
-    public LateBoundBatchSpanProcessor batchSpanProcessorForJaeger() {
-        return new LateBoundBatchSpanProcessor();
+    public JaegerLateBoundBatchSpanProcessor batchSpanProcessorForJaeger() {
+        return new JaegerLateBoundBatchSpanProcessor();
     }
 }
diff --git a/...a/io/quarkus/opentelemetry/exporter/jaeger/runtime/JaegerLateBoundBatchSpanProcessor.java b/...a/io/quarkus/opentelemetry/exporter/jaeger/runtime/JaegerLateBoundBatchSpanProcessor.java
@@ -0,0 +1,6 @@
+package io.quarkus.opentelemetry.exporter.jaeger.runtime;
+
+import io.quarkus.opentelemetry.exporter.runtime.LateBoundBatchSpanProcessor;
+
+public class JaegerLateBoundBatchSpanProcessor extends LateBoundBatchSpanProcessor {
+}
diff --git a/...untime/src/main/java/io/quarkus/opentelemetry/exporter/jaeger/runtime/JaegerRecorder.java b/...untime/src/main/java/io/quarkus/opentelemetry/exporter/jaeger/runtime/JaegerRecorder.java
@@ -29,8 +29,8 @@ public void installBatchSpanProcessorForJaeger(JaegerExporterConfig.JaegerExport
                         .build();
 
                 // Create BatchSpanProcessor for Jaeger and install into LateBoundBatchSpanProcessor
-                LateBoundBatchSpanProcessor delayedProcessor = CDI.current()
-                        .select(LateBoundBatchSpanProcessor.class, Any.Literal.INSTANCE).get();
+                JaegerLateBoundBatchSpanProcessor delayedProcessor = CDI.current()
+                        .select(JaegerLateBoundBatchSpanProcessor.class, Any.Literal.INSTANCE).get();
                 delayedProcessor.setBatchSpanProcessorDelegate(BatchSpanProcessor.builder(jaegerSpanExporter).build());
             } catch (IllegalArgumentException iae) {
                 throw new IllegalStateException("Unable to install Jaeger Exporter", iae);