Merge pull request wildfly#17999 from jasondlee/WFLY-19453

[WFLY-19453] Minimize size of Otel API module
ropalka · Sep 13, 2024 · b0bcb69 · b0bcb69
2 parents 5d0c387 + 9c47af2
commit b0bcb69
Show file tree

Hide file tree

Showing 10 changed files with 98 additions and 14 deletions.
diff --git a/...src/main/resources/modules/system/layers/base/io/opentelemetry/api/events/main/module.xml b/...src/main/resources/modules/system/layers/base/io/opentelemetry/api/events/main/module.xml
@@ -0,0 +1,18 @@
+<!--
+  ~ Copyright The WildFly Authors
+  ~ SPDX-License-Identifier: Apache-2.0
+  -->
+<module xmlns="urn:jboss:module:1.9" name="io.opentelemetry.api.events">
+    <properties>
+        <property name="jboss.api" value="private"/>
+    </properties>
+
+    <resources>
+        <artifact name="${io.opentelemetry:opentelemetry-api-events}"/>
+    </resources>
+
+    <dependencies>
+        <module name="io.opentelemetry.api"/>
+        <module name="io.opentelemetry.context"/>
+    </dependencies>
+</module>
diff --git a/...shared/src/main/resources/modules/system/layers/base/io/opentelemetry/api/main/module.xml b/...shared/src/main/resources/modules/system/layers/base/io/opentelemetry/api/main/module.xml
@@ -9,16 +9,14 @@
 
     <resources>
         <artifact name="${io.opentelemetry:opentelemetry-api}"/>
-        <artifact name="${io.opentelemetry:opentelemetry-api-events}"/>
-        <artifact name="${io.opentelemetry:opentelemetry-semconv}"/>
-        <artifact name="${io.opentelemetry.instrumentation:opentelemetry-instrumentation-api}"/>
-        <artifact name="${io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-semconv}"/>
-        <artifact name="${io.opentelemetry.instrumentation:opentelemetry-instrumentation-annotations}"/>
-        <artifact name="${io.opentelemetry.instrumentation:opentelemetry-instrumentation-annotations-support}"/>
     </resources>
 
     <dependencies>
+        <module name="io.opentelemetry.api.events"/>
         <module name="io.opentelemetry.context"/>
+        <module name="io.opentelemetry.instrumentation.annotations"/>
+        <module name="io.opentelemetry.instrumentation.api"/>
+        <module name="io.opentelemetry.semconv"/>
         <module name="io.smallrye.opentelemetry" services="import"/>
 
         <module name="java.logging"/>

diff --git a/...d/src/main/resources/modules/system/layers/base/io/opentelemetry/exporter/main/module.xml b/...d/src/main/resources/modules/system/layers/base/io/opentelemetry/exporter/main/module.xml
@@ -9,18 +9,16 @@
 
     <resources>
         <artifact name="${io.opentelemetry:opentelemetry-exporter-common}"/>
-        <artifact name="${io.opentelemetry:opentelemetry-exporter-otlp}"/>
-        <artifact name="${io.opentelemetry:opentelemetry-exporter-otlp-common}"/>
         <artifact name="${com.fasterxml.jackson.jr:jackson-jr-objects}"/>
     </resources>
 
     <dependencies>
         <module name="io.opentelemetry.api"/>
         <module name="io.opentelemetry.sdk"/>
         <module name="io.opentelemetry.context"/>
-        <module name="io.opentelemetry.otlp"/>
+        <module name="io.opentelemetry.otlp" services="export"/>
         <module name="com.fasterxml.jackson.core.jackson-core"/>
-        <module name="io.smallrye.opentelemetry" services="import"/>
+        <module name="io.smallrye.opentelemetry" services="export"/>
         <module name="org.slf4j"/>
 
         <module name="java.logging"/>

diff --git a/...s/modules/system/layers/base/io/opentelemetry/instrumentation/annotations/main/module.xml b/...s/modules/system/layers/base/io/opentelemetry/instrumentation/annotations/main/module.xml
@@ -0,0 +1,19 @@
+<!--
+  ~ Copyright The WildFly Authors
+  ~ SPDX-License-Identifier: Apache-2.0
+  -->
+<module xmlns="urn:jboss:module:1.9" name="io.opentelemetry.instrumentation.annotations">
+    <properties>
+        <property name="jboss.api" value="private"/>
+    </properties>
+
+    <resources>
+        <artifact name="${io.opentelemetry.instrumentation:opentelemetry-instrumentation-annotations}"/>
+        <artifact name="${io.opentelemetry.instrumentation:opentelemetry-instrumentation-annotations-support}"/>
+    </resources>
+
+    <dependencies>
+        <module name="io.opentelemetry.api"/>
+        <module name="io.opentelemetry.instrumentation.api"/>
+    </dependencies>
+</module>
diff --git a/...resources/modules/system/layers/base/io/opentelemetry/instrumentation/api/main/module.xml b/...resources/modules/system/layers/base/io/opentelemetry/instrumentation/api/main/module.xml
@@ -0,0 +1,24 @@
+<!--
+  ~ Copyright The WildFly Authors
+  ~ SPDX-License-Identifier: Apache-2.0
+  -->
+<module xmlns="urn:jboss:module:1.9" name="io.opentelemetry.instrumentation.api">
+    <properties>
+        <property name="jboss.api" value="private"/>
+    </properties>
+
+    <resources>
+        <artifact name="${io.opentelemetry.instrumentation:opentelemetry-instrumentation-api}"/>
+        <artifact name="${io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-semconv}"/>
+    </resources>
+
+    <dependencies>
+        <module name="io.opentelemetry.api"/>
+        <module name="io.opentelemetry.context"/>
+        <module name="io.opentelemetry.semconv"/>
+        <module name="io.smallrye.opentelemetry" services="import"/>
+
+        <module name="java.logging"/>
+        <module name="jakarta.interceptor.api" />
+    </dependencies>
+</module>
diff --git a/...hared/src/main/resources/modules/system/layers/base/io/opentelemetry/otlp/main/module.xml b/...hared/src/main/resources/modules/system/layers/base/io/opentelemetry/otlp/main/module.xml
@@ -7,15 +7,16 @@
         <property name="jboss.api" value="private"/>
     </properties>
     <resources>
