github-mirrors/kibana
1
0
Fork 0
mirror of https://github.com/elastic/kibana.git synced 2025-04-24 01:38:56 -04:00
Code Issues Projects Releases Packages Wiki Activity

[Reporting] Logging improvements while generating reports (#123802) (#124014)

Browse source 
* extract message from error objects

* only warn for 400 and up status codes

* Simplify for loop per dokmic's suggestion

Co-authored-by: Michael Dokolin <dokmic@gmail.com>

* formatting

Co-authored-by: Michael Dokolin <dokmic@gmail.com>
Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
(cherry picked from commit 0ee514b1fe)
This commit is contained in:
Jean-Louis Leysens 2022-01-28 15:24:19 +01:00 • committed by GitHub
parent f9acef896c
commit 5f963e13ee
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 57 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

8
x-pack/plugins/screenshotting/server/browsers/chromium/driver.ts
View file

@ -351,16 +351,14 @@ export class HeadlessChromiumDriver {
this.interceptedCount = this.interceptedCount + (isData ? 0 : 1);
});
// Even though 3xx redirects go through our request
// handler, we should probably inspect responses just to
// avoid being bamboozled by some malicious request
this.page.on('response', (interceptedResponse: puppeteer.HTTPResponse) => {
const interceptedUrl = interceptedResponse.url();
const allowed = !interceptedUrl.startsWith('file://');
const status = interceptedResponse.status();
if (!interceptedResponse.ok()) {
if (status >= 400 && !interceptedResponse.ok()) {
logger.warn(
`Chromium received a non-OK response (${interceptedResponse.status()}) for request ${interceptedUrl}`
`Chromium received a non-OK response (${status}) for request ${interceptedUrl}`
);
}

62
x-pack/plugins/screenshotting/server/browsers/chromium/driver_factory/index.ts
View file

@ -16,7 +16,16 @@ import puppeteer, { Browser, ConsoleMessage, HTTPRequest, Page } from 'puppeteer
import { createInterface } from 'readline';
import * as Rx from 'rxjs';
import { InnerSubscriber } from 'rxjs/internal/InnerSubscriber';
import { catchError, ignoreElements, map, mergeMap, reduce, takeUntil, tap } from 'rxjs/operators';
import {
catchError,
ignoreElements,
map,
concatMap,
mergeMap,
reduce,
takeUntil,
tap,
} from 'rxjs/operators';
import type { Logger } from 'src/core/server';
import type { ScreenshotModePluginSetup } from 'src/plugins/screenshot_mode/server';
import { ConfigType } from '../../../config';
@ -241,18 +250,55 @@ export class HeadlessChromiumDriverFactory {
});
}
/**
* In certain cases the browser will emit an error object to console. To ensure
* we extract the message from the error object we need to go the browser's context
* and look at the error there.
*
* If we don't do this we we will get a string that says "JSHandle@error" from
* line.text().
*
* See https://github.com/puppeteer/puppeteer/issues/3397.
*/
private async getErrorMessage(message: ConsoleMessage): Promise<undefined | string> {
for (const arg of message.args()) {
const errorMessage = await arg
.executionContext()
.evaluate<undefined | string>((_arg: unknown) => {
/* !! We are now in the browser context !! */
if (_arg instanceof Error) {
return _arg.message;
}
return undefined;
/* !! End of browser context !! */
}, arg);
if (errorMessage) {
return errorMessage;
}
}
}
getBrowserLogger(page: Page, logger: Logger): Rx.Observable<void> {
const consoleMessages$ = Rx.fromEvent<ConsoleMessage>(page, 'console').pipe(
map((line) => {
const formatLine = () => `{ text: "${line.text()?.trim()}", url: ${line.location()?.url} }`;
concatMap(async (line) => {
if (line.type() === 'error') {
logger.get('headless-browser-console').error(`Error in browser console: ${formatLine()}`);
} else {
logger
.get(`headless-browser-console:${line.type()}`)
.debug(`Message in browser console: ${formatLine()}`);
.get('headless-browser-console')
.error(
`Error in browser console: { message: "${
(await this.getErrorMessage(line)) ?? line.text()
}", url: "${line.location()?.url}" }`
);
return;
}
logger
.get(`headless-browser-console:${line.type()}`)
.debug(
`Message in browser console: { text: "${line.text()?.trim()}", url: ${
line.location()?.url
} }`
);
})
);