Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ fat.project: true

#Any changes to these names must be copied to TestConstants
fat.test.container.images: \
jaegertracing/all-in-one:1.54, \
jaegertracing/all-in-one:1.76.0, \
openzipkin/zipkin-slim:2.23, \
otel/opentelemetry-collector:0.74.0

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,6 @@

import componenttest.containers.TestContainerSuite;
import componenttest.custom.junit.runner.AlwaysPassesTest;
import io.openliberty.microprofile.telemetry.internal.tests.Agent129Test;
import io.openliberty.microprofile.telemetry.internal.tests.Agent214Test;
import io.openliberty.microprofile.telemetry.internal.tests.Agent250Test;
import io.openliberty.microprofile.telemetry.internal.tests.AgentConfigMultiAppTest;
import io.openliberty.microprofile.telemetry.internal.tests.AgentConfigTest;
import io.openliberty.microprofile.telemetry.internal.tests.AgentTest;
import io.openliberty.microprofile.telemetry.internal.tests.CrossFeatureJaegerTest;
import io.openliberty.microprofile.telemetry.internal.tests.CrossFeatureZipkinTest;
import io.openliberty.microprofile.telemetry.internal.tests.JaegerLegacyTest;
Expand All @@ -41,12 +35,12 @@
@SuiteClasses({

AlwaysPassesTest.class, //Must keep this test to run something in the Java 6 builds.
AgentTest.class,
Agent129Test.class,
Agent214Test.class,
Agent250Test.class,
AgentConfigTest.class,
AgentConfigMultiAppTest.class,
// AgentTest.class,
// Agent129Test.class,
// Agent214Test.class,
// Agent250Test.class,
// AgentConfigTest.class,
// AgentConfigMultiAppTest.class,
CrossFeatureJaegerTest.class,
CrossFeatureZipkinTest.class,
JaegerSecureOtelCollectorTest.class,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,8 @@ public static void setUp() throws Exception {
telemetryServer.addEnvVar(TestConstants.ENV_OTEL_EXPORTER_OTLP_ENDPOINT, jaegerContainer.getOtlpGrpcUrl());
telemetryServer.addEnvVar(TestConstants.ENV_OTEL_BSP_SCHEDULE_DELAY, "100"); // Wait no more than 100ms to send traces to the server
telemetryServer.addEnvVar(TestConstants.ENV_OTEL_SDK_DISABLED, "false"); //Enable tracing
telemetryServer.addEnvVar(TestConstants.ENV_OTEL_LOGS_EXPORTER, "none"); //Disable logging
telemetryServer.addEnvVar(TestConstants.ENV_OTEL_LOGS_EXPORTER, "none"); //Disable logging exporting
telemetryServer.addEnvVar(TestConstants.ENV_OTEL_LOGS_EXPORTER, "none"); //Disable metrics exporting
telemetryServer.addEnvVar("OTEL_PROPAGATORS", "tracecontext, baggage, jaeger"); // Include the jaeger propagation headers
telemetryServer.addEnvVar("IO_OPENLIBERTY_MICROPROFILE_TELEMETRY_INTERNAL_APPS_CROSSFEATURE_TELEMETRY_CROSSFEATURECLIENT_MP_REST_URL", getUrl(opentracingServer));

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,8 @@ public static void setUp() throws Exception {
telemetryServer.addEnvVar(TestConstants.ENV_OTEL_EXPORTER_ZIPKIN_ENDPOINT, zipkinContainer.getApiBaseUrl() + "/spans");
telemetryServer.addEnvVar(TestConstants.ENV_OTEL_BSP_SCHEDULE_DELAY, "100"); // Wait no more than 100ms to send traces to the server
telemetryServer.addEnvVar(TestConstants.ENV_OTEL_SDK_DISABLED, "false"); //Enable tracing
telemetryServer.addEnvVar(TestConstants.ENV_OTEL_LOGS_EXPORTER, "none"); //Disable logging
telemetryServer.addEnvVar(TestConstants.ENV_OTEL_LOGS_EXPORTER, "none"); //Disable logging exporting
telemetryServer.addEnvVar(TestConstants.ENV_OTEL_LOGS_EXPORTER, "none"); //Disable metrics exporting
telemetryServer.addEnvVar("OTEL_PROPAGATORS", "tracecontext, b3"); // Include the b3 propagation header for Zipkin
telemetryServer.addEnvVar("IO_OPENLIBERTY_MICROPROFILE_TELEMETRY_INTERNAL_APPS_CROSSFEATURE_TELEMETRY_CROSSFEATURECLIENT_MP_REST_URL", getUrl(opentracingServer));

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,7 @@ public static void setUp() throws Exception {
server.addEnvVar(TestConstants.ENV_OTEL_BSP_SCHEDULE_DELAY, "100"); // Wait no more than 100ms to send traces to the server
server.addEnvVar(TestConstants.ENV_OTEL_SDK_DISABLED, "false"); //Enable tracing
server.addEnvVar(TestConstants.ENV_OTEL_LOGS_EXPORTER, "none"); //Disable logging
server.addEnvVar(TestConstants.ENV_OTEL_METRICS_EXPORTER, "none"); //Disable metrics exporting

// Construct the test application
WebArchive jaegerTest = ShrinkWrap.create(WebArchive.class, "spanTest.war")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,8 @@ public static void setUp() throws Exception {
server.addEnvVar(TestConstants.ENV_OTEL_SERVICE_NAME, "Test service");
server.addEnvVar(TestConstants.ENV_OTEL_BSP_SCHEDULE_DELAY, "100"); // Wait no more than 100ms to send traces to the server
server.addEnvVar(TestConstants.ENV_OTEL_SDK_DISABLED, "false"); //Enable tracing
server.addEnvVar(TestConstants.ENV_OTEL_LOGS_EXPORTER, "none"); //Disable logging
server.addEnvVar(TestConstants.ENV_OTEL_LOGS_EXPORTER, "none"); //Disable logging exporting
server.addEnvVar(TestConstants.ENV_OTEL_METRICS_EXPORTER, "none"); //Disable metrics exporting

// Construct the test application
WebArchive jaegerTest = ShrinkWrap.create(WebArchive.class, "spanTest.war")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,8 @@ public static void setUp() throws Exception {
server.addEnvVar(TestConstants.ENV_OTEL_SERVICE_NAME, "Test service");
server.addEnvVar(TestConstants.ENV_OTEL_BSP_SCHEDULE_DELAY, "100"); // Wait no more than 100ms to send traces to the server
server.addEnvVar(TestConstants.ENV_OTEL_SDK_DISABLED, "false"); //Enable tracing
server.addEnvVar(TestConstants.ENV_OTEL_LOGS_EXPORTER, "none"); //Disable logging
server.addEnvVar(TestConstants.ENV_OTEL_LOGS_EXPORTER, "none"); //Disable logging exporting
server.addEnvVar(TestConstants.ENV_OTEL_METRICS_EXPORTER, "none"); //Disable metrics exporting
server.addEnvVar(TestConstants.ENV_OTEL_EXPORTER_OTLP_CERTIFICATE, otelCollectorKeyPairs.certificateFilePath());

// Construct the test application
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,8 @@ public static void setUp() throws Exception {
server.addEnvVar(TestConstants.ENV_OTEL_SERVICE_NAME, "Test service");
server.addEnvVar(TestConstants.ENV_OTEL_BSP_SCHEDULE_DELAY, "100"); // Wait no more than 100ms to send traces to the server
server.addEnvVar(TestConstants.ENV_OTEL_SDK_DISABLED, "false"); //Enable tracing
server.addEnvVar(TestConstants.ENV_OTEL_LOGS_EXPORTER, "none"); //Disable logging
server.addEnvVar(TestConstants.ENV_OTEL_LOGS_EXPORTER, "none"); //Disable logging exporting
server.addEnvVar(TestConstants.ENV_OTEL_METRICS_EXPORTER, "none"); //Disable metrics exporting
server.addEnvVar(TestConstants.ENV_OTEL_EXPORTER_OTLP_CERTIFICATE, otelCollectorKeyPairs.certificateFilePath());
// Construct the test application
WebArchive jaegerTest = ShrinkWrap.create(WebArchive.class, "spanTest.war")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,8 @@
import org.junit.runner.RunWith;
import org.testcontainers.containers.Network;

import com.ibm.websphere.simplicity.ShrinkHelper;

import com.ibm.websphere.simplicity.OperatingSystem;
import com.ibm.websphere.simplicity.ShrinkHelper;

import componenttest.annotation.Server;
import componenttest.containers.SimpleLogConsumer;
Expand All @@ -53,10 +52,10 @@ public class JvmMetricsOtelCollectorTest {

public static Network network = Network.newNetwork();
public static OtelCollectorContainer otelCollectorContainer = new OtelCollectorContainer(new File("lib/LibertyFATTestFiles/otel-collector-config-metrics.yaml"), 3131)
.withNetwork(network)
.withNetworkAliases("otel-collector-metrics")
.withLogConsumer(new SimpleLogConsumer(JvmMetricsOtelCollectorTest.class,
"otelCol"));
.withNetwork(network)
.withNetworkAliases("otel-collector-metrics")
.withLogConsumer(new SimpleLogConsumer(JvmMetricsOtelCollectorTest.class,
"otelCol"));
public static RepeatTests repeat = TelemetryActions.telemetry20Repeats(SERVER_NAME);

@ClassRule
Expand Down Expand Up @@ -101,7 +100,7 @@ public void testBasicTelemetry2() throws Exception {

//JVM Metrics are not found on AIX. Upstream issue: https://bugs.openjdk.org/browse/JDK-8030957
OperatingSystem os = server.getMachine().getOperatingSystem();
if(os == OperatingSystem.AIX){
if (os == OperatingSystem.AIX) {
return;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,9 @@ public static void setUp() throws Exception {
server.addEnvVar(TestConstants.ENV_OTEL_BSP_SCHEDULE_DELAY, "100"); // Wait no more than 100ms to send traces to the server
// server.addEnvVar(TestConstants.ENV_OTEL_SDK_DISABLED, "false"); // Do not enable tracing

server.addEnvVar(TestConstants.ENV_OTEL_LOGS_EXPORTER, "none"); //Disable logging exporting
server.addEnvVar(TestConstants.ENV_OTEL_METRICS_EXPORTER, "none"); //Disable metrics exporting

// Construct the test application
WebArchive jaegerTest = ShrinkWrap.create(WebArchive.class, "spanTest.war")
.addPackage(TestResource.class.getPackage());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,8 @@ public static void setUp() throws Exception {

// Configure exporter → collector (gRPC)
server.addEnvVar(TestConstants.ENV_OTEL_TRACES_EXPORTER, "otlp");
server.addEnvVar(TestConstants.ENV_OTEL_LOGS_EXPORTER, "none");
server.addEnvVar(TestConstants.ENV_OTEL_LOGS_EXPORTER, "none"); //Disable logging exporting
server.addEnvVar(TestConstants.ENV_OTEL_METRICS_EXPORTER, "none"); //Disable metrics exporting
server.addEnvVar(TestConstants.ENV_OTEL_EXPORTER_OTLP_ENDPOINT, otelCollectorContainer.getOtlpGrpcUrl());
server.addEnvVar(TestConstants.ENV_OTEL_EXPORTER_OTLP_PROTOCOL, "grpc");
// Some older agents only honor the per-signal endpoint:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ private TestConstants() {}

//Docker image names. These must be kept in sync with bnd.bnd
public static final DockerImageName DOCKER_IMAGE_OPENTELEMETRY_COLLECTOR = DockerImageName.parse("otel/opentelemetry-collector:0.74.0");
public static final DockerImageName DOCKER_IMAGE_ALL_IN_ONE = DockerImageName.parse("jaegertracing/all-in-one:1.54");
public static final DockerImageName DOCKER_IMAGE_ALL_IN_ONE = DockerImageName.parse("jaegertracing/all-in-one:1.76.0");
public static final DockerImageName DOCKER_IMAGE_ZIPKIN_SLIM = DockerImageName.parse("openzipkin/zipkin-slim:2.23");

}