From 82ce9041085c00c28e2dfcd0547cd871776d9af6 Mon Sep 17 00:00:00 2001 From: Nitin Misra Date: Tue, 4 Aug 2026 10:49:16 +0530 Subject: [PATCH 1/2] =?UTF-8?q?feat:=20flutter=20parity=20=E2=80=94=20at-m?= =?UTF-8?q?ost-once=20export,=20minimal=20defaults,=20exit-info=20crash=20?= =?UTF-8?q?classification=20(v0.1.12)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/ci.yml | 34 +- .github/workflows/publish.yml | 23 +- .gitignore | 3 + CHANGELOG.md | 107 +++ Makefile | 42 +- README.md | 2 + .../io/base14/scoutreact/ScoutAnrWatchdog.kt | 52 +- .../io/base14/scoutreact/ScoutCrashModule.kt | 29 +- .../scoutreact/ScoutExitInfoClassifier.kt | 53 ++ .../io/base14/scoutreact/ScoutHangDetector.kt | 36 + android/unit-tests/build.gradle.kts | 38 + .../gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 43583 bytes .../gradle/wrapper/gradle-wrapper.properties | 8 + android/unit-tests/gradlew | 252 ++++++ android/unit-tests/gradlew.bat | 94 +++ android/unit-tests/settings.gradle.kts | 6 + .../base14/scoutreact/ExitInfoFilterTest.kt | 93 +++ .../io/base14/scoutreact/HangDetectorTest.kt | 82 ++ babel-plugin/index.d.cts | 39 + docs/configuration.md | 74 +- package-lock.json | 761 +++++++++++++++--- package.json | 52 +- scripts/write-native-cjs-marker.mjs | 26 + src/core/attributes.ts | 7 + src/core/breadcrumb-manager.test.ts | 50 +- src/core/breadcrumb-manager.ts | 27 +- src/core/config.test.ts | 91 ++- src/core/config.ts | 69 +- src/core/otlp-exporter.test.ts | 164 ++++ src/core/otlp-exporter.ts | 183 +++++ src/core/retry-exporter.test.ts | 36 + src/core/retry-exporter.ts | 9 +- src/core/scope.contract.test.ts | 9 + src/core/scope.ts | 2 +- src/core/scout.test.ts | 49 ++ src/core/telemetry.ts | 12 + src/native/index.ts | 33 +- .../instrumentations/battery-discharge.ts | 9 +- src/native/instrumentations/console.ts | 13 +- src/native/instrumentations/cpu.ts | 9 +- src/native/instrumentations/crash.ts | 48 +- src/native/instrumentations/frame-metrics.ts | 7 +- src/native/instrumentations/memory.ts | 8 +- src/native/instrumentations/native-crash.ts | 75 +- src/native/instrumentations/orientation.ts | 1 - src/web/index.ts | 29 +- src/web/instrumentations/console.test.ts | 52 ++ src/web/instrumentations/console.ts | 13 +- src/web/instrumentations/crash.test.ts | 146 ++++ src/web/instrumentations/crash.ts | 36 +- src/web/instrumentations/memory.test.ts | 48 ++ src/web/instrumentations/memory.ts | 8 +- src/web/resource.test.ts | 63 ++ 53 files changed, 2932 insertions(+), 280 deletions(-) create mode 100644 android/src/main/java/io/base14/scoutreact/ScoutExitInfoClassifier.kt create mode 100644 android/src/main/java/io/base14/scoutreact/ScoutHangDetector.kt create mode 100644 android/unit-tests/build.gradle.kts create mode 100644 android/unit-tests/gradle/wrapper/gradle-wrapper.jar create mode 100644 android/unit-tests/gradle/wrapper/gradle-wrapper.properties create mode 100755 android/unit-tests/gradlew create mode 100644 android/unit-tests/gradlew.bat create mode 100644 android/unit-tests/settings.gradle.kts create mode 100644 android/unit-tests/src/test/kotlin/io/base14/scoutreact/ExitInfoFilterTest.kt create mode 100644 android/unit-tests/src/test/kotlin/io/base14/scoutreact/HangDetectorTest.kt create mode 100644 babel-plugin/index.d.cts create mode 100644 scripts/write-native-cjs-marker.mjs create mode 100644 src/core/otlp-exporter.test.ts create mode 100644 src/core/otlp-exporter.ts create mode 100644 src/web/instrumentations/console.test.ts create mode 100644 src/web/instrumentations/crash.test.ts create mode 100644 src/web/instrumentations/memory.test.ts create mode 100644 src/web/resource.test.ts diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e49c68f..62d15a2 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -35,10 +35,42 @@ jobs: - name: audit (production deps only) run: npm audit --omit=dev --audit-level=high + # `make ci` runs plain `vitest run`, which writes no coverage/ — so the + # report has to be produced explicitly for the upload below to have + # anything to collect. + - name: coverage + if: matrix.node == '22' + run: make test-coverage + - name: upload coverage if: matrix.node == '22' uses: actions/upload-artifact@v4 with: name: coverage path: coverage/ - if-no-files-found: ignore + if-no-files-found: error + + android-unit-tests: + name: android unit tests (kotlin) + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v4 + + - uses: actions/setup-java@v4 + with: + distribution: temurin + java-version: '17' + + # The Android library itself needs a host app's Gradle build (it depends + # on :expo-modules-core), so this project compiles only the Android-free + # decision cores — exit-info classification and ANR hang detection. + # Gradle's version comes from the checked-in wrapper, so CI and + # `make test-android` run the identical toolchain. + - uses: gradle/actions/setup-gradle@v4 + with: + validate-wrappers: true + + - name: kotlin unit tests + run: ./gradlew test --console=plain + working-directory: android/unit-tests diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 0d8d052..cfa6f4e 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -20,9 +20,26 @@ jobs: node-version: '24' registry-url: 'https://registry.npmjs.org' - - run: npm ci - - run: npm run build --if-present - - run: npm test + - run: npm ci --no-fund --no-audit + + # npm publishes whatever package.json says, not what the tag says, so an + # unsynced tag silently republishes the previous version under a new + # release. The scope.contract test (run by `make ci` below) pins + # SCOPE_VERSION to package.json, so this completes the chain: + # git tag -> package.json -> the version reported on every span. + - name: tag matches package.json version + run: | + tag="${GITHUB_REF_NAME#v}" + pkg="$(node -p "require('./package.json').version")" + if [ "$tag" != "$pkg" ]; then + echo "::error::tag $GITHUB_REF_NAME does not match package.json version $pkg" + exit 1 + fi + + # Full pipeline, not just tests — a tag can be pushed from any commit, + # so publish cannot assume the CI workflow ever ran on it. + - run: make ci + - run: npm publish --provenance --access public - run: gh release create "$GITHUB_REF_NAME" --generate-notes diff --git a/.gitignore b/.gitignore index 14caa1a..a0f4285 100644 --- a/.gitignore +++ b/.gitignore @@ -40,6 +40,9 @@ android/build/ android/.cxx/ android/.gradle/ android/local.properties +android/unit-tests/build/ +android/unit-tests/.gradle/ +android/unit-tests/.kotlin/ ios/build/ ios/Pods/ ios/*.xcworkspace/ diff --git a/CHANGELOG.md b/CHANGELOG.md index 8b2a794..e78ac7c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,113 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +## [0.1.12] - 2026-08-03 + +Brings scout-react to parity with scout-flutter 0.1.23's production-hardening +work. **This release changes defaults.** Upgrading without action silently +turns off periodic vitals metrics, export retries and offline buffering, and +slows trace/log export from 5s to 30s. All of it is opt-in-able — see below. + +### Changed — behavior (action required) + +- **Vitals metrics are now opt-in.** `enableFrameMetrics`, `enableMemoryMetrics` + and `enableCpuMetrics` default to `false` (were `true`). These are the + highest-volume signals the SDK produces. A default `Scout.initialize()` now + emits **no periodic metrics at all**. Restore with + `{ enableFrameMetrics: true, enableMemoryMetrics: true, enableCpuMetrics: true }`. +- **Delivery is at-most-once.** `exportRetry.maxRetries` defaults to `0` (was + `3`) and `offlineBuffer.enabled` to `false` (was `true`, with 5000/2000/5000 + item caps now `0`). Retrying an ambiguous failure — a timeout the collector + may already have ingested — re-delivers identical span IDs; no duplicates is + worth more than lossless delivery for RUM data. Restore with + `{ exportRetry: { maxRetries: 3 }, offlineBuffer: { enabled: true, maxItems: {...} } }`. +- **Export cadence is 30s for all signals** (traces and logs were 5s; metrics + unchanged at 30s). Tune with `exportIntervalSeconds`. +- **Vitals sampling is 60s** (memory/CPU/frame were 10s). Tune with + `vitalsCollectionIntervalSeconds`. +- **Android exit-info records are no longer all crashes.** Only `REASON_CRASH`, + `REASON_CRASH_NATIVE`, `REASON_ANR` and `REASON_LOW_MEMORY` are reported. + Swipe-from-recents, Force Stop, self-exit, `REASON_SIGNALED`, + `REASON_EXCESSIVE_RESOURCE_USAGE` and `REASON_INITIALIZATION_FAILURE` are + normal process exits and are dropped — they were inflating crash counts with + ordinary user actions. +- **`crash.type` on exit-info records now carries the real reason** + (`jvm_crash`, `native_crash`, `anr`, `low_memory`) instead of the constant + `"exit_info"`. **Dashboards filtering `crash.type = 'exit_info'` must move to + the new `crash.source = 'exit_info'` attribute.** +- **Breadcrumbs are session-scoped.** A relaunched session no longer inherits + the previous session's breadcrumb trail; those crumbs are attached to crash + reports drained from the session that died instead. +- **`app_crash` is attributed to the crashed session.** `session.id` and + `session.start_time` on the span are now the dead session's, and + `crash.timestamp` is when the app was last known alive rather than when the + crash was noticed on relaunch. + +### Added + +- `exportIntervalSeconds` (default 30, min 1) — one cadence for traces, logs + and metrics. Per-signal `traceExportIntervalMs` / `logExportScheduledDelayMs` + / `metricExportIntervalMs` still win when set explicitly. +- `metricExportIntervalSeconds` — metrics-only override. +- `maxExportBatchSize` (512) and `maxQueueSize` (2048) — applied to the trace + and log processors. +- `vitalsCollectionIntervalSeconds` (default 60, min 1) — sampling cadence for + memory, CPU, frame and battery vitals. +- `scout.react.version` resource attribute on every span, metric and log, on + both web and native. Pinned to `package.json` by a CI contract test and not + overridable via `resourceAttributes`. +- `crash.source` — which detection path produced a crash record. +- `crash.drain_app_state`, `crash.drain_process_start_time` and + `crash.drain_uptime_secs` on drained native crash reports. +- Kotlin unit tests (`android/unit-tests`, `make test-android`) covering the + exit-info classification and ANR hang-detection rules, plus a CI job. +- `make check-exports` (`publint` + `arethetypeswrong`), wired into `make ci`. + Both pack the real tarball, so the exports map and the type-resolution matrix + are checked as consumers see them. + +### Fixed + +- **Duplicate exports.** The stock `@opentelemetry/exporter-*-otlp-http` + exporters wrap their transport in `RetryingTransport`, which re-sends up to + five more times on 429/502/503/504 and on network errors — stacked under the + SDK's own retry wrapper, one batch could reach the collector ~20 times. + Replaced with a fetch-based OTLP/JSON exporter where one export is exactly + one request; retry policy now lives in one place and is off by default. +- **Offline buffering was silently dead at zero retries.** The retry wrapper + returned the exporter untouched when `maxRetries <= 0`, so the hook that + feeds the offline buffer never ran. It now wraps whenever a buffer or debug + logging is wired up. +- **Console-capture feedback loop.** With `captureConsole` + `debug`, the SDK's + own `[scout]` diagnostics were captured as logs, which produced more exports, + which logged again. `[scout]`-prefixed lines are no longer captured. +- **Web `crash.started_at` was the marker's write time**, not the session's + start time. +- ANR detection latency: the watchdog polls every 100ms instead of + `threshold/10` (500ms at the default threshold), so a hang is reported at + threshold + ~0.1s. +- **Subpath types were unresolvable under classic `moduleResolution: "node"`.** + `@base-14/scout-react/native`, `/react` and `/babel-plugin` all failed to + resolve types — which covers most React Native tsconfigs. Added + `typesVersions` mappings. +- **CJS consumers got ESM types.** The single top-level `types` condition was + reused for `require`, so a CJS `import` saw ESM declarations ("masquerading + as ESM"). `import` and `require` now carry their own `types` pointing at + `.d.ts` / `.d.cts` respectively. +- **`./native` was unloadable from Node.** `tsconfig.native.json` emits + CommonJS, but the root package is `"type": "module"`, so Node read + `dist/native/**` and `dist/core/**` as ESM and every `require` threw. Both + directories now carry a `{"type":"commonjs"}` marker. Metro was unaffected + either way; this fixes Jest, SSR and other Node-based consumers. +- **`./babel-plugin` shipped no type declarations at all.** Added + `babel-plugin/index.d.cts`, including the `components` / `handlers` options. + +### Removed + +- Dependencies on `@opentelemetry/exporter-trace-otlp-http`, + `@opentelemetry/exporter-metrics-otlp-http` and + `@opentelemetry/exporter-logs-otlp-http`, replaced by a direct dependency on + `@opentelemetry/otlp-transformer`. + ## [0.1.11] - 2026-06-30 ### Added diff --git a/Makefile b/Makefile index 21f9078..dc0d080 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ -.PHONY: help install build typecheck test test-watch test-coverage lint lint-fix \ - fmt fmt-check clean audit ci all +.PHONY: help install build typecheck test test-watch test-coverage test-android \ + lint lint-fix fmt fmt-check check-exports clean audit ci all NODE_BIN := node_modules/.bin @@ -10,8 +10,9 @@ install: ## Install dependencies npm ci --no-fund --no-audit build: ## Build the package — tsup bundles web; tsc emits native unbundled so Metro sees literal require()s - $(NODE_BIN)/tsup - $(NODE_BIN)/tsc -p tsconfig.native.json + # Delegates to the npm script so this and `prepare` (which runs on + # `npm ci` and at publish time) can never drift apart. + npm run build typecheck: ## TypeScript check without emit $(NODE_BIN)/tsc --noEmit @@ -25,6 +26,9 @@ test-watch: ## Run unit tests in watch mode test-coverage: ## Run unit tests with coverage report $(NODE_BIN)/vitest run --coverage +test-android: ## Run the Kotlin unit tests (needs only a JDK 17+; the wrapper fetches Gradle) + cd android/unit-tests && ./gradlew test --console=plain + lint: ## Run eslint $(NODE_BIN)/eslint src @@ -37,15 +41,41 @@ fmt: ## Format src with prettier fmt-check: ## Verify src formatting $(NODE_BIN)/prettier --check src +# Both tools pack the real tarball (which re-runs `prepare`), so they check what +# consumers actually install rather than the working tree. +# +# `cjs-only-exports-default` is ignored deliberately: dist/native is tsc's +# CommonJS output, so its `export default Scout` compiles to +# `exports.default` + `__esModule` without `module.exports`. Metro's babel +# interop honours that, but a Node ESM consumer's `import Scout from +# '.../native'` gets the namespace object instead of the class. Fixing it means +# either dropping the documented default export or patching tsc's output, so +# it stays a known caveat rather than a silent CI failure. +# +# TODO: decide on publint's `"sideEffects": false` suggestion. It would let +# bundlers tree-shake unused instrumentation out of web apps, but it is only +# safe if no module in the graph does real work at import time — and several +# do: 17 modules call `withSuppression(() => require(...))` for optional peers +# at module scope, most of them under src/native/instrumentations/. Those +# requires are exactly the import-time work a `sideEffects: false` claim +# asserts does not happen. Getting it wrong drops telemetry code from +# consumers' production builds silently, with no error to trace it back to. +# Needs a per-module audit of top-level statements plus a bundled-app smoke +# test before flipping — not a one-line change. +check-exports: ## Lint the published exports map + type resolution (publint + attw) + $(NODE_BIN)/publint + $(NODE_BIN)/attw --pack . --ignore-rules cjs-only-exports-default + audit: ## Run npm audit (prod + all) @echo "--- production ---" @npm audit --omit=dev || true @echo "--- all ---" @npm audit || true -clean: ## Remove build outputs +clean: ## Remove build outputs (JS + Kotlin) rm -rf dist coverage + rm -rf android/unit-tests/build android/unit-tests/.gradle android/unit-tests/.kotlin -ci: fmt-check lint typecheck test build ## Mirror the CI pipeline locally +ci: fmt-check lint typecheck test build check-exports ## Mirror the CI pipeline locally all: install audit ci ## Install + audit + ci diff --git a/README.md b/README.md index abf34a5..07228b8 100644 --- a/README.md +++ b/README.md @@ -82,6 +82,8 @@ Scout.registerRootComponent(App); `registerRootComponent` installs a root-level error + touch boundary via RN's `AppRegistry.setWrapperComponentProvider`. Every tap becomes a `user_interaction` span, every render error becomes an `error` span (with `error.component_stack`), automatically. +> **Running the native entry under plain Node** (Jest without a React Native preset, SSR, scripts) — use the named export, `import { Scout } from '@base-14/scout-react/native'`. `dist/native` is CommonJS so Metro can see literal `require()`s; Node's ESM interop does not honour its `__esModule` marker, so the default import resolves to the module namespace rather than the class. Metro and Babel handle the default import correctly, so app code is unaffected. + Then in your `App.tsx`: ```tsx diff --git a/android/src/main/java/io/base14/scoutreact/ScoutAnrWatchdog.kt b/android/src/main/java/io/base14/scoutreact/ScoutAnrWatchdog.kt index 10c7a7f..4220b70 100644 --- a/android/src/main/java/io/base14/scoutreact/ScoutAnrWatchdog.kt +++ b/android/src/main/java/io/base14/scoutreact/ScoutAnrWatchdog.kt @@ -20,11 +20,13 @@ class ScoutAnrWatchdog( val now = SystemClock.uptimeMillis() lastMainHeartbeatMs = now lastJsHeartbeatMs = now - val pollMs = (thresholdMs / 10).coerceAtLeast(200) + // Fixed 100ms cadence: detection lands at threshold + ~0.1s instead of + // threshold + up to a full poll (500ms at the default 5s threshold). + val pollMs = POLL_INTERVAL_MS.coerceAtMost(thresholdMs) Log.i(TAG, "start threshold=${thresholdMs}ms poll=${pollMs}ms") watchdogThread = Thread({ - var inHangMain = false - var inHangJs = false + val mainDetector = ScoutHangDetector(thresholdMs, MAIN_RECOVERY_MS) + val jsDetector = ScoutHangDetector(thresholdMs, JS_RECOVERY_MS) var pendingMainHeartbeat = false var cycle = 0L while (running) { @@ -44,31 +46,25 @@ class ScoutAnrWatchdog( val elapsedMain = nowMs - lastMainHeartbeatMs val elapsedJs = nowMs - lastJsHeartbeatMs cycle++ - if (cycle % 10 == 0L || elapsedMain > pollMs * 2 || elapsedJs > pollMs * 2) { + // 100ms polling makes a per-cycle log far too chatty; log once a + // second, or whenever a thread is visibly lagging. + if (cycle % LOG_EVERY_N_CYCLES == 0L || + elapsedMain > MAIN_RECOVERY_MS || + elapsedJs > JS_RECOVERY_MS + ) { Log.i( TAG, - "cycle=$cycle main=${elapsedMain}ms js=${elapsedJs}ms inHang(m/j)=$inHangMain/$inHangJs", + "cycle=$cycle main=${elapsedMain}ms js=${elapsedJs}ms " + + "inHang(m/j)=${mainDetector.inHang}/${jsDetector.inHang}", ) } - if (elapsedMain >= thresholdMs) { - if (!inHangMain) { - inHangMain = true - Log.w(TAG, "MAIN THREAD ANR elapsed=${elapsedMain}ms") - fireSafe(elapsedMain, "main") - } - } else if (elapsedMain < pollMs) { - if (inHangMain) Log.i(TAG, "main hang ended") - inHangMain = false + if (mainDetector.onSample(elapsedMain)) { + Log.w(TAG, "MAIN THREAD ANR elapsed=${elapsedMain}ms") + fireSafe(elapsedMain, "main") } - if (elapsedJs >= thresholdMs) { - if (!inHangJs) { - inHangJs = true - Log.w(TAG, "JS THREAD ANR elapsed=${elapsedJs}ms") - fireSafe(elapsedJs, "js") - } - } else if (elapsedJs < pollMs * 4) { - if (inHangJs) Log.i(TAG, "js hang ended") - inHangJs = false + if (jsDetector.onSample(elapsedJs)) { + Log.w(TAG, "JS THREAD ANR elapsed=${elapsedJs}ms") + fireSafe(elapsedJs, "js") } } Log.i(TAG, "watchdog loop exited") @@ -97,5 +93,15 @@ class ScoutAnrWatchdog( companion object { private const val TAG = "ScoutAnrWatchdog" + private const val POLL_INTERVAL_MS = 100L + /** Elapsed-since-ping below which the main thread counts as recovered. */ + private const val MAIN_RECOVERY_MS = 500L + /** + * The JS thread heartbeats far less often than the main looper, so it + * needs a slacker recovery window to avoid flapping in and out of hang. + */ + private const val JS_RECOVERY_MS = 2000L + /** 50 cycles × 100ms = one heartbeat log every 5s, as before. */ + private const val LOG_EVERY_N_CYCLES = 50L } } diff --git a/android/src/main/java/io/base14/scoutreact/ScoutCrashModule.kt b/android/src/main/java/io/base14/scoutreact/ScoutCrashModule.kt index 2e831d6..87d15d6 100644 --- a/android/src/main/java/io/base14/scoutreact/ScoutCrashModule.kt +++ b/android/src/main/java/io/base14/scoutreact/ScoutCrashModule.kt @@ -449,12 +449,15 @@ private object ScoutExitInfoCollector { var newest = lastTs for (info in infos) { if (info.timestamp <= lastTs) continue + // The watermark advances over every record, benign ones included, so a + // dropped exit is never re-examined on the next launch. if (info.timestamp > newest) newest = info.timestamp - if (!isInteresting(info.reason)) continue + val crashType = ScoutExitInfoClassifier.crashTypeFor(reasonName(info.reason)) + ?: continue try { - writeReport(dir, info) + writeReport(dir, info, crashType) } catch (_: Throwable) { - + } } if (newest > lastTs) { @@ -462,20 +465,10 @@ private object ScoutExitInfoCollector { } } - private fun isInteresting(reason: Int): Boolean = when (reason) { - ApplicationExitInfo.REASON_CRASH, - ApplicationExitInfo.REASON_CRASH_NATIVE, - ApplicationExitInfo.REASON_ANR, - ApplicationExitInfo.REASON_LOW_MEMORY, - ApplicationExitInfo.REASON_EXCESSIVE_RESOURCE_USAGE, - ApplicationExitInfo.REASON_INITIALIZATION_FAILURE, - ApplicationExitInfo.REASON_SIGNALED -> true - else -> false - } - - private fun writeReport(dir: File, info: ApplicationExitInfo) { + private fun writeReport(dir: File, info: ApplicationExitInfo, crashType: String) { val obj = JSONObject().apply { - put("crash.type", "exit_info") + put("crash.type", crashType) + put("crash.source", ScoutExitInfoClassifier.SOURCE) put("crash.os_reason_code", info.reason) put("crash.os_reason_name", reasonName(info.reason)) @@ -509,7 +502,9 @@ private object ScoutExitInfoCollector { val cap = ScoutExitInfoCollector.maxTombstoneBytes put("crash.tombstone", if (cap > 0 && trace.length > cap) trace.substring(0, cap) else trace) } - put("crash.timestamp", info.timestamp.toString()) + // ISO-8601 for parity with every other crash path (the numeric form + // stays available as crash.death_timestamp_ms). + put("crash.timestamp", ScoutTimeFormat.isoUtc(info.timestamp)) } val out = File(dir, "exit_${info.pid}_${info.timestamp}.json") out.writeText(obj.toString()) diff --git a/android/src/main/java/io/base14/scoutreact/ScoutExitInfoClassifier.kt b/android/src/main/java/io/base14/scoutreact/ScoutExitInfoClassifier.kt new file mode 100644 index 0000000..a987b7b --- /dev/null +++ b/android/src/main/java/io/base14/scoutreact/ScoutExitInfoClassifier.kt @@ -0,0 +1,53 @@ +package io.base14.scoutreact + +import java.text.SimpleDateFormat +import java.util.Date +import java.util.Locale +import java.util.TimeZone + +/** + * ISO-8601 UTC formatting for crash timestamps. + * + * `java.time.Instant` would need API 26 or desugaring; the SDK ships to + * minSdk 23, so this uses SimpleDateFormat (built fresh per call — the class + * is not thread-safe and crash draining runs off the main thread). + */ +internal object ScoutTimeFormat { + fun isoUtc(epochMillis: Long): String { + val fmt = SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'", Locale.US) + fmt.timeZone = TimeZone.getTimeZone("UTC") + return fmt.format(Date(epochMillis)) + } +} + +/** + * Decides which `ApplicationExitInfo` records are crashes. + * + * Deliberately free of Android imports so it can be unit-tested on the JVM + * (see `android/unit-tests`). The caller maps the platform's `reason` int to + * a name via [ScoutExitInfoCollector.reasonName]; this object owns the policy. + * + * Only {anr, jvm_crash, native_crash, low_memory} are crash-class. Everything + * else is a normal way for a process to stop — swiping the app from recents, + * Force Stop, a self-exit — and reporting those inflates crash counts with + * user actions. Matches scout-flutter's `isCrashClassExitInfo`. + */ +internal object ScoutExitInfoClassifier { + /** `crash.source` for records that came from the exit-info path. */ + const val SOURCE = "exit_info" + + /** + * The `crash.type` to report for an OS exit reason name, or null when the + * exit was benign and must not be emitted at all. + */ + fun crashTypeFor(reasonName: String): String? = when (reasonName) { + "crash" -> "jvm_crash" + "crash_native" -> "native_crash" + "anr" -> "anr" + "low_memory" -> "low_memory" + else -> null + } + + /** True when a record describes a crash rather than a normal process exit. */ + fun isCrashClass(reasonName: String): Boolean = crashTypeFor(reasonName) != null +} diff --git a/android/src/main/java/io/base14/scoutreact/ScoutHangDetector.kt b/android/src/main/java/io/base14/scoutreact/ScoutHangDetector.kt new file mode 100644 index 0000000..4465378 --- /dev/null +++ b/android/src/main/java/io/base14/scoutreact/ScoutHangDetector.kt @@ -0,0 +1,36 @@ +package io.base14.scoutreact + +/** + * Single-fire hang detection for one thread. + * + * Fires once when the thread has been unresponsive for [thresholdMs] and + * re-arms only after it recovers — a hang produces one ANR report, not one + * per poll. Kept free of Android imports so the timing rules are unit-tested + * on the JVM (see `android/unit-tests`) instead of by staring at a device. + * + * [recoveryMs] is the elapsed-since-ping value below which the thread counts + * as healthy again. It is an absolute duration rather than a multiple of the + * poll interval, so tightening the poll cadence cannot silently change how + * eagerly the detector re-arms. + */ +internal class ScoutHangDetector( + private val thresholdMs: Long, + private val recoveryMs: Long, +) { + var inHang: Boolean = false + private set + + /** + * Feeds one sample of "how long since this thread last answered". + * Returns true exactly on the sample that opens a new hang. + */ + fun onSample(elapsedMs: Long): Boolean { + if (elapsedMs >= thresholdMs) { + if (inHang) return false + inHang = true + return true + } + if (elapsedMs < recoveryMs) inHang = false + return false + } +} diff --git a/android/unit-tests/build.gradle.kts b/android/unit-tests/build.gradle.kts new file mode 100644 index 0000000..ca17acb --- /dev/null +++ b/android/unit-tests/build.gradle.kts @@ -0,0 +1,38 @@ +plugins { + kotlin("jvm") version "2.0.21" +} + +repositories { + mavenCentral() +} + +kotlin { + jvmToolchain(17) +} + +// Compile only the classes that carry no Android dependency. Everything else +// in the module needs android.jar / expo-modules-core and is covered by the +// on-device checks instead. +sourceSets { + main { + kotlin { + setSrcDirs(listOf("../src/main/java")) + include( + "io/base14/scoutreact/ScoutExitInfoClassifier.kt", + "io/base14/scoutreact/ScoutHangDetector.kt", + ) + } + } +} + +dependencies { + testImplementation(kotlin("test")) + testImplementation("junit:junit:4.13.2") +} + +tasks.test { + useJUnit() + testLogging { + events("passed", "failed", "skipped") + } +} diff --git a/android/unit-tests/gradle/wrapper/gradle-wrapper.jar b/android/unit-tests/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..a4b76b9530d66f5e68d973ea569d8e19de379189 GIT binary patch literal 43583 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 yu?e%!_ptzGB|8GrCfu%p?(_ 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 GZ~q4|mN%#X literal 0 HcmV?d00001 diff --git a/android/unit-tests/gradle/wrapper/gradle-wrapper.properties b/android/unit-tests/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..fb602ee --- /dev/null +++ b/android/unit-tests/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,8 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionSha256Sum=31c55713e40233a8303827ceb42ca48a47267a0ad4bab9177123121e71524c26 +distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip +networkTimeout=10000 +validateDistributionUrl=true +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/android/unit-tests/gradlew b/android/unit-tests/gradlew new file mode 100755 index 0000000..f5feea6 --- /dev/null +++ b/android/unit-tests/gradlew @@ -0,0 +1,252 @@ +#!/bin/sh + +# +# Copyright © 2015-2021 the original authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# SPDX-License-Identifier: Apache-2.0 +# + +############################################################################## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# +############################################################################## + +# Attempt to set APP_HOME + +# Resolve links: $0 may be a link +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s +' "$PWD" ) || exit + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD=$JAVA_HOME/jre/sh/java + else + JAVACMD=$JAVA_HOME/bin/java + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD=java + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/android/unit-tests/gradlew.bat b/android/unit-tests/gradlew.bat new file mode 100644 index 0000000..9b42019 --- /dev/null +++ b/android/unit-tests/gradlew.bat @@ -0,0 +1,94 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem +@rem SPDX-License-Identifier: Apache-2.0 +@rem + +@if "%DEBUG%"=="" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if %ERRORLEVEL% equ 0 goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if %ERRORLEVEL% equ 0 goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/android/unit-tests/settings.gradle.kts b/android/unit-tests/settings.gradle.kts new file mode 100644 index 0000000..08660c6 --- /dev/null +++ b/android/unit-tests/settings.gradle.kts @@ -0,0 +1,6 @@ +// Standalone JVM project: the scout-react Android library itself cannot be +// built in isolation (it depends on :expo-modules-core, which only exists +// inside a host app's Gradle build). This project compiles the Android-free +// decision cores from ../src/main/java and runs their JUnit tests, so CI can +// verify them with nothing but a JDK. +rootProject.name = "scout-react-unit-tests" diff --git a/android/unit-tests/src/test/kotlin/io/base14/scoutreact/ExitInfoFilterTest.kt b/android/unit-tests/src/test/kotlin/io/base14/scoutreact/ExitInfoFilterTest.kt new file mode 100644 index 0000000..3943cc0 --- /dev/null +++ b/android/unit-tests/src/test/kotlin/io/base14/scoutreact/ExitInfoFilterTest.kt @@ -0,0 +1,93 @@ +package io.base14.scoutreact + +import org.junit.Assert.assertEquals +import org.junit.Assert.assertFalse +import org.junit.Assert.assertNull +import org.junit.Assert.assertTrue +import org.junit.Test + +/** + * Locks the exit-info crash classification, ported from scout-flutter's + * `test/exit_info_filter_test.dart`. + * + * The benign list is the load-bearing half: swiping the app from recents, + * Force Stop and self-exit are normal ways for a process to stop. Reporting + * them inflates crash counts with ordinary user actions, which is what this + * test exists to prevent regressing. + */ +class ExitInfoFilterTest { + + /** The only reasons that may ever produce a crash record. */ + private val crashClass = mapOf( + "crash" to "jvm_crash", + "crash_native" to "native_crash", + "anr" to "anr", + "low_memory" to "low_memory", + ) + + /** Every other exit reason the OS can report. None may be emitted. */ + private val benign = listOf( + "user_requested", + "user_stopped", + "exit_self", + "signaled", + "permission_change", + "excessive_resource_usage", + "initialization_failure", + "dependency_died", + "package_updated", + "package_state_change", + "freezer", + "other", + "unknown", + ) + + @Test + fun `crash-class reasons map to their flutter crash type`() { + for ((reasonName, expectedType) in crashClass) { + assertEquals( + "reason '$reasonName' must report crash.type '$expectedType'", + expectedType, + ScoutExitInfoClassifier.crashTypeFor(reasonName), + ) + assertTrue(reasonName, ScoutExitInfoClassifier.isCrashClass(reasonName)) + } + } + + @Test + fun `benign exits are never crashes`() { + for (reasonName in benign) { + assertNull( + "benign exit '$reasonName' must not produce a crash record", + ScoutExitInfoClassifier.crashTypeFor(reasonName), + ) + assertFalse(reasonName, ScoutExitInfoClassifier.isCrashClass(reasonName)) + } + } + + @Test + fun `the crash-class set is exactly these four reasons`() { + val classified = (crashClass.keys + benign).filter { + ScoutExitInfoClassifier.isCrashClass(it) + } + assertEquals( + setOf("crash", "crash_native", "anr", "low_memory"), + classified.toSet(), + ) + } + + @Test + fun `unknown future reason names are treated as benign`() { + // reasonName() falls back to "reason_" for codes added by later + // Android versions; an unrecognised reason must not become a crash. + assertNull(ScoutExitInfoClassifier.crashTypeFor("reason_42")) + assertNull(ScoutExitInfoClassifier.crashTypeFor("")) + } + + @Test + fun `crash source identifies the detection path`() { + // Dashboards previously filtered crash.type = 'exit_info'; that moved to + // crash.source so crash.type can carry the real reason. + assertEquals("exit_info", ScoutExitInfoClassifier.SOURCE) + } +} diff --git a/android/unit-tests/src/test/kotlin/io/base14/scoutreact/HangDetectorTest.kt b/android/unit-tests/src/test/kotlin/io/base14/scoutreact/HangDetectorTest.kt new file mode 100644 index 0000000..924f1fb --- /dev/null +++ b/android/unit-tests/src/test/kotlin/io/base14/scoutreact/HangDetectorTest.kt @@ -0,0 +1,82 @@ +package io.base14.scoutreact + +import org.junit.Assert.assertFalse +import org.junit.Assert.assertTrue +import org.junit.Test + +/** + * Timing rules of the ANR watchdog, ported from scout-flutter's + * `AnrWatchdogTest.kt`. The watchdog samples "how long since this thread last + * answered" every 100ms; these are the decisions it makes on each sample. + */ +class HangDetectorTest { + private fun detector() = ScoutHangDetector(thresholdMs = 5000, recoveryMs = 500) + + @Test + fun `does not fire below the threshold`() { + val d = detector() + for (elapsed in longArrayOf(0, 100, 2500, 4900, 4999)) { + assertFalse("elapsed=$elapsed", d.onSample(elapsed)) + } + assertFalse(d.inHang) + } + + @Test + fun `fires exactly at the threshold`() { + val d = detector() + assertTrue(d.onSample(5000)) + assertTrue(d.inHang) + } + + @Test + fun `fires once per hang, not once per poll`() { + // A 3s hang at a 100ms cadence produces ~30 samples over threshold. One + // ANR report, not thirty. + val d = detector() + var fires = 0 + var elapsed = 5000L + repeat(30) { + if (d.onSample(elapsed)) fires++ + elapsed += 100 + } + assertTrue("expected a single report, got $fires", fires == 1) + } + + @Test + fun `re-arms after the thread recovers`() { + val d = detector() + assertTrue(d.onSample(6000)) + assertFalse("still hung", d.onSample(400)) // recovered: below recoveryMs + assertFalse(d.inHang) + assertTrue("a second hang must report again", d.onSample(5200)) + } + + @Test + fun `stays armed while elapsed sits between recovery and threshold`() { + // The grey zone: the thread answered, but sluggishly. It must not count + // as recovered yet, or a stuttering thread would re-report repeatedly. + val d = detector() + assertTrue(d.onSample(5000)) + assertFalse(d.onSample(600)) + assertTrue("must still be considered hung", d.inHang) + assertFalse("no duplicate report", d.onSample(5000)) + } + + @Test + fun `detection latency is bounded by one poll interval`() { + // Simulated 100ms polling across a hang that starts at t=0: the first + // sample at or past the threshold is what fires, so detection lands + // within one poll of the threshold. + val d = detector() + var firedAt = -1L + var t = 0L + while (t <= 6000) { + if (d.onSample(t)) { + firedAt = t + break + } + t += 100 + } + assertTrue("fired at ${firedAt}ms", firedAt in 5000..5100) + } +} diff --git a/babel-plugin/index.d.cts b/babel-plugin/index.d.cts new file mode 100644 index 0000000..26edcb4 --- /dev/null +++ b/babel-plugin/index.d.cts @@ -0,0 +1,39 @@ +/** + * Babel plugin that wraps tap handlers on React Native touchables so Scout can + * record `ui.tap` spans carrying the component name, accessibility label, + * testID, and static text child — none of which are recoverable at runtime. + * + * Register it in `babel.config.js`: + * + * ```js + * module.exports = { + * plugins: [['@base-14/scout-react/babel-plugin', { components: ['MyButton'] }]], + * }; + * ``` + */ +declare function scoutBabelPlugin(babel: { + types: unknown; +}): scoutBabelPlugin.ScoutBabelPlugin; + +declare namespace scoutBabelPlugin { + interface Options { + /** + * Component names whose handlers get wrapped. Replaces (does not extend) + * the default set: `Pressable`, `TouchableOpacity`, `TouchableHighlight`, + * `TouchableWithoutFeedback`, `TouchableNativeFeedback`, `Button`. + */ + components?: string[]; + /** + * Prop names treated as tap handlers. Replaces (does not extend) the + * default set: `onPress`, `onLongPress`. + */ + handlers?: string[]; + } + + interface ScoutBabelPlugin { + name: string; + visitor: Record; + } +} + +export = scoutBabelPlugin; diff --git a/docs/configuration.md b/docs/configuration.md index 71bdfbb..e7fb462 100644 --- a/docs/configuration.md +++ b/docs/configuration.md @@ -36,27 +36,45 @@ await Scout.initialize({ How telemetry is batched and flushed. -### Traces +### Unified knobs (preferred) + +Set the cadence once for all three signals. | Field | Type | Default | Description | |---|---|---|---| -| `traceExportIntervalMs` | `number` | `5000` | Trace buffer flush interval. Shorter = lower visibility delay; higher = fewer HTTP requests. | -| `traceMaxQueueSize` | `number` | `2048` | Maximum spans buffered. When the queue is full (collector offline, slow export), the oldest spans are dropped. | -| `traceMaxExportBatchSize` | `number` | `512` | Maximum spans per single HTTP POST. Larger batches = better compression, slightly higher tail latency. | +| `exportIntervalSeconds` | `number` | `30` | Flush interval for traces, logs **and** metrics. Minimum `1`. | +| `metricExportIntervalSeconds` | `number` | inherits | Metrics-only override. | +| `maxExportBatchSize` | `number` | `512` | Max items per HTTP POST, applied to traces and logs. | +| `maxQueueSize` | `number` | `2048` | Max items buffered before the oldest are dropped, applied to traces and logs. | + +### Per-signal overrides -### Logs +These still exist for backwards compatibility and **win over the unified knobs** when set explicitly. Left unset, they inherit from the table above. | Field | Type | Default | Description | |---|---|---|---| -| `logExportScheduledDelayMs` | `number` | `5000` | Log buffer flush interval. | -| `logMaxQueueSize` | `number` | `2048` | Max log records buffered before drop. | -| `logMaxExportBatchSize` | `number` | `512` | Max log records per POST. | +| `traceExportIntervalMs` | `number` | `exportIntervalSeconds` | Trace buffer flush interval. | +| `traceMaxQueueSize` | `number` | `maxQueueSize` | Maximum spans buffered. When the queue is full (collector offline, slow export), the oldest spans are dropped. | +| `traceMaxExportBatchSize` | `number` | `maxExportBatchSize` | Maximum spans per single HTTP POST. Larger batches = better compression, slightly higher tail latency. | +| `logExportScheduledDelayMs` | `number` | `exportIntervalSeconds` | Log buffer flush interval. | +| `logMaxQueueSize` | `number` | `maxQueueSize` | Max log records buffered before drop. | +| `logMaxExportBatchSize` | `number` | `maxExportBatchSize` | Max log records per POST. | +| `metricExportIntervalMs` | `number` | `metricExportIntervalSeconds` | Metric reader's periodic export interval. | -### Metrics +```ts +// traces every 5s, logs and metrics every 10s +Scout.initialize({ + serviceName, endpoint, + exportIntervalSeconds: 10, + traceExportIntervalMs: 5000, +}); +``` + +### Vitals sampling | Field | Type | Default | Description | |---|---|---|---| -| `metricExportIntervalMs` | `number` | `30000` | Metric reader's periodic export interval. | +| `vitalsCollectionIntervalSeconds` | `number` | `60` | Sampling cadence for memory, CPU, frame and battery vitals. Minimum `1`. Only in effect for the vitals you have enabled — all of them are opt-in. | ### Shared HTTP @@ -66,11 +84,13 @@ How telemetry is batched and flushed. ## Retry policy -What happens when an export fails. The SDK wraps every OTLP exporter with retry-on-failure using exponential backoff with **full jitter** (a uniform random delay between 0 and the computed backoff). This avoids retry storms when many clients all reconnect after an outage. +**Delivery is at-most-once by default.** Retrying an ambiguous failure — a timeout whose request the collector may already have ingested — re-delivers spans with identical span IDs. For RUM data, no duplicates is worth more than lossless delivery, so `maxRetries` defaults to `0` and one `export()` puts exactly one request on the wire. + +Opting in (`maxRetries > 0`) wraps every OTLP exporter with retry-on-failure using exponential backoff with **full jitter** (a uniform random delay between 0 and the computed backoff). This avoids retry storms when many clients all reconnect after an outage. Retry lives in exactly one layer: the SDK's own exporters issue a single request per attempt, so the total request count per batch is exactly `maxRetries + 1`. | Field | Type | Default | Description | |---|---|---|---| -| `exportRetry.maxRetries` | `number` | `3` | Retries per batch. Set `0` to disable retry (at-most-once delivery). | +| `exportRetry.maxRetries` | `number` | `0` | Retries per batch. `0` = at-most-once delivery. Set `3` for the pre-0.1.12 behaviour. | | `exportRetry.initialDelayMs` | `number` | `1000` | First retry delay. Doubles every attempt up to `maxDelayMs`. | | `exportRetry.maxDelayMs` | `number` | `30000` | Cap on the exponential backoff. | @@ -78,14 +98,23 @@ What happens when an export fails. The SDK wraps every OTLP exporter with retry- ## Offline buffer -When in-memory retry is exhausted on a retryable failure, the batch is **persisted to disk** instead of being dropped. Buffered batches are replayed on next `Scout.initialize()`, on app foreground (RN), and on `visibilitychange → visible` / `online` events (web). +**Off by default** since 0.1.12 — replaying a persisted batch is another way to deliver the same span twice. When enabled, a batch that fails with a retryable error (after any configured retries) is **persisted to disk** instead of being dropped, and replayed on next `Scout.initialize()`, on app foreground (RN), and on `visibilitychange → visible` / `online` events (web). + +Buffering works independently of `exportRetry.maxRetries`: with the default `0`, a failed batch goes straight to disk. + +```ts +Scout.initialize({ + serviceName, endpoint, + offlineBuffer: { enabled: true, maxItems: { traces: 5000, metrics: 2000, logs: 5000 } }, +}); +``` | Field | Type | Default | Description | |---|---|---|---| -| `offlineBuffer.enabled` | `boolean` | `true` | Master toggle. Set `false` for strict at-most-once delivery. | -| `offlineBuffer.maxItems.traces` | `number` | `5000` | FIFO cap on persisted span items. Oldest evicted first when exceeded. | -| `offlineBuffer.maxItems.metrics` | `number` | `2000` | Same, for metric data points. | -| `offlineBuffer.maxItems.logs` | `number` | `5000` | Same, for log records. | +| `offlineBuffer.enabled` | `boolean` | `false` | Master toggle. `false` keeps delivery strictly at-most-once. | +| `offlineBuffer.maxItems.traces` | `number` | `0` | FIFO cap on persisted span items. Oldest evicted first when exceeded. | +| `offlineBuffer.maxItems.metrics` | `number` | `0` | Same, for metric data points. | +| `offlineBuffer.maxItems.logs` | `number` | `0` | Same, for log records. | | `maxOfflineStorageMb` | `number` | `5` | Coarse total-disk cap for the offline buffer. Runs alongside the per-signal `offlineBuffer.maxItems.*` caps above — whichever limit is reached first wins. | **Storage backend**: AsyncStorage on RN, localStorage on web. One key per signal type. Atomic per-batch eviction — if the FIFO cap would be exceeded by a new batch, the oldest batches are shifted out until the cap is satisfied. @@ -100,7 +129,7 @@ Measured from a real Scout RN session: an OTLP-serialized span averages **~5 KB* | Profile | `traces` | `metrics` | `logs` | Worst-case disk | |---|---|---|---|---| -| **Default** | `5000` | `2000` | `5000` | ~25–35 MB | +| **Pre-0.1.12 default** | `5000` | `2000` | `5000` | ~25–35 MB | | Low-end Android, conservative | `2000` | `1000` | `2000` | ~10–15 MB | | High-traffic app, long-outage tolerant | `10000` | `5000` | `10000` | ~50–70 MB | | Web (localStorage 5–10 MB quota) | `3000` | `1500` | `3000` | ~15–20 MB | @@ -117,7 +146,7 @@ If you see `QuotaExceededError` in browser telemetry, drop the web caps. On Andr ## Auto-instrumentation toggles -Every auto-instrumentation can be turned off independently. All default to `true`. +Every auto-instrumentation can be turned off independently. All default to `true` except the periodic vitals metrics (`enableFrameMetrics`, `enableMemoryMetrics`, `enableCpuMetrics`) and console capture, which are opt-in. | Field | Default | What it captures | |---|---|---| @@ -129,8 +158,9 @@ Every auto-instrumentation can be turned off independently. All default to `true | `enablePerformanceMetrics` | `true` | Memory and CPU samples. | | `enableLongTaskDetection` | `true` | JS long tasks > `longTaskThresholdMs`. Emits `long_task` span. | | `enableAnrDetection` | `true` | RN App-Not-Responding via timer drift. Emits `anr` span. | -| `enableFrameMetrics` | `true` | RN frame rate, slow frames, frozen frames. Emits `react_native.frame.*` metrics + `frozen_frame` spans. | -| `enableMemoryMetrics` | `true` | RN process memory sampling. | +| `enableFrameMetrics` | **`false`** | RN frame rate, slow frames, frozen frames. Emits `react_native.frame.*` metrics + `frozen_frame` spans. Opt-in: highest-volume signal the SDK produces. | +| `enableMemoryMetrics` | **`false`** | RN/web process memory sampling. Emits `*.memory.*` metrics. Opt-in. | +| `enableCpuMetrics` | **`false`** | RN CPU usage sampling. Emits `react_native.cpu.usage`. Opt-in. | | `enableWebVitals` | `true` | Web: LCP, INP, CLS, FCP, TTFB. Emits `web_vital` spans. | | `enableBatteryTracking` | `true` | RN: battery level + charging state on every span. | | `enableNetworkTracking` | `true` | Wraps `fetch` / `XMLHttpRequest`. Emits `http.request` spans + provider classification + GraphQL parse. | @@ -150,6 +180,8 @@ Every auto-instrumentation can be turned off independently. All default to `true |---|---|---|---| | `resourceAttributes` | `Record` | `{}` | Extra resource attributes merged into every signal. Use for `deployment.region`, `team`, etc. | +The SDK always stamps **`scout.react.version`** on every span, metric and log, on both web and native. It is pinned to the package version by a CI contract test, and cannot be overridden through `resourceAttributes` — the backend uses it to attribute telemetry to an SDK build, so an app-supplied value would misreport it. + ## Filtering | Field | Type | Default | Description | diff --git a/package-lock.json b/package-lock.json index 986e124..f1b2b22 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,20 +1,18 @@ { "name": "@base-14/scout-react", - "version": "0.1.8", + "version": "0.1.12", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@base-14/scout-react", - "version": "0.1.8", + "version": "0.1.12", "license": "MIT", "dependencies": { "@opentelemetry/api": "^1.9.1", "@opentelemetry/api-logs": "^0.218.0", "@opentelemetry/core": "^2.7.1", - "@opentelemetry/exporter-logs-otlp-http": "^0.218.0", - "@opentelemetry/exporter-metrics-otlp-http": "^0.218.0", - "@opentelemetry/exporter-trace-otlp-http": "^0.218.0", + "@opentelemetry/otlp-transformer": "^0.218.0", "@opentelemetry/resources": "^2.7.1", "@opentelemetry/sdk-logs": "^0.218.0", "@opentelemetry/sdk-metrics": "^2.7.1", @@ -24,6 +22,7 @@ "web-vitals": "^5.2.0" }, "devDependencies": { + "@arethetypeswrong/cli": "^0.18.5", "@eslint/js": "^9.0.0", "@testing-library/dom": "^10.4.1", "@testing-library/jest-dom": "^6.9.1", @@ -38,6 +37,7 @@ "eslint-config-prettier": "^10.1.8", "jsdom": "^29.1.1", "prettier": "^3.8.3", + "publint": "^0.3.22", "react": "^19.2.6", "react-dom": "^19.2.6", "tsup": "^8.3.0", @@ -75,6 +75,78 @@ "dev": true, "license": "MIT" }, + "node_modules/@andrewbranch/untar.js": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/@andrewbranch/untar.js/-/untar.js-1.0.3.tgz", + "integrity": "sha512-Jh15/qVmrLGhkKJBdXlK1+9tY4lZruYjsgkDFj08ZmDiWVBLJcqkok7Z0/R0In+i1rScBpJlSvrTS2Lm41Pbnw==", + "dev": true + }, + "node_modules/@arethetypeswrong/cli": { + "version": "0.18.5", + "resolved": "https://registry.npmjs.org/@arethetypeswrong/cli/-/cli-0.18.5.tgz", + "integrity": "sha512-gM+8vRsQOD/Uc7EnBedUhkG5OCsDWE4uoak5QvomGpMpaky0Eh41p04nIMgrWb8EOmqZUJGc6zz9hsP6E56R7g==", + "dev": true, + "license": "MIT", + "dependencies": { + "@arethetypeswrong/core": "0.18.5", + "chalk": "^4.1.2", + "cli-table3": "^0.6.3", + "commander": "^10.0.1", + "marked": "^9.1.2", + "marked-terminal": "^7.1.0", + "semver": "^7.5.4" + }, + "bin": { + "attw": "dist/index.js" + }, + "engines": { + "node": ">=20" + } + }, + "node_modules/@arethetypeswrong/cli/node_modules/commander": { + "version": "10.0.1", + "resolved": "https://registry.npmjs.org/commander/-/commander-10.0.1.tgz", + "integrity": "sha512-y4Mg2tXshplEbSGzx7amzPwKKOCGuoSRP/CjEdwwk0FOGlUbq6lKuoyDZTNZkmxHdJtp54hdfY/JUrdL7Xfdug==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=14" + } + }, + "node_modules/@arethetypeswrong/core": { + "version": "0.18.5", + "resolved": "https://registry.npmjs.org/@arethetypeswrong/core/-/core-0.18.5.tgz", + "integrity": "sha512-9ytjzGwxjm9Uz7I9avfbt5vlQt6uk9uRRESzJjqrznl6WKvI6dwYTo+vJ3U02Wrq/mR3iql/PzhvHhKdJIAjDQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "@andrewbranch/untar.js": "^1.0.3", + "@loaderkit/resolve": "^1.0.2", + "cjs-module-lexer": "^1.2.3", + "fflate": "^0.8.3", + "lru-cache": "^11.0.1", + "semver": "^7.5.4", + "typescript": "5.6.1-rc", + "validate-npm-package-name": "^5.0.0" + }, + "engines": { + "node": ">=20" + } + }, + "node_modules/@arethetypeswrong/core/node_modules/typescript": { + "version": "5.6.1-rc", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.6.1-rc.tgz", + "integrity": "sha512-E3b2+1zEFu84jB0YQi9BORDjz9+jGbwwy1Zi3G0LUNw7a7cePUrHMRNy8aPh53nXpkFGVHSxIZo5vKTfYaFiBQ==", + "dev": true, + "license": "Apache-2.0", + "bin": { + "tsc": "bin/tsc", + "tsserver": "bin/tsserver" + }, + "engines": { + "node": ">=14.17" + } + }, "node_modules/@asamuzakjp/css-color": { "version": "5.1.11", "resolved": "https://registry.npmjs.org/@asamuzakjp/css-color/-/css-color-5.1.11.tgz", @@ -218,6 +290,13 @@ "node": ">=18" } }, + "node_modules/@braidai/lang": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/@braidai/lang/-/lang-1.1.2.tgz", + "integrity": "sha512-qBcknbBufNHlui137Hft8xauQMTZDKdophmLFv05r2eNmdIv/MlPuP4TdUknHG68UdWLgVZwgxVe735HzJNIwA==", + "dev": true, + "license": "ISC" + }, "node_modules/@bramus/specificity": { "version": "2.4.2", "resolved": "https://registry.npmjs.org/@bramus/specificity/-/specificity-2.4.2.tgz", @@ -231,6 +310,17 @@ "specificity": "bin/cli.js" } }, + "node_modules/@colors/colors": { + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/@colors/colors/-/colors-1.5.0.tgz", + "integrity": "sha512-ooWCrlZP11i8GImSjTHYHLkvFDP48nS4+204nGb1RiX/WXYHmJA2III9/e2DWVabCESdW7hBAEzHRqUn9OUVvQ==", + "dev": true, + "license": "MIT", + "optional": true, + "engines": { + "node": ">=0.1.90" + } + }, "node_modules/@csstools/color-helpers": { "version": "6.0.2", "resolved": "https://registry.npmjs.org/@csstools/color-helpers/-/color-helpers-6.0.2.tgz", @@ -319,6 +409,7 @@ } ], "license": "MIT", + "peer": true, "engines": { "node": ">=20.19.0" }, @@ -367,37 +458,15 @@ } ], "license": "MIT", + "peer": true, "engines": { "node": ">=20.19.0" } }, - "node_modules/@emnapi/core": { - "version": "1.10.0", - "resolved": "https://registry.npmjs.org/@emnapi/core/-/core-1.10.0.tgz", - "integrity": "sha512-yq6OkJ4p82CAfPl0u9mQebQHKPJkY7WrIuk205cTYnYe+k2Z8YBh11FrbRG/H6ihirqcacOgl2BIO8oyMQLeXw==", - "dev": true, - "license": "MIT", - "optional": true, - "dependencies": { - "@emnapi/wasi-threads": "1.2.1", - "tslib": "^2.4.0" - } - }, - "node_modules/@emnapi/runtime": { - "version": "1.10.0", - "resolved": "https://registry.npmjs.org/@emnapi/runtime/-/runtime-1.10.0.tgz", - "integrity": "sha512-ewvYlk86xUoGI0zQRNq/mC+16R1QeDlKQy21Ki3oSYXNgLb45GV1P6A0M+/s6nyCuNDqe5VpaY84BzXGwVbwFA==", - "dev": true, - "license": "MIT", - "optional": true, - "dependencies": { - "tslib": "^2.4.0" - } - }, "node_modules/@emnapi/wasi-threads": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/@emnapi/wasi-threads/-/wasi-threads-1.2.1.tgz", - "integrity": "sha512-uTII7OYF+/Mes/MrcIOYp5yOtSMLBWSIoLPpcgwipoiKbli6k322tcoFsxoIIxPDqW01SQGAgko4EzZi2BNv2w==", + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/@emnapi/wasi-threads/-/wasi-threads-1.2.3.tgz", + "integrity": "sha512-ELEBe8PsLvvJ6QMr0zLt8ffvOHW/dc1m3CEzNMg7aJUv3bMaoDtw2TXyDAwkYBuroxxuHEwhRTLJSe5sya547g==", "dev": true, "license": "MIT", "optional": true, @@ -1173,6 +1242,16 @@ "@jridgewell/sourcemap-codec": "^1.4.14" } }, + "node_modules/@loaderkit/resolve": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/@loaderkit/resolve/-/resolve-1.0.6.tgz", + "integrity": "sha512-G8FdIoF5CypfwmD9rl8BXod5HDn8JqB0CCNBXDTaRZ+yRYhARrrSToX1zg1zy9jX3zLqigsELwhT4gNtkdQAUg==", + "dev": true, + "license": "ISC", + "dependencies": { + "@braidai/lang": "^1.0.0" + } + }, "node_modules/@napi-rs/wasm-runtime": { "version": "1.1.4", "resolved": "https://registry.npmjs.org/@napi-rs/wasm-runtime/-/wasm-runtime-1.1.4.tgz", @@ -1197,6 +1276,7 @@ "resolved": "https://registry.npmjs.org/@opentelemetry/api/-/api-1.9.1.tgz", "integrity": "sha512-gLyJlPHPZYdAk1JENA9LeHejZe1Ti77/pTeFm/nMXmQH/HFZlcS/O2XJB+L8fkbrNSqhdtlvjBVjxwUYanNH5Q==", "license": "Apache-2.0", + "peer": true, "engines": { "node": ">=8.0.0" } @@ -1228,79 +1308,6 @@ "@opentelemetry/api": ">=1.0.0 <1.10.0" } }, - "node_modules/@opentelemetry/exporter-logs-otlp-http": { - "version": "0.218.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/exporter-logs-otlp-http/-/exporter-logs-otlp-http-0.218.0.tgz", - "integrity": "sha512-Qx+4rpVHzgg89dawcWRHyt+XRXeLnhFz/qBtvggmjkcgPUdr+NAB0/u/eIPA8yAeJV0J80Vz43JZCh/XFvZFGw==", - "license": "Apache-2.0", - "dependencies": { - "@opentelemetry/api-logs": "0.218.0", - "@opentelemetry/core": "2.7.1", - "@opentelemetry/otlp-exporter-base": "0.218.0", - "@opentelemetry/otlp-transformer": "0.218.0", - "@opentelemetry/sdk-logs": "0.218.0" - }, - "engines": { - "node": "^18.19.0 || >=20.6.0" - }, - "peerDependencies": { - "@opentelemetry/api": "^1.3.0" - } - }, - "node_modules/@opentelemetry/exporter-metrics-otlp-http": { - "version": "0.218.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/exporter-metrics-otlp-http/-/exporter-metrics-otlp-http-0.218.0.tgz", - "integrity": "sha512-bV7d2OuMpZu2+gAaxUAhzfZ0h3WVZk8ETQUEE3DNSntbTaMpuITjtm8I0rNyHFdm7Ax57K6ty7SgFXlBmOLIvQ==", - "license": "Apache-2.0", - "dependencies": { - "@opentelemetry/core": "2.7.1", - "@opentelemetry/otlp-exporter-base": "0.218.0", - "@opentelemetry/otlp-transformer": "0.218.0", - "@opentelemetry/resources": "2.7.1", - "@opentelemetry/sdk-metrics": "2.7.1" - }, - "engines": { - "node": "^18.19.0 || >=20.6.0" - }, - "peerDependencies": { - "@opentelemetry/api": "^1.3.0" - } - }, - "node_modules/@opentelemetry/exporter-trace-otlp-http": { - "version": "0.218.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/exporter-trace-otlp-http/-/exporter-trace-otlp-http-0.218.0.tgz", - "integrity": "sha512-8dqezsmPhtKitIK/eTipZhYl9EX2/gNQ5zUMhaz3uxEURwfkNf8IPvo6yNfrzbxdtpAOybS/+h7wmIWYqFSpiw==", - "license": "Apache-2.0", - "dependencies": { - "@opentelemetry/core": "2.7.1", - "@opentelemetry/otlp-exporter-base": "0.218.0", - "@opentelemetry/otlp-transformer": "0.218.0", - "@opentelemetry/resources": "2.7.1", - "@opentelemetry/sdk-trace-base": "2.7.1" - }, - "engines": { - "node": "^18.19.0 || >=20.6.0" - }, - "peerDependencies": { - "@opentelemetry/api": "^1.3.0" - } - }, - "node_modules/@opentelemetry/otlp-exporter-base": { - "version": "0.218.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/otlp-exporter-base/-/otlp-exporter-base-0.218.0.tgz", - "integrity": "sha512-ZwqpkNL5W7RyGJPDZ9g06DvKp8KFTWPJPN12anpMQYSKpTSU0z3EIZuPq9vPGpS8siFyOqDYDAuCwlNO9FqgbA==", - "license": "Apache-2.0", - "dependencies": { - "@opentelemetry/core": "2.7.1", - "@opentelemetry/otlp-transformer": "0.218.0" - }, - "engines": { - "node": "^18.19.0 || >=20.6.0" - }, - "peerDependencies": { - "@opentelemetry/api": "^1.3.0" - } - }, "node_modules/@opentelemetry/otlp-transformer": { "version": "0.218.0", "resolved": "https://registry.npmjs.org/@opentelemetry/otlp-transformer/-/otlp-transformer-0.218.0.tgz", @@ -1423,6 +1430,32 @@ "url": "https://github.com/sponsors/Boshen" } }, + "node_modules/@publint/pack": { + "version": "0.1.6", + "resolved": "https://registry.npmjs.org/@publint/pack/-/pack-0.1.6.tgz", + "integrity": "sha512-3uVNyGcVplhPZSLVyeIpL7+cIRn1YCSNHLG/rUIlBQMVH8YuN9++YF+5+UDIIO9RW98dujiUoTltO7RDB5bFJA==", + "dev": true, + "license": "MIT", + "dependencies": { + "tinyexec": "^1.2.4" + }, + "engines": { + "node": ">=18" + }, + "funding": { + "url": "https://bjornlu.com/sponsor" + } + }, + "node_modules/@publint/pack/node_modules/tinyexec": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/tinyexec/-/tinyexec-1.3.0.tgz", + "integrity": "sha512-QKAl9m8gWWGHV8jZcPeym6j+XULi6tOf1mT83WYJ4Lk2ytW/uwAWkrP0uFsdoYMdueVJ0qs26wZ+23xeB4ibNQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=18" + } + }, "node_modules/@rolldown/binding-android-arm64": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/@rolldown/binding-android-arm64/-/binding-android-arm64-1.0.0.tgz", @@ -1646,6 +1679,40 @@ "node": "^20.19.0 || >=22.12.0" } }, + "node_modules/@rolldown/binding-wasm32-wasi/node_modules/@emnapi/core": { + "version": "1.10.0", + "resolved": "https://registry.npmjs.org/@emnapi/core/-/core-1.10.0.tgz", + "integrity": "sha512-yq6OkJ4p82CAfPl0u9mQebQHKPJkY7WrIuk205cTYnYe+k2Z8YBh11FrbRG/H6ihirqcacOgl2BIO8oyMQLeXw==", + "dev": true, + "license": "MIT", + "optional": true, + "dependencies": { + "@emnapi/wasi-threads": "1.2.1", + "tslib": "^2.4.0" + } + }, + "node_modules/@rolldown/binding-wasm32-wasi/node_modules/@emnapi/runtime": { + "version": "1.10.0", + "resolved": "https://registry.npmjs.org/@emnapi/runtime/-/runtime-1.10.0.tgz", + "integrity": "sha512-ewvYlk86xUoGI0zQRNq/mC+16R1QeDlKQy21Ki3oSYXNgLb45GV1P6A0M+/s6nyCuNDqe5VpaY84BzXGwVbwFA==", + "dev": true, + "license": "MIT", + "optional": true, + "dependencies": { + "tslib": "^2.4.0" + } + }, + "node_modules/@rolldown/binding-wasm32-wasi/node_modules/@emnapi/wasi-threads": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/@emnapi/wasi-threads/-/wasi-threads-1.2.1.tgz", + "integrity": "sha512-uTII7OYF+/Mes/MrcIOYp5yOtSMLBWSIoLPpcgwipoiKbli6k322tcoFsxoIIxPDqW01SQGAgko4EzZi2BNv2w==", + "dev": true, + "license": "MIT", + "optional": true, + "dependencies": { + "tslib": "^2.4.0" + } + }, "node_modules/@rolldown/binding-win32-arm64-msvc": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/@rolldown/binding-win32-arm64-msvc/-/binding-win32-arm64-msvc-1.0.0.tgz", @@ -2037,6 +2104,19 @@ "win32" ] }, + "node_modules/@sindresorhus/is": { + "version": "4.6.0", + "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-4.6.0.tgz", + "integrity": "sha512-t09vSN3MdfsyCHoFcTRCH/iUtG7OJ0CsjzB8cjAmKc/va/kIgeDI/TxsigdncE/4be734m0cvIYwNaV4i2XqAw==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sindresorhus/is?sponsor=1" + } + }, "node_modules/@standard-schema/spec": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/@standard-schema/spec/-/spec-1.1.0.tgz", @@ -2050,6 +2130,7 @@ "integrity": "sha512-o4PXJQidqJl82ckFaXUeoAW+XysPLauYI43Abki5hABd853iMhitooc6znOnczgbTYmEP6U6/y1ZyKAIsvMKGg==", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "@babel/code-frame": "^7.10.4", "@babel/runtime": "^7.12.5", @@ -2175,6 +2256,7 @@ "integrity": "sha512-xfrlY7UD5rMJk3ZVJP8BNzS28J36YJg+xp+LPXV1TdWxr8uMH5A860QNxYDGQe/ylDSgjxE52Q9VnO7p75tJxg==", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "undici-types": ">=7.24.0 <7.24.7" } @@ -2185,6 +2267,7 @@ "integrity": "sha512-ilcTH/UniCkMdtexkoCN0bI7pMcJDvmQFPvuPvmEaYA/NSfFTAgdUSLAoVjaRJm7+6PvcM+q1zYOwS4wTYMF9w==", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "csstype": "^3.2.2" } @@ -2195,6 +2278,7 @@ "integrity": "sha512-jp2L/eY6fn+KgVVQAOqYItbF0VY/YApe5Mz2F0aykSO8gx31bYCZyvSeYxCHKvzHG5eZjc+zyaS5BrBWya2+kQ==", "dev": true, "license": "MIT", + "peer": true, "peerDependencies": { "@types/react": "^19.2.0" } @@ -2234,6 +2318,7 @@ "integrity": "sha512-HPwA+hVkfcriajbNvTmZv4VRauibay+cWArYUYq7u7W7PmGShMxbPxLvrwDme55a6d5alG3nrYfhyJ/G28XlLg==", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "@typescript-eslint/scope-manager": "8.59.3", "@typescript-eslint/types": "8.59.3", @@ -2438,6 +2523,7 @@ "integrity": "sha512-36l628fQ/9a/8ihy97eOtEnvWQEdqULQOJtcaxtoNq0G1w3Mxd4szSahOaMM9/NGyZ+hyKcMtIW/WIxq0XQViQ==", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "@bcoe/v8-coverage": "^1.0.2", "@vitest/utils": "4.1.6", @@ -2582,6 +2668,7 @@ "integrity": "sha512-UVJyE9MttOsBQIDKw1skb9nAwQuR5wuGD3+82K6JgJlm/Y+KI92oNsMNGZCYdDsVtRHSak0pcV5Dno5+4jh9sw==", "dev": true, "license": "MIT", + "peer": true, "bin": { "acorn": "bin/acorn" }, @@ -2616,6 +2703,22 @@ "url": "https://github.com/sponsors/epoberezkin" } }, + "node_modules/ansi-escapes": { + "version": "7.3.0", + "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-7.3.0.tgz", + "integrity": "sha512-BvU8nYgGQBxcmMuEeUEmNTvrMVjJNSH7RgW24vXexN4Ven6qCvy4TntnvlnwnMLTVlcRQQdbRY8NKnaIoeWDNg==", + "dev": true, + "license": "MIT", + "dependencies": { + "environment": "^1.0.0" + }, + "engines": { + "node": ">=18" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/ansi-regex": { "version": "5.0.1", "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", @@ -2784,6 +2887,16 @@ "url": "https://github.com/chalk/chalk?sponsor=1" } }, + "node_modules/char-regex": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/char-regex/-/char-regex-1.0.2.tgz", + "integrity": "sha512-kWWXztvZ5SBQV+eRgKFeh8q5sLuZY2+8WUIzlxWVTg+oGwY14qylx1KbKzHd8P6ZYkAg0xyIDU9JMHhyJMZ1jw==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=10" + } + }, "node_modules/chokidar": { "version": "4.0.3", "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-4.0.3.tgz", @@ -2800,6 +2913,70 @@ "url": "https://paulmillr.com/funding/" } }, + "node_modules/cjs-module-lexer": { + "version": "1.4.3", + "resolved": "https://registry.npmjs.org/cjs-module-lexer/-/cjs-module-lexer-1.4.3.tgz", + "integrity": "sha512-9z8TZaGM1pfswYeXrUpzPrkx8UnWYdhJclsiYMm6x/w5+nN+8Tf/LnAgfLGQCm59qAOxU8WwHEq2vNwF6i4j+Q==", + "dev": true, + "license": "MIT" + }, + "node_modules/cli-highlight": { + "version": "2.1.11", + "resolved": "https://registry.npmjs.org/cli-highlight/-/cli-highlight-2.1.11.tgz", + "integrity": "sha512-9KDcoEVwyUXrjcJNvHD0NFc/hiwe/WPVYIleQh2O1N2Zro5gWJZ/K+3DGn8w8P/F6FxOgzyC5bxDyHIgCSPhGg==", + "dev": true, + "license": "ISC", + "dependencies": { + "chalk": "^4.0.0", + "highlight.js": "^10.7.1", + "mz": "^2.4.0", + "parse5": "^5.1.1", + "parse5-htmlparser2-tree-adapter": "^6.0.0", + "yargs": "^16.0.0" + }, + "bin": { + "highlight": "bin/highlight" + }, + "engines": { + "node": ">=8.0.0", + "npm": ">=5.0.0" + } + }, + "node_modules/cli-highlight/node_modules/parse5": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/parse5/-/parse5-5.1.1.tgz", + "integrity": "sha512-ugq4DFI0Ptb+WWjAdOK16+u/nHfiIrcE+sh8kZMaM0WllQKLI9rOUq6c2b7cwPkXdzfQESqvoqK6ug7U/Yyzug==", + "dev": true, + "license": "MIT" + }, + "node_modules/cli-table3": { + "version": "0.6.5", + "resolved": "https://registry.npmjs.org/cli-table3/-/cli-table3-0.6.5.tgz", + "integrity": "sha512-+W/5efTR7y5HRD7gACw9yQjqMVvEMLBHmboM/kPWam+H+Hmyrgjh6YncVKK122YZkXrLudzTuAukUw9FnMf7IQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "string-width": "^4.2.0" + }, + "engines": { + "node": "10.* || >= 12.*" + }, + "optionalDependencies": { + "@colors/colors": "1.5.0" + } + }, + "node_modules/cliui": { + "version": "7.0.4", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz", + "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==", + "dev": true, + "license": "ISC", + "dependencies": { + "string-width": "^4.2.0", + "strip-ansi": "^6.0.0", + "wrap-ansi": "^7.0.0" + } + }, "node_modules/color-convert": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", @@ -2977,6 +3154,20 @@ "dev": true, "license": "MIT" }, + "node_modules/emoji-regex": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", + "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", + "dev": true, + "license": "MIT" + }, + "node_modules/emojilib": { + "version": "2.4.0", + "resolved": "https://registry.npmjs.org/emojilib/-/emojilib-2.4.0.tgz", + "integrity": "sha512-5U0rVMU5Y2n2+ykNLQqMoqklN9ICBT/KsvC1Gz6vqHbz2AXXGkG+Pm5rMWk/8Vjrr/mY9985Hi8DYzn1F09Nyw==", + "dev": true, + "license": "MIT" + }, "node_modules/entities": { "version": "8.0.0", "resolved": "https://registry.npmjs.org/entities/-/entities-8.0.0.tgz", @@ -2990,6 +3181,19 @@ "url": "https://github.com/fb55/entities?sponsor=1" } }, + "node_modules/environment": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/environment/-/environment-1.1.0.tgz", + "integrity": "sha512-xUtoPkMggbz0MPyPiIWr1Kp4aeWJjDZ6SMvURhimjdZgsRuDplF5/s9hcgGhyXMhs+6vpnuoiZ2kFiu3FMnS8Q==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=18" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/es-module-lexer": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-2.1.0.tgz", @@ -3004,6 +3208,7 @@ "dev": true, "hasInstallScript": true, "license": "MIT", + "peer": true, "bin": { "esbuild": "bin/esbuild" }, @@ -3039,6 +3244,16 @@ "@esbuild/win32-x64": "0.27.7" } }, + "node_modules/escalade": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.2.0.tgz", + "integrity": "sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6" + } + }, "node_modules/escape-string-regexp": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz", @@ -3058,6 +3273,7 @@ "integrity": "sha512-XoMjdBOwe/esVgEvLmNsD3IRHkm7fbKIUGvrleloJXUZgDHig2IPWNniv+GwjyJXzuNqVjlr5+4yVUZjycJwfQ==", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "@eslint-community/eslint-utils": "^4.8.0", "@eslint-community/regexpp": "^4.12.1", @@ -3348,6 +3564,13 @@ } } }, + "node_modules/fflate": { + "version": "0.8.3", + "resolved": "https://registry.npmjs.org/fflate/-/fflate-0.8.3.tgz", + "integrity": "sha512-tbZNuJrLwGUp3zshBtdy4W+ORxZuIh8a5ilyIEQDC5rY1f3U20JMry0Ll3WBzU58EZKsEuJFXhb5gwv8CsPvgA==", + "dev": true, + "license": "MIT" + }, "node_modules/file-entry-cache": { "version": "8.0.0", "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-8.0.0.tgz", @@ -3426,6 +3649,16 @@ "node": "^8.16.0 || ^10.6.0 || >=11.0.0" } }, + "node_modules/get-caller-file": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz", + "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==", + "dev": true, + "license": "ISC", + "engines": { + "node": "6.* || 8.* || >= 10.*" + } + }, "node_modules/glob-parent": { "version": "6.0.2", "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz", @@ -3462,6 +3695,16 @@ "node": ">=8" } }, + "node_modules/highlight.js": { + "version": "10.7.3", + "resolved": "https://registry.npmjs.org/highlight.js/-/highlight.js-10.7.3.tgz", + "integrity": "sha512-tzcUFauisWKNHaRkN4Wjl/ZA07gENAjFl3J/c480dprkGTg5EQstgaNFqBfUqCq54kZRIEcreTsAgF/m2quD7A==", + "dev": true, + "license": "BSD-3-Clause", + "engines": { + "node": "*" + } + }, "node_modules/html-encoding-sniffer": { "version": "6.0.0", "resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-6.0.0.tgz", @@ -3539,6 +3782,16 @@ "node": ">=0.10.0" } }, + "node_modules/is-fullwidth-code-point": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", + "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, "node_modules/is-glob": { "version": "4.0.3", "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz", @@ -3641,6 +3894,7 @@ "integrity": "sha512-ECi4Fi2f7BdJtUKTflYRTiaMxIB0O6zfR1fX0GXpUrf6flp8QIYn1UT20YQqdSOfk2dfkCwS8LAFoJDEppNK5Q==", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "@asamuzakjp/css-color": "^5.1.11", "@asamuzakjp/dom-selector": "^7.1.1", @@ -4093,6 +4347,68 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/marked": { + "version": "9.1.6", + "resolved": "https://registry.npmjs.org/marked/-/marked-9.1.6.tgz", + "integrity": "sha512-jcByLnIFkd5gSXZmjNvS1TlmRhCXZjIzHYlaGkPlLIekG55JDR2Z4va9tZwCiP+/RDERiNhMOFu01xd6O5ct1Q==", + "dev": true, + "license": "MIT", + "peer": true, + "bin": { + "marked": "bin/marked.js" + }, + "engines": { + "node": ">= 16" + } + }, + "node_modules/marked-terminal": { + "version": "7.3.0", + "resolved": "https://registry.npmjs.org/marked-terminal/-/marked-terminal-7.3.0.tgz", + "integrity": "sha512-t4rBvPsHc57uE/2nJOLmMbZCQ4tgAccAED3ngXQqW6g+TxA488JzJ+FK3lQkzBQOI1mRV/r/Kq+1ZlJ4D0owQw==", + "dev": true, + "license": "MIT", + "dependencies": { + "ansi-escapes": "^7.0.0", + "ansi-regex": "^6.1.0", + "chalk": "^5.4.1", + "cli-highlight": "^2.1.11", + "cli-table3": "^0.6.5", + "node-emoji": "^2.2.0", + "supports-hyperlinks": "^3.1.0" + }, + "engines": { + "node": ">=16.0.0" + }, + "peerDependencies": { + "marked": ">=1 <16" + } + }, + "node_modules/marked-terminal/node_modules/ansi-regex": { + "version": "6.2.2", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.2.2.tgz", + "integrity": "sha512-Bq3SmSpyFHaWjPk8If9yc6svM8c56dB5BAtW4Qbw5jHTwwXXcTLoRMkpDJp6VL0XzlWaCHTXrkFURMYmD0sLqg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/ansi-regex?sponsor=1" + } + }, + "node_modules/marked-terminal/node_modules/chalk": { + "version": "5.6.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.6.2.tgz", + "integrity": "sha512-7NzBL0rN6fMUW+f7A6Io4h40qQlG+xGmtMxfbnH/K7TAtt8JQWVQK+6g0UXKMeVJoyV5EkkNsErQ8pVD3bLHbA==", + "dev": true, + "license": "MIT", + "engines": { + "node": "^12.17.0 || ^14.13 || >=16.0.0" + }, + "funding": { + "url": "https://github.com/chalk/chalk?sponsor=1" + } + }, "node_modules/mdn-data": { "version": "2.27.1", "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.27.1.tgz", @@ -4139,6 +4455,16 @@ "ufo": "^1.6.3" } }, + "node_modules/mri": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/mri/-/mri-1.2.0.tgz", + "integrity": "sha512-tzzskb3bG8LvYGFF/mDTpq3jpI6Q9wc3LEmBaghu+DdCssd1FakN7Bc0hVNmEyGq1bq3RgfkCb3cmQLpNPOroA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=4" + } + }, "node_modules/ms": { "version": "2.1.3", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", @@ -4184,6 +4510,22 @@ "dev": true, "license": "MIT" }, + "node_modules/node-emoji": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/node-emoji/-/node-emoji-2.2.0.tgz", + "integrity": "sha512-Z3lTE9pLaJF47NyMhd4ww1yFTAP8YhYI8SleJiHzM46Fgpm5cnNzSl9XfzFNqbaz+VlJrIj3fXQ4DeN1Rjm6cw==", + "dev": true, + "license": "MIT", + "dependencies": { + "@sindresorhus/is": "^4.6.0", + "char-regex": "^1.0.2", + "emojilib": "^2.4.0", + "skin-tone": "^2.0.0" + }, + "engines": { + "node": ">=18" + } + }, "node_modules/object-assign": { "version": "4.1.1", "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", @@ -4255,6 +4597,13 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/package-manager-detector": { + "version": "1.8.0", + "resolved": "https://registry.npmjs.org/package-manager-detector/-/package-manager-detector-1.8.0.tgz", + "integrity": "sha512-yQA4H19AmPEoMUeavPMDIe1higySl/gH/yaQrkT/s07Qp+7pp2hYz30N3z2l5BkjVkF9Ow6o0wjJamm2y7Sn0A==", + "dev": true, + "license": "MIT" + }, "node_modules/parent-module": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz", @@ -4281,6 +4630,23 @@ "url": "https://github.com/inikulin/parse5?sponsor=1" } }, + "node_modules/parse5-htmlparser2-tree-adapter": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/parse5-htmlparser2-tree-adapter/-/parse5-htmlparser2-tree-adapter-6.0.1.tgz", + "integrity": "sha512-qPuWvbLgvDGilKc5BoicRovlT4MtYT6JfJyBOMDsKoiT+GiuP5qyrPCnR9HcPECIJJmZh5jRndyNThnhhb/vlA==", + "dev": true, + "license": "MIT", + "dependencies": { + "parse5": "^6.0.1" + } + }, + "node_modules/parse5-htmlparser2-tree-adapter/node_modules/parse5": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/parse5/-/parse5-6.0.1.tgz", + "integrity": "sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw==", + "dev": true, + "license": "MIT" + }, "node_modules/path-exists": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", @@ -4321,6 +4687,7 @@ "integrity": "sha512-QP88BAKvMam/3NxH6vj2o21R6MjxZUAd6nlwAS/pnGvN9IVLocLHxGYIzFhg6fUQ+5th6P4dv4eW9jX3DSIj7A==", "dev": true, "license": "MIT", + "peer": true, "engines": { "node": ">=12" }, @@ -4370,6 +4737,7 @@ } ], "license": "MIT", + "peer": true, "dependencies": { "nanoid": "^3.3.11", "picocolors": "^1.1.1", @@ -4476,6 +4844,28 @@ "url": "https://github.com/chalk/ansi-styles?sponsor=1" } }, + "node_modules/publint": { + "version": "0.3.22", + "resolved": "https://registry.npmjs.org/publint/-/publint-0.3.22.tgz", + "integrity": "sha512-6Z/scsr5CA7APdwyF35EY88CqgDj1textWuY788DVTJYPCWVv/Wn9G6KmLnrVRnStgYcahqN4wCDLZGSbQJ69w==", + "dev": true, + "license": "MIT", + "dependencies": { + "@publint/pack": "^0.1.6", + "package-manager-detector": "^1.7.0", + "picocolors": "^1.1.1", + "sade": "^1.8.1" + }, + "bin": { + "publint": "src/cli.js" + }, + "engines": { + "node": ">=18" + }, + "funding": { + "url": "https://bjornlu.com/sponsor" + } + }, "node_modules/punycode": { "version": "2.3.1", "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz", @@ -4492,6 +4882,7 @@ "integrity": "sha512-sfWGGfavi0xr8Pg0sVsyHMAOziVYKgPLNrS7ig+ivMNb3wbCBw3KxtflsGBAwD3gYQlE/AEZsTLgToRrSCjb0Q==", "dev": true, "license": "MIT", + "peer": true, "engines": { "node": ">=0.10.0" } @@ -4502,6 +4893,7 @@ "integrity": "sha512-0prMI+hvBbPjsWnxDLxlCGyM8PN6UuWjEUCYmZhO67xIV9Xasa/r/vDnq+Xyq4Lo27g8QSbO5YzARu0D1Sps3g==", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "scheduler": "^0.27.0" }, @@ -4544,6 +4936,16 @@ "node": ">=8" } }, + "node_modules/require-directory": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", + "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, "node_modules/require-from-string": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz", @@ -4650,6 +5052,19 @@ "dev": true, "license": "MIT" }, + "node_modules/sade": { + "version": "1.8.1", + "resolved": "https://registry.npmjs.org/sade/-/sade-1.8.1.tgz", + "integrity": "sha512-xal3CZX1Xlo/k4ApwCFrHVACi9fBqJ7V+mwhBsuf/1IOKbBy098Fex+Wa/5QMubw09pSZ/u8EY8PWgevJsXp1A==", + "dev": true, + "license": "MIT", + "dependencies": { + "mri": "^1.1.0" + }, + "engines": { + "node": ">=6" + } + }, "node_modules/saxes": { "version": "6.0.0", "resolved": "https://registry.npmjs.org/saxes/-/saxes-6.0.0.tgz", @@ -4713,6 +5128,19 @@ "dev": true, "license": "ISC" }, + "node_modules/skin-tone": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/skin-tone/-/skin-tone-2.0.0.tgz", + "integrity": "sha512-kUMbT1oBJCpgrnKoSr0o6wPtvRWT9W9UKvGLwfJYO2WuahZRHOpEyL1ckyMGgMWh0UdpmaoFqKKD29WTomNEGA==", + "dev": true, + "license": "MIT", + "dependencies": { + "unicode-emoji-modifier-base": "^1.0.0" + }, + "engines": { + "node": ">=8" + } + }, "node_modules/source-map": { "version": "0.7.6", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.6.tgz", @@ -4747,6 +5175,34 @@ "dev": true, "license": "MIT" }, + "node_modules/string-width": { + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", + "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", + "dev": true, + "license": "MIT", + "dependencies": { + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/strip-ansi": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", + "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", + "dev": true, + "license": "MIT", + "dependencies": { + "ansi-regex": "^5.0.1" + }, + "engines": { + "node": ">=8" + } + }, "node_modules/strip-indent": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-3.0.0.tgz", @@ -4809,6 +5265,23 @@ "node": ">=8" } }, + "node_modules/supports-hyperlinks": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/supports-hyperlinks/-/supports-hyperlinks-3.2.0.tgz", + "integrity": "sha512-zFObLMyZeEwzAoKCyu1B91U79K2t7ApXuQfo8OuxwXLDgcKxuwM+YvcbIhm6QWqz7mHUH1TVytR1PwVVjEuMig==", + "dev": true, + "license": "MIT", + "dependencies": { + "has-flag": "^4.0.0", + "supports-color": "^7.0.0" + }, + "engines": { + "node": ">=14.18" + }, + "funding": { + "url": "https://github.com/chalk/supports-hyperlinks?sponsor=1" + } + }, "node_modules/symbol-tree": { "version": "3.2.4", "resolved": "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.4.tgz", @@ -5046,6 +5519,7 @@ "integrity": "sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw==", "dev": true, "license": "Apache-2.0", + "peer": true, "bin": { "tsc": "bin/tsc", "tsserver": "bin/tsserver" @@ -5078,6 +5552,16 @@ "dev": true, "license": "MIT" }, + "node_modules/unicode-emoji-modifier-base": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/unicode-emoji-modifier-base/-/unicode-emoji-modifier-base-1.0.0.tgz", + "integrity": "sha512-yLSH4py7oFH3oG/9K+XWrz1pSi3dfUrWEnInbxMfArOfc1+33BlGPQtLsOYwvdMy11AwUBetYuaRxSPqgkq+8g==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=4" + } + }, "node_modules/uri-js": { "version": "4.4.1", "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz", @@ -5088,12 +5572,23 @@ "punycode": "^2.1.0" } }, + "node_modules/validate-npm-package-name": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/validate-npm-package-name/-/validate-npm-package-name-5.0.1.tgz", + "integrity": "sha512-OljLrQ9SQdOUqTaQxqL5dEfZWrXExyyWsozYlAWFawPVNuD83igl7uJD2RTkNMbniIYgt8l81eCJGIdQF7avLQ==", + "dev": true, + "license": "ISC", + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, "node_modules/vite": { "version": "8.0.12", "resolved": "https://registry.npmjs.org/vite/-/vite-8.0.12.tgz", "integrity": "sha512-w2dDofOWv2QB09ZITZBsvKTVAlYvPR4IAmrY/v0ir9KvLs0xybR7i48wxhM1/oyBWO34wPns+bPGw5ZrZqDpZg==", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "lightningcss": "^1.32.0", "picomatch": "^4.0.4", @@ -5172,6 +5667,7 @@ "integrity": "sha512-6lvjbS3p9b4CrdCmguzbh2/4uoXhGE2q71R4OX5sqF9R1bo9Xd6fGrMAfvp5wnCzlBnFVdCOp6onuTQVbo8iUQ==", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "@vitest/expect": "4.1.6", "@vitest/mocker": "4.1.6", @@ -5363,6 +5859,24 @@ "node": ">=0.10.0" } }, + "node_modules/wrap-ansi": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", + "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", + "dev": true, + "license": "MIT", + "dependencies": { + "ansi-styles": "^4.0.0", + "string-width": "^4.1.0", + "strip-ansi": "^6.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/wrap-ansi?sponsor=1" + } + }, "node_modules/xml-name-validator": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-5.0.0.tgz", @@ -5380,6 +5894,45 @@ "dev": true, "license": "MIT" }, + "node_modules/y18n": { + "version": "5.0.8", + "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz", + "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==", + "dev": true, + "license": "ISC", + "engines": { + "node": ">=10" + } + }, + "node_modules/yargs": { + "version": "16.2.2", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.2.tgz", + "integrity": "sha512-Nt9ZJjXTv5R8MHbqby/wXQ6Gi0Bb3TcYZkR1bzuL4yB2OxWPkXknz513gEF0GoA6tn00UpbPvERW8rzCuWCA6w==", + "dev": true, + "license": "MIT", + "dependencies": { + "cliui": "^7.0.2", + "escalade": "^3.1.1", + "get-caller-file": "^2.0.5", + "require-directory": "^2.1.1", + "string-width": "^4.2.0", + "y18n": "^5.0.5", + "yargs-parser": "^20.2.2" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/yargs-parser": { + "version": "20.2.9", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz", + "integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==", + "dev": true, + "license": "ISC", + "engines": { + "node": ">=10" + } + }, "node_modules/yocto-queue": { "version": "0.1.0", "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz", diff --git a/package.json b/package.json index 0ed3ad3..4fa12a2 100644 --- a/package.json +++ b/package.json @@ -1,12 +1,12 @@ { "name": "@base-14/scout-react", - "version": "0.1.11", + "version": "0.1.12", "description": "Zero-config OpenTelemetry RUM for React and React Native. Auto-captures clicks, navigation, errors, lifecycle, network, performance, and web vitals.", "license": "MIT", "author": "base-14", "repository": { "type": "git", - "url": "https://github.com/base-14/scout-react.git" + "url": "git+https://github.com/base-14/scout-react.git" }, "type": "module", "main": "./dist/web/index.cjs", @@ -15,10 +15,15 @@ "types": "./dist/web/index.d.ts", "exports": { ".": { - "types": "./dist/web/index.d.ts", "react-native": "./dist/native/index.js", - "import": "./dist/web/index.js", - "require": "./dist/web/index.cjs" + "import": { + "types": "./dist/web/index.d.ts", + "default": "./dist/web/index.js" + }, + "require": { + "types": "./dist/web/index.d.cts", + "default": "./dist/web/index.cjs" + } }, "./native": { "types": "./dist/native/index.d.ts", @@ -26,11 +31,32 @@ "default": "./dist/native/index.js" }, "./react": { - "types": "./dist/web/react/index.d.ts", - "import": "./dist/web/react/index.js", - "require": "./dist/web/react/index.cjs" + "import": { + "types": "./dist/web/react/index.d.ts", + "default": "./dist/web/react/index.js" + }, + "require": { + "types": "./dist/web/react/index.d.cts", + "default": "./dist/web/react/index.cjs" + } }, - "./babel-plugin": "./babel-plugin/index.cjs" + "./babel-plugin": { + "types": "./babel-plugin/index.d.cts", + "default": "./babel-plugin/index.cjs" + } + }, + "typesVersions": { + "*": { + "native": [ + "./dist/native/index.d.ts" + ], + "react": [ + "./dist/web/react/index.d.ts" + ], + "babel-plugin": [ + "./babel-plugin/index.d.cts" + ] + } }, "files": [ "dist", @@ -43,7 +69,7 @@ "LICENSE" ], "scripts": { - "build": "tsup && tsc -p tsconfig.native.json", + "build": "tsup && tsc -p tsconfig.native.json && node scripts/write-native-cjs-marker.mjs", "test": "vitest run", "prepare": "npm run build" }, @@ -66,9 +92,7 @@ "@opentelemetry/api": "^1.9.1", "@opentelemetry/api-logs": "^0.218.0", "@opentelemetry/core": "^2.7.1", - "@opentelemetry/exporter-logs-otlp-http": "^0.218.0", - "@opentelemetry/exporter-metrics-otlp-http": "^0.218.0", - "@opentelemetry/exporter-trace-otlp-http": "^0.218.0", + "@opentelemetry/otlp-transformer": "^0.218.0", "@opentelemetry/resources": "^2.7.1", "@opentelemetry/sdk-logs": "^0.218.0", "@opentelemetry/sdk-metrics": "^2.7.1", @@ -98,6 +122,7 @@ } }, "devDependencies": { + "@arethetypeswrong/cli": "^0.18.5", "@eslint/js": "^9.0.0", "@testing-library/dom": "^10.4.1", "@testing-library/jest-dom": "^6.9.1", @@ -112,6 +137,7 @@ "eslint-config-prettier": "^10.1.8", "jsdom": "^29.1.1", "prettier": "^3.8.3", + "publint": "^0.3.22", "react": "^19.2.6", "react-dom": "^19.2.6", "tsup": "^8.3.0", diff --git a/scripts/write-native-cjs-marker.mjs b/scripts/write-native-cjs-marker.mjs new file mode 100644 index 0000000..94e02d5 --- /dev/null +++ b/scripts/write-native-cjs-marker.mjs @@ -0,0 +1,26 @@ +// The root package is `"type": "module"`, but `tsconfig.native.json` emits +// CommonJS into dist/native/ on purpose — Metro has to see literal `require()` +// calls to statically resolve the optional peer deps (react-native, +// async-storage, expo-modules-core) that soft-load.ts guards. +// +// Without this marker Node reads those .js files as ESM and every `require` +// throws, so the ./native subpath is unusable from Node (Jest, SSR, tooling) +// even though Metro handles it fine. A directory-scoped package.json is the +// supported way to say "this subtree is CommonJS" without renaming a single +// file that Metro resolves. +// Both directories have to be marked, not just dist/native/: the native entry's +// declarations re-export from dist/core/, and tsc writes extensionless relative +// specifiers there. Those are legal in CommonJS but not in ESM, so leaving +// dist/core/ ESM-scoped makes every `./types`-style import in the .d.ts files +// fail to resolve — which is what attw reports as an internal resolution error. +// +// The marker deliberately stops at these two subtrees. dist/ itself must stay +// ESM: tsup emits the web build's shared chunks there, and dist/web/index.js +// imports them with ESM syntax. +import { writeFileSync } from 'node:fs'; + +for (const dir of ['native', 'core']) { + const target = new URL(`../dist/${dir}/package.json`, import.meta.url); + writeFileSync(target, JSON.stringify({ type: 'commonjs' }, null, 2) + '\n'); + console.log(`wrote dist/${dir}/package.json ({"type":"commonjs"})`); +} diff --git a/src/core/attributes.ts b/src/core/attributes.ts index c6b388d..bd745c8 100644 --- a/src/core/attributes.ts +++ b/src/core/attributes.ts @@ -1,4 +1,6 @@ export const ATTR = { + /** Resource attribute: the scout-react version that produced the signal. */ + SCOUT_REACT_VERSION: 'scout.react.version', SESSION_ID: 'session.id', SESSION_TYPE: 'session.type', SESSION_START_TIME: 'session.start_time', @@ -111,6 +113,11 @@ export const ATTR = { CRASH_LAST_SCREEN: 'crash.last_screen', CRASH_TYPE: 'crash.type', CRASH_REASON: 'crash.reason', + /** Which detection path produced the record: exit_info, ndk_signal, ... */ + CRASH_SOURCE: 'crash.source', + CRASH_DRAIN_APP_STATE: 'crash.drain_app_state', + CRASH_DRAIN_PROCESS_START_TIME: 'crash.drain_process_start_time', + CRASH_DRAIN_UPTIME_SECS: 'crash.drain_uptime_secs', LONG_TASK_ID: 'long_task.id', LONG_TASK_DURATION: 'long_task.duration', LONG_TASK_THRESHOLD: 'long_task.threshold', diff --git a/src/core/breadcrumb-manager.test.ts b/src/core/breadcrumb-manager.test.ts index b3834fd..8d03d40 100644 --- a/src/core/breadcrumb-manager.test.ts +++ b/src/core/breadcrumb-manager.test.ts @@ -56,13 +56,57 @@ describe('BreadcrumbManager', () => { expect(parsed[0].type).toBe('tap'); expect(parsed[1].type).toBe('navigation'); }); - it('rehydrates persisted crumbs', async () => { + it('hydrates the previous session’s crumbs as orphans, not into the live trail', async () => { + // Breadcrumbs describe one session. A crash drained after restart needs + // the crumbs of the session that died; the new session's trail must start + // empty rather than inheriting a dead session's history. mgr.add('tap', 'persisted'); await new Promise((r) => setTimeout(r, 5)); const next = new BreadcrumbManager(platform); await next.hydrate(); - expect(next.list()).toHaveLength(1); - expect(next.list()[0]?.message).toBe('persisted'); + expect(next.list()).toEqual([]); + const orphaned = next.orphaned(); + expect(orphaned).toHaveLength(1); + expect(orphaned[0]?.message).toBe('persisted'); + expect(JSON.parse(next.serializeOrphaned()!)).toHaveLength(1); + }); + it('serves the same orphans to every report describing that session', async () => { + // Both the app_crash span and any drained native crash report belong to + // the session that died, so reading the orphans must not consume them. + mgr.add('tap', 'persisted'); + await new Promise((r) => setTimeout(r, 5)); + const next = new BreadcrumbManager(platform); + await next.hydrate(); + expect(next.orphaned()).toHaveLength(1); + expect(next.orphaned()).toHaveLength(1); + }); + it('reports no orphans when nothing was persisted', async () => { + const fresh = new BreadcrumbManager(memoryPlatform()); + await fresh.hydrate(); + expect(fresh.orphaned()).toEqual([]); + expect(fresh.serializeOrphaned()).toBeNull(); + }); + it('keeps the live trail separate from the orphans', async () => { + mgr.add('tap', 'old'); + await new Promise((r) => setTimeout(r, 5)); + const next = new BreadcrumbManager(platform); + await next.hydrate(); + next.add('tap', 'new'); + expect(next.list().map((c) => c.message)).toEqual(['new']); + expect(next.orphaned().map((c) => c.message)).toEqual(['old']); + }); + it('does not re-orphan the same crumbs on a launch that adds none', async () => { + // hydrate() overwrites the persisted copy immediately, so a launch that + // never records a crumb cannot resurrect the previous session's trail and + // attach it to a second crash report. + mgr.add('tap', 'persisted'); + await new Promise((r) => setTimeout(r, 5)); + const second = new BreadcrumbManager(platform); + await second.hydrate(); + expect(second.orphaned()).toHaveLength(1); + const third = new BreadcrumbManager(platform); + await third.hydrate(); + expect(third.orphaned()).toEqual([]); }); it('clear() empties the buffer', () => { mgr.add('tap', 'one'); diff --git a/src/core/breadcrumb-manager.ts b/src/core/breadcrumb-manager.ts index 0e8c54e..30c2972 100644 --- a/src/core/breadcrumb-manager.ts +++ b/src/core/breadcrumb-manager.ts @@ -4,6 +4,7 @@ const MAX_BREADCRUMBS = 100; const STORAGE_KEY = 'scout.breadcrumbs'; export class BreadcrumbManager { private buffer: Breadcrumb[] = []; + private orphanedCrumbs: Breadcrumb[] = []; private nativeSink: ((json: string) => void) | null = null; constructor(private platform: PlatformAdapter) {} setNativeSink(sink: ((json: string) => void) | null): void { @@ -14,16 +15,40 @@ export class BreadcrumbManager { } catch {} } } + /** + * Loads the previous session's persisted crumbs as *orphans* rather than + * into the live trail: breadcrumbs describe one session, and a crash report + * drained after restart needs the crumbs from the session that died, not + * from the one that is only now starting. Retrieve them with + * [orphaned]. + * + * The persisted copy is overwritten immediately so a launch that never adds + * a crumb cannot hand the same orphans out twice. + */ async hydrate(): Promise { try { const raw = await this.platform.getItem(STORAGE_KEY); if (raw) { const arr = JSON.parse(raw); if (Array.isArray(arr)) { - this.buffer = arr.slice(-MAX_BREADCRUMBS); + this.orphanedCrumbs = arr.slice(-MAX_BREADCRUMBS); } } } catch {} + await this.persist(); + } + /** + * The previous session's crumbs. Non-destructive: every report describing + * that session — the `app_crash` span and any drained native crash report — + * needs the same trail. They are dropped at the next launch's [hydrate], + * which has already overwritten the persisted copy. + */ + orphaned(): Breadcrumb[] { + return [...this.orphanedCrumbs]; + } + /** The previous session's crumbs as JSON, or null when there are none. */ + serializeOrphaned(): string | null { + return this.orphanedCrumbs.length ? JSON.stringify(this.orphanedCrumbs) : null; } add(type: string, message: string): void { const crumb: Breadcrumb = { diff --git a/src/core/config.test.ts b/src/core/config.test.ts index 745d133..0968db2 100644 --- a/src/core/config.test.ts +++ b/src/core/config.test.ts @@ -11,7 +11,6 @@ describe('resolveConfig', () => { expect(r.enableAutoTapTracking).toBe(true); expect(r.enableErrorTracking).toBe(true); expect(r.enableAnrDetection).toBe(true); - expect(r.enableFrameMetrics).toBe(true); expect(r.enableBatteryTracking).toBe(true); expect(r.enableNetworkTracking).toBe(true); expect(r.enableLogging).toBe(true); @@ -21,6 +20,96 @@ describe('resolveConfig', () => { expect(r.maxSessionDurationMinutes).toBe(60); expect(r.alwaysCaptureErrors).toBe(true); }); + it('ships the minimal-telemetry, at-most-once default profile', () => { + // Locks the v0.1.12 default table (scout-flutter 0.1.23 parity). Changing + // any of these silently changes every integrator's telemetry volume or + // delivery semantics — it must be a deliberate, reviewed edit. + const r = resolveConfig({ serviceName: 'svc', endpoint: 'https://otlp' }); + // Vitals metrics are opt-in: zero periodic metrics by default. + expect(r.enableFrameMetrics).toBe(false); + expect(r.enableMemoryMetrics).toBe(false); + expect(r.enableCpuMetrics).toBe(false); + // At-most-once: no retries, no offline buffer. + expect(r.exportRetry.maxRetries).toBe(0); + expect(r.offlineBuffer.enabled).toBe(false); + expect(r.offlineBuffer.maxItems).toEqual({ traces: 0, metrics: 0, logs: 0 }); + // One 30s cadence for all three signals. + expect(r.exportIntervalSeconds).toBe(30); + expect(r.traceExportIntervalMs).toBe(30000); + expect(r.logExportScheduledDelayMs).toBe(30000); + expect(r.metricExportIntervalMs).toBe(30000); + expect(r.traceMaxQueueSize).toBe(2048); + expect(r.logMaxQueueSize).toBe(2048); + expect(r.traceMaxExportBatchSize).toBe(512); + expect(r.logMaxExportBatchSize).toBe(512); + expect(r.vitalsCollectionIntervalSeconds).toBe(60); + }); + it('applies exportIntervalSeconds to all three signals', () => { + const r = resolveConfig({ + serviceName: 's', + endpoint: 'e', + exportIntervalSeconds: 10, + }); + expect(r.traceExportIntervalMs).toBe(10000); + expect(r.logExportScheduledDelayMs).toBe(10000); + expect(r.metricExportIntervalMs).toBe(10000); + }); + it('lets an explicit per-signal *Ms option win over the unified knob', () => { + const r = resolveConfig({ + serviceName: 's', + endpoint: 'e', + exportIntervalSeconds: 10, + traceExportIntervalMs: 5000, + }); + expect(r.traceExportIntervalMs).toBe(5000); + expect(r.logExportScheduledDelayMs).toBe(10000); + expect(r.metricExportIntervalMs).toBe(10000); + }); + it('lets metricExportIntervalSeconds override metrics only', () => { + const r = resolveConfig({ + serviceName: 's', + endpoint: 'e', + exportIntervalSeconds: 10, + metricExportIntervalSeconds: 60, + }); + expect(r.metricExportIntervalMs).toBe(60000); + expect(r.metricExportIntervalSeconds).toBe(60); + expect(r.traceExportIntervalMs).toBe(10000); + }); + it('applies unified maxQueueSize / maxExportBatchSize to traces and logs', () => { + const r = resolveConfig({ + serviceName: 's', + endpoint: 'e', + maxQueueSize: 100, + maxExportBatchSize: 50, + }); + expect(r.traceMaxQueueSize).toBe(100); + expect(r.logMaxQueueSize).toBe(100); + expect(r.traceMaxExportBatchSize).toBe(50); + expect(r.logMaxExportBatchSize).toBe(50); + }); + it('clamps interval knobs to a 1s / 1s floor', () => { + const r = resolveConfig({ + serviceName: 's', + endpoint: 'e', + exportIntervalSeconds: 0, + vitalsCollectionIntervalSeconds: 0, + }); + expect(r.exportIntervalSeconds).toBe(1); + expect(r.traceExportIntervalMs).toBe(1000); + expect(r.vitalsCollectionIntervalSeconds).toBe(1); + }); + it('still honours opt-in retries and offline buffering', () => { + const r = resolveConfig({ + serviceName: 's', + endpoint: 'e', + exportRetry: { maxRetries: 2 }, + offlineBuffer: { enabled: true, maxItems: { traces: 100 } }, + }); + expect(r.exportRetry.maxRetries).toBe(2); + expect(r.offlineBuffer.enabled).toBe(true); + expect(r.offlineBuffer.maxItems.traces).toBe(100); + }); it('clamps iosHangThresholdMs (0 disables, otherwise 50ms floor, default 250)', () => { expect(resolveConfig({ serviceName: 's', endpoint: 'e' }).iosHangThresholdMs).toBe( 250, diff --git a/src/core/config.ts b/src/core/config.ts index d9a7850..ff39de7 100644 --- a/src/core/config.ts +++ b/src/core/config.ts @@ -45,6 +45,22 @@ export interface ScoutConfig { maxOfflineStorageMb?: number; beforeSend?: BeforeSendCallback; customTargetResolver?: CustomTargetResolver; + /** + * Export cadence for traces, logs AND metrics (default 30, min 1). + * The per-signal `*Ms` options below override it when explicitly set. + */ + exportIntervalSeconds?: number; + /** Metrics-only override; falls back to `exportIntervalSeconds`. */ + metricExportIntervalSeconds?: number; + /** Applied to the trace + log batch processors (default 512). */ + maxExportBatchSize?: number; + /** Applied to the trace + log batch processors (default 2048). */ + maxQueueSize?: number; + /** + * Sampling cadence for memory / CPU / frame / battery vitals + * (default 60, min 1). Only in effect when those vitals are enabled. + */ + vitalsCollectionIntervalSeconds?: number; traceExportIntervalMs?: number; traceMaxQueueSize?: number; traceMaxExportBatchSize?: number; @@ -116,6 +132,18 @@ export function resolveConfig(config: ScoutConfig): ResolvedConfig { const iosHangThresholdMs = iosHangRaw <= 0 ? 0 : Math.max(50, iosHangRaw); const sessionSampleRate = clamp(config.sessionSampleRate ?? 1, 0, 100); const captureConsole = config.captureConsole ?? config.capturePrintStatements ?? false; + const exportIntervalSeconds = Math.max(1, config.exportIntervalSeconds ?? 30); + const exportIntervalMs = exportIntervalSeconds * 1000; + const metricIntervalMs = + config.metricExportIntervalSeconds != null + ? Math.max(1, config.metricExportIntervalSeconds) * 1000 + : exportIntervalMs; + const maxExportBatchSize = Math.max(1, config.maxExportBatchSize ?? 512); + const maxQueueSize = Math.max(1, config.maxQueueSize ?? 2048); + const vitalsCollectionIntervalSeconds = Math.max( + 1, + config.vitalsCollectionIntervalSeconds ?? 60, + ); return { serviceName: config.serviceName, endpoint: config.endpoint, @@ -134,9 +162,11 @@ export function resolveConfig(config: ScoutConfig): ResolvedConfig { enablePerformanceMetrics: config.enablePerformanceMetrics ?? true, enableLongTaskDetection: config.enableLongTaskDetection ?? true, enableAnrDetection: config.enableAnrDetection ?? true, - enableFrameMetrics: config.enableFrameMetrics ?? true, - enableMemoryMetrics: config.enableMemoryMetrics ?? true, - enableCpuMetrics: config.enableCpuMetrics ?? true, + // Opt-in: these are the highest-volume metrics the SDK can produce, and + // at the inherited sampling rate they dwarf every other signal. + enableFrameMetrics: config.enableFrameMetrics ?? false, + enableMemoryMetrics: config.enableMemoryMetrics ?? false, + enableCpuMetrics: config.enableCpuMetrics ?? false, maxTombstoneBytes: Math.max(4096, config.maxTombstoneBytes ?? 131072), enableWebVitals: config.enableWebVitals ?? true, enableBatteryTracking: config.enableBatteryTracking ?? true, @@ -156,25 +186,34 @@ export function resolveConfig(config: ScoutConfig): ResolvedConfig { maxOfflineStorageMb: config.maxOfflineStorageMb ?? 5, beforeSend: config.beforeSend, customTargetResolver: config.customTargetResolver, - traceExportIntervalMs: config.traceExportIntervalMs ?? 5000, - traceMaxQueueSize: config.traceMaxQueueSize ?? 2048, - traceMaxExportBatchSize: config.traceMaxExportBatchSize ?? 512, - metricExportIntervalMs: config.metricExportIntervalMs ?? 30000, - logExportScheduledDelayMs: config.logExportScheduledDelayMs ?? 5000, - logMaxQueueSize: config.logMaxQueueSize ?? 2048, - logMaxExportBatchSize: config.logMaxExportBatchSize ?? 512, + exportIntervalSeconds, + // Resolved to the *effective* metric cadence — inherited from + // exportIntervalSeconds unless explicitly overridden. + metricExportIntervalSeconds: metricIntervalMs / 1000, + maxExportBatchSize, + maxQueueSize, + vitalsCollectionIntervalSeconds, + traceExportIntervalMs: config.traceExportIntervalMs ?? exportIntervalMs, + traceMaxQueueSize: config.traceMaxQueueSize ?? maxQueueSize, + traceMaxExportBatchSize: config.traceMaxExportBatchSize ?? maxExportBatchSize, + metricExportIntervalMs: config.metricExportIntervalMs ?? metricIntervalMs, + logExportScheduledDelayMs: config.logExportScheduledDelayMs ?? exportIntervalMs, + logMaxQueueSize: config.logMaxQueueSize ?? maxQueueSize, + logMaxExportBatchSize: config.logMaxExportBatchSize ?? maxExportBatchSize, exportTimeoutMs: config.exportTimeoutMs ?? 30000, + // At-most-once by default: retrying an ambiguous failure (a timeout the + // collector may already have ingested) re-delivers identical span IDs. exportRetry: { - maxRetries: Math.max(0, config.exportRetry?.maxRetries ?? 3), + maxRetries: Math.max(0, config.exportRetry?.maxRetries ?? 0), initialDelayMs: Math.max(100, config.exportRetry?.initialDelayMs ?? 1000), maxDelayMs: Math.max(1000, config.exportRetry?.maxDelayMs ?? 30000), }, offlineBuffer: { - enabled: config.offlineBuffer?.enabled ?? true, + enabled: config.offlineBuffer?.enabled ?? false, maxItems: { - traces: Math.max(0, config.offlineBuffer?.maxItems?.traces ?? 5000), - metrics: Math.max(0, config.offlineBuffer?.maxItems?.metrics ?? 2000), - logs: Math.max(0, config.offlineBuffer?.maxItems?.logs ?? 5000), + traces: Math.max(0, config.offlineBuffer?.maxItems?.traces ?? 0), + metrics: Math.max(0, config.offlineBuffer?.maxItems?.metrics ?? 0), + logs: Math.max(0, config.offlineBuffer?.maxItems?.logs ?? 0), }, }, debug: config.debug ?? false, diff --git a/src/core/otlp-exporter.test.ts b/src/core/otlp-exporter.test.ts new file mode 100644 index 0000000..35c038a --- /dev/null +++ b/src/core/otlp-exporter.test.ts @@ -0,0 +1,164 @@ +import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest'; +import { ExportResultCode, type ExportResult } from '@opentelemetry/core'; +import { + createOtlpTraceExporter, + createOtlpLogExporter, + createOtlpMetricExporter, +} from './otlp-exporter'; +import { AggregationTemporality, InstrumentType } from '@opentelemetry/sdk-metrics'; + +// The serializers only need enough shape to produce a non-empty payload; +// what these tests lock is delivery behaviour, not OTLP encoding. +vi.mock('@opentelemetry/otlp-transformer', () => ({ + JsonTraceSerializer: { + serializeRequest: (items: unknown) => + new TextEncoder().encode(JSON.stringify({ kind: 'traces', n: len(items) })), + }, + JsonLogsSerializer: { + // `ISerializer.serializeRequest` may legally return undefined; the empty + // array is this mock's way of reaching that branch. + serializeRequest: (items: unknown) => + len(items) === 0 + ? undefined + : new TextEncoder().encode(JSON.stringify({ kind: 'logs', n: len(items) })), + }, + JsonMetricsSerializer: { + serializeRequest: () => new TextEncoder().encode(JSON.stringify({ kind: 'metrics' })), + }, +})); + +function len(items: unknown): number { + return Array.isArray(items) ? items.length : 1; +} + +const OPTS = { url: 'https://collector.test/v1/traces', timeoutMillis: 5000 }; + +function exportOnce( + exporter: { export: (items: never, cb: (r: ExportResult) => void) => void }, + items: unknown = [{ a: 1 }], +): Promise { + return new Promise((resolve) => exporter.export(items as never, resolve)); +} + +describe('otlp-exporter — at-most-once delivery', () => { + let fetchMock: ReturnType; + beforeEach(() => { + fetchMock = vi.fn(async () => new Response('', { status: 200 })); + vi.stubGlobal('fetch', fetchMock); + }); + afterEach(() => { + vi.unstubAllGlobals(); + }); + + it('sends exactly one request per export and reports SUCCESS', async () => { + const result = await exportOnce(createOtlpTraceExporter(OPTS)); + expect(fetchMock).toHaveBeenCalledTimes(1); + expect(result.code).toBe(ExportResultCode.SUCCESS); + const [url, init] = fetchMock.mock.calls[0]!; + expect(url).toBe(OPTS.url); + expect(init.method).toBe('POST'); + expect(init.headers['content-type']).toBe('application/json'); + }); + + it('sends exactly one request on a 500 — no internal retry layer', async () => { + fetchMock.mockResolvedValue(new Response('boom', { status: 500 })); + const result = await exportOnce(createOtlpTraceExporter(OPTS)); + expect(fetchMock).toHaveBeenCalledTimes(1); + expect(result.code).toBe(ExportResultCode.FAILED); + // .status is what retry-exporter's isRetryableError classifies on. + expect((result.error as { status?: number }).status).toBe(500); + }); + + it.each([429, 502, 503, 504])( + 'sends exactly one request on %i (the statuses the stock RetryingTransport retried)', + async (status) => { + fetchMock.mockResolvedValue(new Response('', { status })); + const result = await exportOnce(createOtlpTraceExporter(OPTS)); + expect(fetchMock).toHaveBeenCalledTimes(1); + expect(result.code).toBe(ExportResultCode.FAILED); + }, + ); + + it('never re-sends a batch under timeout-then-recover', async () => { + // The duplicate-span case: the first export times out (the collector may + // already have ingested it), the second succeeds. Each export must put + // its own batch on the wire exactly once and never replay the first. + fetchMock + .mockRejectedValueOnce(new Error('Aborted due to timeout')) + .mockResolvedValue(new Response('', { status: 200 })); + const exporter = createOtlpTraceExporter(OPTS); + const first = await exportOnce(exporter, [{ span: 'a' }]); + const second = await exportOnce(exporter, [{ span: 'b' }]); + expect(first.code).toBe(ExportResultCode.FAILED); + expect(second.code).toBe(ExportResultCode.SUCCESS); + expect(fetchMock).toHaveBeenCalledTimes(2); + const bodies = fetchMock.mock.calls.map((c) => c[1].body); + expect(bodies).toEqual([ + JSON.stringify({ kind: 'traces', n: 1 }), + JSON.stringify({ kind: 'traces', n: 1 }), + ]); + expect(new Set(bodies).size).toBe(1); // same shape, but two distinct exports + }); + + it('aborts the request when the timeout elapses', async () => { + vi.useFakeTimers(); + let signal: AbortSignal | undefined; + fetchMock.mockImplementation( + (_url: string, init: RequestInit) => + new Promise((_resolve, reject) => { + signal = init.signal as AbortSignal; + signal.addEventListener('abort', () => reject(new Error('aborted'))); + }), + ); + const exporter = createOtlpTraceExporter({ ...OPTS, timeoutMillis: 1000 }); + const pending = exportOnce(exporter); + await vi.advanceTimersByTimeAsync(1001); + const result = await pending; + expect(signal!.aborted).toBe(true); + expect(result.code).toBe(ExportResultCode.FAILED); + vi.useRealTimers(); + }); + + it('drops exports after shutdown without touching the network', async () => { + const exporter = createOtlpTraceExporter(OPTS); + await exporter.shutdown(); + const result = await exportOnce(exporter); + expect(fetchMock).not.toHaveBeenCalled(); + expect(result.code).toBe(ExportResultCode.FAILED); + }); + + it('does not hit the network when serialization yields no payload', async () => { + const exporter = createOtlpLogExporter({ ...OPTS, url: 'https://c.test/v1/logs' }); + const result = await new Promise((resolve) => + exporter.export([], resolve), + ); + expect(fetchMock).not.toHaveBeenCalled(); + expect(result.code).toBe(ExportResultCode.SUCCESS); + }); + + it('passes configured headers through alongside content-type', async () => { + const exporter = createOtlpLogExporter({ + url: 'https://c.test/v1/logs', + headers: { authorization: 'Bearer t' }, + }); + await exportOnce(exporter); + expect(fetchMock.mock.calls[0]![1].headers).toEqual({ + 'content-type': 'application/json', + authorization: 'Bearer t', + }); + }); + + it('keeps the stock exporter’s CUMULATIVE temporality', () => { + const exporter = createOtlpMetricExporter({ url: 'https://c.test/v1/metrics' }); + for (const t of [ + InstrumentType.COUNTER, + InstrumentType.HISTOGRAM, + InstrumentType.OBSERVABLE_GAUGE, + InstrumentType.UP_DOWN_COUNTER, + ]) { + expect(exporter.selectAggregationTemporality!(t)).toBe( + AggregationTemporality.CUMULATIVE, + ); + } + }); +}); diff --git a/src/core/otlp-exporter.ts b/src/core/otlp-exporter.ts new file mode 100644 index 0000000..63e31cd --- /dev/null +++ b/src/core/otlp-exporter.ts @@ -0,0 +1,183 @@ +import { ExportResultCode, type ExportResult } from '@opentelemetry/core'; +import { + JsonTraceSerializer, + JsonMetricsSerializer, + JsonLogsSerializer, +} from '@opentelemetry/otlp-transformer'; +import { + AggregationTemporality, + AggregationType, + type AggregationOption, + type InstrumentType, + type PushMetricExporter, + type ResourceMetrics, +} from '@opentelemetry/sdk-metrics'; +import type { ReadableSpan, SpanExporter } from '@opentelemetry/sdk-trace-base'; +import type { LogRecordExporter, ReadableLogRecord } from '@opentelemetry/sdk-logs'; + +/** + * OTLP/JSON exporters that deliver a batch **at most once**. + * + * The stock `@opentelemetry/exporter-*-otlp-http` exporters wrap their + * transport in `RetryingTransport`, which re-sends up to 5 more times on + * 429/502/503/504 and on network errors. Stacked under our own + * `wrapWithRetry`, one batch could reach the collector ~20 times — the + * duplicate-span-ID bug scout-flutter fixed in 0.1.22 by owning the + * exporter outright (`lib/src/fixed_http_span_exporter.dart`). + * + * One `export()` call here is exactly one `fetch()`. Retry policy lives in + * exactly one place: `wrapWithRetry` (`src/core/retry-exporter.ts`), which + * is off by default. + */ +export interface OtlpExporterOptions { + url: string; + headers?: Record; + timeoutMillis?: number; +} + +const DEFAULT_TIMEOUT_MS = 30000; + +class OtlpHttpError extends Error { + readonly status: number; + constructor(status: number, body: string) { + super(`OTLP export failed with status ${status}${body ? `: ${body}` : ''}`); + this.name = 'OtlpHttpError'; + this.status = status; + } +} + +/** + * POSTs one serialized OTLP/JSON payload. Resolves on 2xx, rejects otherwise. + * + * Errors carry `.status` for non-2xx responses so `isRetryableError` in + * retry-exporter.ts classifies them exactly as it did for the stock + * exporters; transport failures surface their original message, which that + * same classifier matches on (`network|abort|timeout|fetch|ECONN...`). + */ +export async function sendOtlpJson( + url: string, + payload: string, + headers: Record, + timeoutMillis: number, +): Promise { + const controller = new AbortController(); + const timer = setTimeout(() => controller.abort(), timeoutMillis); + try { + const res = await fetch(url, { + method: 'POST', + headers: { 'content-type': 'application/json', ...headers }, + body: payload, + signal: controller.signal, + }); + if (res.status >= 200 && res.status < 300) return; + let body = ''; + try { + body = (await res.text()).slice(0, 200); + } catch {} + throw new OtlpHttpError(res.status, body); + } finally { + clearTimeout(timer); + } +} + +interface Serializer { + serializeRequest(request: T): Uint8Array | undefined; +} + +/** + * Builds the `export(items, callback)` half shared by all three signals. + * Kept generic so trace/metric/log exporters cannot drift apart. + */ +function createExportFn( + serializer: Serializer, + opts: OtlpExporterOptions, + isShutdown: () => boolean, +): (items: T, resultCallback: (result: ExportResult) => void) => void { + const headers = opts.headers ?? {}; + const timeoutMillis = opts.timeoutMillis ?? DEFAULT_TIMEOUT_MS; + return (items, resultCallback) => { + if (isShutdown()) { + resultCallback({ + code: ExportResultCode.FAILED, + error: new Error('exporter has been shut down'), + }); + return; + } + let payload: string; + try { + const bytes = serializer.serializeRequest(items); + if (!bytes || bytes.length === 0) { + resultCallback({ code: ExportResultCode.SUCCESS }); + return; + } + payload = new TextDecoder().decode(bytes); + } catch (error) { + resultCallback({ code: ExportResultCode.FAILED, error: asError(error) }); + return; + } + sendOtlpJson(opts.url, payload, headers, timeoutMillis).then( + () => resultCallback({ code: ExportResultCode.SUCCESS }), + (error: unknown) => + resultCallback({ code: ExportResultCode.FAILED, error: asError(error) }), + ); + }; +} + +function asError(error: unknown): Error { + return error instanceof Error ? error : new Error(String(error)); +} + +export function createOtlpTraceExporter(opts: OtlpExporterOptions): SpanExporter { + let shutdown = false; + const doExport = createExportFn( + JsonTraceSerializer, + opts, + () => shutdown, + ); + return { + export: (spans, resultCallback) => doExport(spans, resultCallback), + forceFlush: async () => {}, + shutdown: async () => { + shutdown = true; + }, + }; +} + +export function createOtlpLogExporter(opts: OtlpExporterOptions): LogRecordExporter { + let shutdown = false; + const doExport = createExportFn( + JsonLogsSerializer, + opts, + () => shutdown, + ); + return { + export: (logs, resultCallback) => doExport(logs, resultCallback), + forceFlush: async () => {}, + shutdown: async () => { + shutdown = true; + }, + }; +} + +const DEFAULT_AGGREGATION: AggregationOption = { type: AggregationType.DEFAULT }; + +export function createOtlpMetricExporter(opts: OtlpExporterOptions): PushMetricExporter { + let shutdown = false; + const doExport = createExportFn( + JsonMetricsSerializer, + opts, + () => shutdown, + ); + return { + export: (metrics, resultCallback) => doExport(metrics, resultCallback), + // Cumulative is what OTLPMetricExporter defaults to; anything else + // would silently change what the backend stores. + selectAggregationTemporality: (_instrumentType: InstrumentType) => + AggregationTemporality.CUMULATIVE, + selectAggregation: (_instrumentType: InstrumentType) => DEFAULT_AGGREGATION, + forceFlush: async () => {}, + shutdown: async () => { + shutdown = true; + }, + }; +} diff --git a/src/core/retry-exporter.test.ts b/src/core/retry-exporter.test.ts index 52eea7f..31937b9 100644 --- a/src/core/retry-exporter.test.ts +++ b/src/core/retry-exporter.test.ts @@ -101,6 +101,42 @@ describe('wrapWithRetry', () => { expect(cb).toHaveBeenCalledTimes(1); expect(cb.mock.calls[0]![0].code).toBe(ExportResultCode.FAILED); }); + it('makes exactly 3 attempts at maxRetries=2, then drops', async () => { + const inner = vi.fn((_items: unknown, cb: (r: ExportResult) => void) => + cb({ code: ExportResultCode.FAILED, error: new Error('network error') }), + ); + const wrapped = wrapWithRetry({ export: inner } as MockExporter, { + maxRetries: 2, + initialDelayMs: 10, + maxDelayMs: 100, + }); + const cb = vi.fn(); + wrapped.export([{}], cb); + await vi.runAllTimersAsync(); + expect(inner).toHaveBeenCalledTimes(3); + expect(cb).toHaveBeenCalledTimes(1); + }); + it('still wraps at maxRetries=0 when an offline hook is present, and feeds it', () => { + // Regression: the wrapper used to return the exporter untouched at zero + // retries, so `onFailedAfterRetries` never fired — which silently killed + // offline buffering once at-most-once became the default. + const inner = vi.fn((_items: unknown, cb: (r: ExportResult) => void) => + cb({ code: ExportResultCode.FAILED, error: { status: 503 } as Error }), + ); + const onFailedAfterRetries = vi.fn(); + const exporter: MockExporter = { export: inner }; + const wrapped = wrapWithRetry( + exporter, + { maxRetries: 0, initialDelayMs: 10, maxDelayMs: 100 }, + { onFailedAfterRetries }, + ); + const cb = vi.fn(); + wrapped.export([{ span: 1 }], cb); + expect(inner).toHaveBeenCalledTimes(1); + expect(onFailedAfterRetries).toHaveBeenCalledTimes(1); + expect(onFailedAfterRetries).toHaveBeenCalledWith([{ span: 1 }]); + expect(cb.mock.calls[0]![0].code).toBe(ExportResultCode.FAILED); + }); it('is a no-op pass-through when maxRetries=0', () => { const inner = vi.fn((_items: unknown, cb: (r: ExportResult) => void) => cb({ code: ExportResultCode.FAILED, error: new Error('network error') }), diff --git a/src/core/retry-exporter.ts b/src/core/retry-exporter.ts index fb5d7fd..f3032d4 100644 --- a/src/core/retry-exporter.ts +++ b/src/core/retry-exporter.ts @@ -13,7 +13,14 @@ export function wrapWithRetry( opts: ResolvedRetry, hooks: RetryHooks = {}, ): E { - if (opts.maxRetries <= 0) return exporter; + // At zero retries the wrapper still has work to do when an offline hook or + // debug logging is wired up: it makes exactly one attempt and then hands + // retryable failures to `onFailedAfterRetries`, which is what feeds the + // offline buffer. Skipping the wrap here would silently disable buffering + // for integrators who re-enable it on top of the at-most-once default. + if (opts.maxRetries <= 0 && !hooks.onFailedAfterRetries && !hooks.debug) { + return exporter; + } const originalExport = exporter.export.bind(exporter); const label = hooks.label ?? 'export'; (exporter as RetryableExporter).export = function ( diff --git a/src/core/scope.contract.test.ts b/src/core/scope.contract.test.ts index dd3c524..7ec9a50 100644 --- a/src/core/scope.contract.test.ts +++ b/src/core/scope.contract.test.ts @@ -22,6 +22,15 @@ describe('SCOPE contract — every span/metric/log must use the SDK scope', () = expect(SCOPE_NAME).toBe('base14.scout.react'); expect(SCOPE_VERSION).toMatch(/^\d+\.\d+\.\d+$/); }); + it('pins SCOPE_VERSION to the package version', () => { + // SCOPE_VERSION is the scope version on every signal AND the value of the + // `scout.react.version` resource attribute, so a drift from package.json + // mislabels which SDK build produced the telemetry. Bump both together. + const pkg = JSON.parse( + readFileSync(join(SRC_ROOT, '..', 'package.json'), 'utf8'), + ) as { version: string }; + expect(SCOPE_VERSION).toBe(pkg.version); + }); it('forbids any other InstrumentationScope name anywhere in src/', () => { const violations: Array<{ file: string; diff --git a/src/core/scope.ts b/src/core/scope.ts index f43686c..0c0a0ac 100644 --- a/src/core/scope.ts +++ b/src/core/scope.ts @@ -1,2 +1,2 @@ export const SCOPE_NAME = 'base14.scout.react'; -export const SCOPE_VERSION = '0.1.11'; +export const SCOPE_VERSION = '0.1.12'; diff --git a/src/core/scout.test.ts b/src/core/scout.test.ts index fc0f239..4056420 100644 --- a/src/core/scout.test.ts +++ b/src/core/scout.test.ts @@ -309,3 +309,52 @@ describe('Scout.logEvent', () => { expect(span?.attributes.amount).toBe('49.99'); }); }); +describe('sampling gates fail closed before the session is hydrated', () => { + // An emit that reaches a gate before bootstrap() has resolved has no + // sampling decision to consult. It must be dropped, not let through: + // a gate that defaults open leaks startup telemetry past sampling for + // every session, sampled or not. + let recorder: Recorder; + beforeEach(() => { + recorder = makeRecorder(); + }); + function unbootstrapped(overrides: Record = {}) { + return new Scout( + { + serviceName: 'test-svc', + endpoint: 'http://localhost:4318', + secure: false, + sessionSampleRate: 100, + ...overrides, + }, + memoryPlatform(), + ); + } + it('drops ordinary spans emitted before hydration', () => { + const s = unbootstrapped(); + s.emitSpan(SPAN.LONG_TASK, { [ATTR.LONG_TASK_DURATION]: 1 }); + s.logEvent('too_early'); + expect(recorder.spans()).toHaveLength(0); + }); + it('drops logs emitted before hydration', () => { + const s = unbootstrapped(); + s.logInfo('too early'); + expect(recorder.logs()).toHaveLength(0); + }); + it('returns null from startRootSpan before hydration', () => { + const s = unbootstrapped(); + expect(s.startRootSpan(SPAN.VIEW_SESSION)).toBeNull(); + }); + it('still lets error-class spans through via alwaysCaptureErrors', () => { + const s = unbootstrapped(); + s.emitSpan(SPAN.ERROR, {}); + const span = recorder.spans()[0]; + expect(span?.name).toBe(SPAN.ERROR); + expect(span?.attributes[ATTR.SESSION_SAMPLED]).toBe('false'); + }); + it('drops error-class spans too when alwaysCaptureErrors is off', () => { + const s = unbootstrapped({ alwaysCaptureErrors: false }); + s.emitSpan(SPAN.ERROR, {}); + expect(recorder.spans()).toHaveLength(0); + }); +}); diff --git a/src/core/telemetry.ts b/src/core/telemetry.ts index 7a6a089..d593a66 100644 --- a/src/core/telemetry.ts +++ b/src/core/telemetry.ts @@ -18,6 +18,12 @@ export function emitScoutConfigLog(scout: Scout): void { 'anrThresholdMs', 'metricExportIntervalMs', 'logExportScheduledDelayMs', + 'exportIntervalSeconds', + 'metricExportIntervalSeconds', + 'traceExportIntervalMs', + 'vitalsCollectionIntervalSeconds', + 'maxExportBatchSize', + 'maxQueueSize', 'enableErrorTracking', 'enableLifecycleTracking', 'enableStartupTracking', @@ -26,6 +32,7 @@ export function emitScoutConfigLog(scout: Scout): void { 'enableAnrDetection', 'enableFrameMetrics', 'enableMemoryMetrics', + 'enableCpuMetrics', 'enableWebVitals', 'enableBatteryTracking', 'enableNetworkTracking', @@ -40,6 +47,11 @@ export function emitScoutConfigLog(scout: Scout): void { for (const k of passthrough) { if (cfg[k] != null) attrs[`scout.config.${snake(k)}`] = cfg[k] as never; } + // Delivery semantics — the two knobs that decide at-most-once vs at-least-once. + const retry = cfg['exportRetry'] as { maxRetries?: number } | undefined; + const offline = cfg['offlineBuffer'] as { enabled?: boolean } | undefined; + attrs['scout.config.export_max_retries'] = retry?.maxRetries ?? 0; + attrs['scout.config.offline_buffer_enabled'] = !!offline?.enabled; attrs['scout.config.use_before_send'] = !!cfg['beforeSend']; attrs['scout.config.use_first_party_hosts'] = Array.isArray(cfg['firstPartyHosts']) && diff --git a/src/native/index.ts b/src/native/index.ts index 4eb8e49..7594f2f 100644 --- a/src/native/index.ts +++ b/src/native/index.ts @@ -1,9 +1,11 @@ import { BasicTracerProvider, BatchSpanProcessor } from '@opentelemetry/sdk-trace-base'; import { MeterProvider, PeriodicExportingMetricReader } from '@opentelemetry/sdk-metrics'; import { LoggerProvider, BatchLogRecordProcessor } from '@opentelemetry/sdk-logs'; -import { OTLPTraceExporter } from '@opentelemetry/exporter-trace-otlp-http'; -import { OTLPMetricExporter } from '@opentelemetry/exporter-metrics-otlp-http'; -import { OTLPLogExporter } from '@opentelemetry/exporter-logs-otlp-http'; +import { + createOtlpTraceExporter, + createOtlpMetricExporter, + createOtlpLogExporter, +} from '../core/otlp-exporter'; import { resourceFromAttributes } from '@opentelemetry/resources'; import { trace, metrics } from '@opentelemetry/api'; import { logs } from '@opentelemetry/api-logs'; @@ -23,6 +25,7 @@ import { wrapWithRetry } from '../core/retry-exporter'; import { buildOfflineWiring } from '../core/offline-wiring'; import type { Attributes, AttributeValue } from '../core/types'; import { ATTR } from '../core/attributes'; +import { SCOPE_VERSION } from '../core/scope'; import { SPAN, BREADCRUMB_TYPE } from '../core/spans'; import { NativePlatform } from './platform'; import { installNativeRejectionTracker } from './instrumentations/error'; @@ -135,10 +138,13 @@ export const Scout = { ...appAttrs, ...baseAttrs, ...((resolved.resourceAttributes as Record) ?? {}), + // Last: the SDK's own version must not be shadowable by integrator + // resource attributes — the backend uses it to attribute every signal. + [ATTR.SCOUT_REACT_VERSION]: SCOPE_VERSION, }); const headers = resolved.headers ?? {}; const traceExporter = wrapWithRetry( - new OTLPTraceExporter({ + createOtlpTraceExporter({ url: `${endpoint}/v1/traces`, headers, timeoutMillis: resolved.exportTimeoutMs, @@ -159,7 +165,7 @@ export const Scout = { }); trace.setGlobalTracerProvider(traceProvider); const metricExporter = wrapWithRetry( - new OTLPMetricExporter({ + createOtlpMetricExporter({ url: `${endpoint}/v1/metrics`, headers, timeoutMillis: resolved.exportTimeoutMs, @@ -182,7 +188,7 @@ export const Scout = { }); metrics.setGlobalMeterProvider(meterProvider); const logExporter = wrapWithRetry( - new OTLPLogExporter({ + createOtlpLogExporter({ url: `${endpoint}/v1/logs`, headers, timeoutMillis: resolved.exportTimeoutMs, @@ -242,14 +248,21 @@ export const Scout = { _disposers.push(installNativeNetworkTracker(core)); if (resolved.enableAnrDetection) _disposers.push(await installNativeAnrDetector(core, resolved.anrThresholdMs)); - if (resolved.enableMemoryMetrics) _disposers.push(installNativeMemoryTracker(core)); - if (resolved.enableCpuMetrics) _disposers.push(installNativeCpuTracker(core)); + const vitalsIntervalMs = resolved.vitalsCollectionIntervalSeconds * 1000; + if (resolved.enableMemoryMetrics) + _disposers.push(installNativeMemoryTracker(core, vitalsIntervalMs)); + if (resolved.enableCpuMetrics) + _disposers.push(installNativeCpuTracker(core, vitalsIntervalMs)); _disposers.push(installOrientationTracker(core)); if (resolved.enableBatteryTracking) - _disposers.push(installBatteryDischargeTracker(core)); + _disposers.push(installBatteryDischargeTracker(core, vitalsIntervalMs)); if (resolved.enableFrameMetrics) _disposers.push( - installNativeFrameMetricsTracker(core, resolved.longTaskThresholdMs), + installNativeFrameMetricsTracker( + core, + resolved.longTaskThresholdMs, + vitalsIntervalMs, + ), ); if (resolved.captureConsole) _disposers.push(installNativeConsoleCapture(core)); _disposers.push(installNativeTapTracker(core)); diff --git a/src/native/instrumentations/battery-discharge.ts b/src/native/instrumentations/battery-discharge.ts index 6e7b2f1..f5a22e2 100644 --- a/src/native/instrumentations/battery-discharge.ts +++ b/src/native/instrumentations/battery-discharge.ts @@ -5,9 +5,12 @@ interface ScoutCrashBatteryApi { getBatteryDischargeRate?(): Promise; } -const SAMPLE_INTERVAL_MS = 60000; +const DEFAULT_SAMPLE_INTERVAL_MS = 60000; -export function installBatteryDischargeTracker(scout: Scout): () => void { +export function installBatteryDischargeTracker( + scout: Scout, + sampleIntervalMs: number = DEFAULT_SAMPLE_INTERVAL_MS, +): () => void { let ScoutCrash: ScoutCrashBatteryApi | null = null; try { const ExpoModules = withSuppression(() => require('expo-modules-core')); @@ -27,7 +30,7 @@ export function installBatteryDischargeTracker(scout: Scout): () => void { } catch {} }; void tick(); - const id = setInterval(tick, SAMPLE_INTERVAL_MS); + const id = setInterval(tick, sampleIntervalMs); return () => { stopped = true; clearInterval(id); diff --git a/src/native/instrumentations/console.ts b/src/native/instrumentations/console.ts index 67cb680..432aa01 100644 --- a/src/native/instrumentations/console.ts +++ b/src/native/instrumentations/console.ts @@ -8,9 +8,13 @@ export function installNativeConsoleCapture(scout: Scout): () => void { ) => { const orig = (console as any)[method]; (console as any)[method] = (...args: unknown[]) => { - try { - scout.emitLog(severity, args.map(stringify).join(' ')); - } catch {} + // The SDK's own `[scout]` diagnostics must never be captured: each + // export would log, which would emit a log, which would export again. + if (!isScoutDiagnostic(args)) { + try { + scout.emitLog(severity, args.map(stringify).join(' ')); + } catch {} + } return orig.apply(console, args); }; return () => { @@ -26,6 +30,9 @@ export function installNativeConsoleCapture(scout: Scout): () => void { ]; return () => restorers.forEach((r) => r()); } +export function isScoutDiagnostic(args: unknown[]): boolean { + return typeof args[0] === 'string' && args[0].startsWith('[scout]'); +} function stringify(v: unknown): string { if (typeof v === 'string') return v; try { diff --git a/src/native/instrumentations/cpu.ts b/src/native/instrumentations/cpu.ts index 2da5ed1..33e2be9 100644 --- a/src/native/instrumentations/cpu.ts +++ b/src/native/instrumentations/cpu.ts @@ -9,9 +9,12 @@ interface ScoutCrashCpuApi { getCpuPercent?(): Promise; } -const SAMPLE_INTERVAL_MS = 10000; +const DEFAULT_SAMPLE_INTERVAL_MS = 60000; -export function installNativeCpuTracker(scout: Scout): () => void { +export function installNativeCpuTracker( + scout: Scout, + sampleIntervalMs: number = DEFAULT_SAMPLE_INTERVAL_MS, +): () => void { let ScoutCrash: ScoutCrashCpuApi | null = null; try { const ExpoModules = withSuppression(() => require('expo-modules-core')); @@ -55,7 +58,7 @@ export function installNativeCpuTracker(scout: Scout): () => void { } catch {} }; void tick(); - const id = setInterval(tick, SAMPLE_INTERVAL_MS); + const id = setInterval(tick, sampleIntervalMs); return () => { stopped = true; clearInterval(id); diff --git a/src/native/instrumentations/crash.ts b/src/native/instrumentations/crash.ts index a4e7c0f..e0d1f33 100644 --- a/src/native/instrumentations/crash.ts +++ b/src/native/instrumentations/crash.ts @@ -3,11 +3,20 @@ import { SPAN } from '../../core/spans'; import type { Scout } from '../../core/scout'; import { withSuppression } from '../soft-load'; const MARKER_KEY = 'scout.session-marker'; +/** + * How often the marker is refreshed while the app is foregrounded. The crash + * timestamp can only be as precise as the last refresh, so this bounds + * `crash.timestamp` error to ~30s — matched to the export interval to keep + * the write rate in line with the SDK's other periodic work. + */ +const HEARTBEAT_MS = 30000; interface Marker { sessionId: string; startedAt: string; lastScreen: string; active: boolean; + /** Wall-clock of the last time the app was known to be alive. */ + lastActiveAt?: string; } let RN: any = null; try { @@ -20,15 +29,27 @@ export async function installNativeCrashDetector(scout: Scout): Promise<() => vo if (raw) { const prev = JSON.parse(raw) as Marker; if (prev.active) { + // The span describes the *crashed* session, so it must be attributed + // to it — the common attributes carry the new session that started + // when the app relaunched. Same rewrite native-crash.ts does for NDK + // reports. + const common = scout.commonAttributes(); + common[ATTR.SESSION_ID] = prev.sessionId; + common[ATTR.SESSION_START_TIME] = prev.startedAt; scout.emitSpan(SPAN.APP_CRASH, { [ATTR.CRASH_PREVIOUS_SESSION_ID]: prev.sessionId, [ATTR.CRASH_STARTED_AT]: prev.startedAt, - [ATTR.CRASH_TIMESTAMP]: new Date().toISOString(), + // When the app was last known alive, not when we noticed on relaunch. + [ATTR.CRASH_TIMESTAMP]: prev.lastActiveAt ?? prev.startedAt, [ATTR.CRASH_STATUS]: 'session_marker', - [ATTR.CRASH_LAST_SCREEN]: prev.lastScreen || lastScreenFromBreadcrumbs(scout), + [ATTR.CRASH_LAST_SCREEN]: + prev.lastScreen || + lastScreenFromBreadcrumbs(scout.breadcrumbsManager.orphaned()), [ATTR.CRASH_TYPE]: 'unclean_termination', - [ATTR.BREADCRUMBS]: scout.breadcrumbsManager.serialize(), - ...scout.commonAttributes(), + // The dead session's trail — the live one is empty this early, and + // would describe the wrong session anyway. + [ATTR.BREADCRUMBS]: scout.breadcrumbsManager.serializeOrphaned() ?? '[]', + ...common, }); } } @@ -40,32 +61,37 @@ export async function installNativeCrashDetector(scout: Scout): Promise<() => vo JSON.stringify({ sessionId: scout.sessionId ?? 'unknown', startedAt: scout.sessionManager.startedAtIso ?? new Date().toISOString(), - lastScreen: lastScreenFromBreadcrumbs(scout), + lastScreen: lastScreenFromBreadcrumbs(scout.breadcrumbsManager.list()), active, + lastActiveAt: new Date().toISOString(), } satisfies Marker), ); } catch {} }; await writeMarker(true); + // Refresh while foregrounded so a crash timestamp is close to the real + // death time rather than to whenever the app last changed state. + const heartbeat = setInterval(() => { + void writeMarker(true); + }, HEARTBEAT_MS); const AppState = RN?.AppState; - if (!AppState) return () => {}; + if (!AppState) return () => clearInterval(heartbeat); const onChange = (state: string) => { void writeMarker(state === 'active'); }; const sub = AppState.addEventListener('change', onChange); return () => { + clearInterval(heartbeat); try { if (typeof sub?.remove === 'function') sub.remove(); else AppState.removeEventListener?.('change', onChange); } catch {} }; } -function lastScreenFromBreadcrumbs(scout: Scout): string { +function lastScreenFromBreadcrumbs( + crumbs: Array<{ type?: string; message?: string }>, +): string { try { - const crumbs = JSON.parse(scout.breadcrumbsManager.serialize()) as Array<{ - type?: string; - message?: string; - }>; for (let i = crumbs.length - 1; i >= 0; i--) { const c = crumbs[i]; if (c?.type === 'navigation' && typeof c.message === 'string') { diff --git a/src/native/instrumentations/frame-metrics.ts b/src/native/instrumentations/frame-metrics.ts index c0a5c67..7028b41 100644 --- a/src/native/instrumentations/frame-metrics.ts +++ b/src/native/instrumentations/frame-metrics.ts @@ -7,10 +7,11 @@ import { uuidv4 } from '../../core/uuid'; import { getCurrentScreen } from './navigation'; const FROZEN_FRAME_MS = 700; const SLOW_FRAME_MS = 16.67; -const REPORT_INTERVAL_MS = 10000; +const DEFAULT_REPORT_INTERVAL_MS = 60000; export function installNativeFrameMetricsTracker( scout: Scout, longTaskThresholdMs: number, + reportIntervalMs: number = DEFAULT_REPORT_INTERVAL_MS, ): () => void { const raf: ((cb: (t: number) => void) => number) | undefined = (globalThis as any) .requestAnimationFrame; @@ -98,7 +99,7 @@ export function installNativeFrameMetricsTracker( droppedSinceLastReport = 0; } if (frameCountWindow > 0) { - const avgDelta = REPORT_INTERVAL_MS / frameCountWindow; + const avgDelta = reportIntervalMs / frameCountWindow; const avgFps = 1000 / avgDelta; const minFps = isFinite(minDeltaInWindow) ? 1000 / minDeltaInWindow : avgFps; scout.emitGauge(METRIC.RN_FRAME_REFRESH_RATE, avgFps, { @@ -134,7 +135,7 @@ export function installNativeFrameMetricsTracker( minDeltaInWindow = Number.POSITIVE_INFINITY; slowFrameMsInWindow = 0; frozenMsInWindow = 0; - }, REPORT_INTERVAL_MS); + }, reportIntervalMs); raf(tick); return () => { stopped = true; diff --git a/src/native/instrumentations/memory.ts b/src/native/instrumentations/memory.ts index 9648538..d7ea8dd 100644 --- a/src/native/instrumentations/memory.ts +++ b/src/native/instrumentations/memory.ts @@ -5,7 +5,11 @@ let DeviceInfo: any = null; try { DeviceInfo = withSuppression(() => require('react-native-device-info'))?.default; } catch {} -export function installNativeMemoryTracker(scout: Scout): () => void { +const DEFAULT_SAMPLE_INTERVAL_MS = 60000; +export function installNativeMemoryTracker( + scout: Scout, + sampleIntervalMs: number = DEFAULT_SAMPLE_INTERVAL_MS, +): () => void { if (!DeviceInfo?.getUsedMemory) return () => {}; const tick = () => { DeviceInfo.getUsedMemory() @@ -17,6 +21,6 @@ export function installNativeMemoryTracker(scout: Scout): () => void { .catch(() => {}); }; tick(); - const id = setInterval(tick, 10000); + const id = setInterval(tick, sampleIntervalMs); return () => clearInterval(id); } diff --git a/src/native/instrumentations/native-crash.ts b/src/native/instrumentations/native-crash.ts index c5f9c9d..e835626 100644 --- a/src/native/instrumentations/native-crash.ts +++ b/src/native/instrumentations/native-crash.ts @@ -12,6 +12,12 @@ export async function installNativeCrashReader(scout: Scout): Promise { try { const reports = await ScoutCrash.getPendingCrashes(); if (!reports || reports.length === 0) return; + // Crumbs from the session that crashed. The NDK path bakes its own into + // the report at signal time; the JVM and exit-info paths have none, and + // the current in-memory trail belongs to the session that just started. + const orphanedCrumbs = scout.breadcrumbsManager.orphaned(); + const orphanedJson = scout.breadcrumbsManager.serializeOrphaned(); + const drainProvenance = await collectDrainProvenance(); for (const report of reports) { try { const attrs: Record = { @@ -33,21 +39,24 @@ export async function installNativeCrashReader(scout: Scout): Promise { attrs[k] = String(v); } } - attrs[ATTR.BREADCRUMBS] = scout.breadcrumbsManager.serialize(); + // Only fall back to the orphaned trail when the report carries none + // of its own. + const ownCrumbs = attrs['crash.breadcrumbs']; + const hasOwnCrumbs = typeof ownCrumbs === 'string' && ownCrumbs.length > 2; + if (!hasOwnCrumbs && orphanedJson) { + attrs[ATTR.BREADCRUMBS] = orphanedJson; + } try { - const lastScreen = (() => { - const crumbs = JSON.parse(scout.breadcrumbsManager.serialize()); - for (let i = crumbs.length - 1; i >= 0; i--) { - const c = crumbs[i]; - if (c?.type === 'navigation' && typeof c.message === 'string') { - const m = c.message.match(/screen:\s*(.+)/); - if (m && m[1]) return m[1]; - } - } - return null; - })(); + const crumbs = hasOwnCrumbs + ? (JSON.parse(ownCrumbs as string) as Array<{ + type?: string; + message?: string; + }>) + : orphanedCrumbs; + const lastScreen = lastScreenOf(crumbs); if (lastScreen) attrs['crash.last_screen'] = lastScreen; } catch {} + Object.assign(attrs, drainProvenance); if (typeof attrs['crash.error_type'] === 'string' && attrs['crash.error_type']) { attrs[ATTR.CRASH_TYPE] = attrs['crash.error_type']; } @@ -71,6 +80,48 @@ export async function installNativeCrashReader(scout: Scout): Promise { await ScoutCrash.clearPendingCrashes(); } catch {} } +function lastScreenOf( + crumbs: Array<{ type?: string; message?: string }> | undefined, +): string | null { + if (!Array.isArray(crumbs)) return null; + for (let i = crumbs.length - 1; i >= 0; i--) { + const c = crumbs[i]; + if (c?.type === 'navigation' && typeof c.message === 'string') { + const m = c.message.match(/screen:\s*(.+)/); + if (m && m[1]) return m[1]; + } + } + return null; +} + +/** + * Describes the *drain*, not the crash: which app state the report was + * recovered in, and how long the recovering process had been up. Makes it + * possible to tell a report drained seconds after relaunch from one that sat + * on disk across several launches. + */ +async function collectDrainProvenance(): Promise> { + const out: Record = {}; + try { + const RN = withSuppression(() => require('react-native')); + const state = RN?.AppState?.currentState; + if (typeof state === 'string' && state) out[ATTR.CRASH_DRAIN_APP_STATE] = state; + } catch {} + try { + const ExpoModules = withSuppression(() => require('expo-modules-core')); + const mod: { getProcessStartTimeMillis?: () => Promise } | null = + ExpoModules?.requireOptionalNativeModule?.('ScoutCrash') ?? null; + if (typeof mod?.getProcessStartTimeMillis === 'function') { + const startMs = await mod.getProcessStartTimeMillis(); + if (typeof startMs === 'number' && Number.isFinite(startMs) && startMs > 0) { + out[ATTR.CRASH_DRAIN_PROCESS_START_TIME] = new Date(startMs).toISOString(); + out[ATTR.CRASH_DRAIN_UPTIME_SECS] = (Date.now() - startMs) / 1000; + } + } + } catch {} + return out; +} + interface ScoutCrashApi { getPendingCrashes(): Promise>>; clearPendingCrashes(): Promise; diff --git a/src/native/instrumentations/orientation.ts b/src/native/instrumentations/orientation.ts index f6cba41..94943e6 100644 --- a/src/native/instrumentations/orientation.ts +++ b/src/native/instrumentations/orientation.ts @@ -21,7 +21,6 @@ function computeOrientation(): string | null { export function installOrientationTracker(scout: Scout): () => void { const initial = computeOrientation(); - // eslint-disable-next-line no-console if ((scout.config as { debug?: boolean }).debug) { console.log( '[scout]', diff --git a/src/web/index.ts b/src/web/index.ts index aa025d6..2fde5be 100644 --- a/src/web/index.ts +++ b/src/web/index.ts @@ -1,9 +1,11 @@ import { WebTracerProvider, BatchSpanProcessor } from '@opentelemetry/sdk-trace-web'; import { MeterProvider, PeriodicExportingMetricReader } from '@opentelemetry/sdk-metrics'; import { LoggerProvider, BatchLogRecordProcessor } from '@opentelemetry/sdk-logs'; -import { OTLPTraceExporter } from '@opentelemetry/exporter-trace-otlp-http'; -import { OTLPMetricExporter } from '@opentelemetry/exporter-metrics-otlp-http'; -import { OTLPLogExporter } from '@opentelemetry/exporter-logs-otlp-http'; +import { + createOtlpTraceExporter, + createOtlpMetricExporter, + createOtlpLogExporter, +} from '../core/otlp-exporter'; import { resourceFromAttributes } from '@opentelemetry/resources'; import { trace, metrics } from '@opentelemetry/api'; import { logs } from '@opentelemetry/api-logs'; @@ -17,6 +19,7 @@ import { wrapWithRetry } from '../core/retry-exporter'; import { buildOfflineWiring } from '../core/offline-wiring'; import type { Attributes, AttributeValue } from '../core/types'; import { ATTR } from '../core/attributes'; +import { SCOPE_VERSION } from '../core/scope'; import { WebPlatform } from './platform'; import { installTapTracker } from './instrumentations/tap'; import { installErrorTracker } from './instrumentations/error'; @@ -71,16 +74,19 @@ export const Scout = { ...(resolved.buildId ? { [ATTR.APP_BUILD_ID]: resolved.buildId } : {}), ...baseAttrs, ...((resolved.resourceAttributes as Record) ?? {}), + // Last: the SDK's own version must not be shadowable by integrator + // resource attributes — the backend uses it to attribute every signal. + [ATTR.SCOUT_REACT_VERSION]: SCOPE_VERSION, }); const headers = resolved.headers ?? {}; const traceExporter = wrapWithRetry( - new OTLPTraceExporter({ + createOtlpTraceExporter({ url: `${endpoint}/v1/traces`, headers, timeoutMillis: resolved.exportTimeoutMs, }), resolved.exportRetry, - offline.hooks.traces, + { ...offline.hooks.traces, debug: !!resolved.debug, label: 'traces' }, ); const traceProvider = new WebTracerProvider({ resource, @@ -96,13 +102,13 @@ export const Scout = { traceProvider.register(); trace.setGlobalTracerProvider(traceProvider); const metricExporter = wrapWithRetry( - new OTLPMetricExporter({ + createOtlpMetricExporter({ url: `${endpoint}/v1/metrics`, headers, timeoutMillis: resolved.exportTimeoutMs, }), resolved.exportRetry, - offline.hooks.metrics, + { ...offline.hooks.metrics, debug: !!resolved.debug, label: 'metrics' }, ); const meterProvider = new MeterProvider({ resource, @@ -119,13 +125,13 @@ export const Scout = { }); metrics.setGlobalMeterProvider(meterProvider); const logExporter = wrapWithRetry( - new OTLPLogExporter({ + createOtlpLogExporter({ url: `${endpoint}/v1/logs`, headers, timeoutMillis: resolved.exportTimeoutMs, }), resolved.exportRetry, - offline.hooks.logs, + { ...offline.hooks.logs, debug: !!resolved.debug, label: 'logs' }, ); const loggerProvider = new LoggerProvider({ resource, @@ -179,7 +185,10 @@ export const Scout = { if (resolved.enableLongTaskDetection) { _disposers.push(installLongTaskTracker(core, resolved.longTaskThresholdMs)); } - if (resolved.enableMemoryMetrics) _disposers.push(installMemoryTracker(core)); + if (resolved.enableMemoryMetrics) + _disposers.push( + installMemoryTracker(core, resolved.vitalsCollectionIntervalSeconds * 1000), + ); if (resolved.enableFrameMetrics) _disposers.push(installFrameMetricsTracker(core)); if (resolved.enableWebVitals) _disposers.push(installWebVitalsTracker(core)); if (resolved.enableBatteryTracking) _disposers.push(installBatteryTracker(core)); diff --git a/src/web/instrumentations/console.test.ts b/src/web/instrumentations/console.test.ts new file mode 100644 index 0000000..fc090f4 --- /dev/null +++ b/src/web/instrumentations/console.test.ts @@ -0,0 +1,52 @@ +import { describe, it, expect, vi, afterEach } from 'vitest'; +import { installConsoleCapture } from './console'; +import type { Scout } from '../../core/scout'; + +function fakeScout(): { scout: Scout; emitLog: ReturnType } { + const emitLog = vi.fn(); + return { scout: { emitLog } as unknown as Scout, emitLog }; +} + +describe('console capture', () => { + const restorers: Array<() => void> = []; + afterEach(() => { + restorers.splice(0).forEach((r) => r()); + vi.restoreAllMocks(); + }); + + it('captures ordinary console output', () => { + const { scout, emitLog } = fakeScout(); + vi.spyOn(console, 'log').mockImplementation(() => {}); + restorers.push(installConsoleCapture(scout)); + console.log('hello', 42); + expect(emitLog).toHaveBeenCalledWith('INFO', 'hello 42'); + }); + + it('does NOT capture the SDK’s own [scout] diagnostics', () => { + // Otherwise every export logs, every log emits, and every emit exports: + // a self-sustaining feedback loop under `captureConsole` + `debug`. + const { scout, emitLog } = fakeScout(); + vi.spyOn(console, 'log').mockImplementation(() => {}); + vi.spyOn(console, 'warn').mockImplementation(() => {}); + restorers.push(installConsoleCapture(scout)); + console.log('[scout]', 'traces', 'attempt', 1); + console.warn('[scout] traces FAIL'); + expect(emitLog).not.toHaveBeenCalled(); + }); + + it('still forwards [scout] lines to the original console', () => { + const { scout } = fakeScout(); + const original = vi.spyOn(console, 'log').mockImplementation(() => {}); + restorers.push(installConsoleCapture(scout)); + console.log('[scout]', 'traces OK'); + expect(original).toHaveBeenCalledWith('[scout]', 'traces OK'); + }); + + it('captures a message that merely contains [scout] later in the string', () => { + const { scout, emitLog } = fakeScout(); + vi.spyOn(console, 'log').mockImplementation(() => {}); + restorers.push(installConsoleCapture(scout)); + console.log('app said [scout] something'); + expect(emitLog).toHaveBeenCalledTimes(1); + }); +}); diff --git a/src/web/instrumentations/console.ts b/src/web/instrumentations/console.ts index 75e079a..f66b4a4 100644 --- a/src/web/instrumentations/console.ts +++ b/src/web/instrumentations/console.ts @@ -8,9 +8,13 @@ export function installConsoleCapture(scout: Scout): () => void { ) => { const orig = (console as any)[method]; (console as any)[method] = (...args: unknown[]) => { - try { - scout.emitLog(severity, args.map(stringify).join(' ')); - } catch {} + // The SDK's own `[scout]` diagnostics must never be captured: each + // export would log, which would emit a log, which would export again. + if (!isScoutDiagnostic(args)) { + try { + scout.emitLog(severity, args.map(stringify).join(' ')); + } catch {} + } return orig.apply(console, args); }; return () => { @@ -26,6 +30,9 @@ export function installConsoleCapture(scout: Scout): () => void { ]; return () => restorers.forEach((r) => r()); } +export function isScoutDiagnostic(args: unknown[]): boolean { + return typeof args[0] === 'string' && args[0].startsWith('[scout]'); +} function stringify(v: unknown): string { if (typeof v === 'string') return v; try { diff --git a/src/web/instrumentations/crash.test.ts b/src/web/instrumentations/crash.test.ts new file mode 100644 index 0000000..6e48d90 --- /dev/null +++ b/src/web/instrumentations/crash.test.ts @@ -0,0 +1,146 @@ +// @vitest-environment jsdom +import { describe, it, expect, beforeEach, afterEach, vi } from 'vitest'; +import { installCrashDetector } from './crash'; +import { Scout } from '../../core/scout'; +import { ATTR } from '../../core/attributes'; +import { SPAN } from '../../core/spans'; +import { makeRecorder, memoryPlatform, type Recorder } from '../../test/recorder'; + +const MARKER_KEY = 'scout.session-marker'; + +async function makeScout() { + const s = new Scout( + { + serviceName: 'test-svc', + endpoint: 'http://localhost:4318', + secure: false, + sessionSampleRate: 100, + }, + memoryPlatform(), + ); + await s.bootstrap(); + return s; +} + +// Node's own experimental `localStorage` global shadows jsdom's and exposes +// no methods, so the tests supply a minimal working Storage. +function memoryStorage() { + const map = new Map(); + return { + getItem: (k: string) => map.get(k) ?? null, + setItem: (k: string, v: string) => void map.set(k, v), + removeItem: (k: string) => void map.delete(k), + clear: () => map.clear(), + key: (i: number) => [...map.keys()][i] ?? null, + get length() { + return map.size; + }, + }; +} + +describe('app_crash from the session marker', () => { + let recorder: Recorder; + let storage: ReturnType; + const disposers: Array<() => void> = []; + beforeEach(() => { + recorder = makeRecorder(); + storage = memoryStorage(); + vi.stubGlobal('localStorage', storage); + }); + afterEach(() => { + disposers.splice(0).forEach((d) => d()); + vi.unstubAllGlobals(); + vi.useRealTimers(); + }); + + function seedCrashedSession(marker: Record) { + storage.setItem( + MARKER_KEY, + JSON.stringify({ + sessionId: 'dead-session', + startedAt: '2026-01-01T00:00:00.000Z', + lastScreen: '/checkout', + active: true, + ...marker, + }), + ); + } + + it('attributes the span to the crashed session, not the new one', async () => { + seedCrashedSession({ lastActiveAt: '2026-01-01T00:05:00.000Z' }); + const s = await makeScout(); + disposers.push(installCrashDetector(s)); + const span = recorder.spans().find((sp) => sp.name === SPAN.APP_CRASH); + expect(span).toBeDefined(); + expect(span!.attributes[ATTR.SESSION_ID]).toBe('dead-session'); + expect(span!.attributes[ATTR.SESSION_ID]).not.toBe(s.sessionId); + expect(span!.attributes[ATTR.SESSION_START_TIME]).toBe('2026-01-01T00:00:00.000Z'); + expect(span!.attributes[ATTR.CRASH_PREVIOUS_SESSION_ID]).toBe('dead-session'); + }); + + it('reports the last-known-alive time, not the detection time', async () => { + seedCrashedSession({ lastActiveAt: '2026-01-01T00:05:00.000Z' }); + const s = await makeScout(); + disposers.push(installCrashDetector(s)); + const span = recorder.spans().find((sp) => sp.name === SPAN.APP_CRASH); + expect(span!.attributes[ATTR.CRASH_TIMESTAMP]).toBe('2026-01-01T00:05:00.000Z'); + }); + + it('falls back to session start when an older marker has no lastActiveAt', async () => { + // Markers written by <=0.1.11 have no lastActiveAt; the crash must still + // be reported, dated no later than it could possibly have happened. + seedCrashedSession({}); + const s = await makeScout(); + disposers.push(installCrashDetector(s)); + const span = recorder.spans().find((sp) => sp.name === SPAN.APP_CRASH); + expect(span!.attributes[ATTR.CRASH_TIMESTAMP]).toBe('2026-01-01T00:00:00.000Z'); + }); + + it('carries the crashed session’s breadcrumbs, not the new session’s', async () => { + seedCrashedSession({ lastActiveAt: '2026-01-01T00:05:00.000Z' }); + const platform = memoryPlatform(); + await platform.setItem( + 'scout.breadcrumbs', + JSON.stringify([ + { + type: 'navigation', + message: 'screen: /checkout', + time: '2026-01-01T00:04:00.000Z', + }, + ]), + ); + const s = new Scout( + { + serviceName: 'test-svc', + endpoint: 'http://localhost:4318', + secure: false, + sessionSampleRate: 100, + }, + platform, + ); + await s.bootstrap(); + s.addBreadcrumb('tap', 'a crumb from the new session'); + disposers.push(installCrashDetector(s)); + const span = recorder.spans().find((sp) => sp.name === SPAN.APP_CRASH); + const crumbs = JSON.parse(String(span!.attributes[ATTR.BREADCRUMBS])); + expect(crumbs).toHaveLength(1); + expect(crumbs[0].message).toBe('screen: /checkout'); + }); + + it('emits nothing when the previous session shut down cleanly', async () => { + seedCrashedSession({ active: false }); + const s = await makeScout(); + disposers.push(installCrashDetector(s)); + expect(recorder.spans().find((sp) => sp.name === SPAN.APP_CRASH)).toBeUndefined(); + }); + + it('records the live session’s own start time in the marker it writes', async () => { + const s = await makeScout(); + disposers.push(installCrashDetector(s)); + const marker = JSON.parse(storage.getItem(MARKER_KEY)!); + expect(marker.sessionId).toBe(s.sessionId); + expect(marker.startedAt).toBe(s.sessionManager.startedAtIso); + expect(marker.active).toBe(true); + expect(typeof marker.lastActiveAt).toBe('string'); + }); +}); diff --git a/src/web/instrumentations/crash.ts b/src/web/instrumentations/crash.ts index 3209d3e..a7c6d0b 100644 --- a/src/web/instrumentations/crash.ts +++ b/src/web/instrumentations/crash.ts @@ -3,11 +3,16 @@ import { SPAN, BREADCRUMB_TYPE } from '../../core/spans'; import type { Scout } from '../../core/scout'; import { getCurrentScreen } from './route'; const MARKER_KEY = 'scout.session-marker'; +const TICK_MS = 2000; +/** 5 ticks × 2s = refresh `lastActiveAt` at least every 10s. */ +const HEARTBEAT_TICKS = 5; interface Marker { sessionId: string; startedAt: string; lastScreen: string; active: boolean; + /** Wall-clock of the last time the tab was known to be alive. */ + lastActiveAt?: string; } export function installCrashDetector(scout: Scout): () => void { if (typeof localStorage === 'undefined') return () => {}; @@ -16,16 +21,24 @@ export function installCrashDetector(scout: Scout): () => void { if (raw) { const prev = JSON.parse(raw) as Marker; if (prev.active) { + // Attribute the span to the session that actually died; the common + // attributes describe the new one this page load created. + const common = scout.commonAttributes(); + common[ATTR.SESSION_ID] = prev.sessionId; + common[ATTR.SESSION_START_TIME] = prev.startedAt; scout.emitSpan(SPAN.APP_CRASH, { [ATTR.CRASH_PREVIOUS_SESSION_ID]: prev.sessionId, [ATTR.CRASH_STARTED_AT]: prev.startedAt, - [ATTR.CRASH_TIMESTAMP]: new Date().toISOString(), + // When the tab was last known alive, not when we noticed on reload. + [ATTR.CRASH_TIMESTAMP]: prev.lastActiveAt ?? prev.startedAt, [ATTR.CRASH_STATUS]: 'session_marker', [ATTR.CRASH_LAST_SCREEN]: prev.lastScreen, [ATTR.CRASH_TYPE]: 'unclean_termination', [ATTR.CRASH_REASON]: 'tab_terminated_without_pagehide', - [ATTR.BREADCRUMBS]: scout.breadcrumbsManager.serialize(), - ...scout.commonAttributes(), + // The dead session's trail — the live one is empty this early, and + // would describe the wrong session anyway. + [ATTR.BREADCRUMBS]: scout.breadcrumbsManager.serializeOrphaned() ?? '[]', + ...common, }); } } @@ -34,9 +47,12 @@ export function installCrashDetector(scout: Scout): () => void { try { const m: Marker = { sessionId: scout.sessionId ?? 'unknown', - startedAt: new Date().toISOString(), + // The session's own start, not "now" — this value is reported as the + // crashed session's session.start_time. + startedAt: scout.sessionManager.startedAtIso ?? new Date().toISOString(), lastScreen: getLastScreen(), active, + lastActiveAt: new Date().toISOString(), }; localStorage.setItem(MARKER_KEY, JSON.stringify(m)); } catch {} @@ -52,14 +68,20 @@ export function installCrashDetector(scout: Scout): () => void { } }; let lastScreen = getLastScreen(); - const updateScreen = () => { + let ticksSinceWrite = 0; + const tick = () => { const next = getLastScreen(); - if (next !== lastScreen) { + ticksSinceWrite += 1; + // Write on screen change, and otherwise once every ~10s to keep + // `lastActiveAt` (the crash timestamp) current without hammering + // localStorage every 2s. + if (next !== lastScreen || ticksSinceWrite >= HEARTBEAT_TICKS) { lastScreen = next; + ticksSinceWrite = 0; writeMarker(true); } }; - const screenInterval = setInterval(updateScreen, 2000); + const screenInterval = setInterval(tick, TICK_MS); window.addEventListener('pagehide', onPageHide); window.addEventListener('beforeunload', onBeforeUnload); document.addEventListener('visibilitychange', onVisibility); diff --git a/src/web/instrumentations/memory.test.ts b/src/web/instrumentations/memory.test.ts new file mode 100644 index 0000000..5c7c872 --- /dev/null +++ b/src/web/instrumentations/memory.test.ts @@ -0,0 +1,48 @@ +import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest'; +import { installMemoryTracker } from './memory'; +import type { Scout } from '../../core/scout'; + +describe('memory tracker sampling cadence', () => { + beforeEach(() => { + vi.useFakeTimers(); + (performance as unknown as { memory: unknown }).memory = { usedJSHeapSize: 1024 }; + }); + afterEach(() => { + vi.useRealTimers(); + delete (performance as unknown as { memory?: unknown }).memory; + }); + + function track(intervalMs?: number) { + const emitGauge = vi.fn(); + const scout = { emitGauge } as unknown as Scout; + const dispose = + intervalMs === undefined + ? installMemoryTracker(scout) + : installMemoryTracker(scout, intervalMs); + return { emitGauge, dispose }; + } + + it('samples once at install, then on the default 60s cadence', () => { + const { emitGauge, dispose } = track(); + expect(emitGauge).toHaveBeenCalledTimes(1); + vi.advanceTimersByTime(59_000); + expect(emitGauge).toHaveBeenCalledTimes(1); + vi.advanceTimersByTime(1_000); + expect(emitGauge).toHaveBeenCalledTimes(2); + dispose(); + }); + + it('honours a configured vitals interval', () => { + const { emitGauge, dispose } = track(5_000); + vi.advanceTimersByTime(15_000); + expect(emitGauge).toHaveBeenCalledTimes(4); // install + 3 ticks + dispose(); + }); + + it('stops sampling once disposed', () => { + const { emitGauge, dispose } = track(5_000); + dispose(); + vi.advanceTimersByTime(60_000); + expect(emitGauge).toHaveBeenCalledTimes(1); + }); +}); diff --git a/src/web/instrumentations/memory.ts b/src/web/instrumentations/memory.ts index fd31a5a..8535a8a 100644 --- a/src/web/instrumentations/memory.ts +++ b/src/web/instrumentations/memory.ts @@ -1,6 +1,10 @@ import { METRIC } from '../../core/metrics'; import type { Scout } from '../../core/scout'; -export function installMemoryTracker(scout: Scout): () => void { +const DEFAULT_SAMPLE_INTERVAL_MS = 60000; +export function installMemoryTracker( + scout: Scout, + sampleIntervalMs: number = DEFAULT_SAMPLE_INTERVAL_MS, +): () => void { if (typeof performance === 'undefined') return () => {}; const perf = performance as Performance & { memory?: { @@ -15,6 +19,6 @@ export function installMemoryTracker(scout: Scout): () => void { } catch {} }; tick(); - const id = setInterval(tick, 10000); + const id = setInterval(tick, sampleIntervalMs); return () => clearInterval(id); } diff --git a/src/web/resource.test.ts b/src/web/resource.test.ts new file mode 100644 index 0000000..bd9b772 --- /dev/null +++ b/src/web/resource.test.ts @@ -0,0 +1,63 @@ +// @vitest-environment jsdom +import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest'; +import { SCOPE_VERSION } from '../core/scope'; +import { ATTR } from '../core/attributes'; + +describe('web resource attributes', () => { + beforeEach(() => { + vi.stubGlobal( + 'fetch', + vi.fn(async () => new Response('', { status: 200 })), + ); + }); + afterEach(async () => { + const { Scout } = await import('./index'); + await Scout.shutdown(); + vi.unstubAllGlobals(); + vi.resetModules(); + }); + + async function initialize(config: Record = {}) { + const { Scout } = await import('./index'); + await Scout.initialize({ + serviceName: 'test-svc', + endpoint: 'http://localhost:4318', + secure: false, + ...config, + } as never); + return (Scout as unknown as { _providers: Record }) + ._providers; + } + + // The providers keep their Resource private, and the three SDKs disagree on + // where: the tracer holds `_resource`, the meter and logger nest it under + // `_sharedState`. Reading it is the only way to assert what actually ships. + interface ProviderInternals { + _resource?: { attributes: Record }; + _sharedState?: { resource: { attributes: Record } }; + } + + function attrsOf(provider: ProviderInternals): Record { + const resource = provider._resource ?? provider._sharedState?.resource; + if (!resource) throw new Error('provider exposes no resource'); + return resource.attributes; + } + + it('stamps scout.react.version on traces, metrics and logs', async () => { + const providers = await initialize(); + for (const key of ['traceProvider', 'meterProvider', 'loggerProvider']) { + expect(attrsOf(providers[key]!)[ATTR.SCOUT_REACT_VERSION]).toBe(SCOPE_VERSION); + } + }); + + it('cannot be shadowed by integrator resourceAttributes', async () => { + // The backend attributes every signal to an SDK build with this key; an + // app overriding it would misreport which SDK produced the telemetry. + const providers = await initialize({ + resourceAttributes: { [ATTR.SCOUT_REACT_VERSION]: '9.9.9', team: 'checkout' }, + }); + const attrs = attrsOf(providers.traceProvider!); + expect(attrs[ATTR.SCOUT_REACT_VERSION]).toBe(SCOPE_VERSION); + expect(attrs.team).toBe('checkout'); + }); +}); From 6be0b6a9d6eccc9b03d48bf0e8adfaa96db79248 Mon Sep 17 00:00:00 2001 From: Nitin Misra Date: Tue, 4 Aug 2026 11:19:00 +0530 Subject: [PATCH 2/2] fix: regenerate package-lock.json on linux so npm ci resolves @emnapi optional deps --- package-lock.json | 84 +++++++++++++++-------------------------------- 1 file changed, 26 insertions(+), 58 deletions(-) diff --git a/package-lock.json b/package-lock.json index f1b2b22..624c98f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -409,7 +409,6 @@ } ], "license": "MIT", - "peer": true, "engines": { "node": ">=20.19.0" }, @@ -458,15 +457,37 @@ } ], "license": "MIT", - "peer": true, "engines": { "node": ">=20.19.0" } }, + "node_modules/@emnapi/core": { + "version": "1.10.0", + "resolved": "https://registry.npmjs.org/@emnapi/core/-/core-1.10.0.tgz", + "integrity": "sha512-yq6OkJ4p82CAfPl0u9mQebQHKPJkY7WrIuk205cTYnYe+k2Z8YBh11FrbRG/H6ihirqcacOgl2BIO8oyMQLeXw==", + "dev": true, + "license": "MIT", + "optional": true, + "dependencies": { + "@emnapi/wasi-threads": "1.2.1", + "tslib": "^2.4.0" + } + }, + "node_modules/@emnapi/runtime": { + "version": "1.10.0", + "resolved": "https://registry.npmjs.org/@emnapi/runtime/-/runtime-1.10.0.tgz", + "integrity": "sha512-ewvYlk86xUoGI0zQRNq/mC+16R1QeDlKQy21Ki3oSYXNgLb45GV1P6A0M+/s6nyCuNDqe5VpaY84BzXGwVbwFA==", + "dev": true, + "license": "MIT", + "optional": true, + "dependencies": { + "tslib": "^2.4.0" + } + }, "node_modules/@emnapi/wasi-threads": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/@emnapi/wasi-threads/-/wasi-threads-1.2.3.tgz", - "integrity": "sha512-ELEBe8PsLvvJ6QMr0zLt8ffvOHW/dc1m3CEzNMg7aJUv3bMaoDtw2TXyDAwkYBuroxxuHEwhRTLJSe5sya547g==", + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/@emnapi/wasi-threads/-/wasi-threads-1.2.1.tgz", + "integrity": "sha512-uTII7OYF+/Mes/MrcIOYp5yOtSMLBWSIoLPpcgwipoiKbli6k322tcoFsxoIIxPDqW01SQGAgko4EzZi2BNv2w==", "dev": true, "license": "MIT", "optional": true, @@ -1276,7 +1297,6 @@ "resolved": "https://registry.npmjs.org/@opentelemetry/api/-/api-1.9.1.tgz", "integrity": "sha512-gLyJlPHPZYdAk1JENA9LeHejZe1Ti77/pTeFm/nMXmQH/HFZlcS/O2XJB+L8fkbrNSqhdtlvjBVjxwUYanNH5Q==", "license": "Apache-2.0", - "peer": true, "engines": { "node": ">=8.0.0" } @@ -1679,40 +1699,6 @@ "node": "^20.19.0 || >=22.12.0" } }, - "node_modules/@rolldown/binding-wasm32-wasi/node_modules/@emnapi/core": { - "version": "1.10.0", - "resolved": "https://registry.npmjs.org/@emnapi/core/-/core-1.10.0.tgz", - "integrity": "sha512-yq6OkJ4p82CAfPl0u9mQebQHKPJkY7WrIuk205cTYnYe+k2Z8YBh11FrbRG/H6ihirqcacOgl2BIO8oyMQLeXw==", - "dev": true, - "license": "MIT", - "optional": true, - "dependencies": { - "@emnapi/wasi-threads": "1.2.1", - "tslib": "^2.4.0" - } - }, - "node_modules/@rolldown/binding-wasm32-wasi/node_modules/@emnapi/runtime": { - "version": "1.10.0", - "resolved": "https://registry.npmjs.org/@emnapi/runtime/-/runtime-1.10.0.tgz", - "integrity": "sha512-ewvYlk86xUoGI0zQRNq/mC+16R1QeDlKQy21Ki3oSYXNgLb45GV1P6A0M+/s6nyCuNDqe5VpaY84BzXGwVbwFA==", - "dev": true, - "license": "MIT", - "optional": true, - "dependencies": { - "tslib": "^2.4.0" - } - }, - "node_modules/@rolldown/binding-wasm32-wasi/node_modules/@emnapi/wasi-threads": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/@emnapi/wasi-threads/-/wasi-threads-1.2.1.tgz", - "integrity": "sha512-uTII7OYF+/Mes/MrcIOYp5yOtSMLBWSIoLPpcgwipoiKbli6k322tcoFsxoIIxPDqW01SQGAgko4EzZi2BNv2w==", - "dev": true, - "license": "MIT", - "optional": true, - "dependencies": { - "tslib": "^2.4.0" - } - }, "node_modules/@rolldown/binding-win32-arm64-msvc": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/@rolldown/binding-win32-arm64-msvc/-/binding-win32-arm64-msvc-1.0.0.tgz", @@ -2130,7 +2116,6 @@ "integrity": "sha512-o4PXJQidqJl82ckFaXUeoAW+XysPLauYI43Abki5hABd853iMhitooc6znOnczgbTYmEP6U6/y1ZyKAIsvMKGg==", "dev": true, "license": "MIT", - "peer": true, "dependencies": { "@babel/code-frame": "^7.10.4", "@babel/runtime": "^7.12.5", @@ -2256,7 +2241,6 @@ "integrity": "sha512-xfrlY7UD5rMJk3ZVJP8BNzS28J36YJg+xp+LPXV1TdWxr8uMH5A860QNxYDGQe/ylDSgjxE52Q9VnO7p75tJxg==", "dev": true, "license": "MIT", - "peer": true, "dependencies": { "undici-types": ">=7.24.0 <7.24.7" } @@ -2267,7 +2251,6 @@ "integrity": "sha512-ilcTH/UniCkMdtexkoCN0bI7pMcJDvmQFPvuPvmEaYA/NSfFTAgdUSLAoVjaRJm7+6PvcM+q1zYOwS4wTYMF9w==", "dev": true, "license": "MIT", - "peer": true, "dependencies": { "csstype": "^3.2.2" } @@ -2278,7 +2261,6 @@ "integrity": "sha512-jp2L/eY6fn+KgVVQAOqYItbF0VY/YApe5Mz2F0aykSO8gx31bYCZyvSeYxCHKvzHG5eZjc+zyaS5BrBWya2+kQ==", "dev": true, "license": "MIT", - "peer": true, "peerDependencies": { "@types/react": "^19.2.0" } @@ -2318,7 +2300,6 @@ "integrity": "sha512-HPwA+hVkfcriajbNvTmZv4VRauibay+cWArYUYq7u7W7PmGShMxbPxLvrwDme55a6d5alG3nrYfhyJ/G28XlLg==", "dev": true, "license": "MIT", - "peer": true, "dependencies": { "@typescript-eslint/scope-manager": "8.59.3", "@typescript-eslint/types": "8.59.3", @@ -2523,7 +2504,6 @@ "integrity": "sha512-36l628fQ/9a/8ihy97eOtEnvWQEdqULQOJtcaxtoNq0G1w3Mxd4szSahOaMM9/NGyZ+hyKcMtIW/WIxq0XQViQ==", "dev": true, "license": "MIT", - "peer": true, "dependencies": { "@bcoe/v8-coverage": "^1.0.2", "@vitest/utils": "4.1.6", @@ -2668,7 +2648,6 @@ "integrity": "sha512-UVJyE9MttOsBQIDKw1skb9nAwQuR5wuGD3+82K6JgJlm/Y+KI92oNsMNGZCYdDsVtRHSak0pcV5Dno5+4jh9sw==", "dev": true, "license": "MIT", - "peer": true, "bin": { "acorn": "bin/acorn" }, @@ -3208,7 +3187,6 @@ "dev": true, "hasInstallScript": true, "license": "MIT", - "peer": true, "bin": { "esbuild": "bin/esbuild" }, @@ -3273,7 +3251,6 @@ "integrity": "sha512-XoMjdBOwe/esVgEvLmNsD3IRHkm7fbKIUGvrleloJXUZgDHig2IPWNniv+GwjyJXzuNqVjlr5+4yVUZjycJwfQ==", "dev": true, "license": "MIT", - "peer": true, "dependencies": { "@eslint-community/eslint-utils": "^4.8.0", "@eslint-community/regexpp": "^4.12.1", @@ -3894,7 +3871,6 @@ "integrity": "sha512-ECi4Fi2f7BdJtUKTflYRTiaMxIB0O6zfR1fX0GXpUrf6flp8QIYn1UT20YQqdSOfk2dfkCwS8LAFoJDEppNK5Q==", "dev": true, "license": "MIT", - "peer": true, "dependencies": { "@asamuzakjp/css-color": "^5.1.11", "@asamuzakjp/dom-selector": "^7.1.1", @@ -4353,7 +4329,6 @@ "integrity": "sha512-jcByLnIFkd5gSXZmjNvS1TlmRhCXZjIzHYlaGkPlLIekG55JDR2Z4va9tZwCiP+/RDERiNhMOFu01xd6O5ct1Q==", "dev": true, "license": "MIT", - "peer": true, "bin": { "marked": "bin/marked.js" }, @@ -4687,7 +4662,6 @@ "integrity": "sha512-QP88BAKvMam/3NxH6vj2o21R6MjxZUAd6nlwAS/pnGvN9IVLocLHxGYIzFhg6fUQ+5th6P4dv4eW9jX3DSIj7A==", "dev": true, "license": "MIT", - "peer": true, "engines": { "node": ">=12" }, @@ -4737,7 +4711,6 @@ } ], "license": "MIT", - "peer": true, "dependencies": { "nanoid": "^3.3.11", "picocolors": "^1.1.1", @@ -4882,7 +4855,6 @@ "integrity": "sha512-sfWGGfavi0xr8Pg0sVsyHMAOziVYKgPLNrS7ig+ivMNb3wbCBw3KxtflsGBAwD3gYQlE/AEZsTLgToRrSCjb0Q==", "dev": true, "license": "MIT", - "peer": true, "engines": { "node": ">=0.10.0" } @@ -4893,7 +4865,6 @@ "integrity": "sha512-0prMI+hvBbPjsWnxDLxlCGyM8PN6UuWjEUCYmZhO67xIV9Xasa/r/vDnq+Xyq4Lo27g8QSbO5YzARu0D1Sps3g==", "dev": true, "license": "MIT", - "peer": true, "dependencies": { "scheduler": "^0.27.0" }, @@ -5519,7 +5490,6 @@ "integrity": "sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw==", "dev": true, "license": "Apache-2.0", - "peer": true, "bin": { "tsc": "bin/tsc", "tsserver": "bin/tsserver" @@ -5588,7 +5558,6 @@ "integrity": "sha512-w2dDofOWv2QB09ZITZBsvKTVAlYvPR4IAmrY/v0ir9KvLs0xybR7i48wxhM1/oyBWO34wPns+bPGw5ZrZqDpZg==", "dev": true, "license": "MIT", - "peer": true, "dependencies": { "lightningcss": "^1.32.0", "picomatch": "^4.0.4", @@ -5667,7 +5636,6 @@ "integrity": "sha512-6lvjbS3p9b4CrdCmguzbh2/4uoXhGE2q71R4OX5sqF9R1bo9Xd6fGrMAfvp5wnCzlBnFVdCOp6onuTQVbo8iUQ==", "dev": true, "license": "MIT", - "peer": true, "dependencies": { "@vitest/expect": "4.1.6", "@vitest/mocker": "4.1.6",