now creating the Callstack Instrument

automation/Extension/firefox/feature.js/index.js

@@ -2,10 +2,11 @@ import {
   CookieInstrument,
   JavascriptInstrument,
   HttpInstrument,
-  NavigationInstrument,
+  NavigationInstrument
 } from "openwpm-webext-instrumentation";
 
 import * as loggingDB from "./loggingdb.js";
+import { CallstackInstrument } from "openwpm-webext-instrumentation/src/background/callstack-instrument";
 
 async function main() {
   // Read the browser configuration from file
@@ -16,11 +17,12 @@ async function main() {
     console.log("Browser Config:", config);
   } else {
     config = {
-      navigation_instrument:false,
-      cookie_instrument:false,
-      js_instrument:false,
+      navigation_instrument:true,
+      cookie_instrument:true,
+      js_instrument:true,
       js_instrument_modules:"fingerprinting",
-      http_instrument:false,
+      http_instrument:true,
+      callstack_instrument:true,
       save_content:false,
       testing:true,
       crawl_id:0
@@ -59,13 +61,11 @@ async function main() {
                        config['save_content']);
   }
 
-  browser.webRequest.onBeforeRequest.addListener((details) => {
-    console.log(`req id: ${details.requestId}`);
-  }, {urls: ["<all_urls>"]});
-
-  browser.stackDump.onStackAvailable.addListener((requestId, stack) => {
-    console.log(requestId, stack);
-  });
+  if (config['callstack_instrument']) {
+    loggingDB.logDebug("Callstack Instrumentation enabled");
+    let callstackInstrument = new CallstackInstrument(loggingDB);
+    callstackInstrument.run(config['crawl_id']);
+  }
 }
 
 main();

automation/Extension/webext-instrumentation/src/background/callstack-instrument.js

@@ -3,14 +3,15 @@ export class CallstackInstrument {
     constructor(dataReceiver) {
         this.dataReceiver = dataReceiver;
     }
-    run(crawlID) {
+    async run(crawlID) {
         browser.stackDump.onStackAvailable.addListener((requestId, stack) => {
             const record = {
                 crawl_id: crawlID,
                 request_id: requestId,
                 call_stack: stack
             }
-            this.dataReceiver.saveRecord("callstacks", record)
+            console.log("Extension Callstack does this even run?")
+            await this.dataReceiver.saveRecord("callstacks", record)
         });
     }
 }

deploy-extension.sh

@@ -0,0 +1,12 @@
+#!/bin/bash
+set -e
+
+cd automation/Extension/firefox
+web-ext build
+cd -
+cp automation/Extension/firefox/dist/openwpm-*.zip firefox-profile/extensions/openwpm@mozilla.org.xpi
+if [ -z "$1" ]; then
+    firefox-bin/firefox-bin -profile firefox-profile;
+else
+    $1 -profile firefox-profile;
+fi