From 90b759dc5b92719c6fa63ad3ba7a03ae347708ea Mon Sep 17 00:00:00 2001
From: Lauri Tulmin <ltulmin@splunk.com>
Date: Sat, 16 Nov 2024 19:29:32 +0200
Subject: [PATCH] Remove catch Throwable, reduce @NoMuzzle annotations

---
 .../v1_0/internal/LoggingEventMapper.java     | 31 +++++++------------
 1 file changed, 11 insertions(+), 20 deletions(-)

diff --git a/instrumentation/logback/logback-appender-1.0/library/src/main/java/io/opentelemetry/instrumentation/logback/appender/v1_0/internal/LoggingEventMapper.java b/instrumentation/logback/logback-appender-1.0/library/src/main/java/io/opentelemetry/instrumentation/logback/appender/v1_0/internal/LoggingEventMapper.java
index 0ab073c1e970..c918dd101840 100644
--- a/instrumentation/logback/logback-appender-1.0/library/src/main/java/io/opentelemetry/instrumentation/logback/appender/v1_0/internal/LoggingEventMapper.java
+++ b/instrumentation/logback/logback-appender-1.0/library/src/main/java/io/opentelemetry/instrumentation/logback/appender/v1_0/internal/LoggingEventMapper.java
@@ -448,14 +448,10 @@ private static boolean supportsMultipleMarkers() {
 
   private static void captureLogstashAttributes(
       AttributesBuilder attributes, ILoggingEvent loggingEvent) {
-    try {
-      if (supportsMultipleMarkers && hasMultipleMarkers(loggingEvent)) {
-        captureMultipleLogstashAttributes(attributes, loggingEvent);
-      } else {
-        captureSingleLogstashAttribute(attributes, loggingEvent);
-      }
-    } catch (Throwable e) {
-      // ignore
+    if (supportsMultipleMarkers && hasMultipleMarkers(loggingEvent)) {
+      captureMultipleLogstashAttributes(attributes, loggingEvent);
+    } else {
+      captureSingleLogstashAttribute(attributes, loggingEvent);
     }
   }
 
@@ -465,13 +461,11 @@ private static boolean isLogstashMarker(Marker marker) {
   }
 
   @SuppressWarnings("deprecation") // getMarker is deprecate since 1.3.0
-  @NoMuzzle
   private static void captureSingleLogstashAttribute(
       AttributesBuilder attributes, ILoggingEvent loggingEvent) {
     Marker marker = loggingEvent.getMarker();
     if (isLogstashMarker(marker)) {
-      LogstashMarker logstashMarker = (LogstashMarker) marker;
-      captureLogstashMarker(attributes, logstashMarker);
+      captureLogstashMarker(attributes, marker);
     }
   }
 
@@ -480,31 +474,28 @@ private static void captureMultipleLogstashAttributes(
       AttributesBuilder attributes, ILoggingEvent loggingEvent) {
     for (Marker marker : loggingEvent.getMarkerList()) {
       if (isLogstashMarker(marker)) {
-        LogstashMarker logstashMarker = (LogstashMarker) marker;
-        captureLogstashMarker(attributes, logstashMarker);
+        captureLogstashMarker(attributes, marker);
       }
     }
   }
 
   @NoMuzzle
-  private static void captureLogstashMarker(
-      AttributesBuilder attributes, LogstashMarker logstashMarker) {
+  private static void captureLogstashMarker(AttributesBuilder attributes, Marker marker) {
+    LogstashMarker logstashMarker = (LogstashMarker) marker;
     captureLogstashMarkerAttributes(attributes, logstashMarker);
 
     if (logstashMarker.hasReferences()) {
       for (Iterator<Marker> it = logstashMarker.iterator(); it.hasNext(); ) {
         Marker referenceMarker = it.next();
         if (isLogstashMarker(referenceMarker)) {
-          LogstashMarker referenceLogstashMarker = (LogstashMarker) referenceMarker;
-          captureLogstashMarker(attributes, referenceLogstashMarker);
+          captureLogstashMarker(attributes, referenceMarker);
         }
       }
     }
   }
 
-  @NoMuzzle
   private static void captureLogstashMarkerAttributes(
-      AttributesBuilder attributes, LogstashMarker logstashMarker) {
+      AttributesBuilder attributes, Object logstashMarker) {
     FieldReader fieldReader = valueField.get(logstashMarker.getClass());
     if (fieldReader != null) {
       fieldReader.read(attributes, logstashMarker);
@@ -608,7 +599,7 @@ private static boolean supportsLogstashMarkers() {
   }
 
   private interface FieldReader {
-    void read(AttributesBuilder attributes, LogstashMarker logstashMarker);
+    void read(AttributesBuilder attributes, Object logstashMarker);
   }
 
   /**