Plugin: fix Chrome path (#451)

* Plugin: fix Chrome path

* fix shell commands

* fix chrome file extension

* fix file extension at runtime

* fix exec path issue for Mac + improve error log

* Update src/app.ts

Co-authored-by: Alex Khomenko <[email protected]>

* clean up

---------

Co-authored-by: Alex Khomenko <[email protected]>

Author: AgnesToulet

scripts/download_chrome.js

@@ -1,4 +1,5 @@
 const { BrowserPlatform, Browser, install, resolveBuildId } = require('@puppeteer/browsers');
+const fs = require('fs')
 const path = require('path');
 
 const archArg = process.argv[2];
@@ -36,6 +37,9 @@ async function download() {
     });
 }
 
-download().then(() => {
+download().then(browser => {
     console.log(`${browserVersion} downloaded into:`, outputPath);
+
+    const chromeInfo = { buildId: browser.buildId };
+    return fs.writeFileSync(path.resolve(outputPath, 'chrome-info.json'), JSON.stringify(chromeInfo));
 });

src/app.ts

@@ -1,6 +1,7 @@
 import * as path from 'path';
-import * as puppeteer from 'puppeteer';
 import * as _ from 'lodash';
+import * as fs from 'fs';
+import { Browser, computeExecutablePath } from '@puppeteer/browsers';
 import { RenderGRPCPluginV2 } from './plugin/v2/grpc_plugin';
 import { HttpServer } from './service/http-server';
 import { ConsoleLogger, PluginLogger } from './logger';
@@ -9,8 +10,6 @@ import { defaultPluginConfig, defaultServiceConfig, readJSONFileSync, PluginConf
 import { serve } from './node-plugin';
 import { createSanitizer } from './sanitizer/Sanitizer';
 
-const chromeFolderPrefix = 'chromium';
-
 async function main() {
   const argv = minimist(process.argv.slice(2));
   const env = Object.assign({}, process.env);
@@ -21,20 +20,16 @@ async function main() {
     const config: PluginConfig = defaultPluginConfig;
     populatePluginConfigFromEnv(config, env);
     if (!config.rendering.chromeBin && (process as any).pkg) {
-      //@ts-ignore
-      const executablePath = puppeteer.executablePath() as string;
-
-      if (executablePath.includes(chromeFolderPrefix)) {
-        const parts = executablePath.split(path.sep);
-        while (!parts[0].startsWith(chromeFolderPrefix)) {
-          parts.shift();
-        }
-
-        config.rendering.chromeBin = [path.dirname(process.execPath), ...parts].join(path.sep);
-      } else {
-        // local chrome installation in dev mode
-        config.rendering.chromeBin = env['PUPPETEER_EXECUTABLE_PATH'];
-      }
+      const execPath = path.dirname(process.execPath);
+      const chromeInfoFile = fs.readFileSync(path.resolve(execPath, 'chrome-info.json'), 'utf8');
+      const chromeInfo = JSON.parse(chromeInfoFile);
+
+     config.rendering.chromeBin = computeExecutablePath({
+        cacheDir: path.dirname(process.execPath),
+        browser: Browser.CHROME,
+        buildId: chromeInfo.buildId,
+      });
+      logger.debug(`Setting chromeBin to ${config.rendering.chromeBin}`);
     }
 
     await serve({
@@ -78,7 +73,13 @@ async function main() {
 }
 
 main().catch((err) => {
-  console.error(err);
+  const errorLog = {
+    '@level': 'error',
+    '@message': 'failed to start grafana-image-renderer',
+    'error': err.message,
+    'trace': err.stack,
+  }
+  console.error(JSON.stringify(errorLog));
   process.exit(1);
 });
 
@@ -91,6 +92,10 @@ function populatePluginConfigFromEnv(config: PluginConfig, env: NodeJS.ProcessEn
   if (env['GF_PLUGIN_GRPC_PORT']) {
     config.plugin.grpc.port = parseInt(env['GF_PLUGIN_GRPC_PORT'] as string, 10);
   }
+
+  if (env['GF_PLUGIN_RENDERING_CHROME_BIN']) {
+    config.rendering.chromeBin = env['GF_PLUGIN_RENDERING_CHROME_BIN'];
+  }
 }
 
 function populateServiceConfigFromEnv(config: ServiceConfig, env: NodeJS.ProcessEnv) {

src/plugin/v2/grpc_plugin.ts

@@ -240,10 +240,6 @@ class PluginGRPCServer {
 const populateConfigFromEnv = (config: PluginConfig) => {
   const env = Object.assign({}, process.env);
 
-  if (env['GF_PLUGIN_RENDERING_CHROME_BIN']) {
-    config.rendering.chromeBin = env['GF_PLUGIN_RENDERING_CHROME_BIN'];
-  }
-
   if (env['GF_PLUGIN_RENDERING_ARGS']) {
     const args = env['GF_PLUGIN_RENDERING_ARGS'] as string;
     if (args.length > 0) {