Skip to content

Commit 363633f

Browse files
committed
revert
1 parent be53a15 commit 363633f

2 files changed

Lines changed: 2 additions & 4 deletions

File tree

  • instrumentation
    • java-util-logging/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jul
    • jaxrs-client/jaxrs-client-1.1-testing/src/test/java/io/opentelemetry/javaagent/instrumentation/jaxrsclient

instrumentation/java-util-logging/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jul/JavaUtilLoggingHelper.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,9 +65,6 @@ public static void capture(application.java.util.logging.Logger logger, LogRecor
6565
* <li>Fully qualified method name - {@link LogRecord#getSourceMethodName()}
6666
* <li>Original log record thread id - {@link LogRecord#getThreadID()}
6767
* </ul>
68-
*
69-
* <p>When experimental log attributes are enabled, the current thread's {@code thread.name} and
70-
* {@code thread.id} are captured separately.
7168
*/
7269
private static void mapLogRecord(LogRecordBuilder builder, LogRecord logRecord) {
7370
// message

instrumentation/jaxrs-client/jaxrs-client-1.1-testing/src/test/java/io/opentelemetry/javaagent/instrumentation/jaxrsclient/JaxRsClientV1Test.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,8 @@ private static Client buildClient(boolean readTimeout) {
4444
client.addFilter(new LoggingFilter());
4545
client.addFilter(new GZIPContentEncodingFilter());
4646

47-
cleanup.deferCleanup(client::destroy);
47+
// shared across tests via @TestInstance(PER_CLASS), destroy after the class finishes
48+
cleanup.deferAfterAll(client::destroy);
4849
return client;
4950
}
5051

0 commit comments

Comments
 (0)