Merge branch 'main' into remove-deprecated-prop

Author: laurit

.github/agents/knowledge/config-property-stability.md

@@ -67,10 +67,10 @@ must be communicated through:
    (`otel.instrumentation.…`) since that is what most users configure today:
 
    ```java
-   boolean captureEventName = config.getBoolean("capture_event_name/development", false);
-   if (captureEventName) {
+   boolean oldSetting = config.getBoolean("old_setting/development", false);
+   if (oldSetting) {
      logger.warning(
-         "The otel.instrumentation.logback-appender.experimental.capture-event-name setting is"
+         "The otel.instrumentation.<module>.experimental.old-setting setting is"
              + " deprecated and will be removed in a future version.");
    }
    ```

.github/scripts/code-review/build-review-matrix.py

@@ -39,6 +39,10 @@ def parse_modules() -> list[tuple[str, str]]:
     pairs = []
     for entry in sorted(raw):
         parts = entry.split(":")
+        # Skip shared/helper modules (e.g. "cdi-testing") that don't follow the
+        # <library>:<variant> layout used for real instrumentation modules.
+        if len(parts) < 2:
+            continue
         module_dir = "instrumentation/" + "/".join(parts)
         # Gradle module name: second-to-last:last
         gradle_name = f"{parts[-2]}:{parts[-1]}"

.github/workflows/build-pull-request.yml

@@ -10,7 +10,11 @@ on:
   workflow_call:
 
 concurrency:
-  group: ${{ github.workflow }}-${{ github.event.pull_request.number }}
+  # fixed group name (not github.workflow) so that runs triggered by pull_request
+  # and runs triggered via workflow_call from rebuild-pull-request-on-label.yml
+  # share the group, otherwise the PR build would run twice in parallel whenever
+  # a "test *" label is added
+  group: build-pull-request-${{ github.event.pull_request.number }}
   cancel-in-progress: true
 
 permissions:

CHANGELOG.md

@@ -22,6 +22,11 @@
 - Removed previously deprecated experimental config property
   `otel.instrumentation.servlet.experimental.add-trace-id-request-attribute`; use
   `otel.instrumentation.servlet.experimental.trace-id-request-attribute.enabled` instead.
+- Removed the previously deprecated `captureEventName` library builder setting from the
+  logback-appender-1.0 and log4j-appender-2.17 `OpenTelemetryAppender`, and the corresponding
+  `otel.instrumentation.{logback-appender,log4j-appender,jboss-logmanager}.experimental.capture-event-name`
+  javaagent properties. Use the `otel.event.name` key in MDC / context data / key-value pairs /
+  Logstash markers / structured arguments instead.
 
 ## Version 2.27.0 (2026-04-21)
 

instrumentation/gwt-2.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/gwt/v2_0/GwtTest.java

