revert

Author: trask

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

@@ -63,11 +63,8 @@ public static void capture(application.java.util.logging.Logger logger, LogRecor
    * <ul>
    *   <li>Fully qualified class name - {@link LogRecord#getSourceClassName()}
    *   <li>Fully qualified method name - {@link LogRecord#getSourceMethodName()}
-   *   <li>Original log record thread id - {@link LogRecord#getThreadID()}
+   *   <li>Thread id - {@link LogRecord#getThreadID()}
    * </ul>
-   *
-   * <p>When experimental log attributes are enabled, the current thread's {@code thread.name} and
-   * {@code thread.id} are captured separately.
    */
   private static void mapLogRecord(LogRecordBuilder builder, LogRecord logRecord) {
     // message

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

@@ -44,7 +44,8 @@ private static Client buildClient(boolean readTimeout) {
     client.addFilter(new LoggingFilter());
     client.addFilter(new GZIPContentEncodingFilter());
 
-    cleanup.deferCleanup(client::destroy);
+    // shared across tests via @TestInstance(PER_CLASS), destroy after the class finishes
+    cleanup.deferAfterAll(client::destroy);
     return client;
   }