Merge pull request #2255 from digma-ai/collect-docker-container-logs

collect-docker-container-logs Closes #2236

Author: shalom938

ide-common/src/main/kotlin/org/digma/intellij/plugin/docker/DockerService.kt

@@ -1,6 +1,7 @@
 package org.digma.intellij.plugin.docker
 
 import com.intellij.execution.configurations.GeneralCommandLine
+import com.intellij.execution.process.ProcessOutput
 import com.intellij.execution.util.ExecUtil
 import com.intellij.openapi.application.ApplicationManager
 import com.intellij.openapi.components.Service
@@ -92,6 +93,35 @@ class DockerService {
     }
 
 
+
+    fun collectDigmaContainerLog(): String {
+        try {
+
+            if (!isInstalled(DOCKER_COMMAND)) {
+                return "could not find docker command"
+            }
+
+            val dockerCmd = getDockerCommand()
+
+            val getContainerIdCommand = GeneralCommandLine(dockerCmd, "ps", "--filter", "name=digma-compound", "--format", "{{.ID}}")
+                .withParentEnvironmentType(GeneralCommandLine.ParentEnvironmentType.CONSOLE)
+
+            val containerId = ExecUtil.execAndReadLine(getContainerIdCommand)
+
+            val getLogCommand = GeneralCommandLine(dockerCmd, "logs", "--tail", "1000", "$containerId")
+                .withParentEnvironmentType(GeneralCommandLine.ParentEnvironmentType.CONSOLE)
+
+            val processOutput: ProcessOutput =  ExecUtil.execAndGetOutput(getLogCommand)
+            return processOutput.toString()
+
+        } catch (ex: Exception) {
+            Log.warnWithException(logger, ex, "Failed in collectDigmaContainerLog")
+            ErrorReporter.getInstance().reportError("DockerService.collectDigmaContainerLog", ex)
+            return "could not collect docker container log because: $ex"
+        }
+    }
+
+
     fun installEngine(project: Project, resultTask: Consumer<String>) {
         installationInProgress = true
 
@@ -421,4 +451,6 @@ class DockerService {
         resultTask.accept(errorMsg)
     }
 
+
+
 }

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

@@ -99,7 +99,7 @@ private constructor(
                     Backgroundable.executeOnPooledThread {
                         try {
                             sendUserInfoMessage(jbCefBrowser.cefBrowser, DigmaDefaultAccountHolder.getInstance().account?.userId, project)
-                            val status = service<DockerService>().getCurrentDigmaInstallationStatusOnConnectionLost()
+                            val status = service<DockerService>().getActualRunningEngine(project)
                             updateDigmaEngineStatus(jbCefBrowser.cefBrowser, status)
                             sendBackendAboutInfo(jbCefBrowser.cefBrowser, project)
                         } catch (e: Throwable) {
@@ -199,7 +199,7 @@ private constructor(
                     sendIsMicrometerProject(jbCefBrowser.cefBrowser, SpringBootMicrometerConfigureDepsService.isSpringBootWithMicrometer())
                     sendIsJaegerButtonEnabledMessage(jbCefBrowser.cefBrowser)
                     sendBackendAboutInfo(jbCefBrowser.cefBrowser, project)
-                    val status = service<DockerService>().getCurrentDigmaInstallationStatusOnConnectionLost()
+                    val status = service<DockerService>().getActualRunningEngine(project)
                     updateDigmaEngineStatus(jbCefBrowser.cefBrowser, status)
                 } catch (e: Throwable) {
                     ErrorReporter.getInstance().reportError("JCefComponent.settingsChanged", e)

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

@@ -286,8 +286,13 @@ fun createInstallationWizardSidePanelWindowPanel(project: Project, wizardSkipIns
                         if (!connectionOk) {
                             Log.log(logger::warn, "no connection after engine installation")
                             if (success) {
+                                val log = DockerService.getInstance().collectDigmaContainerLog()
                                 ActivityMonitor.getInstance(project)
-                                    .registerDigmaEngineEventError("installEngine", "No connection 2 minutes after successful engine install")
+                                    .registerDigmaEngineEventError("installEngine", "No connection 2 minutes after successful engine install",
+                                        mapOf(
+                                            "docker log" to log
+                                        )
+                                    )
                             }
                         }
                         val isEngineUp = connectionOk && success
@@ -409,8 +414,13 @@ fun createInstallationWizardSidePanelWindowPanel(project: Project, wizardSkipIns
                         if (!connectionOk) {
                             Log.log(logger::warn, "no connection after engine start")
                             if (success) {
+                                val log = DockerService.getInstance().collectDigmaContainerLog()
                                 ActivityMonitor.getInstance(project)
-                                    .registerDigmaEngineEventError("startEngine", "No connection after successful engine start")
+                                    .registerDigmaEngineEventError("startEngine", "No connection 2 minutes after successful engine start",
+                                        mapOf(
+                                            "docker log" to log
+                                        )
+                                    )
                             }
                         }