Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add back span name test containing an explicit Application bean #8238

Merged
merged 1 commit into from
Jan 17, 2024
Merged

Add back span name test containing an explicit Application bean #8238

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
51 changes: 26 additions & 25 deletions microprofile/telemetry/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,32 +134,33 @@
</annotationProcessorPaths>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<executions>
<execution>
<id>default-test</id>
<configuration>
<excludes>
<exclude>**/WithSpanWithExplicitAppTest.java</exclude>
</excludes>
</configuration>
</execution>
<execution>
<!-- Run in a separate execution so other tests don't have the Application bean in play. -->
<id>test-with-explicit-app</id>
<goals>
<goal>test</goal>
</goals>
<configuration>
<includes>
<include>**/WithSpanWithExplicitAppTest.java</include>
</includes>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>

<profiles>
<profile>
<id>pipeline</id>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<executions>
<execution>
<id>default-test</id>
<configuration>
<!-- The test times out in the pipeline, even with very long retry delays. -->
<excludes>
<exclude>**/WithSpanWithExplicitAppTest.java</exclude>
</excludes>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
</profiles>

</project>
2 changes: 0 additions & 2 deletions microprofile/telemetry/src/test/java/io/helidon/microprofile/telemetry/WithSpanTestBase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@

import java.util.List;

import io.helidon.microprofile.server.JaxRsApplication;
import io.helidon.microprofile.server.JaxRsCdiExtension;
import io.helidon.microprofile.testing.junit5.AddBean;
import io.helidon.microprofile.testing.junit5.AddConfig;
Expand Down Expand Up @@ -58,7 +57,6 @@ void clear() {

void testSpanNameFromPath(SpanPathTestInfo spanPathTestInfo) {
JaxRsCdiExtension jaxRsCdiExtension = CDI.current().getBeanManager().getExtension(JaxRsCdiExtension.class);
List<JaxRsApplication> apps = jaxRsCdiExtension.applicationsToRun();
Response response = webTarget.path(spanPathTestInfo.requestPath)
.request(MediaType.TEXT_PLAIN)
.get();
Expand Down
5 changes: 0 additions & 5 deletions ...elemetry/src/test/java/io/helidon/microprofile/telemetry/WithSpanWithExplicitAppTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,10 @@
*/
package io.helidon.microprofile.telemetry;

import java.util.List;
import java.util.stream.Stream;

import io.helidon.microprofile.server.JaxRsApplication;
import io.helidon.microprofile.server.JaxRsCdiExtension;
import io.helidon.microprofile.testing.junit5.AddBean;

import jakarta.enterprise.inject.spi.CDI;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.MethodSource;

Expand All @@ -33,7 +29,6 @@ class WithSpanWithExplicitAppTest extends WithSpanTestBase {
@ParameterizedTest()
@MethodSource()
void testExplicitAppSpanNameFromPath(SpanPathTestInfo spanPathTestInfo) {
List<JaxRsApplication> apps = CDI.current().getBeanManager().getExtension(JaxRsCdiExtension.class).applicationsToRun();
testSpanNameFromPath(spanPathTestInfo);
}

Expand Down