Merge branch 'main' into system-properties-bridge

Author: zeitlinger

.github/config/.markdownlint-cli2.yaml

@@ -12,6 +12,12 @@ jobs:
     steps:
       - uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
 
+      - uses: jdx/mise-action@9dc7d5dd454262207dea3ab5a06a3df6afc8ff26 # v3.4.1
+
       - name: Run markdownlint
         run: |
-          npx [email protected] --config .github/config/.markdownlint-cli2.yaml "**/*.md"
+          if ! mise run lint:markdown; then
+            echo "markdownlint failed. To auto-fix many issues locally, run:"
+            echo "  mise run lint:markdown --fix"
+            exit 1
+          fi

.github/workflows/reusable-markdown-lint-check.yml

@@ -0,0 +1,13 @@
+# See https://github.com/DavidAnson/markdownlint/blob/main/doc/Rules.md
+# and https://github.com/DavidAnson/markdownlint-cli2
+
+ul-style: false
+line-length: false
+no-duplicate-heading:
+  siblings_only: true
+ol-prefix:
+  style: ordered
+no-inline-html: false
+fenced-code-language: false
+no-trailing-punctuation:
+  punctuation: ".,;:" # allowing exclamation points and question marks at end of sentences

.markdownlint.yaml

@@ -0,0 +1,11 @@
+#!/usr/bin/env bash
+#MISE description="Lint markdown files"
+#MISE flag "--fix" help="Automatically fix issues"
+
+set -e
+
+if [ "${usage_fix}" = "true" ]; then
+  markdownlint-cli2 --fix "**/*.md" "#**/build" "#CHANGELOG.md" "#licenses/licenses.md"
+else
+  markdownlint-cli2 "**/*.md" "#**/build" "#CHANGELOG.md" "#licenses/licenses.md"
+fi

.mise/tasks/lint/markdown.sh

@@ -92,8 +92,9 @@ public <T> List<T> getScalarList(String name, Class<T> scalarType, List<T> defau
   @Nullable
   @Override
   public DeclarativeConfigProperties getStructured(String name) {
-    return new ApplicationDeclarativeConfigProperties156Incubator(
-        instrumentationConfig.getStructured(name));
+    io.opentelemetry.api.incubator.config.DeclarativeConfigProperties config =
+        instrumentationConfig.getStructured(name);
+    return config == null ? null : new ApplicationDeclarativeConfigProperties156Incubator(config);
   }
 
   @Nullable

instrumentation/opentelemetry-api/opentelemetry-api-1.56/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_56/incubator/config/ApplicationDeclarativeConfigProperties156Incubator.java

@@ -6,6 +6,7 @@
 package io.opentelemetry.javaagent.instrumentation.servlet;
 
 import io.opentelemetry.context.Context;
+import io.opentelemetry.context.Scope;
 
 public class AsyncRunnableWrapper<REQUEST> implements Runnable {
   private final ServletHelper<REQUEST, ?> helper;
@@ -27,7 +28,7 @@ public static <REQUEST> Runnable wrap(ServletHelper<REQUEST, ?> helper, Runnable
 
   @Override
   public void run() {
-    try {
+    try (Scope ignored = context.makeCurrent()) {
       runnable.run();
     } catch (Throwable throwable) {
       helper.recordAsyncException(context, throwable);

instrumentation/servlet/servlet-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/AsyncRunnableWrapper.java

@@ -1,5 +1,6 @@
 [tools]
 lychee = "0.21.0"
+markdownlint-cli2 = "0.17.1"
 
 [settings]
 # Only install tools explicitly defined in the [tools] section above