@newrelic/preflight 1.6.5 → 1.6.6
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/config.js +4 -4
- package/dist/config.js.map +1 -1
- package/dist/shared/config.d.ts +0 -5
- package/dist/shared/config.d.ts.map +1 -1
- package/dist/shared/config.js +5 -12
- package/dist/shared/config.js.map +1 -1
- package/dist/shared/errors.d.ts +0 -6
- package/dist/shared/errors.d.ts.map +1 -1
- package/dist/shared/errors.js +15 -15
- package/dist/shared/errors.js.map +1 -1
- package/dist/shared/events/factory.d.ts.map +1 -1
- package/dist/shared/events/factory.js +31 -12
- package/dist/shared/events/factory.js.map +1 -1
- package/dist/shared/events/serialize.d.ts +10 -11
- package/dist/shared/events/serialize.d.ts.map +1 -1
- package/dist/shared/events/serialize.js +23 -24
- package/dist/shared/events/serialize.js.map +1 -1
- package/dist/shared/harvest/event-buffer.d.ts +2 -3
- package/dist/shared/harvest/event-buffer.d.ts.map +1 -1
- package/dist/shared/harvest/event-buffer.js +7 -8
- package/dist/shared/harvest/event-buffer.js.map +1 -1
- package/dist/shared/harvest/harvest-scheduler.d.ts +4 -7
- package/dist/shared/harvest/harvest-scheduler.d.ts.map +1 -1
- package/dist/shared/harvest/harvest-scheduler.js +10 -38
- package/dist/shared/harvest/harvest-scheduler.js.map +1 -1
- package/dist/shared/harvest/metric-aggregator.d.ts +9 -24
- package/dist/shared/harvest/metric-aggregator.d.ts.map +1 -1
- package/dist/shared/harvest/metric-aggregator.js +16 -25
- package/dist/shared/harvest/metric-aggregator.js.map +1 -1
- package/dist/shared/logger.d.ts.map +1 -1
- package/dist/shared/logger.js +3 -10
- package/dist/shared/logger.js.map +1 -1
- package/dist/shared/pricing-data.d.ts.map +1 -1
- package/dist/shared/pricing-data.js +19 -18
- package/dist/shared/pricing-data.js.map +1 -1
- package/dist/shared/pricing.d.ts +10 -9
- package/dist/shared/pricing.d.ts.map +1 -1
- package/dist/shared/pricing.js +8 -5
- package/dist/shared/pricing.js.map +1 -1
- package/dist/shared/redact.d.ts.map +1 -1
- package/dist/shared/redact.js +19 -4
- package/dist/shared/redact.js.map +1 -1
- package/dist/shared/timing.d.ts +1 -1
- package/dist/shared/timing.d.ts.map +1 -1
- package/dist/shared/timing.js +5 -14
- package/dist/shared/timing.js.map +1 -1
- package/dist/shared/tokens.d.ts.map +1 -1
- package/dist/shared/tokens.js +0 -9
- package/dist/shared/tokens.js.map +1 -1
- package/dist/shared/transport/http-client.d.ts.map +1 -1
- package/dist/shared/transport/http-client.js +1 -12
- package/dist/shared/transport/http-client.js.map +1 -1
- package/dist/shared/transport/metric-api.d.ts +0 -6
- package/dist/shared/transport/metric-api.d.ts.map +1 -1
- package/dist/shared/transport/metric-api.js +0 -6
- package/dist/shared/transport/metric-api.js.map +1 -1
- package/dist/shared/transport/otlp-event-bridge.d.ts.map +1 -1
- package/dist/shared/transport/otlp-event-bridge.js +3 -0
- package/dist/shared/transport/otlp-event-bridge.js.map +1 -1
- package/dist/shared/transport/otlp-transport.js +1 -1
- package/dist/shared/transport/otlp-transport.js.map +1 -1
- package/dist/shared/transport/types.d.ts +4 -6
- package/dist/shared/transport/types.d.ts.map +1 -1
- package/package.json +1 -1
|
@@ -28,11 +28,9 @@ export declare class MetricAggregator {
|
|
|
28
28
|
private buckets;
|
|
29
29
|
/**
|
|
30
30
|
* Number of `record()` calls rejected since the last `drainDropCount()`.
|
|
31
|
-
* Incremented on non-finite values and invalid attribute types.
|
|
32
|
-
*
|
|
33
|
-
* `
|
|
34
|
-
* gauge each harvest tick — operators currently see only `logger.warn`
|
|
35
|
-
* spam, with no aggregate count of "we silently dropped N samples".
|
|
31
|
+
* Incremented on non-finite values and invalid attribute types. Mirrors
|
|
32
|
+
* the pattern in `EventBuffer.dropCount` so `HarvestScheduler` can emit a
|
|
33
|
+
* `nr.ai.dropped_metrics` self-monitoring gauge each harvest tick.
|
|
36
34
|
*/
|
|
37
35
|
private droppedCount;
|
|
38
36
|
constructor();
|
|
@@ -41,10 +39,9 @@ export declare class MetricAggregator {
|
|
|
41
39
|
*
|
|
42
40
|
* Returns `true` when the sample was accepted into a bucket, and `false`
|
|
43
41
|
* when it was rejected (non-finite value or invalid attribute type) per
|
|
44
|
-
* the strict validation contract. The boolean return surface
|
|
45
|
-
*
|
|
46
|
-
*
|
|
47
|
-
* that ignore the return value see unchanged behavior.
|
|
42
|
+
* the strict validation contract. The boolean return surface exposes the
|
|
43
|
+
* rejection signal so callers can implement backpressure or surface
|
|
44
|
+
* invalid-input metrics.
|
|
48
45
|
*/
|
|
49
46
|
record(name: string, value: number, attributes?: Record<string, MetricAttributeValue>): boolean;
|
|
50
47
|
/**
|
|
@@ -87,26 +84,14 @@ export declare class MetricAggregator {
|
|
|
87
84
|
*
|
|
88
85
|
* Public so consumers can build self-monitoring metrics on top of the
|
|
89
86
|
* aggregator (e.g. emit `harvest.metric_aggregator.bucket_count` to NR
|
|
90
|
-
* each tick to detect cardinality explosions).
|
|
91
|
-
* `metric-aggregator.test.ts` to verify post-`harvest()` state.
|
|
92
|
-
*
|
|
93
|
-
* Not used by `HarvestScheduler` today; surfacing it (rather than dropping
|
|
94
|
-
* the accessor) keeps the surface stable for the
|
|
95
|
-
* self-monitoring work.
|
|
87
|
+
* each tick to detect cardinality explosions).
|
|
96
88
|
*/
|
|
97
89
|
get bucketCount(): number;
|
|
98
90
|
}
|
|
99
91
|
/**
|
|
100
92
|
* Convert each {@link MetricSnapshot} to a single wire-format `NrMetric` of
|
|
101
|
-
* type `'summary'
|
|
102
|
-
*
|
|
103
|
-
* Previously this function emitted four separate metrics per snapshot
|
|
104
|
-
* (`{name}.count`, `.sum`, `.min`, `.max`) — three of them as `gauge` (which
|
|
105
|
-
* is semantically wrong for a delta-aggregated value) and one as `count`
|
|
106
|
-
* (without the required `interval.ms` field). The summary type collapses
|
|
107
|
-
* those four into one record carrying `{ count, sum, min, max }` plus the
|
|
108
|
-
* harvest interval, halving payload cardinality and producing correct
|
|
109
|
-
* NR-side aggregate stats.
|
|
93
|
+
* type `'summary'`, carrying `{ count, sum, min, max }` plus the harvest
|
|
94
|
+
* interval.
|
|
110
95
|
*
|
|
111
96
|
* @param intervalMs Harvest interval in ms — appears on the wire as
|
|
112
97
|
* `interval.ms` per NR's Metric API contract.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"metric-aggregator.d.ts","sourceRoot":"","sources":["../../../src/shared/harvest/metric-aggregator.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AAKtD,MAAM,WAAW,iBAAiB;IAChC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;CACtB;AAED;;;;;GAKG;AACH,MAAM,MAAM,oBAAoB,GAAG,MAAM,GAAG,MAAM,GAAG,OAAO,CAAC;AAE7D;;;;;;;GAOG;AACH,MAAM,WAAW,cAAe,SAAQ,iBAAiB;IACvD,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,oBAAoB,CAAC,CAAC;CAC3D;
|
|
1
|
+
{"version":3,"file":"metric-aggregator.d.ts","sourceRoot":"","sources":["../../../src/shared/harvest/metric-aggregator.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AAKtD,MAAM,WAAW,iBAAiB;IAChC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;CACtB;AAED;;;;;GAKG;AACH,MAAM,MAAM,oBAAoB,GAAG,MAAM,GAAG,MAAM,GAAG,OAAO,CAAC;AAE7D;;;;;;;GAOG;AACH,MAAM,WAAW,cAAe,SAAQ,iBAAiB;IACvD,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,oBAAoB,CAAC,CAAC;CAC3D;AAyDD,qBAAa,gBAAgB;IAC3B,OAAO,CAAC,OAAO,CAAsB;IACrC;;;;;OAKG;IACH,OAAO,CAAC,YAAY,CAAK;;IAMzB;;;;;;;;OAQG;IACH,MAAM,CACJ,IAAI,EAAE,MAAM,EACZ,KAAK,EAAE,MAAM,EACb,UAAU,GAAE,MAAM,CAAC,MAAM,EAAE,oBAAoB,CAAM,GACpD,OAAO;IA+CV;;;;;;;;;;OAUG;IACH,gBAAgB,IAAI,cAAc,EAAE;IAiBpC;;;;;OAKG;IACH,KAAK,CAAC,SAAS,EAAE,SAAS,cAAc,EAAE,GAAG,IAAI;IAqCjD,OAAO,CAAC,UAAU,EAAE,MAAM,GAAG,QAAQ,EAAE;IAIvC;;;;;;OAMG;IACH,IAAI,SAAS,IAAI,MAAM,CAEtB;IAED;;;;;OAKG;IACH,cAAc,IAAI,MAAM;IAMxB;;;;;;OAMG;IACH,IAAI,WAAW,IAAI,MAAM,CAExB;CACF;AAED;;;;;;;GAOG;AACH,wBAAgB,oBAAoB,CAClC,SAAS,EAAE,SAAS,cAAc,EAAE,EACpC,UAAU,EAAE,MAAM,EAClB,SAAS,GAAE,MAAmB,GAC7B,QAAQ,EAAE,CAkBZ"}
|
|
@@ -32,6 +32,9 @@ function escapeKeyPart(s) {
|
|
|
32
32
|
return s.replace(/[|=&]/g, (c) => '%' + c.charCodeAt(0).toString(16).toUpperCase());
|
|
33
33
|
}
|
|
34
34
|
function makeKey(name, attributes) {
|
|
35
|
+
// Sort so attribute insertion order doesn't affect bucket identity —
|
|
36
|
+
// otherwise {a:1,b:2} and {b:2,a:1} would key differently and silently
|
|
37
|
+
// fragment into separate buckets depending on caller insertion order.
|
|
35
38
|
const sorted = Object.entries(attributes).sort(([a], [b]) => (a < b ? -1 : a > b ? 1 : 0));
|
|
36
39
|
return (escapeKeyPart(name) +
|
|
37
40
|
'|' +
|
|
@@ -41,11 +44,9 @@ export class MetricAggregator {
|
|
|
41
44
|
buckets;
|
|
42
45
|
/**
|
|
43
46
|
* Number of `record()` calls rejected since the last `drainDropCount()`.
|
|
44
|
-
* Incremented on non-finite values and invalid attribute types.
|
|
45
|
-
*
|
|
46
|
-
* `
|
|
47
|
-
* gauge each harvest tick — operators currently see only `logger.warn`
|
|
48
|
-
* spam, with no aggregate count of "we silently dropped N samples".
|
|
47
|
+
* Incremented on non-finite values and invalid attribute types. Mirrors
|
|
48
|
+
* the pattern in `EventBuffer.dropCount` so `HarvestScheduler` can emit a
|
|
49
|
+
* `nr.ai.dropped_metrics` self-monitoring gauge each harvest tick.
|
|
49
50
|
*/
|
|
50
51
|
droppedCount = 0;
|
|
51
52
|
constructor() {
|
|
@@ -56,10 +57,9 @@ export class MetricAggregator {
|
|
|
56
57
|
*
|
|
57
58
|
* Returns `true` when the sample was accepted into a bucket, and `false`
|
|
58
59
|
* when it was rejected (non-finite value or invalid attribute type) per
|
|
59
|
-
* the strict validation contract. The boolean return surface
|
|
60
|
-
*
|
|
61
|
-
*
|
|
62
|
-
* that ignore the return value see unchanged behavior.
|
|
60
|
+
* the strict validation contract. The boolean return surface exposes the
|
|
61
|
+
* rejection signal so callers can implement backpressure or surface
|
|
62
|
+
* invalid-input metrics.
|
|
63
63
|
*/
|
|
64
64
|
record(name, value, attributes = {}) {
|
|
65
65
|
if (!Number.isFinite(value)) {
|
|
@@ -140,7 +140,10 @@ export class MetricAggregator {
|
|
|
140
140
|
for (const s of snapshots) {
|
|
141
141
|
// Guard against corrupt snapshots (e.g. built manually — the type is
|
|
142
142
|
// exported). A negative count or non-finite sum would permanently corrupt
|
|
143
|
-
// the bucket's accumulators.
|
|
143
|
+
// the bucket's accumulators. Unlike record(), corruption here is
|
|
144
|
+
// silently discarded without logging/counting against droppedCount —
|
|
145
|
+
// merge() only ever receives our own previously-harvested snapshots,
|
|
146
|
+
// so corruption here would mean an internal bug, not bad caller input.
|
|
144
147
|
if (!Number.isFinite(s.sum) ||
|
|
145
148
|
!Number.isFinite(s.min) ||
|
|
146
149
|
!Number.isFinite(s.max) ||
|
|
@@ -197,12 +200,7 @@ export class MetricAggregator {
|
|
|
197
200
|
*
|
|
198
201
|
* Public so consumers can build self-monitoring metrics on top of the
|
|
199
202
|
* aggregator (e.g. emit `harvest.metric_aggregator.bucket_count` to NR
|
|
200
|
-
* each tick to detect cardinality explosions).
|
|
201
|
-
* `metric-aggregator.test.ts` to verify post-`harvest()` state.
|
|
202
|
-
*
|
|
203
|
-
* Not used by `HarvestScheduler` today; surfacing it (rather than dropping
|
|
204
|
-
* the accessor) keeps the surface stable for the
|
|
205
|
-
* self-monitoring work.
|
|
203
|
+
* each tick to detect cardinality explosions).
|
|
206
204
|
*/
|
|
207
205
|
get bucketCount() {
|
|
208
206
|
return this.buckets.size;
|
|
@@ -210,15 +208,8 @@ export class MetricAggregator {
|
|
|
210
208
|
}
|
|
211
209
|
/**
|
|
212
210
|
* Convert each {@link MetricSnapshot} to a single wire-format `NrMetric` of
|
|
213
|
-
* type `'summary'
|
|
214
|
-
*
|
|
215
|
-
* Previously this function emitted four separate metrics per snapshot
|
|
216
|
-
* (`{name}.count`, `.sum`, `.min`, `.max`) — three of them as `gauge` (which
|
|
217
|
-
* is semantically wrong for a delta-aggregated value) and one as `count`
|
|
218
|
-
* (without the required `interval.ms` field). The summary type collapses
|
|
219
|
-
* those four into one record carrying `{ count, sum, min, max }` plus the
|
|
220
|
-
* harvest interval, halving payload cardinality and producing correct
|
|
221
|
-
* NR-side aggregate stats.
|
|
211
|
+
* type `'summary'`, carrying `{ count, sum, min, max }` plus the harvest
|
|
212
|
+
* interval.
|
|
222
213
|
*
|
|
223
214
|
* @param intervalMs Harvest interval in ms — appears on the wire as
|
|
224
215
|
* `interval.ms` per NR's Metric API contract.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"metric-aggregator.js","sourceRoot":"","sources":["../../../src/shared/harvest/metric-aggregator.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAE5C,MAAM,MAAM,GAAG,YAAY,CAAC,mBAAmB,CAAC,CAAC;AAyCjD,SAAS,qBAAqB,CAAC,CAAU;IACvC,MAAM,CAAC,GAAG,OAAO,CAAC,CAAC;IACnB,IAAI,CAAC,KAAK,QAAQ,IAAI,CAAC,KAAK,SAAS;QAAE,OAAO,IAAI,CAAC;IACnD,IAAI,CAAC,KAAK,QAAQ;QAAE,OAAO,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;IAC9C,OAAO,KAAK,CAAC;AACf,CAAC;AAED;;;;GAIG;AACH,SAAS,oBAAoB,CAAC,CAAuB;IACnD,QAAQ,OAAO,CAAC,EAAE,CAAC;QACjB,KAAK,QAAQ;YACX,OAAO,KAAK,CAAC,EAAE,CAAC;QAClB,KAAK,QAAQ;YACX,OAAO,KAAK,CAAC,EAAE,CAAC;QAClB,KAAK,SAAS;YACZ,OAAO,KAAK,CAAC,EAAE,CAAC;IACpB,CAAC;AACH,CAAC;AAED,mEAAmE;AACnE,yEAAyE;AACzE,+EAA+E;AAC/E,sEAAsE;AACtE,wEAAwE;AACxE,SAAS,aAAa,CAAC,CAAS;IAC9B,OAAO,CAAC,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,GAAG,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,WAAW,EAAE,CAAC,CAAC;AACtF,CAAC;AAED,SAAS,OAAO,CAAC,IAAY,EAAE,UAAgD;IAC7E,MAAM,MAAM,GAAG,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAC3F,OAAO,CACL,aAAa,CAAC,IAAI,CAAC;QACnB,GAAG;QACH,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,aAAa,CAAC,CAAC,CAAC,IAAI,oBAAoB,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CACnF,CAAC;AACJ,CAAC;AAED,MAAM,OAAO,gBAAgB;IACnB,OAAO,CAAsB;IACrC
|
|
1
|
+
{"version":3,"file":"metric-aggregator.js","sourceRoot":"","sources":["../../../src/shared/harvest/metric-aggregator.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logger.d.ts","sourceRoot":"","sources":["../../src/shared/logger.ts"],"names":[],"mappings":"AAEA,MAAM,MAAM,QAAQ,GAAG,OAAO,GAAG,MAAM,GAAG,MAAM,GAAG,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"logger.d.ts","sourceRoot":"","sources":["../../src/shared/logger.ts"],"names":[],"mappings":"AAEA,MAAM,MAAM,QAAQ,GAAG,OAAO,GAAG,MAAM,GAAG,MAAM,GAAG,OAAO,CAAC;AA+C3D;;;;;;;;GAQG;AACH,wBAAgB,oBAAoB,IAAI,IAAI,CAE3C;AAED,MAAM,WAAW,MAAM;IACrB,KAAK,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,CAAC;IAC7D,IAAI,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,CAAC;IAC5D,IAAI,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,CAAC;IAC5D,KAAK,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,CAAC;IAC7D;;;;;;;;;;;;;;;;OAgBG;IACH,KAAK,CAAC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,CAAC;CACjD;AAED;;;;;;;;;;;;;;;;;;GAkBG;AACH,wBAAgB,YAAY,CAAC,SAAS,EAAE,MAAM,EAAE,aAAa,CAAC,EAAE,QAAQ,GAAG,MAAM,CAEhF"}
|
package/dist/shared/logger.js
CHANGED
|
@@ -5,21 +5,14 @@ const LOG_LEVEL_ORDER = {
|
|
|
5
5
|
warn: 2,
|
|
6
6
|
error: 3,
|
|
7
7
|
};
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
* `envLevel in LOG_LEVEL_ORDER` check + `as LogLevel` cast was sound at
|
|
11
|
-
* runtime today but the cast hid the gap: TS can't narrow `string` to a
|
|
12
|
-
* literal union via `in`, so a refactor that broadened `LOG_LEVEL_ORDER`
|
|
13
|
-
* (e.g. added `trace`) would silently let `envLevel` flow through with
|
|
14
|
-
* the wrong type. Explicit type guard removes the cast and makes the
|
|
15
|
-
* literal-union membership check the single source of truth.
|
|
16
|
-
*/
|
|
8
|
+
// Explicit type guard so a future broadening of LOG_LEVEL_ORDER (e.g. adding
|
|
9
|
+
// 'trace') can't silently type-check as LogLevel via an `in` check + cast.
|
|
17
10
|
const LOG_LEVELS = ['debug', 'info', 'warn', 'error'];
|
|
18
11
|
function isLogLevel(value) {
|
|
19
12
|
return LOG_LEVELS.includes(value);
|
|
20
13
|
}
|
|
21
14
|
function resolveLogLevel() {
|
|
22
|
-
const envLevel = process.env.NEW_RELIC_AI_LOG_LEVEL?.toLowerCase();
|
|
15
|
+
const envLevel = process.env.NEW_RELIC_AI_LOG_LEVEL?.toLowerCase().trim();
|
|
23
16
|
if (envLevel !== undefined && isLogLevel(envLevel)) {
|
|
24
17
|
return envLevel;
|
|
25
18
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logger.js","sourceRoot":"","sources":["../../src/shared/logger.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAIrC,MAAM,eAAe,GAA6B;IAChD,KAAK,EAAE,CAAC;IACR,IAAI,EAAE,CAAC;IACP,IAAI,EAAE,CAAC;IACP,KAAK,EAAE,CAAC;CACT,CAAC;AAEF
|
|
1
|
+
{"version":3,"file":"logger.js","sourceRoot":"","sources":["../../src/shared/logger.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pricing-data.d.ts","sourceRoot":"","sources":["../../src/shared/pricing-data.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAejD,eAAO,MAAM,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAqBhD,CAAC;AAmBF,eAAO,MAAM,qBAAqB,EAAE,MAAM,CAAC,MAAM,EAAE,YAAY,
|
|
1
|
+
{"version":3,"file":"pricing-data.d.ts","sourceRoot":"","sources":["../../src/shared/pricing-data.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAejD,eAAO,MAAM,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAqBhD,CAAC;AAmBF,eAAO,MAAM,qBAAqB,EAAE,MAAM,CAAC,MAAM,EAAE,YAAY,CA4d9D,CAAC"}
|
|
@@ -6,7 +6,7 @@
|
|
|
6
6
|
// alias, the prefix-match heuristic in resolveModelPricing() prefers longer
|
|
7
7
|
// keys (dated suffixes like "-20250514") and silently returns LEGACY pricing,
|
|
8
8
|
// e.g. claude-opus-4 → claude-opus-4-20250514 ($15/$75) instead of the
|
|
9
|
-
// current claude-opus-4-
|
|
9
|
+
// current claude-opus-4-8 ($5/$25). That's a 3× cost overestimate.
|
|
10
10
|
//
|
|
11
11
|
// Resolution order in resolveModelPricing(): exact → alias → forward-prefix
|
|
12
12
|
// → reverse-prefix → null.
|
|
@@ -49,6 +49,9 @@ export const MODEL_ALIASES = {
|
|
|
49
49
|
// ---------------------------------------------------------------------------
|
|
50
50
|
export const DEFAULT_PRICING_TABLE = {
|
|
51
51
|
// ---- Anthropic (current generation) ----
|
|
52
|
+
// "Fable" — internal/beta codename for a Claude variant priced ahead of a
|
|
53
|
+
// public model-name announcement; update or remove once it ships under a
|
|
54
|
+
// public name.
|
|
52
55
|
'claude-fable-5': {
|
|
53
56
|
inputPerMTok: 10,
|
|
54
57
|
outputPerMTok: 50,
|
|
@@ -103,9 +106,10 @@ export const DEFAULT_PRICING_TABLE = {
|
|
|
103
106
|
contextWindow: 200_000,
|
|
104
107
|
},
|
|
105
108
|
// ---- Anthropic (legacy Claude 4 generation) ----
|
|
106
|
-
// These legacy entries are retained for historical-cost backfill.
|
|
107
|
-
//
|
|
108
|
-
// (e.g. `claude-opus-4` →
|
|
109
|
+
// These legacy entries are retained for historical-cost backfill. Most use
|
|
110
|
+
// the pre-1M-context window (200K); claude-opus-4-7 already had the
|
|
111
|
+
// 1M-context bump backported. Family-name routing (e.g. `claude-opus-4` →
|
|
112
|
+
// current generation) is handled by MODEL_ALIASES.
|
|
109
113
|
'claude-opus-4-7': {
|
|
110
114
|
inputPerMTok: 5,
|
|
111
115
|
outputPerMTok: 25,
|
|
@@ -138,13 +142,11 @@ export const DEFAULT_PRICING_TABLE = {
|
|
|
138
142
|
cacheCreationPerMTok: 6.25,
|
|
139
143
|
contextWindow: 200_000,
|
|
140
144
|
},
|
|
141
|
-
//
|
|
142
|
-
//
|
|
143
|
-
//
|
|
144
|
-
//
|
|
145
|
-
//
|
|
146
|
-
// If Anthropic releases a claude-opus-4-10 model, add an explicit alias
|
|
147
|
-
// before that model key appears in the table.
|
|
145
|
+
// This key uses a version-number suffix (-1), not an 8-digit date suffix,
|
|
146
|
+
// so DATED_SUFFIX_RE never strips it — it's ineligible as a reverse-prefix
|
|
147
|
+
// base. A future 'claude-opus-4-10' resolves via the dated-key + alias path
|
|
148
|
+
// instead (see pricing.test.ts "13b"), never through this entry — no
|
|
149
|
+
// action needed here when that model ships.
|
|
148
150
|
'claude-opus-4-1': {
|
|
149
151
|
inputPerMTok: 15,
|
|
150
152
|
outputPerMTok: 75,
|
|
@@ -263,11 +265,12 @@ export const DEFAULT_PRICING_TABLE = {
|
|
|
263
265
|
cacheReadPerMTok: 0.5,
|
|
264
266
|
contextWindow: 1_000_000,
|
|
265
267
|
// OpenAI long-context pricing is marginal: only tokens above 270k are
|
|
266
|
-
// billed at the tier rate — not the entire request.
|
|
268
|
+
// billed at the tier rate — not the entire request. Output always bills
|
|
269
|
+
// at outputPerMTok in marginal mode (see ModelPricing.tierMode), so no
|
|
270
|
+
// tierOutputPerMTok is set here — it would be dead data.
|
|
267
271
|
tierThreshold: 270_000,
|
|
268
272
|
tierMode: 'marginal',
|
|
269
273
|
tierInputPerMTok: 10,
|
|
270
|
-
tierOutputPerMTok: 45,
|
|
271
274
|
},
|
|
272
275
|
'gpt-5.4': {
|
|
273
276
|
inputPerMTok: 2.5,
|
|
@@ -277,7 +280,6 @@ export const DEFAULT_PRICING_TABLE = {
|
|
|
277
280
|
tierThreshold: 270_000,
|
|
278
281
|
tierMode: 'marginal',
|
|
279
282
|
tierInputPerMTok: 5,
|
|
280
|
-
tierOutputPerMTok: 22.5,
|
|
281
283
|
},
|
|
282
284
|
'gpt-5.4-mini': {
|
|
283
285
|
inputPerMTok: 0.75,
|
|
@@ -498,10 +500,9 @@ export const DEFAULT_PRICING_TABLE = {
|
|
|
498
500
|
outputPerMTok: 0.6,
|
|
499
501
|
contextWindow: 128_000,
|
|
500
502
|
},
|
|
501
|
-
// `command` and `command-light` are deprecated (2024)
|
|
502
|
-
//
|
|
503
|
-
//
|
|
504
|
-
// approximation in the original entry was off by 96 tokens.
|
|
503
|
+
// `command` and `command-light` are deprecated (2024) but retained for
|
|
504
|
+
// historical-cost backfill of consumer apps that haven't migrated.
|
|
505
|
+
// Context window is 4096 tokens, not the round number 4000.
|
|
505
506
|
command: {
|
|
506
507
|
inputPerMTok: 1,
|
|
507
508
|
outputPerMTok: 2,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pricing-data.js","sourceRoot":"","sources":["../../src/shared/pricing-data.ts"],"names":[],"mappings":"AAEA,8EAA8E;AAC9E,+CAA+C;AAC/C,EAAE;AACF,yEAAyE;AACzE,2EAA2E;AAC3E,4EAA4E;AAC5E,8EAA8E;AAC9E,uEAAuE;AACvE,mEAAmE;AACnE,EAAE;AACF,4EAA4E;AAC5E,2BAA2B;AAC3B,8EAA8E;AAC9E,MAAM,CAAC,MAAM,aAAa,GAA2B;IACnD,4BAA4B;IAC5B,eAAe,EAAE,iBAAiB;IAClC,iBAAiB,EAAE,mBAAmB;IACtC,gBAAgB,EAAE,kBAAkB;IACpC,kBAAkB,EAAE,2BAA2B;IAE/C,sCAAsC;IACtC,YAAY,EAAE,kBAAkB;IAChC,gBAAgB,EAAE,wBAAwB;IAC1C,uBAAuB,EAAE,+BAA+B;IACxD,gBAAgB,EAAE,wBAAwB;IAC1C,mEAAmE;IACnE,yEAAyE;IACzE,8DAA8D;IAC9D,YAAY,EAAE,gBAAgB;IAC9B,YAAY,EAAE,kBAAkB;IAEhC,+DAA+D;IAC/D,8DAA8D;IAC9D,OAAO,EAAE,SAAS;CACnB,CAAC;AAEF,8EAA8E;AAC9E,kDAAkD;AAClD,EAAE;AACF,yEAAyE;AACzE,oDAAoD;AACpD,2EAA2E;AAC3E,kDAAkD;AAClD,6CAA6C;AAC7C,6CAA6C;AAC7C,0DAA0D;AAC1D,EAAE;AACF,6EAA6E;AAC7E,8EAA8E;AAC9E,0EAA0E;AAC1E,iCAAiC;AACjC,8EAA8E;AAE9E,MAAM,CAAC,MAAM,qBAAqB,GAAiC;IACjE,2CAA2C;IAC3C,gBAAgB,EAAE;QAChB,YAAY,EAAE,EAAE;QAChB,aAAa,EAAE,EAAE;QACjB,eAAe,EAAE,EAAE;QACnB,gBAAgB,EAAE,CAAC;QACnB,oBAAoB,EAAE,IAAI;QAC1B,aAAa,EAAE,SAAS;KACzB;IACD,iBAAiB,EAAE;QACjB,YAAY,EAAE,CAAC;QACf,aAAa,EAAE,EAAE;QACjB,eAAe,EAAE,EAAE;QACnB,gBAAgB,EAAE,GAAG;QACrB,oBAAoB,EAAE,IAAI;QAC1B,aAAa,EAAE,SAAS;KACzB;IACD,sFAAsF;IACtF,iBAAiB,EAAE;QACjB,YAAY,EAAE,CAAC;QACf,aAAa,EAAE,EAAE;QACjB,eAAe,EAAE,EAAE;QACnB,gBAAgB,EAAE,GAAG;QACrB,oBAAoB,EAAE,GAAG;QACzB,aAAa,EAAE,SAAS;KACzB;IACD,mBAAmB,EAAE;QACnB,YAAY,EAAE,CAAC;QACf,aAAa,EAAE,EAAE;QACjB,eAAe,EAAE,EAAE;QACnB,gBAAgB,EAAE,GAAG;QACrB,oBAAoB,EAAE,IAAI;QAC1B,aAAa,EAAE,SAAS;KACzB;IACD,4EAA4E;IAC5E,+EAA+E;IAC/E,0EAA0E;IAC1E,8CAA8C;IAC9C,kBAAkB,EAAE;QAClB,YAAY,EAAE,CAAC;QACf,aAAa,EAAE,CAAC;QAChB,eAAe,EAAE,CAAC;QAClB,gBAAgB,EAAE,GAAG;QACrB,oBAAoB,EAAE,IAAI;QAC1B,aAAa,EAAE,OAAO;KACvB;IACD,2BAA2B,EAAE;QAC3B,YAAY,EAAE,CAAC;QACf,aAAa,EAAE,CAAC;QAChB,eAAe,EAAE,CAAC;QAClB,gBAAgB,EAAE,GAAG;QACrB,oBAAoB,EAAE,IAAI;QAC1B,aAAa,EAAE,OAAO;KACvB;IAED,mDAAmD;IACnD,
|
|
1
|
+
{"version":3,"file":"pricing-data.js","sourceRoot":"","sources":["../../src/shared/pricing-data.ts"],"names":[],"mappings":"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"}
|
package/dist/shared/pricing.d.ts
CHANGED
|
@@ -16,15 +16,15 @@ export interface ModelPricing {
|
|
|
16
16
|
* `'flat'` (current behavior, matches Gemini 1.5/2.5 Pro semantics).
|
|
17
17
|
*
|
|
18
18
|
* - `'flat'`: the **entire request** (input, output, thinking) is billed at
|
|
19
|
-
* the tier rates.
|
|
19
|
+
* the tier rates. Matches Gemini 1.5/2.5 Pro semantics.
|
|
20
20
|
* - `'marginal'`: only the **input tokens above the threshold** are billed
|
|
21
21
|
* at `tierInputPerMTok`; tokens up to the threshold use `inputPerMTok`.
|
|
22
22
|
* Output and thinking always use their base rates in this mode — the
|
|
23
23
|
* `tierOutputPerMTok` / `tierThinkingPerMTok` fields are ignored. This
|
|
24
|
-
* models providers that charge a higher rate purely for excess context
|
|
25
|
-
*
|
|
26
|
-
*
|
|
27
|
-
*
|
|
24
|
+
* models providers that charge a higher rate purely for excess context,
|
|
25
|
+
* e.g. OpenAI's gpt-5.5/gpt-5.4 long-context pricing. Do not set
|
|
26
|
+
* `tierOutputPerMTok`/`tierThinkingPerMTok` on a `'marginal'` entry —
|
|
27
|
+
* they would be dead data.
|
|
28
28
|
*/
|
|
29
29
|
readonly tierMode?: 'flat' | 'marginal';
|
|
30
30
|
}
|
|
@@ -118,12 +118,13 @@ export declare function initPricing(customFilePath?: string | null): void;
|
|
|
118
118
|
* Resolve a model name against the default singleton pricing table.
|
|
119
119
|
*
|
|
120
120
|
* 1. Exact match (e.g. `claude-sonnet-4-20250514`)
|
|
121
|
-
* 2. Family-name alias (e.g. `claude-opus-4` → `claude-opus-4-
|
|
121
|
+
* 2. Family-name alias (e.g. `claude-opus-4` → `claude-opus-4-8`) — see
|
|
122
122
|
* MODEL_ALIASES in pricing-data.ts. Aliases are the *primary* mechanism
|
|
123
123
|
* for routing family names to current-generation pricing.
|
|
124
|
-
* 3. Forward prefix — table key starts with modelName
|
|
125
|
-
*
|
|
126
|
-
*
|
|
124
|
+
* 3. Forward prefix — table key starts with modelName followed by a
|
|
125
|
+
* digit-led suffix. No built-in model name exercises this today (every
|
|
126
|
+
* real family name already has an alias); reachable via a custom pricing
|
|
127
|
+
* entry whose key extends a shorter query name.
|
|
127
128
|
* 4. Reverse prefix — modelName starts with table key's base (date stripped)
|
|
128
129
|
* (e.g. `claude-opus-4-99` matches base `claude-opus-4` from a dated key)
|
|
129
130
|
* 5. Return `null` and log a warning if nothing matches.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pricing.d.ts","sourceRoot":"","sources":["../../src/shared/pricing.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAU9C,MAAM,WAAW,YAAY;IAC3B,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC;IAC9B,QAAQ,CAAC,aAAa,EAAE,MAAM,CAAC;IAC/B,QAAQ,CAAC,eAAe,CAAC,EAAE,MAAM,CAAC;IAClC,QAAQ,CAAC,gBAAgB,CAAC,EAAE,MAAM,CAAC;IACnC,QAAQ,CAAC,oBAAoB,CAAC,EAAE,MAAM,CAAC;IACvC,QAAQ,CAAC,aAAa,EAAE,MAAM,CAAC;IAC/B,sDAAsD;IACtD,QAAQ,CAAC,aAAa,CAAC,EAAE,MAAM,CAAC;IAChC,QAAQ,CAAC,gBAAgB,CAAC,EAAE,MAAM,CAAC;IACnC,QAAQ,CAAC,iBAAiB,CAAC,EAAE,MAAM,CAAC;IACpC,QAAQ,CAAC,mBAAmB,CAAC,EAAE,MAAM,CAAC;IACtC;;;;;;;;;;;;;;OAcG;IACH,QAAQ,CAAC,QAAQ,CAAC,EAAE,MAAM,GAAG,UAAU,CAAC;CACzC;AAED,MAAM,WAAW,aAAa;IAC5B,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,MAAM,CAAC;IACrB,gBAAgB,EAAE,MAAM,CAAC;IACzB,QAAQ,EAAE,MAAM,CAAC;IACjB,mBAAmB,EAAE,MAAM,CAAC;CAC7B;
|
|
1
|
+
{"version":3,"file":"pricing.d.ts","sourceRoot":"","sources":["../../src/shared/pricing.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAU9C,MAAM,WAAW,YAAY;IAC3B,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC;IAC9B,QAAQ,CAAC,aAAa,EAAE,MAAM,CAAC;IAC/B,QAAQ,CAAC,eAAe,CAAC,EAAE,MAAM,CAAC;IAClC,QAAQ,CAAC,gBAAgB,CAAC,EAAE,MAAM,CAAC;IACnC,QAAQ,CAAC,oBAAoB,CAAC,EAAE,MAAM,CAAC;IACvC,QAAQ,CAAC,aAAa,EAAE,MAAM,CAAC;IAC/B,sDAAsD;IACtD,QAAQ,CAAC,aAAa,CAAC,EAAE,MAAM,CAAC;IAChC,QAAQ,CAAC,gBAAgB,CAAC,EAAE,MAAM,CAAC;IACnC,QAAQ,CAAC,iBAAiB,CAAC,EAAE,MAAM,CAAC;IACpC,QAAQ,CAAC,mBAAmB,CAAC,EAAE,MAAM,CAAC;IACtC;;;;;;;;;;;;;;OAcG;IACH,QAAQ,CAAC,QAAQ,CAAC,EAAE,MAAM,GAAG,UAAU,CAAC;CACzC;AAED,MAAM,WAAW,aAAa;IAC5B,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,MAAM,CAAC;IACrB,gBAAgB,EAAE,MAAM,CAAC;IACzB,QAAQ,EAAE,MAAM,CAAC;IACjB,mBAAmB,EAAE,MAAM,CAAC;CAC7B;AAkMD;;;;;;;;;;;;;;;;;;;;;;GAsBG;AACH,wBAAgB,iBAAiB,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,YAAY,CAAC,GAAG,IAAI,CA4DvF;AAqCD;;;;;;;;;;;;;;;;GAgBG;AACH,qBAAa,YAAY;IACvB,OAAO,CAAC,KAAK,CAA+B;gBAEhC,cAAc,CAAC,EAAE,MAAM,GAAG,IAAI;IAgB1C;;;;OAIG;IACH,KAAK,CAAC,cAAc,CAAC,EAAE,MAAM,GAAG,IAAI,GAAG,IAAI;IAa3C;;;OAGG;IACH,OAAO,CAAC,SAAS,EAAE,MAAM,GAAG,YAAY,GAAG,IAAI;IA8E/C;;;OAGG;IACH,aAAa,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,UAAU,GAAG,aAAa;CAO/D;AAQD;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,WAAW,CAAC,cAAc,CAAC,EAAE,MAAM,GAAG,IAAI,GAAG,IAAI,CAEhE;AAED;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,mBAAmB,CAAC,SAAS,EAAE,MAAM,GAAG,YAAY,GAAG,IAAI,CAE1E;AAuFD;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,aAAa,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,UAAU,GAAG,aAAa,CAE7E"}
|
package/dist/shared/pricing.js
CHANGED
|
@@ -118,6 +118,9 @@ function validatePricingEntry(model, entry) {
|
|
|
118
118
|
});
|
|
119
119
|
return null;
|
|
120
120
|
}
|
|
121
|
+
// Note: does not warn when tierMode is 'marginal' but tierOutputPerMTok /
|
|
122
|
+
// tierThinkingPerMTok are also set — accepted but ignored as dead data by
|
|
123
|
+
// computeCost().
|
|
121
124
|
// Relational sanity checks — accept the entry but warn on configurations
|
|
122
125
|
// that almost always indicate a misconfiguration. These are warnings, not
|
|
123
126
|
// rejections: unusual but legitimate price structures (e.g. an experimental
|
|
@@ -327,7 +330,6 @@ export class PricingTable {
|
|
|
327
330
|
if (Object.hasOwn(this.table, modelName)) {
|
|
328
331
|
return { ...this.table[modelName] };
|
|
329
332
|
}
|
|
330
|
-
// 2. Family-name alias
|
|
331
333
|
const aliasTarget = MODEL_ALIASES[modelName];
|
|
332
334
|
if (aliasTarget && Object.hasOwn(this.table, aliasTarget)) {
|
|
333
335
|
return { ...this.table[aliasTarget] };
|
|
@@ -427,12 +429,13 @@ export function initPricing(customFilePath) {
|
|
|
427
429
|
* Resolve a model name against the default singleton pricing table.
|
|
428
430
|
*
|
|
429
431
|
* 1. Exact match (e.g. `claude-sonnet-4-20250514`)
|
|
430
|
-
* 2. Family-name alias (e.g. `claude-opus-4` → `claude-opus-4-
|
|
432
|
+
* 2. Family-name alias (e.g. `claude-opus-4` → `claude-opus-4-8`) — see
|
|
431
433
|
* MODEL_ALIASES in pricing-data.ts. Aliases are the *primary* mechanism
|
|
432
434
|
* for routing family names to current-generation pricing.
|
|
433
|
-
* 3. Forward prefix — table key starts with modelName
|
|
434
|
-
*
|
|
435
|
-
*
|
|
435
|
+
* 3. Forward prefix — table key starts with modelName followed by a
|
|
436
|
+
* digit-led suffix. No built-in model name exercises this today (every
|
|
437
|
+
* real family name already has an alias); reachable via a custom pricing
|
|
438
|
+
* entry whose key extends a shorter query name.
|
|
436
439
|
* 4. Reverse prefix — modelName starts with table key's base (date stripped)
|
|
437
440
|
* (e.g. `claude-opus-4-99` matches base `claude-opus-4` from a dated key)
|
|
438
441
|
* 5. Return `null` and log a warning if nothing matches.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pricing.js","sourceRoot":"","sources":["../../src/shared/pricing.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"pricing.js","sourceRoot":"","sources":["../../src/shared/pricing.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"redact.d.ts","sourceRoot":"","sources":["../../src/shared/redact.ts"],"names":[],"mappings":"AAeA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"redact.d.ts","sourceRoot":"","sources":["../../src/shared/redact.ts"],"names":[],"mappings":"AAeA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAoC/C;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,MAAM,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,GAAG,CAAC,CAErC;AA4CD;;;;;;;;;;GAUG;AACH,wBAAgB,UAAU,CAAC,MAAM,EAAE,WAAW,GAAG,QAAQ,CAAC,WAAW,CAAC,CAErE"}
|
package/dist/shared/redact.js
CHANGED
|
@@ -13,7 +13,7 @@
|
|
|
13
13
|
// AgentConfig, suitable for diagnostic dumps.
|
|
14
14
|
// ---------------------------------------------------------------------------
|
|
15
15
|
// Pattern notes:
|
|
16
|
-
// - `key(?!s)` matches `apiKey`, `licenseKey`, bare `key`, but NOT `keys` (plural).
|
|
16
|
+
// - `key(?!s)` matches `apiKey`, `licenseKey`, bare `key`, but NOT bare `keys` (plural).
|
|
17
17
|
// The `\b` word-boundary upgrade that was applied to `token\b` and
|
|
18
18
|
// `credentials?\b` cannot be applied here: CamelCase names like `licenseKey`
|
|
19
19
|
// and `apiKey` do NOT have a word boundary before the `K` (both sides are word chars),
|
|
@@ -21,12 +21,27 @@
|
|
|
21
21
|
// Mid-word false positives (`monkey`, `jockey`) are accepted in exchange for reliably
|
|
22
22
|
// redacting all camelCase key properties. A regex-only fix is not feasible without
|
|
23
23
|
// enumerating every legitimate CamelCase prefix, which would miss future additions.
|
|
24
|
+
// - `(?<=\w)keys\b` additionally matches plural COMPOUND forms — `apiKeys`,
|
|
25
|
+
// `license_keys` — where an actual array of secret key strings is a realistic
|
|
26
|
+
// shape. It does NOT match bare `keys` (nothing precedes it), which stays
|
|
27
|
+
// preserved: a standalone `keys` field is more often a list of identifiers
|
|
28
|
+
// (e.g. feature-flag names) than a list of secrets.
|
|
29
|
+
// Scope note: the lookbehind only requires *some* preceding word character,
|
|
30
|
+
// not specifically a camelCase/snake_case compound boundary — so plain
|
|
31
|
+
// English plurals ending in "keys" (`monkeys`, `jockeys`, `turkeys`) also
|
|
32
|
+
// match. That's an extension of the same mid-word false-positive trade-off
|
|
33
|
+
// already accepted above for `monkey`/`jockey` (singular); the failure
|
|
34
|
+
// direction is over-redaction, which is the safe side to err on.
|
|
24
35
|
// - `token\b` matches `apiToken`, `accessToken`, bare `token`, but NOT `tokenCount`,
|
|
25
|
-
// `tokenize`, `tokenAmount`, etc.
|
|
26
|
-
//
|
|
36
|
+
// `tokenize`, `tokenAmount`, etc. Deliberately NOT extended to plural `tokens`:
|
|
37
|
+
// this library's own domain is token *counting*, so `input_tokens`,
|
|
38
|
+
// `cacheReadTokens`, `thinkingTokens`, etc. are pervasive, legitimate,
|
|
39
|
+
// non-secret fields (see the dedicated test below.) Widening to catch
|
|
40
|
+
// plural secret-token arrays (e.g. `accessTokens`) would false-positive on
|
|
41
|
+
// those far more common count fields — an accepted, deliberate gap.
|
|
27
42
|
// - `credentials?\b` matches `credential` and `credentials`, but NOT `credentialType`,
|
|
28
43
|
// `credentialProvider`, etc. Same fix applied to `passwords?\b`.
|
|
29
|
-
const SECRET_KEY_RE = /key(?!s)|token\b|secret|passwords?\b|authorization|credentials?\b|bearer/i;
|
|
44
|
+
const SECRET_KEY_RE = /key(?!s)|(?<=\w)keys\b|token\b|secret|passwords?\b|authorization|credentials?\b|bearer/i;
|
|
30
45
|
const REDACTED = '***';
|
|
31
46
|
const MAX_DEPTH = 8;
|
|
32
47
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"redact.js","sourceRoot":"","sources":["../../src/shared/redact.ts"],"names":[],"mappings":"AAAA,8EAA8E;AAC9E,sEAAsE;AACtE,uEAAuE;AACvE,yEAAyE;AACzE,SAAS;AACT,EAAE;AACF,6EAA6E;AAC7E,2EAA2E;AAC3E,4EAA4E;AAC5E,2DAA2D;AAC3D,EAAE;AACF,8EAA8E;AAC9E,8CAA8C;AAC9C,8EAA8E;AAI9E,iBAAiB;AACjB,
|
|
1
|
+
{"version":3,"file":"redact.js","sourceRoot":"","sources":["../../src/shared/redact.ts"],"names":[],"mappings":"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"}
|
package/dist/shared/timing.d.ts
CHANGED
|
@@ -27,7 +27,7 @@ export interface RequestTimerMetrics {
|
|
|
27
27
|
* Assumes thinking does not overlap with content generation; see file header.
|
|
28
28
|
*/
|
|
29
29
|
readonly generationDurationMs: number;
|
|
30
|
-
/** Output tokens /
|
|
30
|
+
/** (Output tokens / durationMs) * 1000; null if outputTokens not provided. */
|
|
31
31
|
readonly tokensPerSecond: number | null;
|
|
32
32
|
/**
|
|
33
33
|
* Estimated SDK/network overhead — the wall-clock time the request spent
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"timing.d.ts","sourceRoot":"","sources":["../../src/shared/timing.ts"],"names":[],"mappings":"AA2BA,MAAM,WAAW,aAAa;IAC5B,mFAAmF;IACnF,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,mFAAmF;IACnF,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB,yBAAyB;IACzB,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;CAC7B;AAED,MAAM,WAAW,mBAAmB;IAClC,sCAAsC;IACtC,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;IAC5B,uEAAuE;IACvE,QAAQ,CAAC,kBAAkB,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3C;;;OAGG;IACH,QAAQ,CAAC,kBAAkB,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3C;;;;OAIG;IACH,QAAQ,CAAC,cAAc,EAAE,SAAS,aAAa,EAAE,CAAC;IAClD;;;OAGG;IACH,QAAQ,CAAC,oBAAoB,EAAE,MAAM,CAAC;IACtC,8EAA8E;IAC9E,QAAQ,CAAC,eAAe,EAAE,MAAM,GAAG,IAAI,CAAC;IACxC;;;;;;;;;OASG;IACH,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;CAC7B;AAWD,qBAAa,YAAY;IACvB,OAAO,CAAC,OAAO,CAAuB;IACtC,OAAO,CAAC,MAAM,CAAuB;IACrC,OAAO,CAAC,YAAY,CAAuB;IAC3C,qDAAqD;IACrD,OAAO,CAAC,SAAS,CAA0B;IAC3C,oCAAoC;IACpC,OAAO,CAAC,YAAY,CAAqB;IAEzC,oFAAoF;IACpF,KAAK,IAAI,IAAI;IAQb;;;;;OAKG;IACH,cAAc,IAAI,IAAI;IAQtB;;;;;;;;;OASG;IACH,iBAAiB,IAAI,IAAI;IAQzB;;;;;OAKG;IACH,eAAe,IAAI,IAAI;IASvB,kFAAkF;IAClF,IAAI,IAAI,IAAI;IAQZ;;;;;;;;;;;;OAYG;IACH,UAAU,CAAC,YAAY,CAAC,EAAE,MAAM,GAAG,mBAAmB;
|
|
1
|
+
{"version":3,"file":"timing.d.ts","sourceRoot":"","sources":["../../src/shared/timing.ts"],"names":[],"mappings":"AA2BA,MAAM,WAAW,aAAa;IAC5B,mFAAmF;IACnF,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,mFAAmF;IACnF,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB,yBAAyB;IACzB,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;CAC7B;AAED,MAAM,WAAW,mBAAmB;IAClC,sCAAsC;IACtC,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;IAC5B,uEAAuE;IACvE,QAAQ,CAAC,kBAAkB,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3C;;;OAGG;IACH,QAAQ,CAAC,kBAAkB,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3C;;;;OAIG;IACH,QAAQ,CAAC,cAAc,EAAE,SAAS,aAAa,EAAE,CAAC;IAClD;;;OAGG;IACH,QAAQ,CAAC,oBAAoB,EAAE,MAAM,CAAC;IACtC,8EAA8E;IAC9E,QAAQ,CAAC,eAAe,EAAE,MAAM,GAAG,IAAI,CAAC;IACxC;;;;;;;;;OASG;IACH,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;CAC7B;AAWD,qBAAa,YAAY;IACvB,OAAO,CAAC,OAAO,CAAuB;IACtC,OAAO,CAAC,MAAM,CAAuB;IACrC,OAAO,CAAC,YAAY,CAAuB;IAC3C,qDAAqD;IACrD,OAAO,CAAC,SAAS,CAA0B;IAC3C,oCAAoC;IACpC,OAAO,CAAC,YAAY,CAAqB;IAEzC,oFAAoF;IACpF,KAAK,IAAI,IAAI;IAQb;;;;;OAKG;IACH,cAAc,IAAI,IAAI;IAQtB;;;;;;;;;OASG;IACH,iBAAiB,IAAI,IAAI;IAQzB;;;;;OAKG;IACH,eAAe,IAAI,IAAI;IASvB,kFAAkF;IAClF,IAAI,IAAI,IAAI;IAQZ;;;;;;;;;;;;OAYG;IACH,UAAU,CAAC,YAAY,CAAC,EAAE,MAAM,GAAG,mBAAmB;CAoEvD"}
|