PoC: Use Throwable.getStackTrace() instead of currentThread.getStackT…

…race() for optimise
newrelic · Dec 18, 2024 · e1810c5 · e1810c5
1 parent fe0ce16
commit e1810c5
Show file tree

Hide file tree

Showing 30 changed files with 35 additions and 35 deletions.
diff --git a/...ntation-security/akka-http-core-10.0/src/main/scala/akka/http/scaladsl/AkkaCoreUtils.java b/...ntation-security/akka-http-core-10.0/src/main/scala/akka/http/scaladsl/AkkaCoreUtils.java
@@ -115,7 +115,7 @@ public static void preProcessHttpRequest (Boolean isServletLockAcquired, HttpReq
 
             securityRequest.setContentType(httpRequest.entity().getContentType().toString());
 
-            StackTraceElement[] trace = Thread.currentThread().getStackTrace();
+            StackTraceElement[] trace = (new Exception()).getStackTrace();
             securityMetaData.getMetaData().setServiceTrace(Arrays.copyOfRange(trace, 2, trace.length));
             securityRequest.setBody(requestBody);
             securityRequest.setRequestParsed(true);

diff --git a/...security/akka-http-core-2.11_10.0.11/src/main/scala/akka/http/scaladsl/AkkaCoreUtils.java b/...security/akka-http-core-2.11_10.0.11/src/main/scala/akka/http/scaladsl/AkkaCoreUtils.java
@@ -115,7 +115,7 @@ public static void preProcessHttpRequest (Boolean isServletLockAcquired, HttpReq
 
             securityRequest.setContentType(httpRequest.entity().getContentType().toString());
 
-            StackTraceElement[] trace = Thread.currentThread().getStackTrace();
+            StackTraceElement[] trace = (new Exception()).getStackTrace();
             securityMetaData.getMetaData().setServiceTrace(Arrays.copyOfRange(trace, 2, trace.length));
             securityRequest.setBody(requestBody);
             securityRequest.setRequestParsed(true);

diff --git a/...-security/akka-http-core-2.13_10.1.8/src/main/scala/akka/http/scaladsl/AkkaCoreUtils.java b/...-security/akka-http-core-2.13_10.1.8/src/main/scala/akka/http/scaladsl/AkkaCoreUtils.java
@@ -112,7 +112,7 @@ public static void preProcessHttpRequest (Boolean isServletLockAcquired, HttpReq
 
             securityRequest.setContentType(httpRequest.entity().getContentType().toString());
 
-            StackTraceElement[] trace = Thread.currentThread().getStackTrace();
+            StackTraceElement[] trace = (new Exception()).getStackTrace();
             securityMetaData.getMetaData().setServiceTrace(Arrays.copyOfRange(trace, 2, trace.length));
             securityRequest.setBody(requestBody);
             securityRequest.setRequestParsed(true);

diff --git a/...-security/akka-http-core-2.13_10.2.0/src/main/scala/akka/http/scaladsl/AkkaCoreUtils.java b/...-security/akka-http-core-2.13_10.2.0/src/main/scala/akka/http/scaladsl/AkkaCoreUtils.java
@@ -115,7 +115,7 @@ public static void preProcessHttpRequest (Boolean isServletLockAcquired, HttpReq
 
             securityRequest.setContentType(httpRequest.entity().getContentType().toString());
 
-            StackTraceElement[] trace = Thread.currentThread().getStackTrace();
+            StackTraceElement[] trace = (new Exception()).getStackTrace();
             securityMetaData.getMetaData().setServiceTrace(Arrays.copyOfRange(trace, 2, trace.length));
             securityRequest.setBody(requestBody);
             securityRequest.setRequestParsed(true);

diff --git a/...-pekko-http-core-2.13_1/src/main/scala/org.apache.pekko/http/scaladsl/PekkoCoreUtils.java b/...-pekko-http-core-2.13_1/src/main/scala/org.apache.pekko/http/scaladsl/PekkoCoreUtils.java
@@ -137,7 +137,7 @@ public static void preProcessHttpRequest(Boolean isServletLockAcquired, HttpRequ
                 securityRequest.setContentType(request.entity().getContentType().toString());
             }
 
-            StackTraceElement[] trace = Thread.currentThread().getStackTrace();
+            StackTraceElement[] trace = (new Exception()).getStackTrace();
             securityMetaData.getMetaData().setServiceTrace(Arrays.copyOfRange(trace, 2, trace.length));
             securityRequest.setBody(requestBody);
             securityRequest.setRequestParsed(true);

diff --git a/...tation-security/grpc-1.22.0/src/main/java/io/grpc/ServerCallListener_Instrumentation.java b/...tation-security/grpc-1.22.0/src/main/java/io/grpc/ServerCallListener_Instrumentation.java
@@ -47,7 +47,7 @@ public void onMessage(ReqT message) {
     public void onHalfClose() {
         if (NewRelicSecurity.isHookProcessingActive()) {
             SecurityMetaData securityMetaData = NewRelicSecurity.getAgent().getSecurityMetaData();
-            StackTraceElement[] trace = Thread.currentThread().getStackTrace();
+            StackTraceElement[] trace = (new Exception()).getStackTrace();
             securityMetaData.getMetaData().setServiceTrace(Arrays.copyOfRange(trace, 1, trace.length));
         }
         if (tokenForCsec != null) {

diff --git a/....0/src/main/java/com/newrelic/agent/security/instrumentation/grpc140/GrpcServerUtils.java b/....0/src/main/java/com/newrelic/agent/security/instrumentation/grpc140/GrpcServerUtils.java
@@ -28,7 +28,7 @@ public class GrpcServerUtils {
     private static final String EMPTY = "";
     public static final String METHOD_NAME_START_CALL = "startCall";
     public static final String NR_SEC_CUSTOM_ATTRIB_NAME = "NR_CSEC_GRPC_SERVER_OPERATIONAL_LOCK_";
-    private static Set<Descriptors.Descriptor> typeRegistries = new HashSet<>();
+    private static final Set<Descriptors.Descriptor> typeRegistries = new HashSet<>();
 
     public static <ReqT, ResT> void preprocessSecurityHook(ServerStream_Instrumentation call, ServerMethodDefinition<ReqT, ResT> methodDef, Metadata meta, String klass) {
         try {
@@ -79,7 +79,7 @@ public static <ReqT, ResT> void preprocessSecurityHook(ServerStream_Instrumentat
             securityRequest.setContentType(meta.get(Metadata.Key.of("content-type", Metadata.ASCII_STRING_MARSHALLER)));
 
             // TODO: moving this code to its proper place
-            StackTraceElement[] trace = Thread.currentThread().getStackTrace();
+            StackTraceElement[] trace = (new Exception()).getStackTrace();
             securityMetaData.getMetaData().setServiceTrace(Arrays.copyOfRange(trace, 2, trace.length));
 
             securityRequest.setRequestParsed(true);

diff --git a/...ntation-security/grpc-1.4.0/src/main/java/io/grpc/ServerCallListener_Instrumentation.java b/...ntation-security/grpc-1.4.0/src/main/java/io/grpc/ServerCallListener_Instrumentation.java
@@ -47,7 +47,7 @@ public void onMessage(ReqT message) {
     public void onHalfClose() {
         if (NewRelicSecurity.isHookProcessingActive()) {
             SecurityMetaData securityMetaData = NewRelicSecurity.getAgent().getSecurityMetaData();
-            StackTraceElement[] trace = Thread.currentThread().getStackTrace();
+            StackTraceElement[] trace = (new Exception()).getStackTrace();
             securityMetaData.getMetaData().setServiceTrace(Arrays.copyOfRange(trace, 1, trace.length));
         }
         if (tokenForCsec != null) {

diff --git a/...tation-security/grpc-1.40.0/src/main/java/io/grpc/ServerCallListener_Instrumentation.java b/...tation-security/grpc-1.40.0/src/main/java/io/grpc/ServerCallListener_Instrumentation.java
@@ -47,7 +47,7 @@ public void onMessage(ReqT message) {
     public void onHalfClose() {
         if (NewRelicSecurity.isHookProcessingActive()) {
             SecurityMetaData securityMetaData = NewRelicSecurity.getAgent().getSecurityMetaData();
-            StackTraceElement[] trace = Thread.currentThread().getStackTrace();
+            StackTraceElement[] trace = (new Exception()).getStackTrace();
             securityMetaData.getMetaData().setServiceTrace(Arrays.copyOfRange(trace, 1, trace.length));
         }
         if (tokenForCsec != null) {

diff --git a/.../src/main/java/com/newrelic/agent/security/instrumentation/jersey2/HttpRequestHelper.java b/.../src/main/java/com/newrelic/agent/security/instrumentation/jersey2/HttpRequestHelper.java
@@ -63,7 +63,7 @@ public static void preprocessSecurityHook(ContainerRequest requestContext) {
             securityMetaData.setTracingHeaderValue(HttpRequestHelper.getTraceHeader(securityRequest.getHeaders()));
             securityRequest.setUrl(requestContext.getRequestUri().toString());
 
-            StackTraceElement[] trace = Thread.currentThread().getStackTrace();
+            StackTraceElement[] trace = (new Exception()).getStackTrace();
             securityMetaData.getMetaData().setServiceTrace(Arrays.copyOfRange(trace, 2, trace.length));
             securityRequest.setRequestParsed(true);
         } catch (Throwable e) {
@@ -269,7 +269,7 @@ public static void registerUserLevelCode(String frameworkName) {
             SecurityMetaData securityMetaData = NewRelicSecurity.getAgent().getSecurityMetaData();
             if (!securityMetaData.getMetaData().isUserLevelServiceMethodEncountered(frameworkName)) {
                 securityMetaData.getMetaData().setUserLevelServiceMethodEncountered(true);
-                StackTraceElement[] trace = Thread.currentThread().getStackTrace();
+                StackTraceElement[] trace = (new Exception()).getStackTrace();
                 securityMetaData.getMetaData().setServiceTrace(Arrays.copyOfRange(trace, 2, trace.length));
             }
         } catch (Throwable ignored) {

diff --git a/.../src/main/java/com/newrelic/agent/security/instrumentation/jersey2/HttpRequestHelper.java b/.../src/main/java/com/newrelic/agent/security/instrumentation/jersey2/HttpRequestHelper.java
@@ -66,7 +66,7 @@ public static void preprocessSecurityHook(ContainerRequest requestContext) {
             securityMetaData.setTracingHeaderValue(HttpRequestHelper.getTraceHeader(securityRequest.getHeaders()));
             securityRequest.setUrl(requestContext.getRequestUri().toString());
 
-            StackTraceElement[] trace = Thread.currentThread().getStackTrace();
+            StackTraceElement[] trace = (new Exception()).getStackTrace();
             securityMetaData.getMetaData().setServiceTrace(Arrays.copyOfRange(trace, 2, trace.length));
             securityRequest.setRequestParsed(true);
         } catch (Throwable e) {
@@ -255,7 +255,7 @@ public static void registerUserLevelCode(String frameworkName) {
             SecurityMetaData securityMetaData = NewRelicSecurity.getAgent().getSecurityMetaData();
             if (!securityMetaData.getMetaData().isUserLevelServiceMethodEncountered(frameworkName)) {
                 securityMetaData.getMetaData().setUserLevelServiceMethodEncountered(true);
-                StackTraceElement[] trace = Thread.currentThread().getStackTrace();
+                StackTraceElement[] trace = (new Exception()).getStackTrace();
                 securityMetaData.getMetaData().setServiceTrace(Arrays.copyOfRange(trace, 2, trace.length));
             }
         } catch (Throwable ignored) {

diff --git a/.../src/main/java/com/newrelic/agent/security/instrumentation/jersey2/HttpRequestHelper.java b/.../src/main/java/com/newrelic/agent/security/instrumentation/jersey2/HttpRequestHelper.java
@@ -68,7 +68,7 @@ public static void preprocessSecurityHook(ContainerRequest requestContext) {
             securityMetaData.setTracingHeaderValue(HttpRequestHelper.getTraceHeader(securityRequest.getHeaders()));
             securityRequest.setUrl(requestContext.getRequestUri().toString());
 
-            StackTraceElement[] trace = Thread.currentThread().getStackTrace();
+            StackTraceElement[] trace = (new Exception()).getStackTrace();
             securityMetaData.getMetaData().setServiceTrace(Arrays.copyOfRange(trace, 2, trace.length));
             securityRequest.setRequestParsed(true);
         } catch (Throwable e) {
@@ -281,7 +281,7 @@ public static void registerUserLevelCode(String frameworkName) {
             SecurityMetaData securityMetaData = NewRelicSecurity.getAgent().getSecurityMetaData();
             if (!securityMetaData.getMetaData().isUserLevelServiceMethodEncountered(frameworkName)) {
                 securityMetaData.getMetaData().setUserLevelServiceMethodEncountered(true);
-                StackTraceElement[] trace = Thread.currentThread().getStackTrace();
+                StackTraceElement[] trace = (new Exception()).getStackTrace();
                 securityMetaData.getMetaData().setServiceTrace(Arrays.copyOfRange(trace, 2, trace.length));
             }
         } catch (Throwable ignored) {

diff --git a/.../src/main/java/com/newrelic/agent/security/instrumentation/jetty11/HttpServletHelper.java b/.../src/main/java/com/newrelic/agent/security/instrumentation/jetty11/HttpServletHelper.java
@@ -144,7 +144,7 @@ public static void preprocessSecurityHook(HttpServletRequest httpServletRequest)
             }
             securityRequest.setContentType(httpServletRequest.getContentType());
 
-            StackTraceElement[] trace = Thread.currentThread().getStackTrace();
+            StackTraceElement[] trace = (new Exception()).getStackTrace();
             securityMetaData.getMetaData().setServiceTrace(Arrays.copyOfRange(trace, 2, trace.length));
             securityRequest.setRequestParsed(true);
         } catch (Throwable e) {

diff --git a/...in/java/com/newrelic/agent/security/instrumentation/jetty12/server/HttpServletHelper.java b/...in/java/com/newrelic/agent/security/instrumentation/jetty12/server/HttpServletHelper.java
@@ -142,7 +142,7 @@ public static void preprocessSecurityHook(Request request) {
             }
             securityRequest.setContentType(request.getHeaders().get(HttpHeader.CONTENT_TYPE));
 
-            StackTraceElement[] trace = Thread.currentThread().getStackTrace();
+            StackTraceElement[] trace = (new Exception()).getStackTrace();
             securityMetaData.getMetaData().setServiceTrace(Arrays.copyOfRange(trace, 2, trace.length));
             securityRequest.setRequestParsed(true);
         } catch (Throwable e) {

diff --git a/...9/src/main/java/com/newrelic/agent/security/instrumentation/jetty9/HttpServletHelper.java b/...9/src/main/java/com/newrelic/agent/security/instrumentation/jetty9/HttpServletHelper.java
@@ -145,7 +145,7 @@ public static void preprocessSecurityHook(HttpServletRequest httpServletRequest)
             }
             securityRequest.setContentType(httpServletRequest.getContentType());
 
-            StackTraceElement[] trace = Thread.currentThread().getStackTrace();
+            StackTraceElement[] trace = (new Exception()).getStackTrace();
             securityMetaData.getMetaData().setServiceTrace(Arrays.copyOfRange(trace, 2, trace.length));
             securityRequest.setRequestParsed(true);
         } catch (Throwable e) {

diff --git a/...rumentation-security/netty-4.0.0/src/main/java/security/io/netty400/utils/NettyUtils.java b/...rumentation-security/netty-4.0.0/src/main/java/security/io/netty400/utils/NettyUtils.java
@@ -59,7 +59,7 @@ public static void processSecurityRequest(ChannelHandlerContext ctx, Object msg,
                 securityRequest.setProtocol(((HttpRequest) msg).getProtocolVersion().protocolName().toLowerCase());
                 securityRequest.setContentType(securityRequest.getHeaders().get("content-type"));
                 if (!securityMetaData.getMetaData().isUserLevelServiceMethodEncountered(IO_NETTY)){
-                    StackTraceElement[] stack = Thread.currentThread().getStackTrace();
+                    StackTraceElement[] stack = (new Exception()).getStackTrace();
                     securityMetaData.getMetaData().setServiceTrace(Arrays.copyOfRange(stack, 2, stack.length));
                 }
                 securityRequest.setRequestParsed(true);

diff --git a/...rumentation-security/netty-4.0.8/src/main/java/security/io/netty400/utils/NettyUtils.java b/...rumentation-security/netty-4.0.8/src/main/java/security/io/netty400/utils/NettyUtils.java
@@ -58,7 +58,7 @@ public static void processSecurityRequest(ChannelHandlerContext ctx, Object msg,
                 securityRequest.setProtocol(((HttpRequest) msg).getProtocolVersion().protocolName().toLowerCase());
                 securityRequest.setContentType(securityRequest.getHeaders().get("content-type"));
                 if (!securityMetaData.getMetaData().isUserLevelServiceMethodEncountered(IO_NETTY)){
-                    StackTraceElement[] stack = Thread.currentThread().getStackTrace();
+                    StackTraceElement[] stack = (new Exception()).getStackTrace();
                     securityMetaData.getMetaData().setServiceTrace(Arrays.copyOfRange(stack, 2, stack.length));
                 }
                 securityRequest.setRequestParsed(true);

diff --git a/...ntation-security/servlet-2.4/src/main/java/javax/servlet/FilterChain_Instrumentation.java b/...ntation-security/servlet-2.4/src/main/java/javax/servlet/FilterChain_Instrumentation.java
@@ -83,7 +83,7 @@ private void preprocessSecurityHook(ServletRequest request, ServletResponse resp
             securityRequest.setContentType(httpServletRequest.getContentType());
 
 
-            StackTraceElement[] trace = Thread.currentThread().getStackTrace();
+            StackTraceElement[] trace = (new Exception()).getStackTrace();
             securityMetaData.getMetaData().setServiceTrace(Arrays.copyOfRange(trace, 1, trace.length));
             securityRequest.setRequestParsed(true);
         } catch (Throwable e){

diff --git a/instrumentation-security/servlet-2.4/src/main/java/javax/servlet/Filter_Instrumentation.java b/instrumentation-security/servlet-2.4/src/main/java/javax/servlet/Filter_Instrumentation.java
@@ -75,7 +75,7 @@ private void preprocessSecurityHook(ServletRequest request, ServletResponse resp
             }
             securityRequest.setContentType(httpServletRequest.getContentType());
 
-            StackTraceElement[] trace = Thread.currentThread().getStackTrace();
+            StackTraceElement[] trace = (new Exception()).getStackTrace();
             securityMetaData.getMetaData().setServiceTrace(Arrays.copyOfRange(trace, 1, trace.length));
             securityRequest.setRequestParsed(true);
         } catch (Throwable e){

diff --git a/...rumentation-security/servlet-2.4/src/main/java/javax/servlet/Servlet_Instrumentation.java b/...rumentation-security/servlet-2.4/src/main/java/javax/servlet/Servlet_Instrumentation.java
@@ -87,7 +87,7 @@ private void preprocessSecurityHook(ServletRequest_Instrumentation request, Serv
             securityRequest.setContentType(httpServletRequest.getContentType());
 
 
-            StackTraceElement[] trace = Thread.currentThread().getStackTrace();
+            StackTraceElement[] trace = (new Exception()).getStackTrace();
             securityMetaData.getMetaData().setServiceTrace(Arrays.copyOfRange(trace, 1, trace.length));
             securityRequest.setRequestParsed(true);
         } catch (Throwable e){

diff --git a/...ation-security/servlet-5.0/src/main/java/jakarta/servlet/FilterChain_Instrumentation.java b/...ation-security/servlet-5.0/src/main/java/jakarta/servlet/FilterChain_Instrumentation.java
@@ -76,7 +76,7 @@ private void preprocessSecurityHook(ServletRequest request, ServletResponse resp
             }
             securityRequest.setContentType(httpServletRequest.getContentType());
 
-            StackTraceElement[] trace = Thread.currentThread().getStackTrace();
+            StackTraceElement[] trace = (new Exception()).getStackTrace();
             securityMetaData.getMetaData().setServiceTrace(Arrays.copyOfRange(trace, 1, trace.length));
             securityRequest.setRequestParsed(true);
         } catch (Throwable e){

diff --git a/...umentation-security/servlet-5.0/src/main/java/jakarta/servlet/Filter_Instrumentation.java b/...umentation-security/servlet-5.0/src/main/java/jakarta/servlet/Filter_Instrumentation.java
@@ -78,7 +78,7 @@ private void preprocessSecurityHook(ServletRequest request, ServletResponse resp
             securityRequest.setContentType(httpServletRequest.getContentType());
 
 
-            StackTraceElement[] trace = Thread.currentThread().getStackTrace();
+            StackTraceElement[] trace = (new Exception()).getStackTrace();
             securityMetaData.getMetaData().setServiceTrace(Arrays.copyOfRange(trace, 1, trace.length));
             securityRequest.setRequestParsed(true);
         } catch (Throwable e){

diff --git a/...mentation-security/servlet-5.0/src/main/java/jakarta/servlet/Servlet_Instrumentation.java b/...mentation-security/servlet-5.0/src/main/java/jakarta/servlet/Servlet_Instrumentation.java
@@ -82,7 +82,7 @@ private void preprocessSecurityHook(ServletRequest_Instrumentation request, Serv
             }
             securityRequest.setContentType(httpServletRequest.getContentType());
 
-            StackTraceElement[] trace = Thread.currentThread().getStackTrace();
+            StackTraceElement[] trace = (new Exception()).getStackTrace();
             securityMetaData.getMetaData().setServiceTrace(Arrays.copyOfRange(trace, 1, trace.length));
             securityRequest.setRequestParsed(true);
         } catch (Throwable e){

diff --git a/...ation-security/servlet-6.0/src/main/java/jakarta/servlet/FilterChain_Instrumentation.java b/...ation-security/servlet-6.0/src/main/java/jakarta/servlet/FilterChain_Instrumentation.java
@@ -77,7 +77,7 @@ private void preprocessSecurityHook(ServletRequest request, ServletResponse resp
             securityRequest.setContentType(httpServletRequest.getContentType());
 
 
-            StackTraceElement[] trace = Thread.currentThread().getStackTrace();
+            StackTraceElement[] trace = (new Exception()).getStackTrace();
             securityMetaData.getMetaData().setServiceTrace(Arrays.copyOfRange(trace, 1, trace.length));
             securityRequest.setRequestParsed(true);
         } catch (Throwable e){

diff --git a/...umentation-security/servlet-6.0/src/main/java/jakarta/servlet/Filter_Instrumentation.java b/...umentation-security/servlet-6.0/src/main/java/jakarta/servlet/Filter_Instrumentation.java
@@ -79,7 +79,7 @@ private void preprocessSecurityHook(ServletRequest request, ServletResponse resp
             securityRequest.setContentType(httpServletRequest.getContentType());
 
 
-            StackTraceElement[] trace = Thread.currentThread().getStackTrace();
+            StackTraceElement[] trace = (new Exception()).getStackTrace();
             securityMetaData.getMetaData().setServiceTrace(Arrays.copyOfRange(trace, 1, trace.length));
             securityRequest.setRequestParsed(true);
         } catch (Throwable e){

diff --git a/...mentation-security/servlet-6.0/src/main/java/jakarta/servlet/Servlet_Instrumentation.java b/...mentation-security/servlet-6.0/src/main/java/jakarta/servlet/Servlet_Instrumentation.java
@@ -82,7 +82,7 @@ private void preprocessSecurityHook(ServletRequest_Instrumentation request, Serv
             }
             securityRequest.setContentType(httpServletRequest.getContentType());
 
-            StackTraceElement[] trace = Thread.currentThread().getStackTrace();
+            StackTraceElement[] trace = (new Exception()).getStackTrace();
             securityMetaData.getMetaData().setServiceTrace(Arrays.copyOfRange(trace, 1, trace.length));
             securityRequest.setRequestParsed(true);
         } catch (Throwable e){

diff --git a/instrumentation-security/spray-can-1.3.1/src/main/scala/spray/can/SprayHttpUtils.java b/instrumentation-security/spray-can-1.3.1/src/main/scala/spray/can/SprayHttpUtils.java
@@ -54,7 +54,7 @@ public static void preProcessRequestHook(HttpRequest request) {
                 securityRequest.setBody(new StringBuilder(request.entity().data().asString(StandardCharsets.UTF_8)));
             }
 
-            StackTraceElement[] trace = Thread.currentThread().getStackTrace();
+            StackTraceElement[] trace = (new Exception()).getStackTrace();
             securityMetaData.getMetaData().setServiceTrace(Arrays.copyOfRange(trace, 2, trace.length));
             securityRequest.setRequestParsed(true);
         } catch (Exception e){

diff --git a/instrumentation-security/spray-http-1.3.1/src/main/scala/spray/SprayHttpUtils.java b/instrumentation-security/spray-http-1.3.1/src/main/scala/spray/SprayHttpUtils.java
@@ -54,7 +54,7 @@ public static void preProcessRequestHook(HttpRequest request) {
                 securityRequest.setBody(new StringBuilder(request.entity().data().asString(StandardCharsets.UTF_8)));
             }
 
-            StackTraceElement[] trace = Thread.currentThread().getStackTrace();
+            StackTraceElement[] trace = (new Exception()).getStackTrace();
             securityMetaData.getMetaData().setServiceTrace(Arrays.copyOfRange(trace, 2, trace.length));
             securityRequest.setRequestParsed(true);
         } catch (Exception e){

diff --git a/newrelic-security-agent/src/main/java/com/newrelic/api/agent/security/Agent.java b/newrelic-security-agent/src/main/java/com/newrelic/api/agent/security/Agent.java
@@ -408,7 +408,7 @@ public void registerOperation(AbstractOperation operation) {
                 } else if (operation instanceof SecureCookieOperationSet) {
                     operation.setStackTrace(securityMetaData.getMetaData().getServiceTrace());
                 } else {
-                    StackTraceElement[] trace = Thread.currentThread().getStackTrace();
+                    StackTraceElement[] trace = (new Exception()).getStackTrace();
                     operation.setStackTrace(Arrays.copyOfRange(trace, securityMetaData.getMetaData().getFromJumpRequiredInStackTrace(), trace.length));
                 }