@friggframework/core 2.0.0--canary.622.faffe5f.0 → 2.0.0--canary.623.71305f2.0

package/integrations/integration-base.js

@@ -18,9 +18,6 @@ const {
     UpdateIntegrationConfig,
 } = require('./use-cases/update-integration-config');
 const { validateExtensionBinding } = require('./extension');
-const { getTelemetry } = require('../telemetry/telemetry-singleton');
-const { instrumentHandler } = require('../telemetry/instrument-handler');
-const { bindTelemetryContext } = require('../telemetry/bind-telemetry-context');
 
 const constantsToBeMigrated = {
     defaultEvents: {
@@ -79,11 +76,6 @@ class IntegrationBase {
         // Tier 3 Integration Extensions — see packages/core/integrations/EXTENSIONS.md
         // Shape: { [bindingName]: { extension, handlers?: { [eventName]: methodName } } }
         extensions: {},
-        // Usage-counter opt-in. Declaring a canonical key opts into the
-        // cross-integration comparison report + durable rollup; custom keys are
-        // comparable within this integration type. Shape:
-        //   usage: { canonical: ['records.synced', ...], custom: { 'deals.enriched': { unit, label } } }
-        usage: {},
         display: {
             name: 'Integration Name',
             logo: '',
@@ -108,28 +100,18 @@ class IntegrationBase {
         this.messages = { errors: [], warnings: [] };
         this._isHydrated = false;
 
-        // Telemetry: every instance carries the service so integration
-        // code can call `this.telemetry.*`. Extracted before the record check so
-        // passing only `telemetry` never triggers a hollow hydration. Bound to
-        // this instance so emissions auto-carry `integration_type` for the usage
-        // rollup (see bind-telemetry-context).
-        const { telemetry, ...recordParams } = params;
-        this.telemetry = bindTelemetryContext(telemetry || getTelemetry(), () =>
-            this.getTelemetryContext()
-        );
-
-        if (Object.keys(recordParams).length > 0) {
+        if (params && Object.keys(params).length > 0) {
             this.setIntegrationRecord({
                 record: {
-                    id: recordParams.id,
-                    userId: recordParams.userId,
-                    entities: recordParams.entities,
-                    config: recordParams.config,
-                    status: recordParams.status,
-                    version: recordParams.version,
-                    messages: recordParams.messages,
+                    id: params.id,
+                    userId: params.userId,
+                    entities: params.entities,
+                    config: params.config,
+                    status: params.status,
+                    version: params.version,
+                    messages: params.messages,
                 },
-                modules: recordParams.modules || [],
+                modules: params.modules || [],
             });
         }
 
@@ -222,25 +204,6 @@ class IntegrationBase {
         };
 
         this._isHydrated = Boolean(this.id);
-
-        // Log the instance-open exactly once per hydrated
-        // instance, carrying the standard identifier set — so an integration is
-        // visible in telemetry even on a path that never dispatches a handler.
-        // High-cardinality ids ride the bus context (3rd arg), never metric
-        // labels; only the bounded integration_type is an attribute.
-        if (this._isHydrated && !this._instantiationLogged) {
-            this._instantiationLogged = true;
-            try {
-                this.telemetry.event(
-                    'frigg.integration.instantiated',
-                    { integration_type: this.constructor?.Definition?.name },
-                    this.getTelemetryContext()
-                );
-            } catch (_) {
-                // Telemetry must never break integration hydration.
-            }
-        }
-
         return this;
     }
 
@@ -248,25 +211,6 @@ class IntegrationBase {
         return this._isHydrated;
     }
 
-    /**
-     * Standard telemetry identifier set. Assembled from the
-     * hydrated record (integrationId, userId, version), the static Definition
-     * (integrationType, version fallback), and the environment (stage, appName).
-     * High-cardinality ids (integrationId, userId) ride span baggage only — never
-     * metric labels.
-     */
-    getTelemetryContext() {
-        const Definition = this.constructor.Definition || {};
-        return {
-            integrationId: this.id ?? null,
-            integrationType: Definition.name ?? null,
-            userId: this.userId ?? null,
-            version: this.version ?? Definition.version ?? null,
-            stage: process.env.STAGE || process.env.NODE_ENV || null,
-            appName: process.env.FRIGG_STACK || null,
-        };
-    }
-
     assertHydrated(message = 'Integration instance is not hydrated') {
         if (!this.isHydrated) {
             throw new Error(message);
@@ -292,16 +236,13 @@ class IntegrationBase {
         // e.g., 'quo-attio' → 'quo', 'attio' → 'attio'
         const moduleNameToKey = {};
         if (this.constructor.Definition?.modules) {
-            for (const [key, moduleConfig] of Object.entries(
-                this.constructor.Definition.modules
-            )) {
+            for (const [key, moduleConfig] of Object.entries(this.constructor.Definition.modules)) {
                 const definition = moduleConfig.definition;
                 if (definition) {
                     // Use getName() if available, fallback to moduleName
-                    const definitionName =
-                        typeof definition.getName === 'function'
-                            ? definition.getName()
-                            : definition.moduleName;
+                    const definitionName = typeof definition.getName === 'function'
+                        ? definition.getName()
+                        : definition.moduleName;
                     if (definitionName) {
                         moduleNameToKey[definitionName] = key;
                     }
@@ -386,9 +327,7 @@ class IntegrationBase {
             try {
                 const authPassed = await this[module].testAuth();
                 if (!authPassed) {
-                    throw new Error(
-                        `testAuth returned false for module ${module}`
-                    );
+                    throw new Error(`testAuth returned false for module ${module}`);
                 }
             } catch {
                 didAuthPass = false;
@@ -645,9 +584,7 @@ class IntegrationBase {
     async persistStatus(status) {
         await this.updateIntegrationStatus.execute(this.id, status);
         this.status = status;
-        console.log(
-            `[Frigg] Integration ${this.id} status changed to ${status}`
-        );
+        console.log(`[Frigg] Integration ${this.id} status changed to ${status}`);
     }
 
     /**
@@ -812,15 +749,7 @@ class IntegrationBase {
                 `Event ${event} is not defined in the Integration event object`
             );
         }
-        // Auto-instrument. This is the seam for user
-        // actions, config-options, and lifecycle events dispatched via `this.on`
-        // (the queue/webhook/route paths go through IntegrationEventDispatcher).
-        return instrumentHandler(
-            this.telemetry,
-            this.getTelemetryContext(),
-            { event, eventType: this.on[event].type },
-            () => this.on[event].handler.call(this, object)
-        );
+        return this.on[event].handler.call(this, object);
     }
 
     getOptionDetails() {
@@ -862,12 +791,18 @@ class IntegrationBase {
         if (!this.id) return;
 
         if (delegateString === 'CREDENTIAL_INVALIDATED') {
+            const detail =
+                object?.reason || object?.statusCode
+                    ? ` (status ${object?.statusCode ?? '?'}: ${
+                          object?.reason ?? 'no reason given'
+                      })`
+                    : '';
             console.log(
                 `[Frigg] Module ${
                     notifier?.name || '?'
                 } reported invalid credentials for integration ${
                     this.id
-                } — marking ERROR`
+                } — marking ERROR${detail}`
             );
             await this.persistStatus('ERROR');
             return;

package/modules/module.js

@@ -147,15 +147,24 @@ class Module extends Delegate {
         } else if (delegateString === this.api.DLGT_TOKEN_DEAUTHORIZED) {
             await this.deauthorize();
         } else if (delegateString === this.api.DLGT_INVALID_AUTH) {
-            await this.markCredentialsInvalid();
+            await this.markCredentialsInvalid(object);
         }
     }
 
-    async markCredentialsInvalid() {
+    async markCredentialsInvalid(diagnosticInfo = null) {
         if (!this.credential) return;
 
         if (!this.credential.id) return;
 
+        if (diagnosticInfo) {
+            console.error(
+                `[Frigg] Module ${this.name} credentials rejected (status ${
+                    diagnosticInfo.statusCode ?? '?'
+                }):`,
+                diagnosticInfo.message ?? diagnosticInfo
+            );
+        }
+
         await this.credentialRepository.updateAuthenticationStatus(
             this.credential.id,
             false
@@ -181,6 +190,10 @@ class Module extends Delegate {
             await this.notify(this.DLGT_CREDENTIAL_INVALIDATED, {
                 credentialId: this.credential.id,
                 moduleName: this.name,
+                ...(diagnosticInfo && {
+                    reason: diagnosticInfo.message,
+                    statusCode: diagnosticInfo.statusCode,
+                }),
             });
         } catch (err) {
             console.error(

package/modules/requester/requester.js

@@ -2,7 +2,6 @@ const fetch = require('node-fetch');
 const { Delegate } = require('../../core');
 const { FetchError } = require('../../errors');
 const { get } = require('../../assertions');
-const { getTelemetry } = require('../../telemetry/telemetry-singleton');
 
 const DEFAULT_REQUEST_TIMEOUT_MS = 60_000;
 
@@ -43,49 +42,6 @@ class Requester extends Delegate {
         // Allow passing in the fetch function
         // Instance methods can use this.fetch without differentiating
         this.fetch = get(params, 'fetch', fetch);
-
-        // Telemetry. Defaults to the process singleton; overridable
-        // for tests. Outbound requests are instrumented in `_request`.
-        //
-        // Attribution boundary: the `frigg.apimodule.requests` OTel metric fires
-        // for EVERY request (observability is complete). The durable per-
-        // integration `api.requests` usage counter, however, only rolls up
-        // requests carrying an integration context — set by the handler seams via
-        // AsyncLocalStorage (dispatched USER_ACTION/CRON/QUEUE/WEBHOOK paths). A
-        // request made before an integration exists (OAuth/token exchange, entity
-        // discovery during connection setup) has no integration to attribute to,
-        // so it is observable but not rolled up. Pass a context-bound `telemetry`
-        // (an integration's `this.telemetry`) to attribute out-of-band requests.
-        this.telemetry = (params && params.telemetry) || getTelemetry();
-    }
-
-    /**
-     * Redact secrets/PII from a URL before it touches telemetry. Many API
-     * modules embed credentials in the query string (?api_key=, ?token=,
-     * presigned signatures) or in userinfo — those must never reach a span,
-     * the bus, or an exporter. Keep only protocol + host + path (enough for
-     * North Star endpoint matching).
-     */
-    _sanitizeUrl(url) {
-        const raw = String(url);
-        try {
-            const u = new URL(raw);
-            return `${u.protocol}//${u.host}${u.pathname}`;
-        } catch (_) {
-            // Relative/opaque URL: drop the query string at minimum.
-            return raw.split('?')[0];
-        }
-    }
-
-    /** Bounded module label for the apimodule.requests metric. */
-    _telemetryModuleLabel() {
-        return (
-            this.moduleName ||
-            this.delegate?.name ||
-            this.delegate?.constructor?.name ||
-            this.constructor?.name ||
-            'unknown'
-        );
     }
 
     parsedBody = async (resp) => {
@@ -102,66 +58,7 @@ class Requester extends Delegate {
         return resp.text();
     };
 
-    /**
-     * Instrumenting entry point. Wraps the whole logical request —
-     * including retry/refresh recursion — in a single span + one
-     * `frigg.apimodule.requests` counter, emitted on the `i === 0` boundary so
-     * retries are never double-counted. The full URL rides the span only; the
-     * metric carries bounded labels {module, method, status} — never endpoint.
-     */
-    async _request(url, options = {}, i = 0) {
-        if (i !== 0) {
-            return this._rawRequest(url, options, i);
-        }
-
-        const telemetry = this.telemetry;
-        if (!telemetry || typeof telemetry.span !== 'function') {
-            return this._rawRequest(url, options, 0);
-        }
-
-        const module = this._telemetryModuleLabel();
-        const method = (options.method || 'GET').toUpperCase();
-        const safeUrl = this._sanitizeUrl(url);
-
-        return telemetry.span('frigg.apimodule.request', async (span) => {
-            if (span && typeof span.setAttributes === 'function') {
-                span.setAttributes({
-                    'frigg.module': module,
-                    'http.request.method': method,
-                    // Redacted (no query/userinfo) — never emit raw URLs.
-                    'url.path': safeUrl,
-                });
-            }
-            // Redacted url (unbounded) rides the bus-only context for North Star
-            // derived-from-trace matching — never a metric label.
-            const busContext = { url: safeUrl };
-            try {
-                const result = await this._rawRequest(url, options, 0);
-                telemetry.count(
-                    'frigg.apimodule.requests',
-                    1,
-                    { module, method, status: 'ok' },
-                    busContext
-                );
-                return result;
-            } catch (err) {
-                const code = err?.status ?? err?.statusCode;
-                const status = code ? String(code) : 'error';
-                if (span && typeof span.setAttribute === 'function' && code) {
-                    span.setAttribute('http.response.status_code', code);
-                }
-                telemetry.count(
-                    'frigg.apimodule.requests',
-                    1,
-                    { module, method, status },
-                    busContext
-                );
-                throw err;
-            }
-        });
-    }
-
-    async _rawRequest(url, options, i = 0) {
+    async _request(url, options, i = 0) {
         let encodedUrl = encodeURI(url);
         if (options.query) {
             let queryBuild = '?';
@@ -223,7 +120,7 @@ class Requester extends Delegate {
                     clearRequestTimer();
                     const delay = this.backOff[i] * 1000;
                     await new Promise((resolve) => setTimeout(resolve, delay));
-                    return this._rawRequest(url, options, i + 1);
+                    return this._request(url, options, i + 1);
                 }
                 const fetchError = await FetchError.create({
                     resource: encodedUrl,
@@ -250,13 +147,32 @@ class Requester extends Delegate {
                 clearRequestTimer();
                 const delay = this.backOff[i] * 1000;
                 await new Promise((resolve) => setTimeout(resolve, delay));
-                return this._rawRequest(url, options, i + 1);
+                return this._request(url, options, i + 1);
             }
 
             if (status === 401) {
                 if (!this.isRefreshable) {
-                    await this.notify(this.DLGT_INVALID_AUTH);
-                    return;
+                    // A non-refreshable requester (ApiKeyRequester,
+                    // BasicAuthRequester) has no token to renew, but a single
+                    // 401 is not necessarily proof the credential itself is
+                    // bad — it may be a transient edge/gateway hiccup. Grant
+                    // one grace retry of the same request before concluding
+                    // the credential is truly invalid, mirroring the single
+                    // refresh attempt OAuth2Requester gets below.
+                    if (i === 0) {
+                        clearRequestTimer();
+                        const delay = this.backOff[0] * 1000;
+                        await new Promise((resolve) =>
+                            setTimeout(resolve, delay)
+                        );
+                        return this._request(url, options, i + 1);
+                    }
+
+                    throw await this._invalidateAuth(
+                        encodedUrl,
+                        options,
+                        response
+                    );
                 }
 
                 if (this.refreshCount === 0) {
@@ -264,11 +180,14 @@ class Requester extends Delegate {
                     const refreshSucceeded = await this.refreshAuth();
                     if (refreshSucceeded) {
                         clearRequestTimer();
-                        return this._rawRequest(url, options, i + 1);
+                        return this._request(url, options, i + 1);
                     }
 
-                    await this.notify(this.DLGT_INVALID_AUTH);
-                    return;
+                    throw await this._invalidateAuth(
+                        encodedUrl,
+                        options,
+                        response
+                    );
                 }
             }
 
@@ -307,6 +226,22 @@ class Requester extends Delegate {
         }
     }
 
+    // Builds a diagnostic FetchError from the failed 401 response, notifies
+    // delegates with it attached (so the credential-invalidation chain can
+    // log real detail instead of a bare "invalid credentials" with no
+    // evidence), and returns the error for the caller to throw. Notifying
+    // and throwing are split so notify() always fires even though `await`ing
+    // it happens before the throw.
+    async _invalidateAuth(encodedUrl, options, response) {
+        const fetchError = await FetchError.create({
+            resource: encodedUrl,
+            init: options,
+            response,
+        });
+        await this.notify(this.DLGT_INVALID_AUTH, fetchError);
+        return fetchError;
+    }
+
     _maybeFlagTimeoutDuringBodyRead(err, timeoutMs) {
         if (!err || typeof err !== 'object') return err;
         if (err.isTimeout) return err;

package/package.json

@@ -1,20 +1,13 @@
 {
     "name": "@friggframework/core",
     "prettier": "@friggframework/prettier-config",
-    "version": "2.0.0--canary.622.faffe5f.0",
+    "version": "2.0.0--canary.623.71305f2.0",
     "dependencies": {
         "@aws-sdk/client-apigatewaymanagementapi": "^3.588.0",
         "@aws-sdk/client-kms": "^3.588.0",
         "@aws-sdk/client-lambda": "^3.714.0",
         "@aws-sdk/client-sqs": "^3.588.0",
         "@hapi/boom": "^10.0.1",
-        "@opentelemetry/api": "^1.9.1",
-        "@opentelemetry/context-async-hooks": "^2.9.0",
-        "@opentelemetry/exporter-metrics-otlp-http": "^0.220.0",
-        "@opentelemetry/exporter-trace-otlp-http": "^0.220.0",
-        "@opentelemetry/resources": "^2.9.0",
-        "@opentelemetry/sdk-metrics": "^2.9.0",
-        "@opentelemetry/sdk-trace-base": "^2.9.0",
         "bcryptjs": "^2.4.3",
         "body-parser": "^1.20.5",
         "bson": "^4.7.2",
@@ -45,9 +38,9 @@
         }
     },
     "devDependencies": {
-        "@friggframework/eslint-config": "2.0.0--canary.622.faffe5f.0",
-        "@friggframework/prettier-config": "2.0.0--canary.622.faffe5f.0",
-        "@friggframework/test": "2.0.0--canary.622.faffe5f.0",
+        "@friggframework/eslint-config": "2.0.0--canary.623.71305f2.0",
+        "@friggframework/prettier-config": "2.0.0--canary.623.71305f2.0",
+        "@friggframework/test": "2.0.0--canary.623.71305f2.0",
         "@prisma/client": "^6.19.3",
         "@types/lodash": "4.17.15",
         "@typescript-eslint/eslint-plugin": "^8.0.0",
@@ -87,5 +80,5 @@
     "publishConfig": {
         "access": "public"
     },
-    "gitHead": "faffe5ff8b3fea6bbb46a52502cbd5b5ecb35559"
+    "gitHead": "71305f2dfed42de7be90e012a383437a46404159"
 }

package/prisma-mongodb/schema.prisma

@@ -430,27 +430,3 @@ model ScriptSchedule {
   @@index([enabled])
   @@map("ScriptSchedule")
 }
-
-/// ADR-011 durable usage counters. Deliberately isolated (ADR-010 Decision 3):
-/// NO userId and NO foreign key to Integration, so a user-scoped query can never
-/// return a usage row and usage history survives integration deletion. Not in
-/// the encryption registry — dimensions are bounded, non-sensitive.
-model UsageCounter {
-  id String @id @default(auto()) @map("_id") @db.ObjectId
-
-  integrationId   String
-  integrationType String
-  metric          String
-  window          String // e.g. "day:2026-07-05" or "hour:2026-07-05T14"
-  value           BigInt @default(0) // BigInt: a busy day/hour counter can exceed 32-bit
-
-  createdAt DateTime @default(now())
-  updatedAt DateTime @updatedAt
-
-  @@unique([integrationId, integrationType, metric, window])
-  // Covers totals() (metric + window prefix/range, no integrationType filter).
-  @@index([metric, window])
-  // Covers series() (metric + integrationType + window range).
-  @@index([metric, integrationType, window])
-  @@map("UsageCounter")
-}

package/prisma-postgresql/schema.prisma

@@ -412,26 +412,3 @@ model ScriptSchedule {
 
   @@index([enabled])
 }
-
-/// ADR-011 durable usage counters. Deliberately isolated (ADR-010 Decision 3):
-/// NO userId and NO foreign key to Integration, so a user-scoped query can never
-/// return a usage row and usage history survives integration deletion. Not in
-/// the encryption registry — dimensions are bounded, non-sensitive.
-model UsageCounter {
-  id Int @id @default(autoincrement())
-
-  integrationId   String
-  integrationType String
-  metric          String
-  window          String // e.g. "day:2026-07-05" or "hour:2026-07-05T14"
-  value           BigInt @default(0) // BigInt: a busy day/hour counter can exceed 32-bit
-
-  createdAt DateTime @default(now())
-  updatedAt DateTime @updatedAt
-
-  @@unique([integrationId, integrationType, metric, window])
-  // Covers totals() (metric + window prefix/range, no integrationType filter).
-  @@index([metric, window])
-  // Covers series() (metric + integrationType + window range).
-  @@index([metric, integrationType, window])
-}

package/reporting/README.md

@@ -52,15 +52,8 @@ Optional query params (all strings): `status` (an `IntegrationStatus`), `type`
 - `filters` — echoes the applied filters (nulls when omitted).
 - `metrics.total` — count of integrations matching the filters.
 - `metrics.byStatus` — counts keyed by `IntegrationStatus` value.
-- `metrics.byType[]` — per `type` breakdown: `{ type, label, total, byStatus, usage? }`.
+- `metrics.byType[]` — per `type` breakdown: `{ type, label, total, byStatus }`.
   - `type` — the `config.type` slug. Integrations with no type bucket as `"unknown"`.
-  - `usage` — **additive** (ADR-011): present only when the deployment has the
-    usage store configured. A map of canonical counter → total for that type,
-    e.g. `{ "records.synced": 4200, "webhooks.received": 118, "api.requests": 9004 }`
-    (`0` when a type has no data). Read only from the Frigg usage store, never an
-    external APM; a usage-store read failure never fails the structural report.
-    Populated by the counters an integration opts into via `Definition.usage` —
-    see [`../telemetry/README.md`](../telemetry/README.md).
   - `label` — human-readable name from the integration class's
     `Definition.display.label`. Falls back to the `type` slug when no registered
     class supplies a label (e.g. an integration that was removed, or run on an

package/reporting/reporting-router.js

@@ -3,12 +3,7 @@ const catchAsyncError = require('express-async-handler');
 const {
     createReportingRepository,
 } = require('./repositories/reporting-repository-factory');
-const {
-    createUsageRepository,
-} = require('../usage/repositories/usage-repository-factory');
-const {
-    ListIntegrationsReport,
-} = require('./use-cases/list-integrations-report');
+const { ListIntegrationsReport } = require('./use-cases/list-integrations-report');
 const { loadAppDefinition } = require('../handlers/app-definition-loader');
 
 // IntegrationBase.Definition default — skip it so the slug is used instead.
@@ -40,18 +35,8 @@ function buildTypeLabels() {
 
 function createReportingRouter() {
     const reportingRepository = createReportingRepository();
-    // Enrich the report with feature-usage columns read from
-    // the Frigg-owned usage store. Best-effort — a failure to construct it never
-    // blocks the structural report.
-    let usageRepository = null;
-    try {
-        usageRepository = createUsageRepository();
-    } catch (_) {
-        usageRepository = null;
-    }
     const listIntegrationsReport = new ListIntegrationsReport({
         reportingRepository,
-        usageRepository,
         typeLabels: buildTypeLabels(),
     });