lib: add tracing channels for http2 streams

PR-URL: #266
Reviewed-By: Juan José Arboleda <[email protected]>
Reviewed-By: Rafael Gonzaga <[email protected]>

Author: santigimeno

lib/internal/http2/core.js

@@ -198,6 +198,9 @@ const onServerStreamErrorChannel = dc.channel('http2.server.stream.error');
 const onServerStreamFinishChannel = dc.channel('http2.server.stream.finish');
 const onServerStreamCloseChannel = dc.channel('http2.server.stream.close');
 
+const clientTracingChannels = dc.tracingChannel('http2.client');
+const serverTracingChannels = dc.tracingChannel('http2.server');
+
 let debug = require('internal/util/debuglog').debuglog('http2', (fn) => {
   debug = fn;
 });
@@ -259,6 +262,7 @@ const kSentHeaders = Symbol('sent-headers');
 const kSentTrailers = Symbol('sent-trailers');
 const kServer = Symbol('server');
 const kState = Symbol('state');
+const kTracingContext = Symbol('tracing-context');
 const kType = Symbol('type');
 const kWriteGeneric = Symbol('write-generic');
 
@@ -342,6 +346,31 @@ function emit(self, ...args) {
   ReflectApply(self.emit, self, args);
 }
 
+function createServerStream(session, handle, id, options, headers, endOfStream) {
+  // eslint-disable-next-line no-use-before-define
+  const stream = new ServerHttp2Stream(session, handle, id, options, headers);
+  if (endOfStream) {
+    stream.push(null);
+    stream[kState].endAfterHeaders = true;
+  }
+
+  if (headers[HTTP2_HEADER_METHOD] === HTTP2_METHOD_HEAD) {
+    // For head requests, there must not be a body...
+    // end the writable side immediately.
+    stream.end();
+    stream[kState].flags |= STREAM_FLAGS_HEAD_REQUEST;
+  }
+
+  if (onServerStreamStartChannel.hasSubscribers) {
+    onServerStreamStartChannel.publish({
+      stream,
+      headers,
+    });
+  }
+
+  return stream;
+}
+
 // Called when a new block of headers has been received for a given
 // stream. The stream may or may not be new. If the stream is new,
 // create the associated Http2Stream instance and emit the 'stream'
@@ -374,23 +403,24 @@ function onSessionHeaders(handle, id, cat, flags, headers, sensitiveHeaders) {
     }
     // session[kType] can be only one of two possible values
     if (type === NGHTTP2_SESSION_SERVER) {
-      // eslint-disable-next-line no-use-before-define
-      stream = new ServerHttp2Stream(session, handle, id, {}, obj);
-      if (endOfStream) {
-        stream.push(null);
-      }
-      if (obj[HTTP2_HEADER_METHOD] === HTTP2_METHOD_HEAD) {
-        // For head requests, there must not be a body...
-        // end the writable side immediately.
-        stream.end();
-        stream[kState].flags |= STREAM_FLAGS_HEAD_REQUEST;
-      }
-
-      if (onServerStreamStartChannel.hasSubscribers) {
-        onServerStreamStartChannel.publish({
-          stream,
-          headers: obj,
+      if (serverTracingChannels.start.hasSubscribers) {
+        const context = { headers: obj, flags };
+        serverTracingChannels.start.runStores(context, () => {
+          try {
+            stream = createServerStream(session, handle, id, {}, obj);
+            stream[kTracingContext] = context;
+            process.nextTick(emit, session, 'stream', stream, obj, flags, headers);
+          } catch (e) {
+            context.error = e;
+            serverTracingChannels.error.publish(context);
+            throw e;
+          } finally {
+            serverTracingChannels.end.publish(context);
+          }
         });
+      } else {
+        stream = createServerStream(session, handle, id, {}, obj, endOfStream);
+        process.nextTick(emit, session, 'stream', stream, obj, flags, headers);
       }
     } else {
       // eslint-disable-next-line no-use-before-define
@@ -406,10 +436,10 @@ function onSessionHeaders(handle, id, cat, flags, headers, sensitiveHeaders) {
         stream.push(null);
       }
       stream.end();
+      if (endOfStream)
+        stream[kState].endAfterHeaders = true;
+      process.nextTick(emit, session, 'stream', stream, obj, flags, headers);
     }
-    if (endOfStream)
-      stream[kState].endAfterHeaders = true;
-    process.nextTick(emit, session, 'stream', stream, obj, flags, headers);
   } else {
     let event;
     const status = obj[HTTP2_HEADER_STATUS];
@@ -445,9 +475,10 @@ function onSessionHeaders(handle, id, cat, flags, headers, sensitiveHeaders) {
         });
       }
     }
-  }
-  if (endOfStream) {
-    stream.push(null);
+
+    if (endOfStream) {
+      stream.push(null);
+    }
   }
 }
 
