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

MicroProfile Telemetry 2.0 #339

Merged
merged 1 commit into from
Aug 22, 2024
Merged

MicroProfile Telemetry 2.0 #339

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
3 changes: 2 additions & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<version.opentelemetry>1.39.0</version.opentelemetry>
<version.opentelemetry.instrumentation>2.5.0</version.opentelemetry.instrumentation>
<version.opentelemetry.semconv>1.25.0-alpha</version.opentelemetry.semconv>
<version.microprofile.opentelemetry>1.1</version.microprofile.opentelemetry>
<version.microprofile.opentelemetry>2.0</version.microprofile.opentelemetry>
<version.microprofile.config>3.1</version.microprofile.config>
<version.resteasy>6.2.9.Final</version.resteasy>
<version.vertx.grpc>4.5.8</version.vertx.grpc>
Expand All @@ -27,6 +27,7 @@
<!-- Test -->
<version.smallrye.testing>2.3.0</version.smallrye.testing>
<version.smallrye.config>3.8.3</version.smallrye.config>
<version.resteasy.client>2.1.5.Final</version.resteasy.client>
</properties>

<licenses>
Expand Down
6 changes: 0 additions & 6 deletions testsuite/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,6 @@

<name>SmallRye OpenTelemetry: Test Suite</name>

<properties>
<version.resteasy.client>2.1.5.Final</version.resteasy.client>
</properties>

<dependencyManagement>
<dependencies>
<dependency>
Expand All @@ -38,9 +34,7 @@

<modules>
<module>extra</module>
<!--
<module>tck</module>
-->
</modules>

<build>
Expand Down
111 changes: 107 additions & 4 deletions testsuite/tck/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,28 @@
</dependency>

<dependency>
<groupId>org.eclipse.microprofile.telemetry.tracing</groupId>
<groupId>org.eclipse.microprofile.telemetry</groupId>
<artifactId>microprofile-telemetry-tracing-tck</artifactId>
<version>${version.microprofile.opentelemetry}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.eclipse.microprofile.telemetry</groupId>
<artifactId>microprofile-telemetry-metrics-tck</artifactId>
<version>${version.microprofile.opentelemetry}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.eclipse.microprofile.telemetry</groupId>
<artifactId>microprofile-telemetry-logs-tck</artifactId>
<version>${version.microprofile.opentelemetry}</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>io.opentelemetry</groupId>
<artifactId>opentelemetry-exporter-logging</artifactId>
</dependency>