@@ -80,7 +80,7 @@ static void setup() throws Exception {
     Testcontainers.exposeHostPorts(port);
 
     browser =
-        new BrowserWebDriverContainer("selenium/standalone-chrome")
+        new BrowserWebDriverContainer("selenium/standalone-chrome:4.43.0")
             .withLogConsumer(new Slf4jLogConsumer(logger));
     cleanup.deferAfterAll(browser::stop);
     browser.start();

instrumentation/jboss-logmanager/README.md

@@ -4,6 +4,5 @@
 |-----------------------------------------------------------------------------|---------|---------|----------------------------------------------------------------------------------------------------------------------------------------------------|
 | `otel.instrumentation.jboss-logmanager.experimental-log-attributes`         | Boolean | `false` | Enable the capture of experimental log attributes `thread.name` and `thread.id`.                                                                   |
 | `otel.instrumentation.jboss-logmanager.experimental.capture-mdc-attributes` | String  |         | Comma separated list of MDC attributes to capture. Use the wildcard character `*` to capture all attributes.                                       |
-| `otel.instrumentation.jboss-logmanager.experimental.capture-event-name`     | Boolean | `false` | **Deprecated.** Enable moving the `event.name` attribute (captured by one of the other mechanisms of capturing attributes) to the log event name.  |
 
 The `otel.event.name` key is supported in MDC entries. When present, its value is used as the log event name and is not emitted as an attribute.

instrumentation/jboss-logmanager/jboss-logmanager-appender-1.1/javaagent/build.gradle.kts

@@ -29,7 +29,6 @@ if (otelProps.testLatestDeps) {
 tasks.withType<Test>().configureEach {
   // TODO run tests both with and without experimental log attributes
   jvmArgs("-Dotel.instrumentation.jboss-logmanager.experimental.capture-mdc-attributes=*")
-  jvmArgs("-Dotel.instrumentation.jboss-logmanager.experimental.capture-event-name=true")
   jvmArgs("-Dotel.instrumentation.jboss-logmanager.experimental-log-attributes=true")
   jvmArgs("-Dotel.instrumentation.java-util-logging.experimental-log-attributes=true")
 }

instrumentation/jboss-logmanager/jboss-logmanager-appender-1.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jbosslogmanager/appender/v1_1/LoggingEventMapper.java

@@ -28,16 +28,10 @@
 
 public class LoggingEventMapper {
 
-  private static final java.util.logging.Logger logger =
-      java.util.logging.Logger.getLogger(LoggingEventMapper.class.getName());
-
   public static final LoggingEventMapper INSTANCE = new LoggingEventMapper();
 
   private static final Cache<String, AttributeKey<String>> mdcAttributeKeys = Cache.bounded(100);
 
-  // copied from EventIncubatingAttributes
-  private static final AttributeKey<String> EVENT_NAME = AttributeKey.stringKey("event.name");
-
   private final List<AttributeKey<String>> captureMdcAttributeKeys;
 
   private static final boolean captureExperimentalAttributes =
@@ -47,10 +41,6 @@ public class LoggingEventMapper {
   // cached as an optimization
   private final boolean captureAllMdcAttributes;
 
-  private final boolean captureEventName =
-      DeclarativeConfigUtil.getInstrumentationConfig(GlobalOpenTelemetry.get(), "jboss_logmanager")
-          .getBoolean("capture_event_name/development", false);
-
   private LoggingEventMapper() {
     List<String> captureMdcAttributes =
         DeclarativeConfigUtil.getInstrumentationConfig(
@@ -63,18 +53,12 @@ private LoggingEventMapper() {
     } else {
       List<AttributeKey<String>> keys = new ArrayList<>(captureMdcAttributes.size());
       for (String key : captureMdcAttributes) {
-        if (!OTEL_EVENT_NAME.getKey().equals(key)
-            && !(captureEventName && EVENT_NAME.getKey().equals(key))) {
+        if (!OTEL_EVENT_NAME.getKey().equals(key)) {
           keys.add(getMdcAttributeKey(key));
         }
       }
       this.captureMdcAttributeKeys = keys;
     }
-    if (captureEventName) {
-      logger.warning(
-          "The otel.instrumentation.jboss-logmanager.experimental.capture-event-name setting is"
-              + " deprecated and will be removed in a future version.");
-    }
   }
 
   public void capture(Logger logger, ExtLogRecord record) {
@@ -126,22 +110,15 @@ private void captureMdcAttributes(LogRecordBuilder builder) {
       return;
     }
 
-    // otel.event.name takes priority over event.name
     String otelEventName = context.get(OTEL_EVENT_NAME.getKey());
     if (otelEventName != null) {
       builder.setEventName(otelEventName);
-    } else if (captureEventName) {
-      String eventName = context.get(EVENT_NAME.getKey());
-      if (eventName != null) {
-        builder.setEventName(eventName);
-      }
     }
 
     if (captureAllMdcAttributes) {
       for (Map.Entry<String, String> entry : context.entrySet()) {
         String key = entry.getKey();
-        if (!OTEL_EVENT_NAME.getKey().equals(key)
-            && !(captureEventName && EVENT_NAME.getKey().equals(key))) {
+        if (!OTEL_EVENT_NAME.getKey().equals(key)) {
           builder.setAttribute(getMdcAttributeKey(key), entry.getValue());
         }
       }

instrumentation/jboss-logmanager/jboss-logmanager-appender-1.1/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jbosslogmanager/appender/v1_1/JbossLogmanagerTest.java

@@ -31,11 +31,11 @@
 import org.jboss.logmanager.LogContext;
 import org.jboss.logmanager.Logger;
 import org.jboss.logmanager.MDC;
+import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
-import org.junit.jupiter.params.provider.ValueSource;
 
 class JbossLogmanagerTest {
 
@@ -193,18 +193,17 @@ private static void performLogging(
     }
   }
 
-  @ParameterizedTest
-  @ValueSource(strings = {"event.name", "otel.event.name"})
-  void testMdc(String eventNameProperty) {
+  @Test
+  void testMdc() {
     MDC.put("key1", "val1");
     MDC.put("key2", "val2");
-    MDC.put(eventNameProperty, "MyEventName");
+    MDC.put("otel.event.name", "MyEventName");
     try {
       logger.info("xyz");
     } finally {
       MDC.remove("key1");
       MDC.remove("key2");
-      MDC.remove(eventNameProperty);
+      MDC.remove("otel.event.name");
     }
 
     testing.waitAndAssertLogRecords(

instrumentation/jboss-logmanager/jboss-logmanager-appender-1.1/metadata.yaml

@@ -21,10 +21,3 @@ configurations:
     examples:
       - "custom-mdc-key"
       - "key1,key2,key3"
-  - name: otel.instrumentation.jboss-logmanager.experimental.capture-event-name
-    declarative_name: java.jboss_logmanager.capture_event_name/development
-    description: >
-      Enables the capture of the event name from the MDC attribute "event.name" and sets it as the
-      log record's event name.
-    type: boolean
-    default: false