@@ -1779,7 +1810,31 @@ class ClientHttp2Session extends Http2Session {
   // associated Http2Stream instance.
   request(headers, options) {
     debugSessionObj(this, 'initiating request');
+    headers = ObjectAssign({ __proto__: null }, headers);
+    options = { ...options };
+    if (!clientTracingChannels.start.hasSubscribers) {
+      this._requestPrepare(headers, options);
+      return this._requestFinalize(headers, options);
+    }
+
+    this._requestPrepare(headers, options);
+    const context = { headers, options };
+    return clientTracingChannels.start.runStores(context, () => {
+      try {
+        const stream = this._requestFinalize(context.headers, context.options);
+        stream[kTracingContext] = context;
+        return stream;
+      } catch (e) {
+        context.error = e;
+        clientTracingChannels.error.publish(context);
+        throw e;
+      } finally {
+        clientTracingChannels.end.publish(context);
+      }
+    });
+  }
 
+  _requestPrepare(headers, options) {
     if (this.destroyed)
       throw new ERR_HTTP2_INVALID_SESSION();
 
@@ -1802,9 +1857,6 @@ class ClientHttp2Session extends Http2Session {
     assertIsObject(headers, 'headers');
     assertIsObject(options, 'options');
 
-    headers = ObjectAssign(ObjectCreate(null), headers);
-    options = { ...options };
-
     if (headers[HTTP2_HEADER_METHOD] === undefined)
       headers[HTTP2_HEADER_METHOD] = HTTP2_METHOD_GET;
 
@@ -1837,7 +1889,9 @@ class ClientHttp2Session extends Http2Session {
     } else if (typeof options.endStream !== 'boolean') {
       throw new ERR_INVALID_ARG_VALUE('options.endStream', options.endStream);
     }
+  }
 
+  _requestFinalize(headers, options) {
     const headersList = mapToHeaders(headers);
 
     // eslint-disable-next-line no-use-before-define
@@ -1853,6 +1907,13 @@ class ClientHttp2Session extends Http2Session {
     if (options.waitForTrailers)
       stream[kState].flags |= STREAM_FLAGS_HAS_TRAILERS;
 
+    if (onClientStreamCreatedChannel.hasSubscribers) {
+      onClientStreamCreatedChannel.publish({
+        stream,
+        headers,
+      });
+    }
+
     const { signal } = options;
     if (signal) {
       validateAbortSignal(signal, 'options.signal');
@@ -1883,17 +1944,11 @@ class ClientHttp2Session extends Http2Session {
       onConnect();
     }
 
-    if (onClientStreamCreatedChannel.hasSubscribers) {
-      onClientStreamCreatedChannel.publish({
-        stream,
-        headers,
-      });
-    }
-
     return stream;
   }
 }
 
+
 function trackWriteState(stream, bytes) {
   const session = stream[kSession];
   stream[kState].writeQueueSize += bytes;
@@ -1996,18 +2051,31 @@ function closeStream(stream, code, rstStreamStatus = kSubmitRstStream) {
       stream.once('finish', finishFn);
   }
 
+  const context = stream[kTracingContext];
   if (type === NGHTTP2_SESSION_CLIENT) {
     if (onClientStreamCloseChannel.hasSubscribers) {
       onClientStreamCloseChannel.publish({
         stream,
         code,
       });
     }
-  } else if (onServerStreamCloseChannel.hasSubscribers) {
-    onServerStreamCloseChannel.publish({
-      stream,
-      code,
-    });
+
+    if (context) {
+      context.result = code;
+      clientTracingChannels.asyncEnd.publish(context);
+    }
+  } else {
+    if (onServerStreamCloseChannel.hasSubscribers) {
+      onServerStreamCloseChannel.publish({
+        stream,
+        code,
+      });
+    }
+
+    if (context) {
+      context.result = code;
+      serverTracingChannels.asyncEnd.publish(context);
+    }
   }
 }
 
@@ -2404,6 +2472,41 @@ class Http2Stream extends Duplex {
     }
     const hasHandle = handle !== undefined;
 
+    // RST code 8 not emitted as an error as its used by clients to signify
+    // abort and is already covered by aborted event, also allows more
+    // seamless compatibility with http1
+    if (err == null && code !== NGHTTP2_NO_ERROR && code !== NGHTTP2_CANCEL)
+      err = new ERR_HTTP2_STREAM_ERROR(nameForErrorCode[code] || code);
+
+    if (err) {
+      const context = this[kTracingContext];
+      if (session[kType] === NGHTTP2_SESSION_CLIENT) {
+        if (onClientStreamErrorChannel.hasSubscribers) {
+          onClientStreamErrorChannel.publish({
+            stream: this,
+            error: err,
+          });
+        }
+
+        if (context) {
+          context.error = err;
+          clientTracingChannels.error.publish(context);
+        }
+      } else {
+        if (onServerStreamErrorChannel.hasSubscribers) {
+          onServerStreamErrorChannel.publish({
+            stream: this,
+            error: err,
+          });
+        }
+
+        if (context) {
+          context.error = err;
+          serverTracingChannels.error.publish(context);
+        }
+      }
+    }
+
     if (!this.closed)
       closeStream(this, code, hasHandle ? kForceRstStream : kNoRstStream);
     this.push(null);
@@ -2419,12 +2522,6 @@ class Http2Stream extends Duplex {
     sessionState.writeQueueSize -= state.writeQueueSize;
     state.writeQueueSize = 0;
 
-    // RST code 8 not emitted as an error as its used by clients to signify
-    // abort and is already covered by aborted event, also allows more
-    // seamless compatibility with http1
-    if (err == null && code !== NGHTTP2_NO_ERROR && code !== NGHTTP2_CANCEL)
-      err = new ERR_HTTP2_STREAM_ERROR(nameForErrorCode[code] || code);
-
     this[kSession] = undefined;
     this[kHandle] = undefined;
 
@@ -2433,21 +2530,6 @@ class Http2Stream extends Duplex {
     // will destroy if it has been closed and there are no other open or
     // pending streams.
     session[kMaybeDestroy]();
-    if (err) {
-      if (session[kType] === NGHTTP2_SESSION_CLIENT) {
-        if (onClientStreamErrorChannel.hasSubscribers) {
-          onClientStreamErrorChannel.publish({
-            stream: this,
-            error: err,
-          });
-        }
-      } else if (onServerStreamErrorChannel.hasSubscribers) {
-        onServerStreamErrorChannel.publish({
-          stream: this,
-          error: err,
-        });
-      }
-    }
     callback(err);
   }
   // The Http2Stream can be destroyed if it has closed and if the readable