NR-215332 : Add java temp directory to ServerInfo (#161)

* NR-215332 : Add java temp directory to ServerInfo
newrelic · Jan 16, 2024 · 2e0225f · 2e0225f
1 parent f8e7686
commit 2e0225f
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 1 deletion.
diff --git a/newrelic-security-agent/src/main/java/com/newrelic/agent/security/util/IUtilConstants.java b/newrelic-security-agent/src/main/java/com/newrelic/agent/security/util/IUtilConstants.java
@@ -31,4 +31,7 @@ public interface IUtilConstants {
 
     String SERVER_BASE_DIRECTORY = "SERVER_BASE_DIRECTORY";
     String SAME_SITE_COOKIES = "SAME_SITE_COOKIES";
+
+    String APPLICATION_TMP_DIRECTORY = "APPLICATION_TMP_DIRECTORY";
+    String JAVA_IO_TMPDIR = "java.io.tmpdir";
 }
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
@@ -134,11 +134,16 @@ private void initialise() {
         info.initStatusLogValues();
         setInitialised(true);
         populateLinkingMetadata();
-
+        populateApplicationTmpDir();
         startK2Services();
         info.agentStatTrigger();
     }
 
+    private void populateApplicationTmpDir() {
+        String tmpDir = System.getProperty(IUtilConstants.JAVA_IO_TMPDIR);
+        setServerInfo(IUtilConstants.APPLICATION_TMP_DIRECTORY, tmpDir);
+    }
+
     private BuildInfo readCollectorBuildInfo() {
         BuildInfo buildInfo = new BuildInfo();
         try {
@@ -538,6 +543,8 @@ public void setServerInfo(String key, String value) {
             case IUtilConstants.SAME_SITE_COOKIES:
                 appServerInfo.setSameSiteCookies(value);
                 break;
+            case IUtilConstants.APPLICATION_TMP_DIRECTORY:
+                appServerInfo.setApplicationTmpDirectory(value);
             default:
                 break;
         }
@@ -554,6 +561,8 @@ public String getServerInfo(String key) {
                 return appServerInfo.getServerBaseDirectory();
             case IUtilConstants.SAME_SITE_COOKIES:
                 return appServerInfo.getSameSiteCookies();
+            case IUtilConstants.APPLICATION_TMP_DIRECTORY:
+                return appServerInfo.getApplicationTmpDirectory();
             default:
                 return null;
         }

diff --git a/...elic-security-api/src/main/java/com/newrelic/api/agent/security/schema/AppServerInfo.java b/...elic-security-api/src/main/java/com/newrelic/api/agent/security/schema/AppServerInfo.java
@@ -8,6 +8,8 @@ public class AppServerInfo {
 
     String sameSiteCookies;
 
+    String applicationTmpDirectory;
+
     public String getApplicationDirectory() {
         return applicationDirectory;
     }
@@ -31,4 +33,12 @@ public String getSameSiteCookies() {
     public void setSameSiteCookies(String sameSiteCookies) {
         this.sameSiteCookies = sameSiteCookies;
     }
+
+    public String getApplicationTmpDirectory() {
+        return applicationTmpDirectory;
+    }
+
+    public void setApplicationTmpDirectory(String applicationTmpDirectory) {
+        this.applicationTmpDirectory = applicationTmpDirectory;
+    }
 }