diff --git a/package.json b/package.json index 62b721fd8b..d208d14aab 100644 --- a/package.json +++ b/package.json @@ -133,12 +133,13 @@ "lint": "aegir lint", "lint:fix": "aegir lint --fix", "clean": "aegir clean", - "dep-check": "aegir dep-check", + "dep-check": "aegir dep-check -i protons", "release": "aegir release" }, "dependencies": { "@chainsafe/libp2p-noise": "^11.0.4", "@libp2p/interface-connection": "^5.0.2", + "@libp2p/interface-metrics": "^4.0.8", "@libp2p/interface-peer-id": "^2.0.2", "@libp2p/interface-peer-store": "^2.0.2", "@libp2p/interface-registrar": "^2.0.12", @@ -169,10 +170,11 @@ "@libp2p/peer-id-factory": "^2.0.3", "@protobuf-ts/protoc": "^2.9.0", "@types/sinon": "^10.0.14", - "aegir": "^39.0.5", + "aegir": "^39.0.6", "eslint-plugin-etc": "^2.0.2", "it-pair": "^2.0.6", "protons": "^7.0.2", - "sinon": "^15.0.4" + "sinon": "^15.0.4", + "sinon-ts": "^1.0.0" } } diff --git a/src/maconn.ts b/src/maconn.ts index f977a00c4c..ffd869c506 100644 --- a/src/maconn.ts +++ b/src/maconn.ts @@ -1,6 +1,7 @@ import { logger } from '@libp2p/logger' import { nopSink, nopSource } from './util.js' import type { MultiaddrConnection, MultiaddrConnectionTimeline } from '@libp2p/interface-connection' +import type { CounterGroup } from '@libp2p/interface-metrics' import type { Multiaddr } from '@multiformats/multiaddr' import type { Source, Sink } from 'it-stream-types' @@ -21,6 +22,11 @@ interface WebRTCMultiaddrConnectionInit { * Holds the relevant events timestamps of the connection */ timeline: MultiaddrConnectionTimeline + + /** + * Optional metrics counter group for this connection + */ + metrics?: CounterGroup } export class WebRTCMultiaddrConnection implements MultiaddrConnection { @@ -39,6 +45,11 @@ export class WebRTCMultiaddrConnection implements MultiaddrConnection { */ timeline: MultiaddrConnectionTimeline + /** + * Optional metrics counter group for this connection + */ + metrics?: CounterGroup + /** * The stream source, a no-op as the transport natively supports multiplexing */ @@ -59,10 +70,10 @@ export class WebRTCMultiaddrConnection implements MultiaddrConnection { if (err !== undefined) { log.error('error closing connection', err) } - log.trace('closing connection') this.timeline.close = Date.now() this.peerConnection.close() + this.metrics?.increment({ close: true }) } } diff --git a/src/muxer.ts b/src/muxer.ts index 2522878d45..5d96125ce2 100644 --- a/src/muxer.ts +++ b/src/muxer.ts @@ -1,18 +1,25 @@ import { WebRTCStream } from './stream.js' import { nopSink, nopSource } from './util.js' import type { Stream } from '@libp2p/interface-connection' +import type { CounterGroup } from '@libp2p/interface-metrics' import type { StreamMuxer, StreamMuxerFactory, StreamMuxerInit } from '@libp2p/interface-stream-muxer' import type { Source, Sink } from 'it-stream-types' import type { Uint8ArrayList } from 'uint8arraylist' +export interface DataChannelMuxerFactoryInit { + peerConnection: RTCPeerConnection + metrics?: CounterGroup +} + export class DataChannelMuxerFactory implements StreamMuxerFactory { /** * WebRTC Peer Connection */ private readonly peerConnection: RTCPeerConnection private streamBuffer: WebRTCStream[] = [] + private readonly metrics?: CounterGroup - constructor (peerConnection: RTCPeerConnection, readonly protocol = '/webrtc') { + constructor (peerConnection: RTCPeerConnection, metrics?: CounterGroup, readonly protocol = '/webrtc') { this.peerConnection = peerConnection // store any datachannels opened before upgrade has been completed this.peerConnection.ondatachannel = ({ channel }) => { @@ -28,10 +35,11 @@ export class DataChannelMuxerFactory implements StreamMuxerFactory { }) this.streamBuffer.push(stream) } + this.metrics = metrics } createStreamMuxer (init?: StreamMuxerInit | undefined): StreamMuxer { - return new DataChannelMuxer(this.peerConnection, this.streamBuffer, this.protocol, init) + return new DataChannelMuxer(this.peerConnection, this.streamBuffer, this.protocol, init, this.metrics) } } @@ -44,6 +52,11 @@ export class DataChannelMuxer implements StreamMuxer { */ private readonly peerConnection: RTCPeerConnection + /** + * Optional metrics for this data channel muxer + */ + private readonly metrics?: CounterGroup + /** * Array of streams in the data channel */ @@ -69,7 +82,7 @@ export class DataChannelMuxer implements StreamMuxer { */ sink: Sink, Promise> = nopSink - constructor (peerConnection: RTCPeerConnection, streams: Stream[], readonly protocol = '/webrtc', init?: StreamMuxerInit) { + constructor (peerConnection: RTCPeerConnection, streams: Stream[], readonly protocol: string = '/webrtc', init?: StreamMuxerInit, metrics?: CounterGroup) { /** * Initialized stream muxer */ @@ -100,6 +113,7 @@ export class DataChannelMuxer implements StreamMuxer { this.streams.push(stream) if ((init?.onIncomingStream) != null) { + this.metrics?.increment({ incoming_stream: true }) init.onIncomingStream(stream) } } @@ -120,6 +134,10 @@ export class DataChannelMuxer implements StreamMuxer { newStream (): Stream { // The spec says the label SHOULD be an empty string: https://github.com/libp2p/specs/blob/master/webrtc/README.md#rtcdatachannel-label const channel = this.peerConnection.createDataChannel('') + const closeCb = (stream: Stream): void => { + this.metrics?.increment({ stream_end: true }) + this.init?.onStreamEnd?.(stream) + } const stream = new WebRTCStream({ channel, stat: { @@ -128,9 +146,10 @@ export class DataChannelMuxer implements StreamMuxer { open: 0 } }, - closeCb: this.wrapStreamEnd(this.init?.onStreamEnd) + closeCb: this.wrapStreamEnd(closeCb) }) this.streams.push(stream) + this.metrics?.increment({ outgoing_stream: true }) return stream } diff --git a/src/transport.ts b/src/transport.ts index d10c8723c9..303890980e 100644 --- a/src/transport.ts +++ b/src/transport.ts @@ -15,6 +15,7 @@ import { WebRTCStream } from './stream.js' import { genUfrag } from './util.js' import type { WebRTCDialOptions } from './options.js' import type { Connection } from '@libp2p/interface-connection' +import type { CounterGroup, Metrics } from '@libp2p/interface-metrics' import type { PeerId } from '@libp2p/interface-peer-id' import type { Multiaddr } from '@multiformats/multiaddr' @@ -42,19 +43,29 @@ export const CERTHASH_CODE: number = protocols('certhash').code /** * The peer for this transport */ -// @TODO(ddimaria): seems like an unnessary abstraction, consider removing export interface WebRTCDirectTransportComponents { peerId: PeerId + metrics?: Metrics +} + +export interface WebRTCMetrics { + dialerEvents: CounterGroup } export class WebRTCDirectTransport implements Transport { - /** - * The peer for this transport - */ + private readonly metrics?: WebRTCMetrics private readonly components: WebRTCDirectTransportComponents constructor (components: WebRTCDirectTransportComponents) { this.components = components + if (components.metrics != null) { + this.metrics = { + dialerEvents: components.metrics.registerCounterGroup('libp2p_webrtc_dialer_events_total', { + label: 'event', + help: 'Total count of WebRTC dial events by type' + }) + } + } } /** @@ -125,6 +136,7 @@ export class WebRTCDirectTransport implements Transport { const handshakeTimeout = setTimeout(() => { const error = `Data channel was never opened: state: ${handshakeDataChannel.readyState}` log.error(error) + this.metrics?.dialerEvents.increment({ open_error: true }) reject(dataChannelError('data', error)) }, HANDSHAKE_TIMEOUT_MS) @@ -139,6 +151,8 @@ export class WebRTCDirectTransport implements Transport { const errorTarget = event.target?.toString() ?? 'not specified' const error = `Error opening a data channel for handshaking: ${errorTarget}` log.error(error) + // NOTE: We use unknown error here but this could potentially be considered a reset by some standards. + this.metrics?.dialerEvents.increment({ unknown_error: true }) reject(dataChannelError('data', error)) } }) @@ -193,7 +207,8 @@ export class WebRTCDirectTransport implements Transport { remoteAddr: ma, timeline: { open: Date.now() - } + }, + metrics: this.metrics?.dialerEvents }) const eventListeningName = isFirefox ? 'iceconnectionstatechange' : 'connectionstatechange' @@ -215,7 +230,10 @@ export class WebRTCDirectTransport implements Transport { } }, { signal }) - const muxerFactory = new DataChannelMuxerFactory(peerConnection) + // Track opened peer connection + this.metrics?.dialerEvents.increment({ peer_connection: true }) + + const muxerFactory = new DataChannelMuxerFactory(peerConnection, this.metrics?.dialerEvents) // For outbound connections, the remote is expected to start the noise handshake. // Therefore, we need to secure an inbound noise connection from the remote. diff --git a/test/maconn.browser.spec.ts b/test/maconn.browser.spec.ts index 9db987f180..4cd542f939 100644 --- a/test/maconn.browser.spec.ts +++ b/test/maconn.browser.spec.ts @@ -2,19 +2,26 @@ import { multiaddr } from '@multiformats/multiaddr' import { expect } from 'aegir/chai' +import { stubObject } from 'sinon-ts' import { WebRTCMultiaddrConnection } from './../src/maconn.js' +import type { CounterGroup } from '@libp2p/interface-metrics' describe('Multiaddr Connection', () => { it('can open and close', async () => { const peerConnection = new RTCPeerConnection() peerConnection.createDataChannel('whatever', { negotiated: true, id: 91 }) const remoteAddr = multiaddr('/ip4/1.2.3.4/udp/1234/webrtc/certhash/uEiAUqV7kzvM1wI5DYDc1RbcekYVmXli_Qprlw3IkiEg6tQ') + const metrics = stubObject({ + increment: () => {}, + reset: () => {} + }) const maConn = new WebRTCMultiaddrConnection({ peerConnection, remoteAddr, timeline: { open: (new Date()).getTime() - } + }, + metrics }) expect(maConn.timeline.close).to.be.undefined @@ -22,5 +29,6 @@ describe('Multiaddr Connection', () => { await maConn.close() expect(maConn.timeline.close).to.not.be.undefined + expect(metrics.increment.calledWith({ close: true })).to.be.true }) }) diff --git a/test/transport.browser.spec.ts b/test/transport.browser.spec.ts index b270d3fa02..581dd9fd46 100644 --- a/test/transport.browser.spec.ts +++ b/test/transport.browser.spec.ts @@ -1,6 +1,6 @@ /* eslint-disable @typescript-eslint/no-floating-promises */ -import { mockUpgrader } from '@libp2p/interface-mocks' +import { mockMetrics, mockUpgrader } from '@libp2p/interface-mocks' import { type CreateListenerOptions, symbol } from '@libp2p/interface-transport' import { createEd25519PeerId } from '@libp2p/peer-id-factory' import { multiaddr, type Multiaddr } from '@multiformats/multiaddr' @@ -8,6 +8,7 @@ import { expect, assert } from 'aegir/chai' import { UnimplementedError } from './../src/error.js' import * as underTest from './../src/transport.js' import { expectError } from './util.js' +import type { Metrics } from '@libp2p/interface-metrics' function ignoredDialOption (): CreateListenerOptions { const upgrader = mockUpgrader({}) @@ -15,11 +16,14 @@ function ignoredDialOption (): CreateListenerOptions { } describe('WebRTC Transport', () => { + let metrics: Metrics let components: underTest.WebRTCDirectTransportComponents before(async () => { + metrics = mockMetrics()() components = { - peerId: await createEd25519PeerId() + peerId: await createEd25519PeerId(), + metrics } })