@jeffjassky/telemetry 0.6.0 → 0.7.0

package/dist/index.cjs

@@ -71,6 +71,8 @@ var newCounters = () => ({
   truncated: 0,
   rollupSkippedBy: {},
   undeclaredAttrs: {},
+  attrsDropped: {},
+  metricsDropped: {},
   subjectsLinked: 0,
   subjectLinkMisses: 0,
   subjectLinkErrors: 0,
@@ -280,6 +282,7 @@ var UsageDetailSchema = new mongoose.Schema(
   { _id: false }
 );
 function buildBaseSchema(collection, registry, counters, opts) {
+  const validation = opts.validation;
   const schema = new mongoose.Schema(
     {
       /** UUIDv7 — sortable, insertion-local, replaces the ObjectId */
@@ -421,13 +424,39 @@ function buildBaseSchema(collection, registry, counters, opts) {
     }
     const check = (label3, m, zschema) => {
       const obj = Object.fromEntries(m ?? []);
+      const dropped = label3 === "attrs" ? counters.attrsDropped : counters.metricsDropped;
+      const note = (key) => bumpCounterMap(dropped, `${this.name}|${key}`);
       if (!zschema) {
-        if (Object.keys(obj).length) throw new Error(`telemetry: "${this.name}" declares no ${label3}`);
+        if (!Object.keys(obj).length) return;
+        if (validation === "strict") throw new Error(`telemetry: "${this.name}" declares no ${label3}`);
+        for (const key of Object.keys(obj)) {
+          note(key);
+          m?.delete(key);
+        }
         return;
       }
       const s = zschema.strict?.() ?? zschema;
       const r = s.safeParse(obj);
-      if (!r.success) throw new Error(`telemetry: ${label3} invalid for "${this.name}": ${r.error.message}`);
+      if (r.success) return;
+      if (validation === "strict") {
+        throw new Error(`telemetry: ${label3} invalid for "${this.name}": ${r.error.message}`);
+      }
+      const bad = /* @__PURE__ */ new Set();
+      for (const issue of r.error.issues) {
+        if (issue.code === "unrecognized_keys" && Array.isArray(issue.keys)) {
+          for (const k of issue.keys) bad.add(String(k));
+        } else if (Array.isArray(issue.path) && issue.path.length) {
+          bad.add(String(issue.path[0]));
+        }
+      }
+      for (const key of bad) {
+        if (m?.has(key)) {
+          note(key);
+          m.delete(key);
+        } else {
+          note("(missing)");
+        }
+      }
     };
     check("attrs", this.attrs, spec.attrs);
     check("metrics", this.metrics, spec.metrics);
@@ -460,7 +489,11 @@ function buildTelemetryModels(opts) {
       )
     };
   }
-  const base = buildBaseSchema(collection, registry, counters, { platforms, bodyMax });
+  const base = buildBaseSchema(collection, registry, counters, {
+    platforms,
+    bodyMax,
+    validation: opts.validation ?? "lenient"
+  });
   const TelemetryModel = connection.model(modelName, base);
   const disc = (kind, build) => TelemetryModel.discriminator(`${modelName}_${kind}`, build(), kind);
   const byKind = {
@@ -3843,7 +3876,8 @@ function createTelemetry(config) {
     modelName,
     collection,
     platforms: config.platforms,
-    bodyMax: config.bodyMax
+    bodyMax: config.bodyMax,
+    validation: config.validation
   });
   const RollupModel = buildRollupModel(conn, `${modelName}Rollup`, `${collection}_rollups`);
   const CheckpointModel = buildCheckpointModel(conn, `${modelName}Checkpoint`, `${collection}_checkpoints`);