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;
 	}
 
 	/**
@@ -313,6 +313,7 @@ declare module Mobile {
 	}
 
 	interface IDeviceAndroidDebugBridge extends IAndroidDebugBridge {
+		identifier: string;
 		executeShellCommand(args: string[], options?: IAndroidDebugBridgeCommandOptions): Promise<any>;
 		sendBroadcastToDevice(action: string, extras?: IStringDictionary): Promise<number>;
 	}

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,10 +50,39 @@ export class AndroidApplicationManager extends ApplicationManagerBase {
 			"1"]);
 
 		if (!this.$options.justlaunch) {
+			let processIdentifier = await this.getProcessId(appIdentifier);
+			if (processIdentifier) {
+				let deviceIdentifier = this.adb.identifier;
+				this.$deviceLogProvider.setApplicationPidForDevice(deviceIdentifier, processIdentifier);
+			}
+
 			await this.$logcatHelper.start(this.identifier);
 		}
 	}
 
+	private async getProcessId(appId: string): Promise<string> {
+		// Read the process id of the application that was just started
+		// Information is returned in the following format
+		// USER      PID   PPID  VSIZE  RSS   WCHAN            PC  NAME
+		// u0_a64    4831  488   851380 94888    ep_poll f1e43bb9 S org.nativescript.myApplication
+		let processes = await this.adb.executeShellCommand(["ps"]);
+		processes = processes.trim()
+			.split("\n")
+			.map((line: string) => line.replace(/\s+/g, ' ')
+				.split(" ")
+				.filter((entry: string) => /\S/.test(entry)));
+
+		let currentProcessLine = processes.find((line: Array<string>) => line[line.length - 1] === appId);
+
+		if (!currentProcessLine) {
+			return Promise.resolve(null);
+		}
+
+		let pid = currentProcessLine[1];
+
+		return pid;
+	}
+
 	public stopApplication(appIdentifier: string): Promise<void> {
 		return this.adb.executeShellCommand(["am", "force-stop", `${appIdentifier}`]);
 	}

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 {
+	public filterData(data: string, logLevel: string, pid: string): string {
 		let specifiedLogLevel = (logLevel || '').toUpperCase();
 		if (specifiedLogLevel === this.$loggingLevels.info) {
-			let log = this.getConsoleLogFromLine(data);
+			let log = this.getConsoleLogFromLine(data, pid);
 			if (log) {
 				if (log.tag) {
 					return `${log.tag}: ${log.message}` + os.EOL;
@@ -29,15 +29,20 @@ export class AndroidLogFilter implements Mobile.IPlatformLogFilter {
 		return data + os.EOL;
 	}
 
-	private getConsoleLogFromLine(lineText: string): any {
-		let acceptedTags = ["chromium", "Web Console", "JS"];
+	private getConsoleLogFromLine(lineText: string, pid: string): any {
+		// filter log line if it does not belong to the current application process id
+		if (lineText.indexOf(pid) < 0) {
+			return null;
+		}
+
+		let acceptedTags = ["chromium", "Web Console", "JS", "ActivityManager", "System.err"];
 		let 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] };
 		}
-		let matchingTag = _.some(acceptedTags, (tag: string) => { return lineText.indexOf(tag) !== -1; });
-		return matchingTag ? { message: lineText } : null;
+
+		return null;
 	}
 }
 $injector.register("androidLogFilter", AndroidLogFilter);

mobile/android/device-android-debug-bridge.ts

@@ -6,7 +6,7 @@ interface IComposeCommandResult {
 }
 
 export class DeviceAndroidDebugBridge extends AndroidDebugBridge implements Mobile.IDeviceAndroidDebugBridge {
-	constructor(private identifier: string,
+	constructor(public identifier: string,
 		protected $childProcess: IChildProcess,
 		protected $errors: IErrors,
 		protected $logger: ILogger,

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);
 		}
 	}