Skip to content

Commit

Permalink
Remove arquillian
Browse files Browse the repository at this point in the history 
Signed-off-by: Dmitry Aleksandrov <dmitry.aleksandrov@oracle.com>
  • Loading branch information
@dalexandrov
dalexandrov committed Nov 30, 2023
1 parent 1069474 commit 8d2cc72
Show file tree
Hide file tree
Showing 10 changed files with 37 additions and 325 deletions.
12 changes: 0 additions & 12 deletions microprofile/telemetry/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -117,18 +117,6 @@
<artifactId>awaitility</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jboss.arquillian.junit5</groupId>
<artifactId>arquillian-junit5-container</artifactId>
<version>${version.lib.arquillian}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>io.helidon.microprofile.tests</groupId>
<artifactId>helidon-arquillian</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
</dependencies>

<build>
Expand Down
47 changes: 0 additions & 47 deletions microprofile/telemetry/src/test/java/io/helidon/microprofile/telemetry/ConfigAsset.java
View file

This file was deleted.

67 changes: 20 additions & 47 deletions ...file/telemetry/src/test/java/io/helidon/microprofile/telemetry/RestSpanHierarchyTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,82 +17,55 @@

package io.helidon.microprofile.telemetry;

import static org.hamcrest.MatcherAssert.assertThat;

import java.net.URI;
import java.net.URL;
import java.util.List;

import io.helidon.http.Status;
import io.helidon.webclient.http1.Http1Client;
import io.helidon.microprofile.testing.junit5.AddBean;
import io.helidon.microprofile.testing.junit5.AddConfig;
import io.helidon.microprofile.testing.junit5.HelidonTest;

import io.opentelemetry.api.common.AttributeKey;
import io.opentelemetry.instrumentation.annotations.WithSpan;
import io.opentelemetry.sdk.trace.data.SpanData;
import org.jboss.arquillian.container.test.api.Deployment;
import org.jboss.arquillian.junit5.ArquillianExtension;
import org.jboss.arquillian.test.api.ArquillianResource;
import org.jboss.shrinkwrap.api.ShrinkWrap;
import org.jboss.shrinkwrap.api.spec.WebArchive;
import org.junit.Before;

import io.opentelemetry.sdk.autoconfigure.spi.traces.ConfigurableSpanExporterProvider;
import jakarta.inject.Inject;
import jakarta.ws.rs.ApplicationPath;
import jakarta.ws.rs.GET;
import jakarta.ws.rs.Path;
import jakarta.ws.rs.client.WebTarget;
import jakarta.ws.rs.core.Application;
import jakarta.ws.rs.core.Response;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;

import static io.opentelemetry.api.trace.SpanKind.SERVER;
import static io.opentelemetry.api.trace.SpanKind.INTERNAL;
import static org.hamcrest.Matchers.*;
import static io.opentelemetry.api.trace.SpanKind.SERVER;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.is;

