@reventlessdev/reventless-core 3.0.0-alpha.326 → 3.0.0-alpha.328
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/CHANGELOG.md +18 -0
- package/package.json +6 -6
- package/src/CommandSent.res +22 -0
- package/src/CommandSent.res.mjs +22 -0
- package/src/Projection.res +26 -1
- package/src/Projection.res.mjs +19 -1
- package/src/RowChange.res +37 -0
- package/src/RowChange.res.mjs +62 -0
- package/src/adapter/Runtime/AggregateRuntime_Builder_Common.res.mjs +5 -5
- package/src/adapter/Runtime/EventCollectorRuntime_Builder_Single.res.mjs +2 -2
- package/src/admin/Platform_Admin_Callback.res.mjs +1 -1
- package/src/components/Aggregate/Aggregate_Callback.res +88 -18
- package/src/components/Aggregate/Aggregate_Callback.res.mjs +53 -32
- package/src/components/Api/GraphQL_FragmentGenerator.res +22 -0
- package/src/components/Api/GraphQL_FragmentGenerator.res.mjs +20 -4
- package/src/components/Api/GraphQL_SchemaInspector.res.mjs +2 -2
- package/src/components/AutomationSlice/AutomationSlice_Builder.res.mjs +1 -1
- package/src/components/AutomationSlice/AutomationSlice_Callback.res +9 -0
- package/src/components/AutomationSlice/AutomationSlice_Callback.res.mjs +20 -14
- package/src/components/CommandGenerator/CommandGenerator_Callback.res +47 -6
- package/src/components/CommandGenerator/CommandGenerator_Callback.res.mjs +41 -4
- package/src/components/CommandTopic/CommandTopic_Callback.res.mjs +1 -1
- package/src/components/CommandTopic/CommandTopic_Helpers.res +9 -1
- package/src/components/CommandTopic/CommandTopic_Helpers.res.mjs +7 -6
- package/src/components/CommandTopic/CommandTopic_Operations.res +2 -0
- package/src/components/CommandTopic/CommandTopic_Operations.res.mjs +2 -2
- package/src/components/Counter/Counter_Callback.res.mjs +3 -3
- package/src/components/Counter/Counter_Operations.res.mjs +4 -4
- package/src/components/DcbEventLog/DcbEventLog_Operations.res.mjs +3 -3
- package/src/components/EventLog/EventLog_Operations.res +1 -0
- package/src/components/EventLog/EventLog_Operations.res.mjs +3 -3
- package/src/components/EventMapper/EventMapper_Callback.res +12 -2
- package/src/components/EventMapper/EventMapper_Callback.res.mjs +16 -14
- package/src/components/EventTopic/EventTopic_Operations.res +2 -0
- package/src/components/EventTopic/EventTopic_Operations.res.mjs +2 -2
- package/src/components/Extension/Extension_Operations.res +4 -0
- package/src/components/Extension/Extension_Operations.res.mjs +8 -8
- package/src/components/ExtensionPoint/ExtensionPoint_Callback.res +5 -1
- package/src/components/ExtensionPoint/ExtensionPoint_Callback.res.mjs +4 -3
- package/src/components/ExtensionPoint/ExtensionPoint_Operations.res +2 -0
- package/src/components/ExtensionPoint/ExtensionPoint_Operations.res.mjs +9 -8
- package/src/components/InboundTranslationSlice/InboundTranslationSlice_Callback.res +4 -0
- package/src/components/InboundTranslationSlice/InboundTranslationSlice_Callback.res.mjs +4 -2
- package/src/components/InboundTranslationSlice/InboundTranslationSlice_Webhook.res.mjs +1 -1
- package/src/components/OutboundTranslationSlice/OutboundTranslationSlice_Builder.res.mjs +1 -1
- package/src/components/OutboundTranslationSlice/OutboundTranslationSlice_Callback.res +12 -0
- package/src/components/OutboundTranslationSlice/OutboundTranslationSlice_Callback.res.mjs +14 -12
- package/src/components/QueryDb/QueryDb_Operations.res +2 -0
- package/src/components/QueryDb/QueryDb_Operations.res.mjs +3 -0
- package/src/components/ReadModel/ReadModel_Callback.res +1 -0
- package/src/components/ReadModel/ReadModel_Callback.res.mjs +1 -1
- package/src/components/SideEffectHandler/SideEffectHandler_Callback.res +2 -0
- package/src/components/SideEffectHandler/SideEffectHandler_Callback.res.mjs +6 -6
- package/src/components/StateChangeSlice/StateChangeSlice_Callback.res +36 -7
- package/src/components/StateChangeSlice/StateChangeSlice_Callback.res.mjs +38 -20
- package/src/components/StateViewSlice/StateViewSlice_Builder.res +2 -0
- package/src/components/StateViewSlice/StateViewSlice_Builder.res.mjs +2 -2
- package/src/components/StateViewSlice/StateViewSlice_Callback.res +6 -0
- package/src/components/StateViewSlice/StateViewSlice_Callback.res.mjs +3 -2
- package/src/components/Task/Task_Builder.res +5 -3
- package/src/components/Task/Task_Builder.res.mjs +2 -1
- package/src/plugin/component/Plugin_Callback.res +6 -2
- package/src/plugin/component/Plugin_Callback.res.mjs +3 -2
- package/src/plugin/connect/PluginExtensionPoint_Plugin.res.mjs +6 -6
- package/src/util/CommandPublisher.res.mjs +9 -9
- package/src/util/EffectLogger.res +85 -17
- package/src/util/EffectLogger.res.mjs +63 -12
- package/src/util/FTPHandler.res.mjs +6 -6
- package/src/util/Metrics.res +151 -16
- package/src/util/Metrics.res.mjs +123 -3
- package/src/util/ScheduleOps.res.mjs +4 -4
- package/src/util/Util_AdapterRuntime.res.mjs +2 -2
- package/src/util/Util_Promise.res.mjs +1 -1
- package/src/util/Util_QueryDbRuntime.res.mjs +1 -1
- package/src/util/Validation.res.mjs +1 -1
- package/tests/api/GraphQL_FragmentGeneratorTest.res.mjs +2 -2
- package/tests/api/IdentitySemanticTest.res.mjs +1 -1
- package/tests/commandgenerator/OwnerStampingTest.res +65 -0
- package/tests/commandgenerator/OwnerStampingTest.res.mjs +62 -0
- package/tests/commandtopic/CommandOutcomeHookTest.res +25 -0
- package/tests/commandtopic/CommandOutcomeHookTest.res.mjs +28 -0
- package/tests/commandtopic/CommandTopicHelpersRejectionTest.res.mjs +4 -4
- package/tests/logger/ComponentLineIdsTest.res +97 -0
- package/tests/logger/ComponentLineIdsTest.res.mjs +118 -0
- package/tests/logger/LogFormatTest.res.mjs +5 -5
- package/tests/logger/LoggerSinkTest.res.mjs +3 -3
- package/tests/querydb/RowChangeTest.res +87 -0
- package/tests/querydb/RowChangeTest.res.mjs +157 -0
- package/tests/util/MetricsTest.res +72 -0
- package/tests/util/MetricsTest.res.mjs +108 -0
|
@@ -113,29 +113,77 @@ function install() {
|
|
|
113
113
|
|
|
114
114
|
install();
|
|
115
115
|
|
|
116
|
-
function
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
116
|
+
function idsOf(entityId, entityType, meta) {
|
|
117
|
+
return {
|
|
118
|
+
msgId: meta.msgId,
|
|
119
|
+
correlationId: meta.correlationId,
|
|
120
|
+
causationId: meta.causationId,
|
|
121
|
+
entityId: entityId,
|
|
122
|
+
entityType: entityType
|
|
123
|
+
};
|
|
124
|
+
}
|
|
125
|
+
|
|
126
|
+
function idsOfSource(source) {
|
|
127
|
+
return {
|
|
128
|
+
msgId: source.msgId,
|
|
129
|
+
correlationId: source.correlationId
|
|
130
|
+
};
|
|
131
|
+
}
|
|
132
|
+
|
|
133
|
+
function idsOfJson(json) {
|
|
134
|
+
if (typeof json !== "object" || json === null || Array.isArray(json)) {
|
|
135
|
+
return;
|
|
136
|
+
}
|
|
137
|
+
let match = json["meta"];
|
|
138
|
+
if (match === undefined) {
|
|
139
|
+
return;
|
|
140
|
+
}
|
|
141
|
+
if (typeof match !== "object" || match === null || Array.isArray(match)) {
|
|
142
|
+
return;
|
|
143
|
+
}
|
|
144
|
+
let str = k => {
|
|
145
|
+
let match$1 = match[k];
|
|
146
|
+
if (typeof match$1 === "string" && match$1 !== "") {
|
|
147
|
+
return match$1;
|
|
148
|
+
}
|
|
149
|
+
};
|
|
150
|
+
return {
|
|
151
|
+
msgId: str("msgId"),
|
|
152
|
+
correlationId: str("correlationId"),
|
|
153
|
+
causationId: str("causationId")
|
|
154
|
+
};
|
|
155
|
+
}
|
|
156
|
+
|
|
157
|
+
function _annotate(eff, comp, detail, ids) {
|
|
158
|
+
let one = (eff, key, value) => {
|
|
159
|
+
if (value !== undefined) {
|
|
160
|
+
return Effect.annotateLogs(eff, key, value);
|
|
161
|
+
} else {
|
|
162
|
+
return eff;
|
|
163
|
+
}
|
|
164
|
+
};
|
|
165
|
+
let eff$1 = one(one(eff, "comp", comp), "detail", Stdlib_Option.map(detail, d => JSON.stringify(d)));
|
|
166
|
+
if (ids !== undefined) {
|
|
167
|
+
return one(one(one(one(one(eff$1, "msgId", ids.msgId), "correlationId", ids.correlationId), "causationId", ids.causationId), "entityId", ids.entityId), "entityType", ids.entityType);
|
|
120
168
|
} else {
|
|
121
169
|
return eff$1;
|
|
122
170
|
}
|
|
123
171
|
}
|
|
124
172
|
|
|
125
|
-
function logInfo(comp, detail, msg) {
|
|
126
|
-
return Logger.withMinimumLogLevel(_annotate(Effect.logInfo(msg), comp, detail), _effectMin(comp, undefined));
|
|
173
|
+
function logInfo(comp, detail, ids, msg) {
|
|
174
|
+
return Logger.withMinimumLogLevel(_annotate(Effect.logInfo(msg), comp, detail, ids), _effectMin(comp, undefined));
|
|
127
175
|
}
|
|
128
176
|
|
|
129
|
-
function logWarn(comp, detail, msg) {
|
|
130
|
-
return Logger.withMinimumLogLevel(_annotate(Effect.logWarning(msg), comp, detail), _effectMin(comp, undefined));
|
|
177
|
+
function logWarn(comp, detail, ids, msg) {
|
|
178
|
+
return Logger.withMinimumLogLevel(_annotate(Effect.logWarning(msg), comp, detail, ids), _effectMin(comp, undefined));
|
|
131
179
|
}
|
|
132
180
|
|
|
133
|
-
function logError(comp, detail, msg) {
|
|
134
|
-
return Logger.withMinimumLogLevel(_annotate(Effect.logError(msg), comp, detail), _effectMin(comp, undefined));
|
|
181
|
+
function logError(comp, detail, ids, msg) {
|
|
182
|
+
return Logger.withMinimumLogLevel(_annotate(Effect.logError(msg), comp, detail, ids), _effectMin(comp, undefined));
|
|
135
183
|
}
|
|
136
184
|
|
|
137
|
-
function logDebug(comp, detail, msg) {
|
|
138
|
-
return Logger.withMinimumLogLevel(_annotate(Effect.logDebug(msg), comp, detail), _effectMin(comp, undefined));
|
|
185
|
+
function logDebug(comp, detail, ids, msg) {
|
|
186
|
+
return Logger.withMinimumLogLevel(_annotate(Effect.logDebug(msg), comp, detail, ids), _effectMin(comp, undefined));
|
|
139
187
|
}
|
|
140
188
|
|
|
141
189
|
let setDefaultMinLevel = Logger$ReventlessCore.setDefaultMinLevel;
|
|
@@ -146,6 +194,9 @@ export {
|
|
|
146
194
|
_effectMin,
|
|
147
195
|
ordinalToLevel,
|
|
148
196
|
install,
|
|
197
|
+
idsOf,
|
|
198
|
+
idsOfSource,
|
|
199
|
+
idsOfJson,
|
|
149
200
|
_annotate,
|
|
150
201
|
logInfo,
|
|
151
202
|
logWarn,
|
|
@@ -45,7 +45,7 @@ function ftp(connectionParams, ftpAction) {
|
|
|
45
45
|
readyTimeout: readyTimeout
|
|
46
46
|
});
|
|
47
47
|
SSH2.Client.onReady(client.on("end", () => {
|
|
48
|
-
Effect.runSync(EffectLogger$ReventlessCore.logInfo("FTPHandler-ReventlessCore", undefined, "Client.onEnd"));
|
|
48
|
+
Effect.runSync(EffectLogger$ReventlessCore.logInfo("FTPHandler-ReventlessCore", undefined, undefined, "Client.onEnd"));
|
|
49
49
|
resolve(result.contents);
|
|
50
50
|
}).on("error", err => resolve({
|
|
51
51
|
TAG: "Error",
|
|
@@ -74,8 +74,8 @@ function ftp(connectionParams, ftpAction) {
|
|
|
74
74
|
let endFtp = () => {
|
|
75
75
|
client.end();
|
|
76
76
|
};
|
|
77
|
-
sftp.on("end", () => Effect.runSync(EffectLogger$ReventlessCore.logInfo("FTPHandler-ReventlessCore", undefined, "end sftp stream"))).on("error", err => {
|
|
78
|
-
Effect.runSync(EffectLogger$ReventlessCore.logError("FTPHandler-ReventlessCore", undefined, `Error: ` + Stdlib_Option.getOr(JSON.stringify(err), "unknown")));
|
|
77
|
+
sftp.on("end", () => Effect.runSync(EffectLogger$ReventlessCore.logInfo("FTPHandler-ReventlessCore", undefined, undefined, "end sftp stream"))).on("error", err => {
|
|
78
|
+
Effect.runSync(EffectLogger$ReventlessCore.logError("FTPHandler-ReventlessCore", undefined, undefined, `Error: ` + Stdlib_Option.getOr(JSON.stringify(err), "unknown")));
|
|
79
79
|
client.emit("error", err);
|
|
80
80
|
client.end();
|
|
81
81
|
});
|
|
@@ -109,16 +109,16 @@ function ftp(connectionParams, ftpAction) {
|
|
|
109
109
|
TAG: "Ok",
|
|
110
110
|
_0: true
|
|
111
111
|
};
|
|
112
|
-
Effect.runSync(EffectLogger$ReventlessCore.logInfo("FTPHandler-ReventlessCore", undefined, "writable ended"));
|
|
112
|
+
Effect.runSync(EffectLogger$ReventlessCore.logInfo("FTPHandler-ReventlessCore", undefined, undefined, "writable ended"));
|
|
113
113
|
}).on("close", () => {
|
|
114
114
|
result.contents = {
|
|
115
115
|
TAG: "Ok",
|
|
116
116
|
_0: true
|
|
117
117
|
};
|
|
118
|
-
Effect.runSync(EffectLogger$ReventlessCore.logInfo("FTPHandler-ReventlessCore", undefined, "writable closed"));
|
|
118
|
+
Effect.runSync(EffectLogger$ReventlessCore.logInfo("FTPHandler-ReventlessCore", undefined, undefined, "writable closed"));
|
|
119
119
|
client.end();
|
|
120
120
|
}).on("error", err => {
|
|
121
|
-
Effect.runSync(EffectLogger$ReventlessCore.logError("FTPHandler-ReventlessCore", undefined, `Error in Write Stream: ` + Stdlib_Option.getOr(Stdlib_JsExn.message(err), "unknown")));
|
|
121
|
+
Effect.runSync(EffectLogger$ReventlessCore.logError("FTPHandler-ReventlessCore", undefined, undefined, `Error in Write Stream: ` + Stdlib_Option.getOr(Stdlib_JsExn.message(err), "unknown")));
|
|
122
122
|
let err$1 = new Error("FTPHandler: Error in Write Stream");
|
|
123
123
|
sftp.emit("error", err$1);
|
|
124
124
|
});
|
package/src/util/Metrics.res
CHANGED
|
@@ -1,15 +1,9 @@
|
|
|
1
|
-
// Provider-neutral metric
|
|
2
|
-
//
|
|
3
|
-
//
|
|
4
|
-
// (
|
|
5
|
-
//
|
|
6
|
-
//
|
|
7
|
-
// deploy-time) matches the discriminator field and extracts the `slice`
|
|
8
|
-
// dimension + value; another provider can match the same generic shape.
|
|
9
|
-
//
|
|
10
|
-
// Suppressed outside a JSON sink so TTY dev runs stay clean. Used by the DCB
|
|
11
|
-
// StateChangeSlice callback to surface append-retry / append-conflict rates per
|
|
12
|
-
// slice (see docs/analysis/dcb-high-contention-handling.md §6).
|
|
1
|
+
// Provider-neutral metric emission. `emitCount` is the one call that emits a
|
|
2
|
+
// metric; where the count goes is the installed `Sink`. The default writes one
|
|
3
|
+
// JSON line per occurrence to a JSON log sink, which a deployed collector turns
|
|
4
|
+
// into a metric (on AWS a CloudWatch metric filter keys on `reventlessMetric`). A
|
|
5
|
+
// local platform installs `Counts.sink` instead: it counts in memory and writes
|
|
6
|
+
// nothing. See docs/plans/metrics-are-counted-not-logged.md.
|
|
13
7
|
|
|
14
8
|
// Discriminator key a metric collector keys off. Stable — changing it is a
|
|
15
9
|
// breaking change for any configured metric filter.
|
|
@@ -24,9 +18,150 @@ let metricLine = (~metric: string, ~slice: string, ~value: int=1): JSON.t =>
|
|
|
24
18
|
("unit", "Count"->JSON.Encode.string),
|
|
25
19
|
])->JSON.Encode.object
|
|
26
20
|
|
|
27
|
-
|
|
28
|
-
|
|
21
|
+
/** One occurrence of a metric, as a sink receives it. */
|
|
22
|
+
type sample = {
|
|
23
|
+
metric: string,
|
|
24
|
+
slice: string,
|
|
25
|
+
/** The plugin the slice belongs to, when the registry knows it. */
|
|
26
|
+
plugin?: string,
|
|
27
|
+
value: int,
|
|
28
|
+
unit: string,
|
|
29
|
+
/** In milliseconds since 1970. */
|
|
30
|
+
at: float,
|
|
31
|
+
}
|
|
32
|
+
|
|
33
|
+
module Sink = {
|
|
34
|
+
type t = sample => unit
|
|
35
|
+
|
|
36
|
+
/** The line a deployed collector reads, written only to a JSON log sink. */
|
|
37
|
+
let line: t = s =>
|
|
38
|
+
if Reventless.AnsiStyle.isJsonSink() {
|
|
39
|
+
Console.log(metricLine(~metric=s.metric, ~slice=s.slice, ~value=s.value)->JSON.stringify)
|
|
40
|
+
}
|
|
41
|
+
|
|
42
|
+
let current: ref<t> = ref(line)
|
|
43
|
+
|
|
44
|
+
/** Where every metric goes from now on, installed at a process's start. */
|
|
45
|
+
let install = (sink: t) => current := sink
|
|
46
|
+
|
|
47
|
+
/** Back to the line: for tests. */
|
|
48
|
+
let reset = () => current := line
|
|
49
|
+
}
|
|
50
|
+
|
|
51
|
+
// Emits a single count for `metric`, dimensioned by `slice`. `value` defaults to
|
|
52
|
+
// 1 (one occurrence).
|
|
29
53
|
let emitCount = (~metric: string, ~slice: string, ~value: int=1): unit =>
|
|
30
|
-
|
|
31
|
-
|
|
54
|
+
Sink.current.contents({
|
|
55
|
+
metric,
|
|
56
|
+
slice,
|
|
57
|
+
plugin: ?Reventless.LogPrefix.lookup(slice),
|
|
58
|
+
value,
|
|
59
|
+
unit: "Count",
|
|
60
|
+
at: Date.now(),
|
|
61
|
+
})
|
|
62
|
+
|
|
63
|
+
/** Metrics counted in memory, per metric, plugin and slice: how often, the sum of
|
|
64
|
+
their values, the last time, and how many in each of the last 60 minutes. Bounded
|
|
65
|
+
by the number of slices, not of commands. */
|
|
66
|
+
module Counts = {
|
|
67
|
+
let minutes = 60
|
|
68
|
+
let minuteMs = 60_000.
|
|
69
|
+
|
|
70
|
+
type entry = {
|
|
71
|
+
metric: string,
|
|
72
|
+
plugin: string,
|
|
73
|
+
slice: string,
|
|
74
|
+
unit: string,
|
|
75
|
+
mutable count: int,
|
|
76
|
+
mutable sum: float,
|
|
77
|
+
mutable lastAt: float,
|
|
78
|
+
/** The counts of the last `minutes` minutes, oldest first; the last is `minute`'s. */
|
|
79
|
+
mutable perMinute: array<int>,
|
|
80
|
+
mutable minute: float,
|
|
81
|
+
}
|
|
82
|
+
|
|
83
|
+
type t = {entries: dict<entry>}
|
|
84
|
+
|
|
85
|
+
/** One count as a reader gets it. */
|
|
86
|
+
type snapshot = {
|
|
87
|
+
metric: string,
|
|
88
|
+
plugin: string,
|
|
89
|
+
slice: string,
|
|
90
|
+
unit: string,
|
|
91
|
+
count: int,
|
|
92
|
+
sum: float,
|
|
93
|
+
lastAt: float,
|
|
94
|
+
perMinute: array<int>,
|
|
95
|
+
}
|
|
96
|
+
|
|
97
|
+
let make = (): t => {entries: Dict.make()}
|
|
98
|
+
|
|
99
|
+
let clear = (t: t) => t.entries->Dict.keysToArray->Array.forEach(k => t.entries->Dict.delete(k))
|
|
100
|
+
|
|
101
|
+
let minuteOf = (at: float) => Math.floor(at /. minuteMs)
|
|
102
|
+
|
|
103
|
+
/** The buckets moved on to `minute`: the minutes since the last count are zero. */
|
|
104
|
+
let rolled = (perMinute: array<int>, ~from: float, ~to_: float): array<int> => {
|
|
105
|
+
let gap = Math.Int.min(minutes, (to_ -. from)->Float.toInt)
|
|
106
|
+
gap <= 0
|
|
107
|
+
? perMinute
|
|
108
|
+
: perMinute
|
|
109
|
+
->Array.slice(~start=gap, ~end=minutes)
|
|
110
|
+
->Array.concat(Array.make(~length=gap, 0))
|
|
111
|
+
}
|
|
112
|
+
|
|
113
|
+
let add = (t: t, s: sample) => {
|
|
114
|
+
let plugin = s.plugin->Option.getOr("")
|
|
115
|
+
let key = `${s.metric}|${plugin}|${s.slice}`
|
|
116
|
+
let minute = minuteOf(s.at)
|
|
117
|
+
let e = switch t.entries->Dict.get(key) {
|
|
118
|
+
| Some(e) => e
|
|
119
|
+
| None =>
|
|
120
|
+
let e = {
|
|
121
|
+
metric: s.metric,
|
|
122
|
+
plugin,
|
|
123
|
+
slice: s.slice,
|
|
124
|
+
unit: s.unit,
|
|
125
|
+
count: 0,
|
|
126
|
+
sum: 0.,
|
|
127
|
+
lastAt: s.at,
|
|
128
|
+
perMinute: Array.make(~length=minutes, 0),
|
|
129
|
+
minute,
|
|
130
|
+
}
|
|
131
|
+
t.entries->Dict.set(key, e)
|
|
132
|
+
e
|
|
133
|
+
}
|
|
134
|
+
e.perMinute = rolled(e.perMinute, ~from=e.minute, ~to_=minute)
|
|
135
|
+
e.minute = Math.max(e.minute, minute)
|
|
136
|
+
let last = minutes - 1
|
|
137
|
+
e.perMinute->Array.setUnsafe(last, e.perMinute->Array.getUnsafe(last) + 1)
|
|
138
|
+
e.count = e.count + 1
|
|
139
|
+
e.sum = e.sum +. s.value->Int.toFloat
|
|
140
|
+
e.lastAt = Math.max(e.lastAt, s.at)
|
|
32
141
|
}
|
|
142
|
+
|
|
143
|
+
/** The sink that counts into `t` and writes nothing. */
|
|
144
|
+
let sink = (t: t): Sink.t => s => add(t, s)
|
|
145
|
+
|
|
146
|
+
/** The counts at `now`, of the given plugins or of every one, ordered by plugin,
|
|
147
|
+
slice and metric. */
|
|
148
|
+
let read = (t: t, ~now: float, ~plugins: option<array<string>>=?): array<snapshot> =>
|
|
149
|
+
t.entries
|
|
150
|
+
->Dict.valuesToArray
|
|
151
|
+
->Array.filter(e => plugins->Option.mapOr(true, ps => ps->Array.includes(e.plugin)))
|
|
152
|
+
->Array.map((e): snapshot => {
|
|
153
|
+
metric: e.metric,
|
|
154
|
+
plugin: e.plugin,
|
|
155
|
+
slice: e.slice,
|
|
156
|
+
unit: e.unit,
|
|
157
|
+
count: e.count,
|
|
158
|
+
sum: e.sum,
|
|
159
|
+
lastAt: e.lastAt,
|
|
160
|
+
perMinute: rolled(e.perMinute, ~from=e.minute, ~to_=minuteOf(now)),
|
|
161
|
+
})
|
|
162
|
+
->Array.toSorted((a, b) =>
|
|
163
|
+
`${a.plugin}|${a.slice}|${a.metric}`->String.localeCompare(
|
|
164
|
+
`${b.plugin}|${b.slice}|${b.metric}`,
|
|
165
|
+
)
|
|
166
|
+
)
|
|
167
|
+
}
|
package/src/util/Metrics.res.mjs
CHANGED
|
@@ -1,6 +1,10 @@
|
|
|
1
1
|
// Generated by ReScript, PLEASE EDIT WITH CARE
|
|
2
2
|
|
|
3
|
+
import * as Stdlib_Dict from "@rescript/runtime/lib/es6/Stdlib_Dict.js";
|
|
4
|
+
import * as Stdlib_Array from "@rescript/runtime/lib/es6/Stdlib_Array.js";
|
|
5
|
+
import * as Stdlib_Option from "@rescript/runtime/lib/es6/Stdlib_Option.js";
|
|
3
6
|
import * as AnsiStyle$Reventless from "@reventlessdev/reventless-spec/src/AnsiStyle.res.mjs";
|
|
7
|
+
import * as LogPrefix$Reventless from "@reventlessdev/reventless-spec/src/LogPrefix.res.mjs";
|
|
4
8
|
|
|
5
9
|
let discriminator = "reventlessMetric";
|
|
6
10
|
|
|
@@ -26,17 +30,133 @@ function metricLine(metric, slice, valueOpt) {
|
|
|
26
30
|
]);
|
|
27
31
|
}
|
|
28
32
|
|
|
29
|
-
function
|
|
30
|
-
let value = valueOpt !== undefined ? valueOpt : 1;
|
|
33
|
+
function line(s) {
|
|
31
34
|
if (AnsiStyle$Reventless.isJsonSink()) {
|
|
32
|
-
console.log(JSON.stringify(metricLine(metric, slice, value)));
|
|
35
|
+
console.log(JSON.stringify(metricLine(s.metric, s.slice, s.value)));
|
|
33
36
|
return;
|
|
34
37
|
}
|
|
35
38
|
}
|
|
36
39
|
|
|
40
|
+
let current = {
|
|
41
|
+
contents: line
|
|
42
|
+
};
|
|
43
|
+
|
|
44
|
+
function install(sink) {
|
|
45
|
+
current.contents = sink;
|
|
46
|
+
}
|
|
47
|
+
|
|
48
|
+
function reset() {
|
|
49
|
+
current.contents = line;
|
|
50
|
+
}
|
|
51
|
+
|
|
52
|
+
let Sink = {
|
|
53
|
+
line: line,
|
|
54
|
+
current: current,
|
|
55
|
+
install: install,
|
|
56
|
+
reset: reset
|
|
57
|
+
};
|
|
58
|
+
|
|
59
|
+
function emitCount(metric, slice, valueOpt) {
|
|
60
|
+
let value = valueOpt !== undefined ? valueOpt : 1;
|
|
61
|
+
current.contents({
|
|
62
|
+
metric: metric,
|
|
63
|
+
slice: slice,
|
|
64
|
+
plugin: LogPrefix$Reventless.lookup(slice),
|
|
65
|
+
value: value,
|
|
66
|
+
unit: "Count",
|
|
67
|
+
at: Date.now()
|
|
68
|
+
});
|
|
69
|
+
}
|
|
70
|
+
|
|
71
|
+
function make() {
|
|
72
|
+
return {
|
|
73
|
+
entries: {}
|
|
74
|
+
};
|
|
75
|
+
}
|
|
76
|
+
|
|
77
|
+
function clear(t) {
|
|
78
|
+
Object.keys(t.entries).forEach(k => Stdlib_Dict.$$delete(t.entries, k));
|
|
79
|
+
}
|
|
80
|
+
|
|
81
|
+
function minuteOf(at) {
|
|
82
|
+
return Math.floor(at / 60000);
|
|
83
|
+
}
|
|
84
|
+
|
|
85
|
+
function rolled(perMinute, from, to_) {
|
|
86
|
+
let gap = Math.min(60, to_ - from | 0);
|
|
87
|
+
if (gap <= 0) {
|
|
88
|
+
return perMinute;
|
|
89
|
+
} else {
|
|
90
|
+
return perMinute.slice(gap, 60).concat(Stdlib_Array.make(gap, 0));
|
|
91
|
+
}
|
|
92
|
+
}
|
|
93
|
+
|
|
94
|
+
function add(t, s) {
|
|
95
|
+
let plugin = Stdlib_Option.getOr(s.plugin, "");
|
|
96
|
+
let key = s.metric + `|` + plugin + `|` + s.slice;
|
|
97
|
+
let minute = Math.floor(s.at / 60000);
|
|
98
|
+
let e = t.entries[key];
|
|
99
|
+
let e$1;
|
|
100
|
+
if (e !== undefined) {
|
|
101
|
+
e$1 = e;
|
|
102
|
+
} else {
|
|
103
|
+
let e$2 = {
|
|
104
|
+
metric: s.metric,
|
|
105
|
+
plugin: plugin,
|
|
106
|
+
slice: s.slice,
|
|
107
|
+
unit: s.unit,
|
|
108
|
+
count: 0,
|
|
109
|
+
sum: 0,
|
|
110
|
+
lastAt: s.at,
|
|
111
|
+
perMinute: Stdlib_Array.make(60, 0),
|
|
112
|
+
minute: minute
|
|
113
|
+
};
|
|
114
|
+
t.entries[key] = e$2;
|
|
115
|
+
e$1 = e$2;
|
|
116
|
+
}
|
|
117
|
+
e$1.perMinute = rolled(e$1.perMinute, e$1.minute, minute);
|
|
118
|
+
e$1.minute = Math.max(e$1.minute, minute);
|
|
119
|
+
let last = 59;
|
|
120
|
+
e$1.perMinute[last] = e$1.perMinute[last] + 1 | 0;
|
|
121
|
+
e$1.count = e$1.count + 1 | 0;
|
|
122
|
+
e$1.sum = e$1.sum + s.value;
|
|
123
|
+
e$1.lastAt = Math.max(e$1.lastAt, s.at);
|
|
124
|
+
}
|
|
125
|
+
|
|
126
|
+
function sink(t) {
|
|
127
|
+
return s => add(t, s);
|
|
128
|
+
}
|
|
129
|
+
|
|
130
|
+
function read(t, now, plugins) {
|
|
131
|
+
return Object.values(t.entries).filter(e => Stdlib_Option.mapOr(plugins, true, ps => ps.includes(e.plugin))).map(e => ({
|
|
132
|
+
metric: e.metric,
|
|
133
|
+
plugin: e.plugin,
|
|
134
|
+
slice: e.slice,
|
|
135
|
+
unit: e.unit,
|
|
136
|
+
count: e.count,
|
|
137
|
+
sum: e.sum,
|
|
138
|
+
lastAt: e.lastAt,
|
|
139
|
+
perMinute: rolled(e.perMinute, e.minute, Math.floor(now / 60000))
|
|
140
|
+
})).toSorted((a, b) => (a.plugin + `|` + a.slice + `|` + a.metric).localeCompare(b.plugin + `|` + b.slice + `|` + b.metric));
|
|
141
|
+
}
|
|
142
|
+
|
|
143
|
+
let Counts = {
|
|
144
|
+
minutes: 60,
|
|
145
|
+
minuteMs: 60000,
|
|
146
|
+
make: make,
|
|
147
|
+
clear: clear,
|
|
148
|
+
minuteOf: minuteOf,
|
|
149
|
+
rolled: rolled,
|
|
150
|
+
add: add,
|
|
151
|
+
sink: sink,
|
|
152
|
+
read: read
|
|
153
|
+
};
|
|
154
|
+
|
|
37
155
|
export {
|
|
38
156
|
discriminator,
|
|
39
157
|
metricLine,
|
|
158
|
+
Sink,
|
|
40
159
|
emitCount,
|
|
160
|
+
Counts,
|
|
41
161
|
}
|
|
42
162
|
/* AnsiStyle-Reventless Not a pure module */
|
|
@@ -42,12 +42,12 @@ function create(scheduler, channelResources, resourceNaming) {
|
|
|
42
42
|
payload: schedule_payload
|
|
43
43
|
};
|
|
44
44
|
let createSchedule = scheduler.createSchedule;
|
|
45
|
-
let exit = await Effect$1.runPromiseExit(Effect$1.tap(Effect.tryPromise(err => Util_Error$ReventlessCore.messageFromUnknown(err, "schedule create"), () => createSchedule(channelResources, schedule$1)), () => EffectLogger$ReventlessCore.logInfo("ScheduleOps-ReventlessCore", undefined, `create: created ` + Stdlib_Option.getOr(JSON.stringify(schedule$1), ""))));
|
|
45
|
+
let exit = await Effect$1.runPromiseExit(Effect$1.tap(Effect.tryPromise(err => Util_Error$ReventlessCore.messageFromUnknown(err, "schedule create"), () => createSchedule(channelResources, schedule$1)), () => EffectLogger$ReventlessCore.logInfo("ScheduleOps-ReventlessCore", undefined, undefined, `create: created ` + Stdlib_Option.getOr(JSON.stringify(schedule$1), ""))));
|
|
46
46
|
if (Exit$1.isSuccess(exit)) {
|
|
47
47
|
return;
|
|
48
48
|
}
|
|
49
49
|
let errMsg = Exit.match(exit, cause => Cause.pretty(cause), () => "unknown");
|
|
50
|
-
Effect$1.runSync(EffectLogger$ReventlessCore.logError("ScheduleOps-ReventlessCore", undefined, `create: couldn't create ` + Stdlib_Option.getOr(JSON.stringify(schedule$1), "") + `: ` + errMsg));
|
|
50
|
+
Effect$1.runSync(EffectLogger$ReventlessCore.logError("ScheduleOps-ReventlessCore", undefined, undefined, `create: couldn't create ` + Stdlib_Option.getOr(JSON.stringify(schedule$1), "") + `: ` + errMsg));
|
|
51
51
|
throw {
|
|
52
52
|
RE_EXN_ID: ScheduleNotCreated,
|
|
53
53
|
_1: schedule$1,
|
|
@@ -60,12 +60,12 @@ function $$delete(scheduler, channelResources, resourceNaming) {
|
|
|
60
60
|
return async name => {
|
|
61
61
|
let name$1 = resourceNaming.validateName(name);
|
|
62
62
|
let deleteSchedule = scheduler.deleteSchedule;
|
|
63
|
-
let exit = await Effect$1.runPromiseExit(Effect$1.tap(Effect.tryPromise(err => Util_Error$ReventlessCore.messageFromUnknown(err, "schedule delete"), () => deleteSchedule(channelResources, name$1)), () => EffectLogger$ReventlessCore.logInfo("ScheduleOps-ReventlessCore", undefined, `delete: deleted ` + name$1)));
|
|
63
|
+
let exit = await Effect$1.runPromiseExit(Effect$1.tap(Effect.tryPromise(err => Util_Error$ReventlessCore.messageFromUnknown(err, "schedule delete"), () => deleteSchedule(channelResources, name$1)), () => EffectLogger$ReventlessCore.logInfo("ScheduleOps-ReventlessCore", undefined, undefined, `delete: deleted ` + name$1)));
|
|
64
64
|
if (Exit$1.isSuccess(exit)) {
|
|
65
65
|
return;
|
|
66
66
|
}
|
|
67
67
|
let errMsg = Exit.match(exit, cause => Cause.pretty(cause), () => "unknown");
|
|
68
|
-
Effect$1.runSync(EffectLogger$ReventlessCore.logError("ScheduleOps-ReventlessCore", undefined, `delete: couldn't delete ` + name$1 + `: ` + errMsg));
|
|
68
|
+
Effect$1.runSync(EffectLogger$ReventlessCore.logError("ScheduleOps-ReventlessCore", undefined, undefined, `delete: couldn't delete ` + name$1 + `: ` + errMsg));
|
|
69
69
|
throw {
|
|
70
70
|
RE_EXN_ID: ScheduleNotDeleted,
|
|
71
71
|
_1: name$1,
|
|
@@ -19,7 +19,7 @@ function findResource(resources, service) {
|
|
|
19
19
|
return matching[0];
|
|
20
20
|
}
|
|
21
21
|
let err = `Util.Adapter.findResource: Couldn't find service ` + service + ` in resources: ` + resources.map(res => Stdlib_Option.getOrThrow(JSON.stringify(res), undefined)).join(", ");
|
|
22
|
-
Effect.runSync(EffectLogger$ReventlessCore.logError("Util_AdapterRuntime-ReventlessCore", undefined, err));
|
|
22
|
+
Effect.runSync(EffectLogger$ReventlessCore.logError("Util_AdapterRuntime-ReventlessCore", undefined, undefined, err));
|
|
23
23
|
return Stdlib_JsError.throwWithMessage(err);
|
|
24
24
|
}
|
|
25
25
|
|
|
@@ -29,7 +29,7 @@ function findResolvedResource(resources, service) {
|
|
|
29
29
|
return resources$1[0];
|
|
30
30
|
}
|
|
31
31
|
let err = `Util.Adapter.findResolvedResource: Couldn't find service ` + service + ` in resources: ` + resources.map(res => Stdlib_Option.getOrThrow(JSON.stringify(res), undefined)).join(", ");
|
|
32
|
-
Effect.runSync(EffectLogger$ReventlessCore.logError("Util_AdapterRuntime-ReventlessCore", undefined, err));
|
|
32
|
+
Effect.runSync(EffectLogger$ReventlessCore.logError("Util_AdapterRuntime-ReventlessCore", undefined, undefined, err));
|
|
33
33
|
return Stdlib_JsError.throwWithMessage(err);
|
|
34
34
|
}
|
|
35
35
|
|
|
@@ -70,7 +70,7 @@ async function onEndHandler(flush, resolve) {
|
|
|
70
70
|
} catch (raw_e) {
|
|
71
71
|
let e = Primitive_exceptions.internalToException(raw_e);
|
|
72
72
|
if (e.RE_EXN_ID === "JsExn") {
|
|
73
|
-
Effect.runSync(EffectLogger$ReventlessCore.logError("Util_Promise-ReventlessCore", undefined, "File \"Util_Promise.res\", line 57, characters 9-16" + `: ` + Stdlib_Option.getOr(Stdlib_JsExn.message(e._1), "unknown")));
|
|
73
|
+
Effect.runSync(EffectLogger$ReventlessCore.logError("Util_Promise-ReventlessCore", undefined, undefined, "File \"Util_Promise.res\", line 57, characters 9-16" + `: ` + Stdlib_Option.getOr(Stdlib_JsExn.message(e._1), "unknown")));
|
|
74
74
|
} else {
|
|
75
75
|
throw e;
|
|
76
76
|
}
|
|
@@ -8,7 +8,7 @@ function getRuntimeResource(allQueryDbs, queryDbName) {
|
|
|
8
8
|
try {
|
|
9
9
|
return Stdlib_Option.getOrThrow(allQueryDbs[queryDbName], undefined);
|
|
10
10
|
} catch (exn) {
|
|
11
|
-
Effect.runSync(EffectLogger$ReventlessCore.logError("Util_QueryDbRuntime-ReventlessCore", undefined, `getRuntimeResource: Couldn't find QueryDb ` + queryDbName + ` in ` + Object.keys(allQueryDbs).join(", ")));
|
|
11
|
+
Effect.runSync(EffectLogger$ReventlessCore.logError("Util_QueryDbRuntime-ReventlessCore", undefined, undefined, `getRuntimeResource: Couldn't find QueryDb ` + queryDbName + ` in ` + Object.keys(allQueryDbs).join(", ")));
|
|
12
12
|
throw exn;
|
|
13
13
|
}
|
|
14
14
|
}
|
|
@@ -105,7 +105,7 @@ function merge(v1, v2) {
|
|
|
105
105
|
}
|
|
106
106
|
|
|
107
107
|
function defaultErrorHandler(err) {
|
|
108
|
-
Effect.runSync(EffectLogger$ReventlessCore.logError("Validation-ReventlessCore", undefined, Util_Sury$Reventless.exnMessage(err, undefined)));
|
|
108
|
+
Effect.runSync(EffectLogger$ReventlessCore.logError("Validation-ReventlessCore", undefined, undefined, Util_Sury$Reventless.exnMessage(err, undefined)));
|
|
109
109
|
return {
|
|
110
110
|
TAG: "Failure",
|
|
111
111
|
_0: "Couldn't resolve promise."
|
|
@@ -361,7 +361,7 @@ globalThis.describe("semantic composites are named once, not once per field", ()
|
|
|
361
361
|
globalThis.expect(fragmentTypes.some(t => t.includes("AddProductPrice"))).toBe(false);
|
|
362
362
|
});
|
|
363
363
|
globalThis.test("the output position keeps the bare name", () => {
|
|
364
|
-
let types = GraphQL_FragmentGenerator$ReventlessCore.deriveObjectTypeWithNested("Catalog_Product", undefined, false, undefined, Sury.$schema(s => ({
|
|
364
|
+
let types = GraphQL_FragmentGenerator$ReventlessCore.deriveObjectTypeWithNested("Catalog_Product", undefined, false, undefined, undefined, Sury.$schema(s => ({
|
|
365
365
|
productId: s.m(Sury.string),
|
|
366
366
|
price: s.m(Money$Reventless.schema)
|
|
367
367
|
})));
|
|
@@ -579,7 +579,7 @@ globalThis.describe("the by-index door", () => {
|
|
|
579
579
|
});
|
|
580
580
|
|
|
581
581
|
globalThis.describe("@internal keeps a field off the generated type", () => {
|
|
582
|
-
let types = excludeFields => GraphQL_FragmentGenerator$ReventlessCore.deriveObjectTypeWithNested("Platform_Widget", excludeFields, undefined, undefined, PsInternalFieldsReadModel$ReventlessCore.stateSchema).join("\n");
|
|
582
|
+
let types = excludeFields => GraphQL_FragmentGenerator$ReventlessCore.deriveObjectTypeWithNested("Platform_Widget", excludeFields, undefined, undefined, undefined, PsInternalFieldsReadModel$ReventlessCore.stateSchema).join("\n");
|
|
583
583
|
globalThis.test("the declared fields are absent", () => {
|
|
584
584
|
globalThis.expect([
|
|
585
585
|
types(undefined).includes("eventCollector"),
|
|
@@ -49,7 +49,7 @@ globalThis.describe("the identity semantic on the JSON Schema", () => {
|
|
|
49
49
|
});
|
|
50
50
|
|
|
51
51
|
globalThis.describe("the identity semantic in the SDL", () => {
|
|
52
|
-
let sdl = GraphQL_FragmentGenerator$ReventlessCore.deriveObjectTypeWithNested("Ordering_Order", undefined, false, undefined, orderSchema).join("\n");
|
|
52
|
+
let sdl = GraphQL_FragmentGenerator$ReventlessCore.deriveObjectTypeWithNested("Ordering_Order", undefined, false, undefined, undefined, orderSchema).join("\n");
|
|
53
53
|
globalThis.test("an identity field not named `*Id` is an ID", () => {
|
|
54
54
|
globalThis.expect(sdl.includes("buyer: ID!")).toBe(true);
|
|
55
55
|
});
|
|
@@ -346,3 +346,68 @@ describe("the caller claim on the envelope:", () => {
|
|
|
346
346
|
expect(Message.deriveMeta(~parent).callerClaim)->toEqual(None)
|
|
347
347
|
})
|
|
348
348
|
})
|
|
349
|
+
|
|
350
|
+
describe("the command's entry names the command on its lines", () => {
|
|
351
|
+
let capture = async (run: unit => promise<unit>) => {
|
|
352
|
+
let lines = []
|
|
353
|
+
let remove = Logger.addSink(r => lines->Array.push(r))
|
|
354
|
+
await run()
|
|
355
|
+
remove()
|
|
356
|
+
lines
|
|
357
|
+
}
|
|
358
|
+
|
|
359
|
+
testPromise("a generated command's line carries its own msgId and flow", async () => {
|
|
360
|
+
let lines = await capture(
|
|
361
|
+
async () => {
|
|
362
|
+
let _ = await generate(
|
|
363
|
+
placeOrder(~customerId="cust-A", ~identity=cognito(~userId="cust-A", ~groups=[])),
|
|
364
|
+
)->Effect.runPromise
|
|
365
|
+
},
|
|
366
|
+
)
|
|
367
|
+
let line =
|
|
368
|
+
lines->Array.find(r => r.message->String.startsWith("generated command"))->Option.getOrThrow
|
|
369
|
+
let msgId = line.annotations->Dict.get("msgId")
|
|
370
|
+
expect(msgId->Option.isSome)->toBe(true)
|
|
371
|
+
// A command sent from outside starts its own flow.
|
|
372
|
+
expect(line.annotations->Dict.get("correlationId"))->toEqual(msgId)
|
|
373
|
+
expect(Some(lastPublished().meta.msgId))->toEqual(msgId)
|
|
374
|
+
})
|
|
375
|
+
|
|
376
|
+
testPromise(
|
|
377
|
+
"a refusal before the handler is logged with the command's ids, and heard",
|
|
378
|
+
async () => {
|
|
379
|
+
let heard = []
|
|
380
|
+
let remove = CommandTopic_Helpers.registerCommandOutcome(r => heard->Array.push(r))
|
|
381
|
+
let lines = await capture(
|
|
382
|
+
async () =>
|
|
383
|
+
switch await generate(
|
|
384
|
+
placeOrder(~customerId="cust-B", ~identity=Reventless.Identity.anonymous),
|
|
385
|
+
)->Effect.runPromise {
|
|
386
|
+
| _ => ()
|
|
387
|
+
| exception _ => ()
|
|
388
|
+
},
|
|
389
|
+
)
|
|
390
|
+
remove()
|
|
391
|
+
let line =
|
|
392
|
+
lines
|
|
393
|
+
->Array.find(r => r.message->String.startsWith("refused before its handler"))
|
|
394
|
+
->Option.getOrThrow
|
|
395
|
+
expect(line.level)->toEqual(Logger.Warn)
|
|
396
|
+
expect(line.annotations->Dict.get("msgId")->Option.isSome)->toBe(true)
|
|
397
|
+
expect(
|
|
398
|
+
heard->Array.map(
|
|
399
|
+
r => (r.component, r.reference == line.annotations->Dict.get("msgId")->Option.getOr("")),
|
|
400
|
+
),
|
|
401
|
+
)->toEqual([("Ordering", true)])
|
|
402
|
+
expect(
|
|
403
|
+
heard->Array.map(
|
|
404
|
+
r =>
|
|
405
|
+
switch r.outcome {
|
|
406
|
+
| OutcomeRejected({cause: AccessRefusal}) => true
|
|
407
|
+
| _ => false
|
|
408
|
+
},
|
|
409
|
+
),
|
|
410
|
+
)->toEqual([true])
|
|
411
|
+
},
|
|
412
|
+
)
|
|
413
|
+
})
|