Filter android logs by process id

Author: petekanev

definitions/mobile.d.ts

@@ -170,7 +170,7 @@ declare module Mobile {
 		 * @param {string} deviceIdentifier The unique identifier of the device.
 		 * @param {string} pid The Process ID of the currently running application for which we need the logs.
 		 */
-		setApplictionPidForDevice(deviceIdentifier: string, pid: string): void;
+		setApplicationPidForDevice(deviceIdentifier: string, pid: string): void;
 	}
 
 	/**
@@ -448,6 +448,14 @@ declare module Mobile {
 		 * @return {Promise<IDictionary<number>>} Dictionary, where the keys are app identifiers and the values are local ports.
 		 */
 		getMappedAbstractToTcpPorts(deviceIdentifier: string, appIdentifiers: string[], framework: string): Promise<IDictionary<number>>;
+
+		/**
+		 * Gets the PID of a running application.
+		 * @param deviceIdentifier {string} The identifier of the device.
+		 * @param appIdentifier The identifier of the application.
+		 * @return {string} Returns the process id matching the application identifier in the device process list.
+		 */
+		getAppProcessId(deviceIdentifier: string, appIdentifier: string): Promise<string>;
 	}
 
 	/**

mobile/android/android-application-manager.ts

@@ -11,6 +11,7 @@ export class AndroidApplicationManager extends ApplicationManagerBase {
 		private $logcatHelper: Mobile.ILogcatHelper,
 		private $androidProcessService: Mobile.IAndroidProcessService,
 		private $httpClient: Server.IHttpClient,
+		private $deviceLogProvider: Mobile.IDeviceLogProvider,
 		$logger: ILogger,
 		$hooksService: IHooksService) {
 		super($logger, $hooksService);
@@ -49,6 +50,12 @@ export class AndroidApplicationManager extends ApplicationManagerBase {
 			"1"]);
 
 		if (!this.$options.justlaunch) {
+			const deviceIdentifier = this.identifier;
+			const processIdentifier = await this.$androidProcessService.getAppProcessId(deviceIdentifier, appIdentifier);
+			if (processIdentifier) {
+				this.$deviceLogProvider.setApplicationPidForDevice(deviceIdentifier, processIdentifier);
+			}
+
 			await this.$logcatHelper.start(this.identifier);
 		}
 	}

mobile/android/android-log-filter.ts

@@ -7,14 +7,14 @@ export class AndroidLogFilter implements Mobile.IPlatformLogFilter {
 
 	// sample line is "11-23 12:39:07.310  1584  1597 I art     : Background sticky concurrent mark sweep GC freed 21966(1780KB) AllocSpace objects, 4(80KB) LOS objects, 77% free, 840KB/3MB, paused 4.018ms total 158.629ms"
 	// or '12-28 10:45:08.020  3329  3329 W chromium: [WARNING:data_reduction_proxy_settings.cc(328)] SPDY proxy OFF at startup'
-	private static API_LEVEL_23_LINE_REGEX = /.+?\s+?(?:[A-Z]\s+?)([A-Za-z ]+?)\s*?\: (.*)/;
+	private static API_LEVEL_23_LINE_REGEX = /.+?\s+?(?:[A-Z]\s+?)([A-Za-z \.]+?)\s*?\: (.*)/;
 
 	constructor(private $loggingLevels: Mobile.ILoggingLevels) { }
 
-	public filterData(data: string, logLevel: string): string {
-		let specifiedLogLevel = (logLevel || '').toUpperCase();
+	public filterData(data: string, logLevel: string, pid: string): string {
+		const specifiedLogLevel = (logLevel || '').toUpperCase();
 		if (specifiedLogLevel === this.$loggingLevels.info) {
-			let log = this.getConsoleLogFromLine(data);
+			const log = this.getConsoleLogFromLine(data, pid);
 			if (log) {
 				if (log.tag) {
 					return `${log.tag}: ${log.message}` + os.EOL;
@@ -29,15 +29,28 @@ export class AndroidLogFilter implements Mobile.IPlatformLogFilter {
 		return data + os.EOL;
 	}
 
-	private getConsoleLogFromLine(lineText: string): any {
-		let acceptedTags = ["chromium", "Web Console", "JS"];
-		let match = lineText.match(AndroidLogFilter.LINE_REGEX) || lineText.match(AndroidLogFilter.API_LEVEL_23_LINE_REGEX);
+	private getConsoleLogFromLine(lineText: string, pid: string): any {
+		const acceptedTags = ["chromium", "Web Console", "JS", "ActivityManager", "System.err"];
+
+		let consoleLogMessage: { tag?: string, message: string };
+
+		const match = lineText.match(AndroidLogFilter.LINE_REGEX) || lineText.match(AndroidLogFilter.API_LEVEL_23_LINE_REGEX);
 
 		if (match && acceptedTags.indexOf(match[1].trim()) !== -1) {
-			return { tag: match[1].trim(), message: match[2] };
+			consoleLogMessage = { tag: match[1].trim(), message: match[2] };
+		}
+
+		if (!consoleLogMessage) {
+			const matchingTag = _.some(acceptedTags, (tag: string) => { return lineText.indexOf(tag) !== -1; });
+			consoleLogMessage = matchingTag ? { message: lineText } : null;
 		}
-		let matchingTag = _.some(acceptedTags, (tag: string) => { return lineText.indexOf(tag) !== -1; });
-		return matchingTag ? { message: lineText } : null;
+
+		// filter log line if it does not belong to the current application process id
+		if (pid && lineText.indexOf(pid) < 0) {
+			return null;
+		}
+
+		return consoleLogMessage;
 	}
 }
 $injector.register("androidLogFilter", AndroidLogFilter);

mobile/device-log-provider-base.ts

@@ -13,7 +13,7 @@ export abstract class DeviceLogProviderBase extends EventEmitter implements Mobi
 
 	public abstract setLogLevel(logLevel: string, deviceIdentifier?: string): void;
 
-	public setApplictionPidForDevice(deviceIdentifier: string, pid: string): void {
+	public setApplicationPidForDevice(deviceIdentifier: string, pid: string): void {
 		this.setDeviceLogOptionsProperty(deviceIdentifier, (deviceLogOptions: Mobile.IDeviceLogOptions) => deviceLogOptions.applicationPid, pid);
 	}
 

mobile/device-log-provider.ts

@@ -8,7 +8,6 @@ export class DeviceLogProvider extends DeviceLogProviderBase {
 
 	public logData(lineText: string, platform: string, deviceIdentifier: string): void {
 		let applicationPid = this.getApplicationPidForDevice(deviceIdentifier);
-
 		let data = this.$logFilter.filterData(platform, lineText, applicationPid);
 		if (data) {
 			this.$logger.write(data);

mobile/ios/simulator/ios-simulator-application-manager.ts

@@ -44,7 +44,7 @@ export class IOSSimulatorApplicationManager extends ApplicationManagerBase {
 
 		if (!this.$options.justlaunch) {
 			let pid = launchResult.split(":")[1].trim();
-			this.$deviceLogProvider.setApplictionPidForDevice(this.identifier, pid);
+			this.$deviceLogProvider.setApplicationPidForDevice(this.identifier, pid);
 			this.$iOSSimulatorLogProvider.startLogProcess(this.identifier);
 		}
 	}

mobile/mobile-core/android-process-service.ts

@@ -118,6 +118,13 @@ export class AndroidProcessService implements Mobile.IAndroidProcessService {
 			.value();
 	}
 
+	public async getAppProcessId(deviceIdentifier: string, appIdentifier: string): Promise<string> {
+		const adb = this.getAdb(deviceIdentifier);
+		const processId = (await this.getProcessIds(adb, [appIdentifier]))[appIdentifier];
+
+		return processId ? processId.toString() : null;
+	}
+
 	private async getApplicationInfoFromWebViewPortInformation(adb: Mobile.IDeviceAndroidDebugBridge, deviceIdentifier: string, information: string): Promise<Mobile.IDeviceApplicationInformation> {
 		// Need to search by processId to check for old Android webviews (@webview_devtools_remote_<processId>).
 		let processIdRegExp = /@webview_devtools_remote_(.+)/g,