fix(frontend): fixes golang package name coloring (#635)

grafana · Dec 26, 2021 · 6c390b5 · 6c390b5
1 parent c176dac
commit 6c390b5
Show file tree

Hide file tree

Showing 17 changed files with 2 additions and 22 deletions.
diff --git a/cypress/integration/webapp/basic.ts b/cypress/integration/webapp/basic.ts
@@ -351,27 +351,6 @@ describe('basic test', () => {
     });
   });
 
-  describe('focus', () => {
-    it('it toggles when clicked again', () => {
-      cy.intercept('**/render*', {
-        fixture: 'simple-golang-app-cpu.json',
-        times: 1,
-      }).as('render');
-
-      cy.visit('/');
-
-      // click once once
-      cy.findByTestId('flamegraph-canvas').click(0, BAR_HEIGHT * 2);
-
-      // click again
-      cy.findByTestId('flamegraph-canvas').click(0, BAR_HEIGHT * 2);
-
-      cy.findByTestId('flamegraph-canvas').matchImageSnapshot(
-        `simple-golang-app-focus-toggle`
-      );
-    });
-  });
-
   describe('contextmenu', () => {
     it("it works when 'clear view' is clicked", () => {
       cy.intercept('**/render*', {

diff --git a/cypress/snapshots/basic.ts/grafana-simple-golang-app-cpu.snap.png b/cypress/snapshots/basic.ts/grafana-simple-golang-app-cpu.snap.png
diff --git a/cypress/snapshots/basic.ts/pyroscope.server.alloc_objects-flamegraph.snap.png b/cypress/snapshots/basic.ts/pyroscope.server.alloc_objects-flamegraph.snap.png
diff --git a/cypress/snapshots/basic.ts/pyroscope.server.alloc_objects-table.snap.png b/cypress/snapshots/basic.ts/pyroscope.server.alloc_objects-table.snap.png
diff --git a/cypress/snapshots/basic.ts/pyroscope.server.alloc_space-flamegraph.snap.png b/cypress/snapshots/basic.ts/pyroscope.server.alloc_space-flamegraph.snap.png
diff --git a/cypress/snapshots/basic.ts/pyroscope.server.alloc_space-table.snap.png b/cypress/snapshots/basic.ts/pyroscope.server.alloc_space-table.snap.png
diff --git a/cypress/snapshots/basic.ts/pyroscope.server.cpu-flamegraph.snap.png b/cypress/snapshots/basic.ts/pyroscope.server.cpu-flamegraph.snap.png
diff --git a/cypress/snapshots/basic.ts/pyroscope.server.cpu-table.snap.png b/cypress/snapshots/basic.ts/pyroscope.server.cpu-table.snap.png
diff --git a/cypress/snapshots/basic.ts/pyroscope.server.inuse_objects-flamegraph.snap.png b/cypress/snapshots/basic.ts/pyroscope.server.inuse_objects-flamegraph.snap.png
diff --git a/cypress/snapshots/basic.ts/pyroscope.server.inuse_objects-table.snap.png b/cypress/snapshots/basic.ts/pyroscope.server.inuse_objects-table.snap.png
diff --git a/cypress/snapshots/basic.ts/pyroscope.server.inuse_space-flamegraph.snap.png b/cypress/snapshots/basic.ts/pyroscope.server.inuse_space-flamegraph.snap.png
diff --git a/cypress/snapshots/basic.ts/pyroscope.server.inuse_space-table.snap.png b/cypress/snapshots/basic.ts/pyroscope.server.inuse_space-table.snap.png
diff --git a/cypress/snapshots/basic.ts/simple-golang-app-focus-toggle.snap.png b/cypress/snapshots/basic.ts/simple-golang-app-focus-toggle.snap.png
diff --git a/cypress/snapshots/lang-smoke.ts/comparison-go-1.snap.png b/cypress/snapshots/lang-smoke.ts/comparison-go-1.snap.png
diff --git a/cypress/snapshots/lang-smoke.ts/comparison-go-2.snap.png b/cypress/snapshots/lang-smoke.ts/comparison-go-2.snap.png
diff --git a/cypress/snapshots/lang-smoke.ts/shipping-service-go-cpu-flamegraph.snap.png b/cypress/snapshots/lang-smoke.ts/shipping-service-go-cpu-flamegraph.snap.png
diff --git a/webapp/javascript/components/FlameGraph/FlameGraphComponent/color.ts b/webapp/javascript/components/FlameGraph/FlameGraphComponent/color.ts
@@ -101,7 +101,8 @@ export function getPackageNameFromStackTrace(
     default: /^(?<packageName>(.*\/)*)(?<filename>.*)(?<line_info>.*)$/,
     dotnetspy: /^(?<packageName>.+)\.(.+)\.(.+)\(.*\)$/,
     ebpfspy: /^(?<packageName>.+)$/,
-    gospy: /^(?<packageName>(.*\/)*)(?<filename>.*)(?<line_info>.*)$/,
+    // tested with pyroscope stacktraces here: https://regex101.com/r/99KReq/1
+    gospy: /^(?<packageName>.*?\/.*?\.|.*?\.|.+)(?<functionName>.*)$/,
     phpspy: /^(?<packageName>(.*\/)*)(?<filename>.*\.php+)(?<line_info>.*)$/,
     pyspy: /^(?<packageName>(.*\/)*)(?<filename>.*\.py+)(?<line_info>.*)$/,
     rbspy: /^(?<packageName>(.*\/)*)(?<filename>.*\.rb+)(?<line_info>.*)$/,