introduce register operation at exit for ok-http3 module

newrelic · Dec 17, 2024 · 02c217e · 02c217e
1 parent 1374701
commit 02c217e
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 6 deletions.
diff --git a/....0.0/src/main/java/com/newrelic/agent/security/instrumentation/okhttp30/OkhttpHelper.java b/....0.0/src/main/java/com/newrelic/agent/security/instrumentation/okhttp30/OkhttpHelper.java
@@ -31,7 +31,6 @@ public static AbstractOperation preprocessSecurityHook(String url, String classN
             SSRFOperation operation = new SSRFOperation(url,
                     className, methodName);
             NewRelicSecurity.getAgent().getSecurityMetaData().getMetaData().setFromJumpRequiredInStackTrace(3);
-            NewRelicSecurity.getAgent().registerOperation(operation);
             return operation;
         } catch (Throwable e) {
             if (e instanceof NewRelicSecurityException) {
@@ -51,7 +50,7 @@ public static void registerExitOperation(boolean isProcessingAllowed, AbstractOp
             ) {
                 return;
             }
-            NewRelicSecurity.getAgent().registerExitEvent(operation);
+            NewRelicSecurity.getAgent().registerOperation(operation);
         } catch (Throwable e) {
             NewRelicSecurity.getAgent().log(LogLevel.FINEST, String.format(GenericHelper.EXIT_OPERATION_EXCEPTION_MESSAGE, OKHTTP_3_0_0, e.getMessage()), e, OkhttpHelper.class.getName());
         }

diff --git a/...n/java/com/newrelic/agent/security/instrumentation/okhttp30/RealCall_Instrumentation.java b/...n/java/com/newrelic/agent/security/instrumentation/okhttp30/RealCall_Instrumentation.java
@@ -51,10 +51,10 @@ public Response execute() {
             returnVal = Weaver.callOriginal();
         } finally {
             if(isLockAcquired){
+                OkhttpHelper.registerExitOperation(isLockAcquired, operation);
                 releaseLock();
             }
         }
-        OkhttpHelper.registerExitOperation(isLockAcquired, operation);
         return returnVal;
     }
 

diff --git a/....5.0/src/main/java/com/newrelic/agent/security/instrumentation/okhttp35/OkhttpHelper.java b/....5.0/src/main/java/com/newrelic/agent/security/instrumentation/okhttp35/OkhttpHelper.java
@@ -30,7 +30,6 @@ public static AbstractOperation preprocessSecurityHook(String url, String classN
             }
             SSRFOperation ssrfOperation = new SSRFOperation(url, className, methodName);
             NewRelicSecurity.getAgent().getSecurityMetaData().getMetaData().setFromJumpRequiredInStackTrace(3);
-            NewRelicSecurity.getAgent().registerOperation(ssrfOperation);
             return ssrfOperation;
         } catch (Throwable e) {
             if (e instanceof NewRelicSecurityException) {
@@ -50,7 +49,7 @@ public static void registerExitOperation(boolean isProcessingAllowed, AbstractOp
             ) {
                 return;
             }
-            NewRelicSecurity.getAgent().registerExitEvent(operation);
+            NewRelicSecurity.getAgent().registerOperation(operation);
         } catch (Throwable e) {
             NewRelicSecurity.getAgent().log(LogLevel.FINEST, String.format(GenericHelper.EXIT_OPERATION_EXCEPTION_MESSAGE, OKHTTP_3_5_0, e.getMessage()), e, OkhttpHelper.class.getName());
         }

diff --git a/.../com/newrelic/agent/security/instrumentation/okhttp35/http/HttpCodec_Instrumentation.java b/.../com/newrelic/agent/security/instrumentation/okhttp35/http/HttpCodec_Instrumentation.java
@@ -36,10 +36,10 @@ public void writeRequestHeaders(Request request) {
             Weaver.callOriginal();
         } finally {
             if (isLockAcquired) {
+                OkhttpHelper.registerExitOperation(isLockAcquired, operation);
                 releaseLock();
             }
         }
-        OkhttpHelper.registerExitOperation(isLockAcquired, operation);
     }
 
     private void releaseLock() {