-        <artifact name="${io.opentelemetry:opentelemetry-exporter-common}"/>
-        <artifact name="${io.opentelemetry:opentelemetry-exporter-otlp-common}"/>
         <artifact name="${io.opentelemetry:opentelemetry-exporter-otlp}"/>
+        <artifact name="${io.opentelemetry:opentelemetry-exporter-otlp-common}"/>
     </resources>
 
     <dependencies>
         <module name="io.opentelemetry.api"/>
         <module name="io.opentelemetry.context"/>
         <module name="io.opentelemetry.sdk"/>
+        <module name="io.opentelemetry.exporter"/>
+        <module name="io.smallrye.opentelemetry" services="import"/>
         <module name="org.slf4j"/>
 
         <module name="java.logging"/>

diff --git a/...shared/src/main/resources/modules/system/layers/base/io/opentelemetry/sdk/main/module.xml b/...shared/src/main/resources/modules/system/layers/base/io/opentelemetry/sdk/main/module.xml
@@ -19,9 +19,11 @@
 
     <dependencies>
         <module name="io.opentelemetry.api"/>
+        <module name="io.opentelemetry.api.events"/>
         <module name="io.opentelemetry.context"/>
         <module name="io.opentelemetry.exporter"/>
-        <module name="io.smallrye.opentelemetry" services="import"/>
+        <module name="io.opentelemetry.semconv"/>
+        <module name="io.smallrye.opentelemetry" services="export"/>
 
         <module name="java.logging"/>
         <module name="jdk.unsupported"/>

diff --git a/...ed/src/main/resources/modules/system/layers/base/io/opentelemetry/semconv/main/module.xml b/...ed/src/main/resources/modules/system/layers/base/io/opentelemetry/semconv/main/module.xml
@@ -0,0 +1,17 @@
+<!--
+  ~ Copyright The WildFly Authors
+  ~ SPDX-License-Identifier: Apache-2.0
+  -->
+<module xmlns="urn:jboss:module:1.9" name="io.opentelemetry.semconv">
+    <properties>
+        <property name="jboss.api" value="private"/>
+    </properties>
+
+    <resources>
+        <artifact name="${io.opentelemetry:opentelemetry-semconv}"/>
+    </resources>
+
+    <dependencies>
+        <module name="io.opentelemetry.api"/>
+    </dependencies>
+</module>
diff --git a/...d/src/main/resources/modules/system/layers/base/io/smallrye/opentelemetry/main/module.xml b/...d/src/main/resources/modules/system/layers/base/io/smallrye/opentelemetry/main/module.xml
@@ -16,9 +16,14 @@
 
     <dependencies>
         <module name="io.opentelemetry.api"/>
+        <module name="io.opentelemetry.api.events"/>
         <module name="io.opentelemetry.context"/>
         <module name="io.opentelemetry.exporter"/>
+        <module name="io.opentelemetry.otlp"/>
         <module name="io.opentelemetry.sdk"/>
+        <module name="io.opentelemetry.semconv"/>
+        <module name="io.opentelemetry.instrumentation.api"/>
+        <module name="io.opentelemetry.instrumentation.annotations"/>
 
         <module name="org.jboss.resteasy.resteasy-core"/>
         <module name="org.jboss.resteasy.resteasy-core-spi"/>

diff --git a/...ry/src/main/java/org/wildfly/extension/opentelemetry/OpenTelemetrySubsystemRegistrar.java b/...ry/src/main/java/org/wildfly/extension/opentelemetry/OpenTelemetrySubsystemRegistrar.java
@@ -58,9 +58,11 @@ class OpenTelemetrySubsystemRegistrar implements SubsystemResourceDefinitionRegi
     public static final String API_MODULE = "org.wildfly.extension.opentelemetry-api";
     public static final String[] EXPORTED_MODULES = {
             "io.opentelemetry.api",
-            "io.opentelemetry.context",
+            "io.opentelemetry.api.events",
             "io.opentelemetry.exporter",
+            "io.opentelemetry.otlp",
             "io.opentelemetry.sdk",
+            "io.opentelemetry.semconv",
             "io.smallrye.opentelemetry"
     };