Merge pull request #2207 from digma-ai/feature/system-property-for-jcef-logging

jcef logging system property

Author: kshmidt-digma

build.gradle.kts

@@ -247,6 +247,7 @@ tasks {
             "idea.log.limit" to "999999999",
             "idea.trace.stub.index.update" to "true",
             "org.digma.plugin.enable.devtools" to "true",
+            "org.digma.plugin.enable.JCEFLogging" to "true"
 
 //            "idea.ProcessCanceledException" to "disabled"
 

src/main/java/org/digma/intellij/plugin/dashboard/DashboardIndexTemplateBuilder.java

@@ -10,12 +10,13 @@
 import org.digma.intellij.plugin.settings.SettingsState;
 import org.digma.intellij.plugin.ui.common.JaegerUtilKt;
 import org.digma.intellij.plugin.ui.jcef.BaseIndexTemplateBuilderKt;
-
+import static org.digma.intellij.plugin.ui.jcef.BaseIndexTemplateBuilderKt.IS_LOGGING_ENABLED;
 import java.io.*;
 import java.nio.charset.StandardCharsets;
 import java.util.HashMap;
 
 import static org.digma.intellij.plugin.analytics.EnvUtilsKt.getCurrentEnvironmentId;
+import static org.digma.intellij.plugin.ui.jcef.JCEFUtilsKt.getIsLoggingEnabledSystemProperty;
 
 public class DashboardIndexTemplateBuilder {
     private final Logger logger = Logger.getInstance(DashboardIndexTemplateBuilder.class);
@@ -62,6 +63,7 @@ public InputStream build(Project project, DashboardVirtualFile dashboardVirtualF
 
             data.put(DASHBOARD_REFRESH_INTERVAL, 10*1000);
             data.put(DASHBOARD_ENVIRONMENT, getCurrentEnvironmentId(project));
+            data.put(IS_LOGGING_ENABLED,getIsLoggingEnabledSystemProperty());
 
             Template template = freemarketConfiguration.getTemplate(INDEX_TEMPLATE_NAME);
             StringWriter stringWriter = new StringWriter();

src/main/java/org/digma/intellij/plugin/troubleshooting/TroubleshootingIndexTemplateBuilder.java

@@ -14,6 +14,9 @@
 import java.nio.charset.StandardCharsets;
 import java.util.HashMap;
 
+import static org.digma.intellij.plugin.ui.jcef.BaseIndexTemplateBuilderKt.IS_LOGGING_ENABLED;
+import static org.digma.intellij.plugin.ui.jcef.JCEFUtilsKt.getIsLoggingEnabledSystemProperty;
+
 class TroubleshootingIndexTemplateBuilder {
 
     private final Logger logger = Logger.getInstance(TroubleshootingIndexTemplateBuilder.class);
@@ -53,7 +56,7 @@ public InputStream build(Project project) {
             data.put(IS_DIGMA_ENGINE_RUNNING, ApplicationManager.getApplication().getService(DockerService.class).isEngineRunning(project));
             data.put(IS_DOCKER_INSTALLED, ApplicationManager.getApplication().getService(DockerService.class).isDockerInstalled());
             data.put(IS_DOCKER_COMPOSE_INSTALLED, ApplicationManager.getApplication().getService(DockerService.class).isDockerInstalled());
-
+            data.put(IS_LOGGING_ENABLED, getIsLoggingEnabledSystemProperty());
 
             Template template = freemarketConfiguration.getTemplate(INDEX_TEMPLATE_NAME);
             StringWriter stringWriter = new StringWriter();

src/main/kotlin/org/digma/intellij/plugin/ui/jcef/BaseIndexTemplateBuilder.kt

@@ -51,6 +51,7 @@ const val DIGMATHON_ENABLED = "isDigmathonModeEnabled"
 const val DIGMATHON_PRODUCT_KEY = "productKey"
 const val USER_ID = "userId"
 const val USER_FINISHED_DIGMATHON = "isDigmathonGameFinished"
+const val IS_LOGGING_ENABLED = "isLoggingEnabled"
 
 
 abstract class BaseIndexTemplateBuilder(resourceFolderName: String, private val indexTemplateName: String) {
@@ -91,6 +92,7 @@ abstract class BaseIndexTemplateBuilder(resourceFolderName: String, private val
             data[DIGMATHON_PRODUCT_KEY] = DigmathonService.getInstance().getProductKey().orEmpty()
             data[USER_ID] = UniqueGeneratedUserId.userId
             data[USER_FINISHED_DIGMATHON] = DigmathonService.getInstance().isUserFinishedDigmathon
+            data[IS_LOGGING_ENABLED] = getIsLoggingEnabledSystemProperty()
 
             addAppSpecificEnvVariable(project, data)
 

src/main/kotlin/org/digma/intellij/plugin/ui/jcef/JCEFUtils.kt

@@ -5,6 +5,12 @@ import com.fasterxml.jackson.databind.ObjectMapper
 import com.fasterxml.jackson.databind.node.ObjectNode
 
 
+fun getIsLoggingEnabledSystemProperty():Boolean{
+    return java.lang.Boolean.getBoolean("org.digma.plugin.enable.JCEFLogging")
+}
+
+
+
 fun getQueryMapFromPayload(requestJsonNode: JsonNode, objectMapper: ObjectMapper): MutableMap<String, Any> {
 
     val payloadNode: JsonNode = objectMapper.readTree(requestJsonNode.get("payload").toString())

src/main/kotlin/org/digma/intellij/plugin/ui/wizard/InstallationWizardSidePanelWindowPanel.kt

@@ -48,10 +48,12 @@ import org.digma.intellij.plugin.ui.common.isJaegerButtonEnabled
 import org.digma.intellij.plugin.ui.common.updateObservabilityValue
 import org.digma.intellij.plugin.ui.jcef.DIGMATHON_ENABLED
 import org.digma.intellij.plugin.ui.jcef.DIGMATHON_PRODUCT_KEY
+import org.digma.intellij.plugin.ui.jcef.IS_LOGGING_ENABLED
 import org.digma.intellij.plugin.ui.jcef.JBCefBrowserBuilderCreator
 import org.digma.intellij.plugin.ui.jcef.JCEFGlobalConstants
 import org.digma.intellij.plugin.ui.jcef.USER_FINISHED_DIGMATHON
 import org.digma.intellij.plugin.ui.jcef.USER_ID
+import org.digma.intellij.plugin.ui.jcef.getIsLoggingEnabledSystemProperty
 import org.digma.intellij.plugin.ui.jcef.jsonToObject
 import org.digma.intellij.plugin.ui.jcef.model.OpenInDefaultBrowserRequest
 import org.digma.intellij.plugin.ui.jcef.model.SendTrackingEventRequest
@@ -136,7 +138,9 @@ fun createInstallationWizardSidePanelWindowPanel(project: Project, wizardSkipIns
         DIGMATHON_ENABLED to DigmathonService.getInstance().getDigmathonState().isActive(),
         DIGMATHON_PRODUCT_KEY to DigmathonService.getInstance().getProductKey().orEmpty(),
         USER_ID to UniqueGeneratedUserId.userId,
-        USER_FINISHED_DIGMATHON to DigmathonService.getInstance().isUserFinishedDigmathon
+        USER_FINISHED_DIGMATHON to DigmathonService.getInstance().isUserFinishedDigmathon,
+        IS_LOGGING_ENABLED to getIsLoggingEnabledSystemProperty()
+
     )
 
 

src/main/resources/webview/dashboard/dashboard.ftl

@@ -28,6 +28,7 @@
         window.isDockerInstalled = ${isDockerInstalled?string('true', 'false')};
         window.isDockerComposeInstalled = ${isDockerComposeInstalled?string('true', 'false')};
         window.digmaApiUrl = "${digmaApiUrl}";
+        window.isLoggingEnabled = ${isLoggingEnabled?string('true', 'false')};
 
         window.dashboardRefreshInterval = "${dashboardRefreshInterval}";
         window.dashboardEnvironment = "${dashboardEnvironment}";

src/main/resources/webview/dashboard/index.js

@@ -21,3 +21,4 @@
       window.isDigmathonGameFinished = ${isDigmathonGameFinished?string('true', 'false')};
       window.productKey = "${productKey}";
       window.userId = "${userId}";
+      window.isLoggingEnabled = ${isLoggingEnabled?string('true', 'false')};