Merge branch 'main' into ferdinand-gutzy-add-data-to-spans

Author: brunnert

.github/workflows/maven.yml

@@ -29,7 +29,10 @@ jobs:
           cache: maven
       - name: Build with Maven
         run: mvn -B package --file pom.xml
+      - name: Integration Test with Maven
+        run: mvn -B test -Dtest=JavaAgentExtensionIntegrationTest --file ./extension/pom.xml
 
       # Optional: Uploads the full dependency graph to GitHub to improve the quality of Dependabot alerts this repository can receive
       #- name: Update dependency graph
-      #  uses: advanced-security/maven-dependency-submission-action@571e99aab1055c2e71a1e2309b9691de18d6b7d6
+      #  uses: advanced-security/maven-dependency-submission-action@571e99aab1055c2e71a1e2309b9691de18d6b7d6
+

.gitignore

@@ -63,4 +63,5 @@ local.properties
 .vscode
 
 # Maven
-de.retit.apm/de.retit.apm.javaagent.sampleapplication/dependency-reduced-pom.xml
+de.retit.apm/de.retit.apm.javaagent.sampleapplication/dependency-reduced-pom.xml
+/sampleapplication/dependency-reduced-pom.xml

extension/src/test/java/io/retit/opentelemetry/javaagent/extension/JavaAgentExtensionIntegrationTest.java

@@ -34,11 +34,13 @@ class JavaAgentExtensionIntegrationTest {
 
     @BeforeEach
     public void setupApplication() {
-        String image = "registry.retit-support.de/brunnert/docker/otel-integration-test:feature";
+        String image = "otel-integration-test:feature";
         LOGGER.info("Using image: " + image);
         applicationContainer = new GenericContainer<>(image)
+                .withEnv("OTEL_LOGS_EXPORTER", "none")
                 .withEnv("OTEL_METRICS_EXPORTER", "none")
-                .withEnv("OTEL_TRACES_EXPORTER", "logging");
+                .withEnv("OTEL_TRACES_EXPORTER", "logging")
+                .withEnv("JAVA_TOOL_OPTIONS", "-javaagent:opentelemetry-javaagent-all.jar -Dotel.javaagent.extensions=io.retit.opentelemetry.javaagent.extension.jar");
         spanDemands = new HashMap<>();
     }
 

pom.xml

@@ -73,7 +73,7 @@
             <dependency>
                 <groupId>io.opentelemetry.javaagent</groupId>
                 <artifactId>opentelemetry-javaagent</artifactId>
-                <version>1.27.0</version>
+                <version>2.6.0</version>
                 <scope>test</scope>
             </dependency>
 

sampleapplication/pom.xml

@@ -98,7 +98,7 @@
                                 <resource>
                                     <directory>${project.build.directory}</directory>
                                     <includes>
-                                        <include>io.retit.opentelemetry.javaagent.sampleapplication-${project.version}.jar
+                                        <include>sampleapplication-${project.version}.jar
                                         </include>
                                     </includes>
                                 </resource>
@@ -116,7 +116,7 @@
                         <image>openjdk:17-slim</image>
                     </from>
                     <to>
-                        <image>registry.retit-support.de/brunnert/docker/otel-integration-test:${project.version}</image>
+                        <image>otel-integration-test:${project.version}</image>
                         <tags>
                             <tag>feature</tag>
                         </tags>
@@ -127,12 +127,15 @@
                             <path>${project.build.directory}/jib</path>
                         </paths>
                     </extraDirectories>
-                    <container>
-                        <entrypoint>
-                            java,-javaagent:opentelemetry-javaagent-all.jar,-Dotel.javaagent.extensions=io.retit.opentelemetry.javaagent.extension.jar,-cp,io.retit.opentelemetry.javaagent.sampleapplication-${project.version}.jar,SampleApplication
-                        </entrypoint>
-                    </container>
                 </configuration>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>dockerBuild</goal>
+                        </goals>
+                    </execution>
+                </executions>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>