commit a2a0ca5336c1e1cdbb8e88750ccdee6ea558ef55
Author: Jason Laster <jlaster@mozilla.com>
Date:   Tue Apr 9 21:23:16 2019 -0400

    Bug 1543291 -  Log Points could be nested by call site

diff --git a/devtools/server/actors/breakpoint.js b/devtools/server/actors/breakpoint.js
index 327115d0e1ac..d8e807f81e9c 100644
--- a/devtools/server/actors/breakpoint.js
+++ b/devtools/server/actors/breakpoint.js
@@ -237,14 +237,35 @@ BreakpointActor.prototype = {
         value = value.unsafeDereference();
       }

-      const message = {
+      const location = {
         filename: url,
         lineNumber: generatedLine,
         columnNumber: generatedColumn,
-        level: "logPoint",
-        arguments: value,
       };
-      this.threadActor._parent._consoleActor.onConsoleAPICall(message);
+
+      this.threadActor._parent._consoleActor.onConsoleAPICall({
+        ...location,
+        level: "group",
+        groupName: displayName,
+        arguments: [displayName],
+      });
+
+      if (logValue != "displayName") {
+        this.threadActor._parent._consoleActor.onConsoleAPICall({
+          ...location,
+          level: "logPoint",
+          arguments: value,
+        });
+      }
+
+      frame.onPop = () => {
+        this.threadActor._parent._consoleActor.onConsoleAPICall({
+          ...location,
+          level: "groupEnd",
+          groupName: displayName,
+          arguments: [displayName],
+        });
+      };

       // Never stop at log points.
       return undefined;