Avoid instanceof if redacted exceptions are active (#3553)

* Avoid instanceof if redacted exceptions are active

* Added changelog

* Fix test

Author: JonasKunz

CHANGELOG.asciidoc

@@ -31,6 +31,11 @@ Use subheadings with the "=====" level for adding notes for unreleased changes:
 
 === Unreleased
 
+[float]
+===== Bug fixes
+* Avoid another case where we might touch application exceptions for `safe_exceptions` - {pull}3553[#3553]
+
+
 [[release-notes-1.x]]
 === Java Agent version 1.x
 

apm-agent-core/src/main/java/co/elastic/apm/agent/impl/ElasticApmTracer.java

@@ -1002,7 +1002,7 @@ public Service createService(String ephemeralId) {
     @Override
     @Nullable
     public Throwable redactExceptionIfRequired(@Nullable Throwable original) {
-        if (original != null && coreConfiguration.isRedactExceptions() && !(original instanceof RedactedException)) {
+        if (original != null && coreConfiguration.isRedactExceptions()) {
             return new RedactedException();
         }
         return original;

apm-agent-core/src/test/java/org/example/stacktrace/ErrorCaptureTest.java

@@ -117,15 +117,16 @@ void testExceptionRedaction() {
         Throwable redacted = tracer.redactExceptionIfRequired(exception);
         assertThat(redacted).isInstanceOf(RedactedException.class);
 
-        assertThat(tracer.redactExceptionIfRequired(redacted)).isSameAs(redacted);
+        // double redaction means no instanceof check
+        assertThat(tracer.redactExceptionIfRequired(redacted)).isNotSameAs(redacted);
 
         ErrorCapture errorCapture = tracer.captureException(exception, tracer.currentContext(), null);
         assertThat(errorCapture).isNotNull();
         assertThat(errorCapture.getException()).isInstanceOf(RedactedException.class);
 
         ErrorCapture alreadyRedacted = tracer.captureException(redacted, tracer.currentContext(), null);
         assertThat(alreadyRedacted).isNotNull();
-        assertThat(alreadyRedacted.getException()).isSameAs(redacted);
+        assertThat(alreadyRedacted.getException()).isNotSameAs(redacted);
     }