Merge branch 'main' into lychee

Author: trask

.github/workflows/codeql.yml

@@ -57,7 +57,7 @@ jobs:
           cache-read-only: ${{ github.event_name == 'pull_request' }}
 
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@ce28f5bb42b7a9f2c824e633a3f6ee835bab6858 # v3.29.0
+        uses: github/codeql-action/init@39edc492dbe16b1465b0cafca41432d857bdb31a # v3.29.1
         with:
           languages: ${{ matrix.language }}
           # using "latest" helps to keep up with the latest Kotlin support
@@ -73,6 +73,6 @@ jobs:
         run: ./gradlew assemble -x javadoc -x :instrumentation:quarkus-resteasy-reactive:quarkus3-testing:quarkusGenerateCodeDev -x :instrumentation:quarkus-resteasy-reactive:quarkus2-testing:quarkusGenerateCodeDev --no-build-cache --no-daemon
 
       - name: Perform CodeQL analysis
-        uses: github/codeql-action/analyze@ce28f5bb42b7a9f2c824e633a3f6ee835bab6858 # v3.29.0
+        uses: github/codeql-action/analyze@39edc492dbe16b1465b0cafca41432d857bdb31a # v3.29.1
         with:
           category: "/language:${{matrix.language}}"

.github/workflows/ossf-scorecard.yml

@@ -42,6 +42,6 @@ jobs:
       # Upload the results to GitHub's code scanning dashboard (optional).
       # Commenting out will disable upload of results to your repo's Code Scanning dashboard
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@ce28f5bb42b7a9f2c824e633a3f6ee835bab6858 # v3.29.0
+        uses: github/codeql-action/upload-sarif@39edc492dbe16b1465b0cafca41432d857bdb31a # v3.29.1
         with:
           sarif_file: results.sarif

.github/workflows/reusable-misspell-check.yml

@@ -14,9 +14,7 @@ jobs:
 
       - name: Install misspell
         run: |
-          curl -L -o install-misspell.sh \
-               https://raw.githubusercontent.com/client9/misspell/master/install-misspell.sh
-          sh ./install-misspell.sh
+          curl -sfL https://raw.githubusercontent.com/golangci/misspell/master/install-misspell.sh | sh -s -- -b bin
 
       - name: Run misspell
         run: |

conventions/src/main/kotlin/otel.java-conventions.gradle.kts

@@ -431,7 +431,7 @@ codenarc {
 checkstyle {
   configFile = rootProject.file("buildscripts/checkstyle.xml")
   // this version should match the version of google_checks.xml used as basis for above configuration
-  toolVersion = "10.26.0"
+  toolVersion = "10.26.1"
   maxWarnings = 0
 }
 

instrumentation/restlet/restlet-1.1/javaagent/build.gradle.kts

@@ -8,9 +8,20 @@ muzzle {
     module.set("org.restlet")
     versions.set("[1.1.0, 1.2-M1)")
     extraDependency("com.noelios.restlet:com.noelios.restlet")
-    // missing dependencies
-    skip("2.5.0", "2.5.1", "2.5.2")
-    assertInverse.set(true)
+  }
+
+  // assertInverse was removed because extraDependency is not available in later versions (e.g., 2.5.x),
+  // which causes exception during muzzle. #14159
+  fail {
+    group.set("org.restlet")
+    module.set("org.restlet")
+    versions.set("[,1.1.0)")
+  }
+
+  fail {
+    group.set("org.restlet")
+    module.set("org.restlet")
+    versions.set("[1.2-M1,)")
   }
 }
 

instrumentation/runtime-telemetry/runtime-telemetry-java17/library/src/main/java/io/opentelemetry/instrumentation/runtimemetrics/java17/HandlerRegistry.java

@@ -10,7 +10,6 @@
 import io.opentelemetry.api.metrics.MeterBuilder;
 import io.opentelemetry.instrumentation.api.internal.EmbeddedInstrumentationProperties;
 import io.opentelemetry.instrumentation.runtimemetrics.java17.internal.RecordedEventHandler;
-import io.opentelemetry.instrumentation.runtimemetrics.java17.internal.ThreadGrouper;
 import io.opentelemetry.instrumentation.runtimemetrics.java17.internal.buffer.DirectBufferStatisticsHandler;
 import io.opentelemetry.instrumentation.runtimemetrics.java17.internal.classes.ClassesLoadedHandler;
 import io.opentelemetry.instrumentation.runtimemetrics.java17.internal.container.ContainerConfigurationHandler;
