@datadog/webpack-plugin 0.0.12-dev → 0.0.13-1

package/dist/src/index.d.ts

@@ -6,15 +6,15 @@ interface GetPluginsOptions {
         appKey: string;
     };
 }
-
-declare const CONFIG_KEY: "telemetry";
-
 interface Metric {
     metric: string;
     type: 'count' | 'size' | 'duration';
     value: number;
     tags: string[];
 }
+
+declare const CONFIG_KEY: "telemetry";
+
 type Filter = (metric: Metric) => Metric | null;
 interface DatadogOptions {
     apiKey?: string;

package/dist/src/index.js

@@ -3058,6 +3058,48 @@ const getContext = (args) => {
     value: typeof arg === "string" ? arg : void 0
   }));
 };
+const filterTreeMetrics = (metric) => (
+  // Remove tree metrics because way too verbose
+  !/modules\.tree\.(count|size)$/.test(metric.metric) ? metric : null
+);
+const filterSourcemapsAndNodeModules = (metric) => metric.tags.some(
+  (tag) => (
+    // Remove sourcemaps.
+    /^assetName:.*\.map$/.test(tag) || // Remove third parties.
+    /^moduleName:\/node_modules/.test(tag)
+  )
+) ? null : metric;
+const filterMetricsOnThreshold = (metric) => {
+  const thresholds = {
+    size: 1e5,
+    count: 10,
+    duration: 1e3
+  };
+  if (/(entries|loaders|warnings|errors)\.count$/.test(metric.metric)) {
+    thresholds.count = 0;
+  }
+  if (/(modules\.(dependencies|dependents)$)/.test(metric.metric)) {
+    thresholds.count = 30;
+  }
+  if (/modules\.tree\.count$/.test(metric.metric)) {
+    thresholds.count = 150;
+  }
+  if (/modules\.tree\.size$/.test(metric.metric)) {
+    thresholds.size = 15e5;
+  }
+  if (/entries\.size$/.test(metric.metric)) {
+    thresholds.size = 0;
+  }
+  if (/entries\.modules\.count$/.test(metric.metric)) {
+    thresholds.count = 0;
+  }
+  return metric.value > thresholds[metric.type] ? metric : null;
+};
+const defaultTelemetryFilters = [
+  filterTreeMetrics,
+  filterSourcemapsAndNodeModules,
+  filterMetricsOnThreshold
+];
 
 const outputFiles = async (context, options) => {
   const { report, metrics, bundler } = context;
@@ -5026,48 +5068,6 @@ var templates = (chalk, tmp) => {
 var chalkExports = chalk$1.exports;
 var chalk = /*@__PURE__*/getDefaultExportFromCjs(chalkExports);
 
-const filterTreeMetrics = (metric) => (
-  // Remove tree metrics because way too verbose
-  !/modules\.tree\.(count|size)$/.test(metric.metric) ? metric : null
-);
-const filterSourcemapsAndNodeModules = (metric) => metric.tags.some(
-  (tag) => (
-    // Remove sourcemaps.
-    /^assetName:.*\.map$/.test(tag) || // Remove third parties.
-    /^moduleName:\/node_modules/.test(tag)
-  )
-) ? null : metric;
-const filterMetricsOnThreshold = (metric) => {
-  const thresholds = {
-    size: 1e5,
-    count: 10,
-    duration: 1e3
-  };
-  if (/(entries|loaders|warnings|errors)\.count$/.test(metric.metric)) {
-    thresholds.count = 0;
-  }
-  if (/(modules\.(dependencies|dependents)$)/.test(metric.metric)) {
-    thresholds.count = 30;
-  }
-  if (/modules\.tree\.count$/.test(metric.metric)) {
-    thresholds.count = 150;
-  }
-  if (/modules\.tree\.size$/.test(metric.metric)) {
-    thresholds.size = 15e5;
-  }
-  if (/entries\.size$/.test(metric.metric)) {
-    thresholds.size = 0;
-  }
-  if (/entries\.modules\.count$/.test(metric.metric)) {
-    thresholds.count = 0;
-  }
-  return metric.value > thresholds[metric.type] ? metric : null;
-};
-const defaultFilters = [
-  filterTreeMetrics,
-  filterSourcemapsAndNodeModules,
-  filterMetricsOnThreshold
-];
 const getMetric = (metric, opts) => ({
   type: "gauge",
   tags: [...metric.tags, ...opts.tags],
@@ -5084,7 +5084,7 @@ const getOptionsDD = (opt) => {
     tags: options.datadog?.tags || [],
     endPoint: options.datadog?.endPoint || "app.datadoghq.com",
     prefix: options.datadog?.prefix || "",
-    filters: options.datadog?.filters || defaultFilters
+    filters: options.datadog?.filters || defaultTelemetryFilters
   };
 };
 
@@ -5623,16 +5623,17 @@ const getMetrics = (opts, report, bundler) => {
   if (bundler.esbuild) {
     metrics.push(...getEsbuildMetrics(bundler.esbuild, opts.cwd));
   }
+  const ddOptions = getOptionsDD(opts);
   const metricsToSend = metrics.map((m) => {
     let metric = m;
-    if (opts[CONFIG_KEY].datadog?.filters?.length) {
-      for (const filter of opts[CONFIG_KEY].datadog.filters) {
+    if (ddOptions.filters?.length) {
+      for (const filter of ddOptions.filters) {
         if (metric) {
           metric = filter(metric);
         }
       }
     }
-    return metric ? getMetric(metric, getOptionsDD(opts)) : null;
+    return metric ? getMetric(metric, ddOptions) : null;
   }).filter((m) => m !== null);
   return metricsToSend;
 };
@@ -5643,7 +5644,7 @@ const sendMetrics = (metrics, opts) => {
   }
   const metricsNames = [...new Set(metrics.map((m) => m.metric))].sort().map((name) => `${name} - ${metrics.filter((m) => m.metric === name).length}`);
   console.log(`
-[NEW] Sending ${metrics.length} metrics.
+Sending ${metrics.length} metrics.
 Metrics:
     - ${metricsNames.join("\n    - ")}`);
   return new Promise((resolve, reject) => {