aljaz/ditto
1
0
Fork 0
mirror of https://github.com/aljazceru/ditto.git synced 2026-01-26 08:44:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'prom-metrics-best' into 'main'

Browse Source 
Update Prometheus metrics to conform to best practices

See merge request soapbox-pub/ditto!478
This commit is contained in:
Alex Gleason
2024-09-07 14:15:07 +00:00
parent a7292b1b8d 537de85421
commit 1a98049ee8
8 changed files with 2159 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/controllers/nostr/relay.ts
View File

@@ -12,7 +12,7 @@ import {
import { AppController } from '@/app.ts';
import { Conf } from '@/config.ts';
import { relayInfoController } from '@/controllers/nostr/relay-info.ts';
import { relayConnectionsGauge, relayEventCounter, relayMessageCounter } from '@/metrics.ts';
import { relayConnectionsGauge, relayEventsCounter, relayMessagesCounter } from '@/metrics.ts';
import * as pipeline from '@/pipeline.ts';
import { RelayError } from '@/RelayError.ts';
import { Storages } from '@/storages.ts';
@@ -54,10 +54,10 @@ function connectStream(socket: WebSocket, ip: string | undefined) {
const result = n.json().pipe(n.clientMsg()).safeParse(e.data);
if (result.success) {
relayMessageCounter.inc({ verb: result.data[0] });
relayMessagesCounter.inc({ verb: result.data[0] });
handleMsg(result.data);
} else {
relayMessageCounter.inc();
relayMessagesCounter.inc();
send(['NOTICE', 'Invalid message.']);
}
};
@@ -130,7 +130,7 @@ function connectStream(socket: WebSocket, ip: string | undefined) {
/** Handle EVENT. Store the event. */
async function handleEvent([_, event]: NostrClientEVENT): Promise<void> {
relayEventCounter.inc({ kind: event.kind.toString() });
relayEventsCounter.inc({ kind: event.kind.toString() });
try {
// This will store it (if eligible) and run other side-effects.
await pipeline.handleEvent(event, AbortSignal.timeout(1000));