/**
* Test Span Hierarchy with Tracer Mock
*/
@ExtendWith(ArquillianExtension.class)
@HelidonTest
@AddBean(InMemorySpanExporter.class)
@AddBean(InMemorySpanExporterProvider.class)
@AddConfig(key = "otel.service.name", value = "helidon-mp-telemetry")
@AddConfig(key = "otel.sdk.disabled", value = "false")
@AddConfig(key = "telemetry.span.full.url", value = "false")
@AddConfig(key = "otel.traces.exporter", value = "in-memory")
public class RestSpanHierarchyTest {

private Http1Client client;

@Deployment
public static WebArchive createDeployment() {

ConfigAsset config = new ConfigAsset()
.add("otel.service.name", "helidon-mp-telemetry")
.add("otel.sdk.disabled", "false")
.add("telemetry.span.full.url", "false")
.add("otel.traces.exporter", "in-memory");

return ShrinkWrap.create(WebArchive.class)
.addClasses(InMemorySpanExporter.class, InMemorySpanExporterProvider.class)
.addAsLibrary(TestLibraries.AWAITILITY_LIB)
.addAsServiceProvider(ConfigurableSpanExporterProvider.class, InMemorySpanExporterProvider.class)
.addAsResource(config, "META-INF/microprofile-config.properties");
}

@ArquillianResource
URL url;
@Inject
WebTarget webTarget;

@Inject
InMemorySpanExporter spanExporter;

@Before
@BeforeEach
void setup() {
if (spanExporter != null) {
spanExporter.reset();
}

if (client == null){
client = Http1Client
.builder()
.baseUri(URI.create(url.toString()))
.build();
}
}

@AfterEach
Expand All @@ -103,7 +76,7 @@ void reset(){
@Test
void spanHierarchy() {

assertThat(client.get("mixed").request().status(), is(Status.OK_200));
assertThat(webTarget.request("mixed").get(), is(Status.OK_200));

List<SpanData> spanItems = spanExporter.getFinishedSpanItems(3);
assertThat(spanItems.size(), is(3));
Expand All @@ -125,7 +98,7 @@ void spanHierarchy() {
@Test
void spanHierarchyInjected() {

assertThat(client.get("mixed_injected").request().status(), is(Status.OK_200));
assertThat(webTarget.request("mixed_injected").get(), is(Status.OK_200));

List<SpanData> spanItems = spanExporter.getFinishedSpanItems(3);
assertThat(spanItems.size(), is(3));
Expand Down
31 changes: 0 additions & 31 deletions ...profile/telemetry/src/test/java/io/helidon/microprofile/telemetry/TelemetryExtension.java
View file

This file was deleted.

67 changes: 17 additions & 50 deletions microprofile/telemetry/src/test/java/io/helidon/microprofile/telemetry/TestFullUrlName.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,96 +17,63 @@

package io.helidon.microprofile.telemetry;

import java.net.URI;
import java.net.URL;
import java.util.List;

import io.helidon.http.Status;
import io.helidon.webclient.http1.Http1Client;
import io.helidon.microprofile.testing.junit5.AddBean;
import io.helidon.microprofile.testing.junit5.AddConfig;
import io.helidon.microprofile.testing.junit5.HelidonTest;

import io.opentelemetry.api.common.AttributeKey;
import io.opentelemetry.instrumentation.annotations.WithSpan;
import io.opentelemetry.sdk.autoconfigure.spi.traces.ConfigurableSpanExporterProvider;
import io.opentelemetry.sdk.trace.data.SpanData;
import jakarta.inject.Inject;
import jakarta.ws.rs.ApplicationPath;
import jakarta.ws.rs.GET;
import jakarta.ws.rs.Path;
import jakarta.ws.rs.client.WebTarget;
import jakarta.ws.rs.core.Application;
import jakarta.ws.rs.core.Response;
import org.jboss.arquillian.container.test.api.Deployment;
import org.jboss.arquillian.junit5.ArquillianExtension;
import org.jboss.arquillian.test.api.ArquillianResource;
import org.jboss.shrinkwrap.api.ShrinkWrap;
import org.jboss.shrinkwrap.api.spec.WebArchive;
import org.junit.After;
import org.junit.Before;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;

import static io.opentelemetry.api.trace.SpanKind.INTERNAL;
import static io.opentelemetry.api.trace.SpanKind.SERVER;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.is;

/**
* Test Span Hierarchy with Tracer Mock
*/
@ExtendWith(ArquillianExtension.class)
@HelidonTest
@AddBean(InMemorySpanExporter.class)
@AddBean(InMemorySpanExporterProvider.class)
@AddConfig(key = "otel.service.name", value = "helidon-mp-telemetry")
@AddConfig(key = "otel.sdk.disabled", value = "false")
@AddConfig(key = "telemetry.span.full.url", value = "false")
@AddConfig(key = "otel.traces.exporter", value = "in-memory")
public class TestFullUrlName {

private Http1Client client;

@Deployment
public static WebArchive createDeployment() {

ConfigAsset config = new ConfigAsset()
.add("otel.service.name", "helidon-mp-telemetry")
.add("otel.sdk.disabled", "false")
.add("telemetry.span.full.url", "true")
.add("otel.traces.exporter", "in-memory");

return ShrinkWrap.create(WebArchive.class)
.addClasses(InMemorySpanExporter.class, InMemorySpanExporterProvider.class)
.addAsLibrary(TestLibraries.AWAITILITY_LIB)
.addAsServiceProvider(ConfigurableSpanExporterProvider.class, InMemorySpanExporterProvider.class)
.addAsResource(config, "META-INF/microprofile-config.properties");
}
@Inject
WebTarget webTarget;

@ArquillianResource
URL url;

@Inject
InMemorySpanExporter spanExporter;

@Before
@BeforeEach
void setup() {
if (spanExporter != null) {
spanExporter.reset();
}

if (client == null){
client = Http1Client
.builder()
.baseUri(URI.create(url.toString()))
.build();
}
}

@After
void cleanup() {
spanExporter.reset();
}

@Test
void spanNaming() {

assertThat(client.get("/named").request().status(), is(Status.OK_200));
assertThat(webTarget.request("/named").get(), is(Status.OK_200));

List<SpanData> spanItems = spanExporter.getFinishedSpanItems(1);
assertThat(spanItems.size(), is(1));
assertThat(spanItems.get(0).getName(), is("http://localhost:" + url.getPort() + "/named"));
assertThat(spanItems.get(0).getName(), is("http://localhost:" + webTarget.getUri().getPort() + "/named"));
}


Expand Down
29 changes: 0 additions & 29 deletions microprofile/telemetry/src/test/java/io/helidon/microprofile/telemetry/TestLibraries.java
View file

This file was deleted.

Loading

0 comments on commit 8d2cc72

Please sign in to comment.