Merge branch 'main' into mv3-release

extension-manifest-v2/package.json

@@ -45,7 +45,7 @@
     "@ghostery/trackers-preview": "^1.0.0",
     "@ghostery/ui": "^1.0.0",
     "@sentry/browser": "7.1.1",
-    "@whotracksme/webextension-packages": "^5.0.1",
+    "@whotracksme/webextension-packages": "^5.0.2",
     "classnames": "^2.3.2",
     "d3": "^7.8.5",
     "foundation-sites": "^6.6.2",

extension-manifest-v3/package.json

@@ -38,7 +38,7 @@
     "@ghostery/trackers-preview": "^1.0.0",
     "@ghostery/ui": "^1.0.0",
     "@github/relative-time-element": "^4.3.0",
-    "@whotracksme/webextension-packages": "^5.0.1",
+    "@whotracksme/webextension-packages": "^5.0.2",
     "hybrids": "^8.2.5",
     "idb": "^7.1.1",
     "jwt-decode": "^4.0.0",

extension-manifest-v3/src/background/reporting/index.js

@@ -18,6 +18,7 @@ import {
   UrlReporter,
   RequestReporter,
   setLogLevel,
+  describeLoggers,
 } from '@whotracksme/webextension-packages/packages/reporting';
 import { getBrowserInfo } from '@ghostery/libs';
 
@@ -33,7 +34,21 @@ const webRequestPipeline = new WebRequestPipeline();
 // Important to call it in a first tick as it assigns chrome. listeners
 webRequestPipeline.init();
 
-setLogLevel('debug');
+(async () => {
+  try {
+    const key = 'ghosteryReportingLoggerConfig';
+    const { [key]: config } = (await chrome.storage.local.get(key)) || {};
+    if (config) {
+      for (const { level, prefix = '*' } of config) {
+        setLogLevel(level, { prefix });
+      }
+    } else {
+      setLogLevel('off');
+    }
+  } catch (e) {
+    console.warn('Failed to apply logger overwrites', e);
+  }
+})();
 
 function platformSpecificSettings() {
   if (
@@ -261,4 +276,8 @@ globalThis.ghostery.WTM = {
   config,
   webRequestPipeline,
   extensionStartedAt: new Date(),
+  logging: {
+    setLogLevel,
+    describeLoggers,
+  },
 };