@fougere/observability 0.9.2-alpha.0 → 0.9.3-alpha.0
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/extension.d.ts +19 -0
- package/dist/extension.d.ts.map +1 -1
- package/dist/extension.js +29 -6
- package/dist/extension.js.map +1 -1
- package/dist/index.d.ts +84 -2
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +103 -10
- package/dist/index.js.map +1 -1
- package/dist/metrics.d.ts +13 -3
- package/dist/metrics.d.ts.map +1 -1
- package/dist/metrics.js +90 -20
- package/dist/metrics.js.map +1 -1
- package/dist/otlp.d.ts.map +1 -1
- package/dist/otlp.js +7 -1
- package/dist/otlp.js.map +1 -1
- package/package.json +14 -7
- package/src/extension.ts +50 -6
- package/src/index.ts +183 -10
- package/src/metrics.ts +96 -20
- package/src/otlp.ts +8 -1
package/dist/metrics.js
CHANGED
|
@@ -1,14 +1,25 @@
|
|
|
1
|
+
/** The four signals every service is judged on, derived from the span that already exists. */
|
|
2
|
+
import { declaredTopologyOf } from '@fougere/core';
|
|
1
3
|
import { activeCalls } from './index.js';
|
|
2
4
|
/**
|
|
3
|
-
* Bucket bounds in SECONDS, the
|
|
4
|
-
*
|
|
5
|
+
* Bucket bounds in SECONDS, and the operator's to choose — this is the default, not the rule.
|
|
6
|
+
*
|
|
7
|
+
* The OpenTelemetry recommendation for request durations: dense under 100 ms because that is
|
|
8
|
+
* where a healthy op lives, and open above 10 s. A system whose ops all cross two processes has
|
|
9
|
+
* its floor elsewhere and wastes half these buckets.
|
|
10
|
+
*
|
|
11
|
+
* Deliberately NOT derived per operation, though `reach` could: an explicit-bucket histogram only
|
|
12
|
+
* aggregates across series that share its bounds, so a panel asking for the p95 of the whole
|
|
13
|
+
* service — which sums over every op — would stop meaning anything, silently. One list per
|
|
14
|
+
* process is what keeps that reading honest. The number that IS per-op is the load threshold,
|
|
15
|
+
* where nothing aggregates.
|
|
5
16
|
*/
|
|
6
17
|
const BOUNDS = [0.005, 0.01, 0.025, 0.05, 0.075, 0.1, 0.25, 0.5, 0.75, 1, 2.5, 5, 7.5, 10];
|
|
7
18
|
/**
|
|
8
19
|
* `app` is optional and only feeds the topology: what fronds this process found, and which of them
|
|
9
20
|
* run elsewhere.
|
|
10
21
|
*/
|
|
11
|
-
export function metrics(app) {
|
|
22
|
+
export function metrics(app, bounds = BOUNDS) {
|
|
12
23
|
const since = Date.now();
|
|
13
24
|
const series = new Map();
|
|
14
25
|
/** Every frond this process has actually CALLED — the other half of the topology. */
|
|
@@ -17,6 +28,11 @@ export function metrics(app) {
|
|
|
17
28
|
const edges = new Map();
|
|
18
29
|
return {
|
|
19
30
|
sink: (span) => {
|
|
31
|
+
// The one reader that has to choose: a statement is a step, not a call this process
|
|
32
|
+
// answered. Counted here it would publish `select.post` as an operation nothing
|
|
33
|
+
// serves, and every topology and saturation figure would count it too.
|
|
34
|
+
if (span.kind !== 'operation')
|
|
35
|
+
return;
|
|
20
36
|
const key = `${span.entity}\0${span.operation}\0${span.error ?? ''}`;
|
|
21
37
|
let row = series.get(key);
|
|
22
38
|
if (!row) {
|
|
@@ -27,7 +43,10 @@ export function metrics(app) {
|
|
|
27
43
|
error: span.error,
|
|
28
44
|
count: 0,
|
|
29
45
|
sum: 0,
|
|
30
|
-
buckets: new Array(
|
|
46
|
+
buckets: new Array(bounds.length + 1).fill(0),
|
|
47
|
+
selfSum: 0,
|
|
48
|
+
selfBuckets: new Array(bounds.length + 1).fill(0),
|
|
49
|
+
statements: 0,
|
|
31
50
|
};
|
|
32
51
|
series.set(key, row);
|
|
33
52
|
}
|
|
@@ -44,13 +63,17 @@ export function metrics(app) {
|
|
|
44
63
|
const seconds = span.ms / 1000;
|
|
45
64
|
row.count += 1;
|
|
46
65
|
row.sum += seconds;
|
|
47
|
-
row.buckets[bucketOf(seconds)] += 1;
|
|
66
|
+
row.buckets[bucketOf(seconds, bounds)] += 1;
|
|
67
|
+
const self = span.selfMs / 1000;
|
|
68
|
+
row.selfSum += self;
|
|
69
|
+
row.selfBuckets[bucketOf(self, bounds)] += 1;
|
|
70
|
+
row.statements += span.statements;
|
|
48
71
|
},
|
|
49
72
|
snapshot: () => ({
|
|
50
73
|
since,
|
|
51
74
|
series: [...series.values()],
|
|
52
75
|
active: activeCalls(),
|
|
53
|
-
bounds:
|
|
76
|
+
bounds: [...bounds],
|
|
54
77
|
topology: topologyOf(app, seen),
|
|
55
78
|
edges: [...edges.values()],
|
|
56
79
|
}),
|
|
@@ -63,8 +86,14 @@ export function metrics(app) {
|
|
|
63
86
|
function topologyOf(app, seen) {
|
|
64
87
|
// What the app SERVES: a frond an extension brought is instrumentation, and reporting it
|
|
65
88
|
// would describe this package to itself.
|
|
89
|
+
//
|
|
90
|
+
// A frond named in `remotes:` is scanned when its code sits in the same project, and stays
|
|
91
|
+
// in `app.fronds` — the boot says `declared remote — not hosted locally` and keeps it. This
|
|
92
|
+
// half reports what RUNS here, so it is not one of them: it used to answer `local` for a
|
|
93
|
+
// frond every call reached over HTTP. Not a config-derived node either — it is named below
|
|
94
|
+
// only once it has answered, like any other remote.
|
|
66
95
|
const local = new Map((app?.fronds ?? [])
|
|
67
|
-
.filter((frond) => !frond.brought)
|
|
96
|
+
.filter((frond) => !frond.brought && !app?.remotes[frond.name])
|
|
68
97
|
.map((frond) => [frond.name, frond]));
|
|
69
98
|
const here = [...local.values()].map((frond) => ({
|
|
70
99
|
frond: frond.name,
|
|
@@ -80,17 +109,22 @@ function topologyOf(app, seen) {
|
|
|
80
109
|
return [...here, ...elsewhere];
|
|
81
110
|
}
|
|
82
111
|
/** The first bound this duration does not exceed, or the overflow bucket. */
|
|
83
|
-
function bucketOf(seconds) {
|
|
84
|
-
for (let i = 0; i <
|
|
85
|
-
if (seconds <=
|
|
112
|
+
function bucketOf(seconds, bounds) {
|
|
113
|
+
for (let i = 0; i < bounds.length; i++)
|
|
114
|
+
if (seconds <= bounds[i])
|
|
86
115
|
return i;
|
|
87
|
-
return
|
|
116
|
+
return bounds.length;
|
|
88
117
|
}
|
|
89
|
-
/**
|
|
118
|
+
/**
|
|
119
|
+
* Serve the topology on `rpc.topology` — read from inside the process it describes.
|
|
120
|
+
*
|
|
121
|
+
* The declared half is read at every call rather than once here: `reloadFougere()` builds the app
|
|
122
|
+
* again, and a config read at boot would keep answering for the app that was released.
|
|
123
|
+
*/
|
|
90
124
|
export function serveTopology(app, measured) {
|
|
91
125
|
app.serveRpc('topology', () => {
|
|
92
126
|
const { since, active, topology, edges } = measured.snapshot();
|
|
93
|
-
return { since, active, fronds: topology, edges };
|
|
127
|
+
return { since, active, fronds: topology, edges, declared: declaredTopologyOf(app) };
|
|
94
128
|
});
|
|
95
129
|
}
|
|
96
130
|
/** One snapshot, as OTLP/JSON spells metrics. Cumulative, which is what Prometheus reads. */
|
|
@@ -98,6 +132,14 @@ export function metricsPayload(service, snapshot) {
|
|
|
98
132
|
const since = `${snapshot.since * 1e6}`;
|
|
99
133
|
const now = `${Date.now() * 1e6}`;
|
|
100
134
|
const attr = (key, value) => ({ key, value: { stringValue: value } });
|
|
135
|
+
/** What an operation's three series are all sliced by — said once, so they stay comparable. */
|
|
136
|
+
const dimensions = (row) => [
|
|
137
|
+
...(row.frond ? [attr('fougere.frond', row.frond)] : []),
|
|
138
|
+
attr('fougere.entity', row.entity),
|
|
139
|
+
attr('fougere.operation', row.operation),
|
|
140
|
+
attr('fougere.outcome', row.error ? 'error' : 'ok'),
|
|
141
|
+
...(row.error ? [attr('fougere.error.code', row.error)] : []),
|
|
142
|
+
];
|
|
101
143
|
return {
|
|
102
144
|
resourceMetrics: [
|
|
103
145
|
{
|
|
@@ -116,13 +158,7 @@ export function metricsPayload(service, snapshot) {
|
|
|
116
158
|
// only temporality Prometheus reads without a collector in between.
|
|
117
159
|
aggregationTemporality: 2,
|
|
118
160
|
dataPoints: snapshot.series.map((row) => ({
|
|
119
|
-
attributes:
|
|
120
|
-
...(row.frond ? [attr('fougere.frond', row.frond)] : []),
|
|
121
|
-
attr('fougere.entity', row.entity),
|
|
122
|
-
attr('fougere.operation', row.operation),
|
|
123
|
-
attr('fougere.outcome', row.error ? 'error' : 'ok'),
|
|
124
|
-
...(row.error ? [attr('fougere.error.code', row.error)] : []),
|
|
125
|
-
],
|
|
161
|
+
attributes: dimensions(row),
|
|
126
162
|
startTimeUnixNano: since,
|
|
127
163
|
timeUnixNano: now,
|
|
128
164
|
count: `${row.count}`,
|
|
@@ -132,6 +168,40 @@ export function metricsPayload(service, snapshot) {
|
|
|
132
168
|
})),
|
|
133
169
|
},
|
|
134
170
|
},
|
|
171
|
+
{
|
|
172
|
+
name: 'fougere.operation.self',
|
|
173
|
+
description: 'How long an operation took on its own, with what it waited for taken out.',
|
|
174
|
+
unit: 's',
|
|
175
|
+
histogram: {
|
|
176
|
+
aggregationTemporality: 2,
|
|
177
|
+
dataPoints: snapshot.series.map((row) => ({
|
|
178
|
+
attributes: dimensions(row),
|
|
179
|
+
startTimeUnixNano: since,
|
|
180
|
+
timeUnixNano: now,
|
|
181
|
+
count: `${row.count}`,
|
|
182
|
+
sum: row.selfSum,
|
|
183
|
+
bucketCounts: row.selfBuckets.map((n) => `${n}`),
|
|
184
|
+
explicitBounds: snapshot.bounds,
|
|
185
|
+
})),
|
|
186
|
+
},
|
|
187
|
+
},
|
|
188
|
+
{
|
|
189
|
+
name: 'fougere.operation.statements',
|
|
190
|
+
description: 'Statements run under an operation. Against its count, statements per call.',
|
|
191
|
+
unit: '{statement}',
|
|
192
|
+
sum: {
|
|
193
|
+
aggregationTemporality: 2,
|
|
194
|
+
isMonotonic: true,
|
|
195
|
+
dataPoints: snapshot.series
|
|
196
|
+
.filter((row) => row.statements > 0)
|
|
197
|
+
.map((row) => ({
|
|
198
|
+
attributes: dimensions(row),
|
|
199
|
+
startTimeUnixNano: since,
|
|
200
|
+
timeUnixNano: now,
|
|
201
|
+
asInt: `${row.statements}`,
|
|
202
|
+
})),
|
|
203
|
+
},
|
|
204
|
+
},
|
|
135
205
|
{
|
|
136
206
|
name: 'fougere.operations.active',
|
|
137
207
|
description: 'Operations running right now — the saturation signal.',
|
package/dist/metrics.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"metrics.js","sourceRoot":"","sources":["../src/metrics.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"metrics.js","sourceRoot":"","sources":["../src/metrics.ts"],"names":[],"mappings":"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"}
|
package/dist/otlp.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"otlp.d.ts","sourceRoot":"","sources":["../src/otlp.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAgB,QAAQ,EAAE,MAAM,YAAY,CAAC;AACzD,OAAO,EAAkB,KAAK,OAAO,EAAE,MAAM,cAAc,CAAC;AAE5D,MAAM,WAAW,WAAW;IAC1B,wEAAwE;IACxE,OAAO,EAAE,MAAM,CAAC;IAChB,0EAA0E;IAC1E,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,4DAA4D;IAC5D,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,+FAA+F;IAC/F,OAAO,CAAC,EAAE,CAAC,GAAG,EAAE,OAAO,KAAK,IAAI,CAAC;IACjC,8CAA8C;IAC9C,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,oEAAoE;IACpE,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED,MAAM,WAAW,YAAY;IAC3B,wBAAwB;IACxB,IAAI,EAAE,QAAQ,CAAC;IACf,4EAA4E;IAC5E,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IACvB,4CAA4C;IAC5C,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CACvB;
|
|
1
|
+
{"version":3,"file":"otlp.d.ts","sourceRoot":"","sources":["../src/otlp.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAgB,QAAQ,EAAE,MAAM,YAAY,CAAC;AACzD,OAAO,EAAkB,KAAK,OAAO,EAAE,MAAM,cAAc,CAAC;AAE5D,MAAM,WAAW,WAAW;IAC1B,wEAAwE;IACxE,OAAO,EAAE,MAAM,CAAC;IAChB,0EAA0E;IAC1E,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,4DAA4D;IAC5D,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,+FAA+F;IAC/F,OAAO,CAAC,EAAE,CAAC,GAAG,EAAE,OAAO,KAAK,IAAI,CAAC;IACjC,8CAA8C;IAC9C,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,oEAAoE;IACpE,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED,MAAM,WAAW,YAAY;IAC3B,wBAAwB;IACxB,IAAI,EAAE,QAAQ,CAAC;IACf,4EAA4E;IAC5E,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IACvB,4CAA4C;IAC5C,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CACvB;AAUD,wBAAgB,IAAI,CAAC,OAAO,EAAE,WAAW,GAAG,YAAY,CA2BvD"}
|
package/dist/otlp.js
CHANGED
|
@@ -5,6 +5,9 @@ import { metricsPayload } from './metrics.js';
|
|
|
5
5
|
/** OTLP status codes: 0 unset, 1 ok, 2 error. */
|
|
6
6
|
const OK = 1;
|
|
7
7
|
const ERROR = 2;
|
|
8
|
+
/** OTLP span kinds, of the six only these two are ours. */
|
|
9
|
+
const INTERNAL = 1;
|
|
10
|
+
const CLIENT = 3;
|
|
8
11
|
export function otlp(options) {
|
|
9
12
|
const url = options.url ?? 'http://localhost:4318/v1/traces';
|
|
10
13
|
const traces = Endpoint.at(url, options.onError);
|
|
@@ -41,7 +44,10 @@ function payload(service, spans) {
|
|
|
41
44
|
spanId: span.spanId,
|
|
42
45
|
...(span.parentId ? { parentSpanId: span.parentId } : {}),
|
|
43
46
|
name: `${span.entity}.${span.operation}`,
|
|
44
|
-
|
|
47
|
+
// 1 INTERNAL, 3 CLIENT: a statement left this process for an engine, and a
|
|
48
|
+
// viewer draws the two differently. `selfMs` is NOT sent — a collector
|
|
49
|
+
// derives it from the tree it already holds.
|
|
50
|
+
kind: span.kind === 'statement' ? CLIENT : INTERNAL,
|
|
45
51
|
startTimeUnixNano: nanos(span.startedAt),
|
|
46
52
|
endTimeUnixNano: nanos(span.startedAt + span.ms),
|
|
47
53
|
status: span.error ? { code: ERROR, message: span.error } : { code: OK },
|
package/dist/otlp.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"otlp.js","sourceRoot":"","sources":["../src/otlp.ts"],"names":[],"mappings":"AAAA,6FAA6F;AAC7F,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAEzC,OAAO,EAAE,cAAc,EAAgB,MAAM,cAAc,CAAC;AA0B5D,iDAAiD;AACjD,MAAM,EAAE,GAAG,CAAC,CAAC;AACb,MAAM,KAAK,GAAG,CAAC,CAAC;AAEhB,MAAM,UAAU,IAAI,CAAC,OAAoB;IACvC,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,IAAI,iCAAiC,CAAC;IAC7D,MAAM,MAAM,GAAG,QAAQ,CAAC,EAAE,CAAC,GAAG,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;IACjD,MAAM,OAAO,GAAG,QAAQ,CAAC,EAAE,CACzB,OAAO,CAAC,UAAU,IAAI,GAAG,CAAC,OAAO,CAAC,eAAe,EAAE,aAAa,CAAC,EACjE,OAAO,CAAC,OAAO,CAChB,CAAC;IACF,IAAI,MAAM,GAAmB,EAAE,CAAC;IAEhC,KAAK,UAAU,KAAK;QAClB,MAAM,KAAK,GAAG,MAAM,CAAC;QACrB,MAAM,GAAG,EAAE,CAAC;QACZ,gFAAgF;QAChF,4CAA4C;QAC5C,MAAM,OAAO,CAAC,GAAG,CAAC;YAChB,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,EAAE;YACnF,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,OAAO,EAAE,OAAO,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,EAAE;SAChH,CAAC,CAAC;IACL,CAAC;IAED,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;IAEhD,OAAO;QACL,IAAI,EAAE,CAAC,IAAI,EAAE,EAAE,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QACtC,KAAK;QACL,IAAI,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,IAAI,EAAE;KACxB,CAAC;AACJ,CAAC;AAED,wFAAwF;AACxF,SAAS,OAAO,CAAC,OAAe,EAAE,KAAqB;IACrD,OAAO;QACL,aAAa,EAAE;YACb;gBACE,QAAQ,EAAE,EAAE,UAAU,EAAE,CAAC,EAAE,GAAG,EAAE,cAAc,EAAE,KAAK,EAAE,EAAE,WAAW,EAAE,OAAO,EAAE,EAAE,CAAC,EAAE;gBACpF,UAAU,EAAE;oBACV;wBACE,KAAK,EAAE,EAAE,IAAI,EAAE,wBAAwB,EAAE;wBACzC,KAAK,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;4BAC1B,OAAO,EAAE,IAAI,CAAC,OAAO;4BACrB,MAAM,EAAE,IAAI,CAAC,MAAM;4BACnB,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,YAAY,EAAE,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;4BACzD,IAAI,EAAE,GAAG,IAAI,CAAC,MAAM,IAAI,IAAI,CAAC,SAAS,EAAE;4BACxC,IAAI,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"otlp.js","sourceRoot":"","sources":["../src/otlp.ts"],"names":[],"mappings":"AAAA,6FAA6F;AAC7F,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAEzC,OAAO,EAAE,cAAc,EAAgB,MAAM,cAAc,CAAC;AA0B5D,iDAAiD;AACjD,MAAM,EAAE,GAAG,CAAC,CAAC;AACb,MAAM,KAAK,GAAG,CAAC,CAAC;AAEhB,2DAA2D;AAC3D,MAAM,QAAQ,GAAG,CAAC,CAAC;AACnB,MAAM,MAAM,GAAG,CAAC,CAAC;AAEjB,MAAM,UAAU,IAAI,CAAC,OAAoB;IACvC,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,IAAI,iCAAiC,CAAC;IAC7D,MAAM,MAAM,GAAG,QAAQ,CAAC,EAAE,CAAC,GAAG,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;IACjD,MAAM,OAAO,GAAG,QAAQ,CAAC,EAAE,CACzB,OAAO,CAAC,UAAU,IAAI,GAAG,CAAC,OAAO,CAAC,eAAe,EAAE,aAAa,CAAC,EACjE,OAAO,CAAC,OAAO,CAChB,CAAC;IACF,IAAI,MAAM,GAAmB,EAAE,CAAC;IAEhC,KAAK,UAAU,KAAK;QAClB,MAAM,KAAK,GAAG,MAAM,CAAC;QACrB,MAAM,GAAG,EAAE,CAAC;QACZ,gFAAgF;QAChF,4CAA4C;QAC5C,MAAM,OAAO,CAAC,GAAG,CAAC;YAChB,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,EAAE;YACnF,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,OAAO,EAAE,OAAO,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,EAAE;SAChH,CAAC,CAAC;IACL,CAAC;IAED,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;IAEhD,OAAO;QACL,IAAI,EAAE,CAAC,IAAI,EAAE,EAAE,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QACtC,KAAK;QACL,IAAI,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,IAAI,EAAE;KACxB,CAAC;AACJ,CAAC;AAED,wFAAwF;AACxF,SAAS,OAAO,CAAC,OAAe,EAAE,KAAqB;IACrD,OAAO;QACL,aAAa,EAAE;YACb;gBACE,QAAQ,EAAE,EAAE,UAAU,EAAE,CAAC,EAAE,GAAG,EAAE,cAAc,EAAE,KAAK,EAAE,EAAE,WAAW,EAAE,OAAO,EAAE,EAAE,CAAC,EAAE;gBACpF,UAAU,EAAE;oBACV;wBACE,KAAK,EAAE,EAAE,IAAI,EAAE,wBAAwB,EAAE;wBACzC,KAAK,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;4BAC1B,OAAO,EAAE,IAAI,CAAC,OAAO;4BACrB,MAAM,EAAE,IAAI,CAAC,MAAM;4BACnB,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,YAAY,EAAE,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;4BACzD,IAAI,EAAE,GAAG,IAAI,CAAC,MAAM,IAAI,IAAI,CAAC,SAAS,EAAE;4BACxC,2EAA2E;4BAC3E,uEAAuE;4BACvE,6CAA6C;4BAC7C,IAAI,EAAE,IAAI,CAAC,IAAI,KAAK,WAAW,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,QAAQ;4BACnD,iBAAiB,EAAE,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC;4BACxC,eAAe,EAAE,KAAK,CAAC,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,EAAE,CAAC;4BAChD,MAAM,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,OAAO,EAAE,IAAI,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE;yBACzE,CAAC,CAAC;qBACJ;iBACF;aACF;SACF;KACF,CAAC;AACJ,CAAC;AAED,0EAA0E;AAC1E,SAAS,KAAK,CAAC,EAAU;IACvB,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,EAAE,GAAG,GAAG,CAAC,EAAE,CAAC;AACnC,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@fougere/observability",
|
|
3
|
-
"version": "0.9.
|
|
3
|
+
"version": "0.9.3-alpha.0",
|
|
4
4
|
"description": "Optional observability for Fougere: one span per operation, W3C Trace Context across any transport.",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"fougere",
|
|
@@ -31,15 +31,17 @@
|
|
|
31
31
|
"src"
|
|
32
32
|
],
|
|
33
33
|
"peerDependencies": {
|
|
34
|
-
"@fougere/core": "^0.9.
|
|
34
|
+
"@fougere/core": "^0.9.3-alpha.0",
|
|
35
|
+
"@fougere/adapter-sql": "^0.9.3-alpha.0"
|
|
35
36
|
},
|
|
36
37
|
"devDependencies": {
|
|
37
38
|
"vitest": "^4.1.0",
|
|
38
|
-
"@fougere/
|
|
39
|
-
"@fougere/
|
|
40
|
-
"@fougere/
|
|
41
|
-
"@fougere/
|
|
42
|
-
"@fougere/
|
|
39
|
+
"@fougere/adapter-sql": "0.9.3-alpha.0",
|
|
40
|
+
"@fougere/schema": "0.9.3-alpha.0",
|
|
41
|
+
"@fougere/container": "0.9.3-alpha.0",
|
|
42
|
+
"@fougere/compiler": "0.9.3-alpha.0",
|
|
43
|
+
"@fougere/transport-http": "0.9.3-alpha.0",
|
|
44
|
+
"@fougere/core": "0.9.3-alpha.0"
|
|
43
45
|
},
|
|
44
46
|
"publishConfig": {
|
|
45
47
|
"access": "public"
|
|
@@ -51,6 +53,11 @@
|
|
|
51
53
|
"default": "./dist/context/als.js"
|
|
52
54
|
}
|
|
53
55
|
},
|
|
56
|
+
"peerDependenciesMeta": {
|
|
57
|
+
"@fougere/adapter-sql": {
|
|
58
|
+
"optional": true
|
|
59
|
+
}
|
|
60
|
+
},
|
|
54
61
|
"scripts": {
|
|
55
62
|
"build": "rm -rf dist && tsc",
|
|
56
63
|
"test": "vitest run",
|
package/src/extension.ts
CHANGED
|
@@ -2,8 +2,7 @@
|
|
|
2
2
|
import { frond, loggerMiddleware, Logger, LogLine, type App, type Extension, type LogSink } from '@fougere/core';
|
|
3
3
|
import ExportHandler from './ExportHandler.js';
|
|
4
4
|
import { traceContext } from '#trace-context';
|
|
5
|
-
import { registerFlush } from './index.js';
|
|
6
|
-
import { trace, type SpanSink } from './index.js';
|
|
5
|
+
import { registerFlush, statementsUnder, tracing, type SpanSink } from './index.js';
|
|
7
6
|
import { metrics, serveTopology } from './metrics.js';
|
|
8
7
|
import { otlp } from './otlp.js';
|
|
9
8
|
import { logs } from './logs.js';
|
|
@@ -23,6 +22,45 @@ export interface ObservabilityOptions {
|
|
|
23
22
|
* extension took.
|
|
24
23
|
*/
|
|
25
24
|
onSpan?: SpanSink;
|
|
25
|
+
/**
|
|
26
|
+
* A span of its own for every statement, beside the count every operation already carries.
|
|
27
|
+
* Off by default — see `TracingOptions.spanPerStatement`.
|
|
28
|
+
*/
|
|
29
|
+
spanPerStatement?: boolean;
|
|
30
|
+
/**
|
|
31
|
+
* What share of the operations that stay in this process are traced, `0` to `1`. Default `1`.
|
|
32
|
+
*
|
|
33
|
+
* A rate is a budget, which no reading of the code answers. What the code does answer is
|
|
34
|
+
* which spans a budget may not touch — see `TracingOptions.sample`.
|
|
35
|
+
*/
|
|
36
|
+
sample?: number;
|
|
37
|
+
/**
|
|
38
|
+
* Bucket bounds in SECONDS for the duration histograms. Default: the OpenTelemetry
|
|
39
|
+
* recommendation for request durations, which assumes a healthy op lives under 100 ms.
|
|
40
|
+
*
|
|
41
|
+
* One list for the whole process, deliberately — see `metrics.ts`.
|
|
42
|
+
*/
|
|
43
|
+
bounds?: readonly number[];
|
|
44
|
+
}
|
|
45
|
+
|
|
46
|
+
/**
|
|
47
|
+
* How far each operation's work goes, read off the model ONCE at boot.
|
|
48
|
+
*
|
|
49
|
+
* `EffectiveOperation.reach` is resolved when the app is built, so the middleware does not
|
|
50
|
+
* recompute it per call — it looks one name up. An address the model does not hold answers zero,
|
|
51
|
+
* which is what `rpc` and a brought frond's own ops are.
|
|
52
|
+
*/
|
|
53
|
+
function hopsIn(app: App): (entity: string, operation: string) => number {
|
|
54
|
+
const hops = new Map<string, number>();
|
|
55
|
+
for (const frond of app.fronds) {
|
|
56
|
+
for (const handler of frond.handlers) {
|
|
57
|
+
for (const [name, op] of app.operationsFor(handler.address) ?? []) {
|
|
58
|
+
hops.set(`${handler.address}.${name}`, op.reach.hops);
|
|
59
|
+
}
|
|
60
|
+
}
|
|
61
|
+
}
|
|
62
|
+
|
|
63
|
+
return (entity, operation) => hops.get(`${entity}.${operation}`) ?? 0;
|
|
26
64
|
}
|
|
27
65
|
|
|
28
66
|
/** Observe this process — one member of the ascent. */
|
|
@@ -55,17 +93,23 @@ export function observability(options: ObservabilityOptions = {}): Extension {
|
|
|
55
93
|
}],
|
|
56
94
|
})],
|
|
57
95
|
|
|
58
|
-
up(app: App) {
|
|
96
|
+
async up(app: App) {
|
|
59
97
|
// Held across the ascent: the exporter exists only when `otlp` is declared, and the
|
|
60
98
|
// handler resolves this either way.
|
|
61
99
|
app.container.registerValue('LogExport', exporting);
|
|
62
100
|
const undo: (() => void | Promise<void>)[] = [];
|
|
63
101
|
undoing.set(app, undo);
|
|
64
|
-
// Order matters: `
|
|
102
|
+
// Order matters: `tracing()` opens the span that every log line written inside the
|
|
65
103
|
// call will carry. Installed the other way round, the lines leave uncorrelated.
|
|
66
104
|
const spans: SpanSink[] = options.onSpan ? [options.onSpan] : [];
|
|
67
105
|
takers.set(app, spans);
|
|
68
|
-
|
|
106
|
+
const tracer = tracing(spans, {
|
|
107
|
+
spanPerStatement: options.spanPerStatement ?? false,
|
|
108
|
+
...(options.sample === undefined ? {} : { sample: options.sample }),
|
|
109
|
+
hopsOf: hopsIn(app),
|
|
110
|
+
});
|
|
111
|
+
app.use(tracer.middleware);
|
|
112
|
+
undo.push(await statementsUnder(tracer));
|
|
69
113
|
// The app's own logger, named — NOT `new Logger(service)`: a logger built here has
|
|
70
114
|
// no `Carry`, so its lines printed and announced nothing. 20 on the console, 0 in
|
|
71
115
|
// the ring, measured on `demos/observability`.
|
|
@@ -84,7 +128,7 @@ export function observability(options: ObservabilityOptions = {}): Extension {
|
|
|
84
128
|
);
|
|
85
129
|
}
|
|
86
130
|
|
|
87
|
-
const measured = metrics(app);
|
|
131
|
+
const measured = metrics(app, options.bounds);
|
|
88
132
|
spans.push(measured.sink);
|
|
89
133
|
serveTopology(app, measured);
|
|
90
134
|
|