up

Author: trask

CHANGELOG.md

@@ -19,20 +19,17 @@
   use `setTraceIdRequestAttributeEnabled()` and `setCaptureRequestParameters()` respectively.
 - Removed the `opentelemetry-runtime-telemetry-java8` and `opentelemetry-runtime-telemetry-java17`
   library artifacts (deprecated aliases); use `opentelemetry-runtime-telemetry` instead.
-<<<<<<< remove-more-deprecated-props
+- 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.
 - Removed previously deprecated experimental config property
   `otel.instrumentation.http.client.experimental.redact-query-parameters`; use
   `otel.instrumentation.sanitization.url.experimental.sensitive-query-parameters` instead.
 - Removed previously deprecated experimental config property
   `otel.instrumentation.common.experimental.db-sqlcommenter.enabled`; use
   `otel.instrumentation.common.db.experimental.sqlcommenter.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.
->>>>>>> main
 
 ## Version 2.27.0 (2026-04-21)