@@ -84,17 +83,16 @@ static List<RecordedEventHandler> getHandlers(
       }
     }
 
-    ThreadGrouper grouper = new ThreadGrouper();
     List<RecordedEventHandler> basicHandlers =
         List.of(
-            new ObjectAllocationInNewTlabHandler(meter, grouper),
-            new ObjectAllocationOutsideTlabHandler(meter, grouper),
-            new NetworkReadHandler(meter, grouper),
-            new NetworkWriteHandler(meter, grouper),
+            new ObjectAllocationInNewTlabHandler(meter),
+            new ObjectAllocationOutsideTlabHandler(meter),
+            new NetworkReadHandler(meter),
+            new NetworkWriteHandler(meter),
             new ContextSwitchRateHandler(meter),
             new OverallCpuLoadHandler(meter),
             new ContainerConfigurationHandler(meter),
-            new LongLockHandler(meter, grouper),
+            new LongLockHandler(meter),
             new ThreadCountHandler(meter),
             new ClassesLoadedHandler(meter),
             new MetaspaceSummaryHandler(meter),

instrumentation/runtime-telemetry/runtime-telemetry-java17/library/src/main/java/io/opentelemetry/instrumentation/runtimemetrics/java17/internal/AbstractThreadDispatchingHandler.java

@@ -9,34 +9,34 @@
 import io.opentelemetry.api.metrics.DoubleHistogram;
 import io.opentelemetry.api.metrics.Meter;
 import io.opentelemetry.instrumentation.runtimemetrics.java17.JfrFeature;
-import io.opentelemetry.instrumentation.runtimemetrics.java17.internal.AbstractThreadDispatchingHandler;
 import io.opentelemetry.instrumentation.runtimemetrics.java17.internal.Constants;
 import io.opentelemetry.instrumentation.runtimemetrics.java17.internal.DurationUtil;
-import io.opentelemetry.instrumentation.runtimemetrics.java17.internal.ThreadGrouper;
+import io.opentelemetry.instrumentation.runtimemetrics.java17.internal.RecordedEventHandler;
 import java.time.Duration;
 import java.util.Optional;
-import java.util.function.Consumer;
 import jdk.jfr.consumer.RecordedEvent;
 
 /**
  * This class is internal and is hence not for public use. Its APIs are unstable and can change at
  * any time.
  */
-public final class LongLockHandler extends AbstractThreadDispatchingHandler {
+public final class LongLockHandler implements RecordedEventHandler {
   private static final String METRIC_NAME = "jvm.cpu.longlock";
   private static final String METRIC_DESCRIPTION = "Long lock times";
   private static final String EVENT_NAME = "jdk.JavaMonitorWait";
 
   private final DoubleHistogram histogram;
+  private final Attributes attributes;
 
-  public LongLockHandler(Meter meter, ThreadGrouper grouper) {
-    super(grouper);
+  public LongLockHandler(Meter meter) {
     histogram =
         meter
             .histogramBuilder(METRIC_NAME)
             .setDescription(METRIC_DESCRIPTION)
             .setUnit(Constants.SECONDS)
             .build();
+
+    attributes = Attributes.empty();
   }
 
   @Override
@@ -50,34 +50,17 @@ public JfrFeature getFeature() {
   }
 
   @Override
-  public Consumer<RecordedEvent> createPerThreadSummarizer(String threadName) {
-    return new PerThreadLongLockHandler(histogram, threadName);
+  public void accept(RecordedEvent recordedEvent) {
+    histogram.record(DurationUtil.toSeconds(recordedEvent.getDuration()), attributes);
+    // What about the class name in MONITOR_CLASS ?
+    // We can get a stack trace from the thread on the event
+    // if (recordedEvent.hasField("eventThread")) {
+    //  var eventThread = recordedEvent.getThread("eventThread");
+    // }
   }
 
   @Override
   public Optional<Duration> getThreshold() {
     return Optional.empty();
   }
-
-  private static class PerThreadLongLockHandler implements Consumer<RecordedEvent> {
-    private static final String EVENT_THREAD = "eventThread";
-
-    private final DoubleHistogram histogram;
-    private final Attributes attributes;
-
-    public PerThreadLongLockHandler(DoubleHistogram histogram, String threadName) {
-      this.histogram = histogram;
-      this.attributes = Attributes.of(Constants.ATTR_THREAD_NAME, threadName);
-    }
-
-    @Override
-    public void accept(RecordedEvent recordedEvent) {
-      if (recordedEvent.hasField(EVENT_THREAD)) {
-        histogram.record(DurationUtil.toSeconds(recordedEvent.getDuration()), attributes);
-      }
-      // What about the class name in MONITOR_CLASS ?
-      // We can get a stack trace from the thread on the event
-      // var eventThread = recordedEvent.getThread(EVENT_THREAD);
-    }
-  }
 }

instrumentation/runtime-telemetry/runtime-telemetry-java17/library/src/main/java/io/opentelemetry/instrumentation/runtimemetrics/java17/internal/ThreadGrouper.java

@@ -9,10 +9,8 @@
 import io.opentelemetry.api.metrics.LongHistogram;
 import io.opentelemetry.api.metrics.Meter;
 import io.opentelemetry.instrumentation.runtimemetrics.java17.JfrFeature;
-import io.opentelemetry.instrumentation.runtimemetrics.java17.internal.AbstractThreadDispatchingHandler;
 import io.opentelemetry.instrumentation.runtimemetrics.java17.internal.Constants;
-import io.opentelemetry.instrumentation.runtimemetrics.java17.internal.ThreadGrouper;
-import java.util.function.Consumer;
+import io.opentelemetry.instrumentation.runtimemetrics.java17.internal.RecordedEventHandler;
 import jdk.jfr.consumer.RecordedEvent;
 
 /**
@@ -22,20 +20,22 @@
  * <p>This class is internal and is hence not for public use. Its APIs are unstable and can change
  * at any time.
  */
-public final class ObjectAllocationInNewTlabHandler extends AbstractThreadDispatchingHandler {
+public final class ObjectAllocationInNewTlabHandler implements RecordedEventHandler {
   private static final String EVENT_NAME = "jdk.ObjectAllocationInNewTLAB";
+  private static final String TLAB_SIZE = "tlabSize";
 
   private final LongHistogram histogram;
+  private final Attributes attributes;
 
-  public ObjectAllocationInNewTlabHandler(Meter meter, ThreadGrouper grouper) {
-    super(grouper);
+  public ObjectAllocationInNewTlabHandler(Meter meter) {
     histogram =
         meter
             .histogramBuilder(Constants.METRIC_NAME_MEMORY_ALLOCATION)
             .setDescription(Constants.METRIC_DESCRIPTION_MEMORY_ALLOCATION)
             .setUnit(Constants.BYTES)
             .ofLongs()
             .build();
+    attributes = Attributes.of(Constants.ATTR_ARENA_NAME, "TLAB");
   }
 
   @Override
@@ -49,29 +49,9 @@ public JfrFeature getFeature() {
   }
 
   @Override
-  public Consumer<RecordedEvent> createPerThreadSummarizer(String threadName) {
-    return new PerThreadObjectAllocationInNewTlabHandler(histogram, threadName);
-  }
-
-  /** This class aggregates all TLAB allocation JFR events for a single thread */
-  private static class PerThreadObjectAllocationInNewTlabHandler
-      implements Consumer<RecordedEvent> {
-    private static final String TLAB_SIZE = "tlabSize";
-
-    private final LongHistogram histogram;
-    private final Attributes attributes;
-
-    public PerThreadObjectAllocationInNewTlabHandler(LongHistogram histogram, String threadName) {
-      this.histogram = histogram;
-      this.attributes =
-          Attributes.of(Constants.ATTR_THREAD_NAME, threadName, Constants.ATTR_ARENA_NAME, "TLAB");
-    }
-
-    @Override
-    public void accept(RecordedEvent ev) {
-      histogram.record(ev.getLong(TLAB_SIZE), attributes);
-      // Probably too high a cardinality
-      // ev.getClass("objectClass").getName();
-    }
+  public void accept(RecordedEvent ev) {
+    histogram.record(ev.getLong(TLAB_SIZE), attributes);
+    // Probably too high a cardinality
+    // ev.getClass("objectClass").getName();
   }
 }