<dependency>
<groupId>io.smallrye.opentelemetry</groupId>
Expand Down Expand Up @@ -54,6 +71,19 @@
<groupId>io.smallrye.testing</groupId>
<artifactId>smallrye-testing-tck-jetty</artifactId>
</dependency>
<!-- TODO - Move this to TCK-Jetty -->
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-jdk14</artifactId>
<version>2.0.13</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>2.0.13</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>io.smallrye.config</groupId>
<artifactId>smallrye-config</artifactId>
Expand All @@ -70,11 +100,84 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<dependenciesToScan>
<dependency>org.eclipse.microprofile.telemetry.tracing:microprofile-telemetry-tracing-tck</dependency>
</dependenciesToScan>
<skip>true</skip>
<systemPropertyVariables>
<java.util.logging.config.file>${project.basedir}/src/test/resources/logging.properties</java.util.logging.config.file>
</systemPropertyVariables>
<excludesFile>src/test/resources/exclusions.txt</excludesFile>
</configuration>
<executions>
<execution>
<id>tracing</id>
<goals>
<goal>test</goal>
</goals>
<configuration>
<skip>false</skip>
<reportsDirectory>${project.build.directory}/surefire-reports-tracing</reportsDirectory>
<dependenciesToScan>
<dependency>org.eclipse.microprofile.telemetry:microprofile-telemetry-tracing-tck</dependency>
</dependenciesToScan>
</configuration>
</execution>
<execution>
<id>metrics</id>
<goals>
<goal>test</goal>
</goals>
<configuration>
<skip>false</skip>
<reportsDirectory>${project.build.directory}/surefire-reports-metrics</reportsDirectory>
<dependenciesToScan>
<dependency>org.eclipse.microprofile.telemetry:microprofile-telemetry-metrics-tck</dependency>
</dependenciesToScan>
<includes>
<include>**/application/**/*Test.java</include>
</includes>
</configuration>
</execution>
<execution>
<id>metrics-jvm</id>
<goals>
<goal>test</goal>
</goals>
<configuration>
<skip>false</skip>
<reportsDirectory>${project.build.directory}/surefire-reports-metrics-jvm</reportsDirectory>
<systemPropertyVariables>
<otel.sdk.disabled>false</otel.sdk.disabled>
<otel.metrics.exporter>logging</otel.metrics.exporter>
<otel.traces.exporter>none</otel.traces.exporter>
<otel.logs.exporter>none</otel.logs.exporter>
<otel.metric.export.interval>1000</otel.metric.export.interval>
<mptelemetry.tck.log.file.path>${project.build.directory}/tck.log</mptelemetry.tck.log.file.path>
</systemPropertyVariables>
<dependenciesToScan>
<dependency>org.eclipse.microprofile.telemetry:microprofile-telemetry-metrics-tck</dependency>
</dependenciesToScan>
<includes>
<include>**/jvm/*Test.java</include>
</includes>
</configuration>
</execution>
<execution>
<id>logs</id>
<goals>
<goal>test</goal>
</goals>
<configuration>
<skip>false</skip>
<reportsDirectory>${project.build.directory}/surefire-reports-logs</reportsDirectory>
<systemPropertyVariables>
<otel.sdk.disabled>false</otel.sdk.disabled>
<mptelemetry.tck.log.file.path>${project.build.directory}/out.log</mptelemetry.tck.log.file.path>
</systemPropertyVariables>
<dependenciesToScan>
<dependency>org.eclipse.microprofile.telemetry:microprofile-telemetry-logs-tck</dependency>
</dependenciesToScan>
</configuration>
</execution>
</executions>
<dependencies>
<dependency>
<groupId>org.apache.maven.surefire</groupId>
Expand Down
10 changes: 0 additions & 10 deletions testsuite/tck/src/test/java/io/smallrye/opentelemetry/tck/ArquillianExtension.java
View file
Open in desktop

This file was deleted.

13 changes: 0 additions & 13 deletions testsuite/tck/src/test/java/io/smallrye/opentelemetry/tck/ArquillianLifecycle.java
View file
Open in desktop

This file was deleted.

40 changes: 40 additions & 0 deletions testsuite/tck/src/test/java/io/smallrye/opentelemetry/tck/RedirectOutHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
package io.smallrye.opentelemetry.tck;

import java.io.PrintStream;
import java.util.logging.Handler;
import java.util.logging.LogManager;
import java.util.logging.LogRecord;

import io.smallrye.common.constraint.Assert;

public class RedirectOutHandler extends Handler {
private final PrintStream oldOut;
private final PrintStream newOut;

public RedirectOutHandler() throws Exception {
LogManager manager = LogManager.getLogManager();

String className = this.getClass().getName();
String pattern = Assert.checkNotNullParam(className + ".pattern", manager.getProperty(className + ".pattern"));

this.oldOut = System.out;
this.newOut = new PrintStream(pattern);
System.setOut(newOut);
}

@Override
public void publish(final LogRecord record) {

}

@Override
public void flush() {

}

@Override
public void close() throws SecurityException {
newOut.close();
System.setOut(oldOut);
}
}
6 changes: 3 additions & 3 deletions testsuite/tck/src/test/java/io/smallrye/opentelemetry/tck/TestConfigSource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
public class TestConfigSource extends MapBackedConfigSource {
public TestConfigSource() {
super("TestConfigSource",
Map.of("otel.sdk.disabled", "true",
"otel.traces.exporter", "none",
"otel.metrics.exporter", "none"),
Map.of("otel.traces.exporter", "none",
"otel.metrics.exporter", "none",
"otel.logs.exporter", "none"),
brunobat marked this conversation as resolved.
Show resolved Hide resolved
Integer.MIN_VALUE);
}
}
2 changes: 1 addition & 1 deletion testsuite/tck/src/test/resources/exclusions.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Optional tests
# Tracing - Optional tests
org.eclipse.microprofile.telemetry.tracing.tck.rest.JaegerPropagationTest
org.eclipse.microprofile.telemetry.tracing.tck.rest.B3MultiPropagationTest
org.eclipse.microprofile.telemetry.tracing.tck.rest.B3PropagationTest
Expand Down
10 changes: 10 additions & 0 deletions testsuite/tck/src/test/resources/logging.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
handlers=java.util.logging.FileHandler,java.util.logging.ConsoleHandler,io.smallrye.opentelemetry.tck.RedirectOutHandler
.level=INFO

java.util.logging.ConsoleHandler.level=FINE
java.util.logging.ConsoleHandler.formatter=java.util.logging.SimpleFormatter

java.util.logging.FileHandler.pattern=target/tck.log
java.util.logging.FileHandler.formatter=java.util.logging.SimpleFormatter

io.smallrye.opentelemetry.tck.RedirectOutHandler.pattern=target/out.log