lib: fix diagnostics channel

PR-URL: #44154Fixes: #44143
Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
Reviewed-By: Paolo Insogna <paolo@cowtech.it>
Reviewed-By: Stephen Belanger <admin@stephenbelanger.com>

Author: theanarkh

test/parallel/test-diagnostics-channel-http-server-start.js

@@ -6,21 +6,18 @@ const dc = require('diagnostics_channel');
 constassert=require('assert');
 consthttp=require('http');
 
-constincomingStartChannel=dc.channel('http.server.request.start');
-constoutgoingFinishChannel=dc.channel('http.server.response.finish');
-
 constals=newAsyncLocalStorage();
 letcontext;
 
 // Bind requests to an AsyncLocalStorage context
-incomingStartChannel.subscribe(common.mustCall((message)=>{
+dc.subscribe('http.server.request.start',common.mustCall((message)=>{
 als.enterWith(message);
 context=message;
 }));
 
 // When the request ends, verify the context has been maintained
 // and that the messages contain the expected data
-outgoingFinishChannel.subscribe(common.mustCall((message)=>{
+dc.subscribe('http.server.response.finish',common.mustCall((message)=>{
 constdata={
  request,
  response,

test/parallel/test-diagnostics-channel-http.js

@@ -5,26 +5,24 @@ const http = require('http');
 constnet=require('net');
 constdc=require('diagnostics_channel');
 
-constonClientRequestStart=dc.channel('http.client.request.start');
-constonClientResponseFinish=dc.channel('http.client.response.finish');
-constonServerRequestStart=dc.channel('http.server.request.start');
-constonServerResponseFinish=dc.channel('http.server.response.finish');
-
 constisHTTPServer=(server)=>serverinstanceofhttp.Server;
 constisIncomingMessage=(object)=>objectinstanceofhttp.IncomingMessage;
 constisOutgoingMessage=(object)=>objectinstanceofhttp.OutgoingMessage;
 constisNetSocket=(socket)=>socketinstanceofnet.Socket;
 
-onClientRequestStart.subscribe(common.mustCall(({ request })=>{
+dc.subscribe('http.client.request.start',common.mustCall(({ request })=>{
 assert.strictEqual(isOutgoingMessage(request),true);
 }));
 
-onClientResponseFinish.subscribe(common.mustCall(({ request, response })=>{
+dc.subscribe('http.client.response.finish',common.mustCall(({
+ request,
+ response
+})=>{
 assert.strictEqual(isOutgoingMessage(request),true);
 assert.strictEqual(isIncomingMessage(response),true);
 }));
 
-onServerRequestStart.subscribe(common.mustCall(({
+dc.subscribe('http.server.request.start',common.mustCall(({
  request,
  response,
  socket,
@@ -36,7 +34,7 @@ onServerRequestStart.subscribe(common.mustCall(({
 assert.strictEqual(isHTTPServer(server),true);
 }));
 
-onServerResponseFinish.subscribe(common.mustCall(({
+dc.subscribe('http.server.response.finish',common.mustCall(({
  request,
  response,
  socket,