Merge pull request #2625 from newrelic/disable-jfr-reporting-for-serverless

Serverless POC: Disable JFR when serverless mode is enabled

Author: sharvath-newrelic

newrelic-agent/src/main/java/com/newrelic/agent/jfr/JfrService.java

@@ -97,12 +97,15 @@ void startJfrLoop() throws JfrRecorderException {
     public final boolean isEnabled() {
         final boolean enabled = jfrConfig.isEnabled();
         boolean isHighSecurity = defaultAgentConfig.isHighSecurity();
+        boolean isServerless = defaultAgentConfig.getServerlessConfig().isEnabled();
         if (!enabled) {
             Agent.LOG.log(Level.INFO, "New Relic JFR Monitor is disabled: JFR config has not been enabled in the Java agent.");
         } else if (isHighSecurity) {
             Agent.LOG.log(Level.INFO, "New Relic JFR Monitor is enabled but High Security mode is also enabled; JFR will not be activated.");
+        } else if (isServerless) {
+            Agent.LOG.log(Level.INFO, "New Relic JFR Monitor is enabled but Serverless mode is also enabled; JFR will not be activated.");
         }
-        return enabled && !isHighSecurity;
+        return enabled && !isHighSecurity && !isServerless;
     }
 
     @Override

newrelic-agent/src/test/java/com/newrelic/agent/jfr/JfrServiceTest.java

@@ -5,11 +5,9 @@
 import com.newrelic.agent.RPMServiceManager;
 import com.newrelic.agent.ThreadService;
 import com.newrelic.agent.config.AgentConfig;
-import com.newrelic.agent.config.ConfigService;
 import com.newrelic.agent.config.JfrConfig;
+import com.newrelic.agent.config.ServerlessConfig;
 import com.newrelic.agent.service.ServiceFactory;
-import com.newrelic.agent.service.ServiceManager;
-import com.newrelic.agent.service.ServiceManagerImpl;
 import com.newrelic.jfr.ThreadNameNormalizer;
 import com.newrelic.jfr.daemon.DaemonConfig;
 import com.newrelic.jfr.daemon.JfrRecorderException;
@@ -18,7 +16,6 @@
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 import org.mockito.Mock;
-import org.mockito.MockedStatic;
 import org.mockito.MockitoAnnotations;
 
 import static com.newrelic.agent.config.AgentConfigImpl.DEFAULT_EVENT_INGEST_URI;
@@ -30,7 +27,6 @@
 import static org.mockito.Mockito.any;
 import static org.mockito.Mockito.eq;
 import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.mockStatic;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.timeout;
 import static org.mockito.Mockito.times;
@@ -45,6 +41,9 @@ public class JfrServiceTest {
     @Mock
     AgentConfig agentConfig;
 
+    @Mock
+    ServerlessConfig serverlessConfig;
+
     @Before
     public void before() {
         MockitoAnnotations.openMocks(this);
@@ -62,6 +61,8 @@ public void before() {
         when(agentConfig.getProxyScheme()).thenReturn("http");
         when(agentConfig.getValue(eq(ThreadService.NAME_PATTERN_CFG_KEY), any(String.class)))
                 .thenReturn(ThreadNameNormalizer.DEFAULT_PATTERN);
+        when(agentConfig.getServerlessConfig()).thenReturn(serverlessConfig);
+        when(serverlessConfig.isEnabled()).thenReturn(false);
     }
 
     @Test
@@ -126,6 +127,20 @@ public void jfrLoopDoesNotStartWhenIsEnabledIsTrueAndHighSecurityIsTrue() throws
         verify(spyJfr, times(0)).startJfrLoop();
     }
 
+    @Test
+    public void jfrLoopDoesNotStartWhenIsEnabledIsTrueAndServerlessModeIsTrue() throws JfrRecorderException {
+        JfrService jfrService = new JfrService(jfrConfig, agentConfig);
+        JfrService spyJfr = spy(jfrService);
+        when(serverlessConfig.isEnabled()).thenReturn(true);
+        when(jfrConfig.isEnabled()).thenReturn(true);
+        when(spyJfr.coreApisExist()).thenReturn(true);
+
+        spyJfr.doStart();
+
+        assertFalse(spyJfr.isEnabled());
+        verify(spyJfr, times(0)).startJfrLoop();
+    }
+
     @Category( IBMJ9IncompatibleTest.class )
     @Test
     public void jfrLoopDoesStart() {