build: remove dtrace & etw support

There are no clear indicators anyone is using the dtrace USDT probes. ETW support is very intertwined with the dtrace infrastructure. It's not clear if anyone uses ETW so to keep things simple it too is removed. Fixes: #43649 PR-URL: #43652 Reviewed-By: Matteo Collina <[email protected]> Reviewed-By: Michaël Zasso <[email protected]> Reviewed-By: Santiago Gimeno <[email protected]> Reviewed-By: Juan José Arboleda <[email protected]> Reviewed-By: James M Snell <[email protected]> Reviewed-By: Gerhard Stöbich <[email protected]>
nodejs · Jul 17, 2022 · aa3a572 · aa3a572
1 parent 8baf372
commit aa3a572
Show file tree

Hide file tree

Showing 31 changed files with 10 additions and 2,722 deletions.
diff --git a/common.gypi b/common.gypi
@@ -546,9 +546,6 @@
           }],
         ],
       }],
-      ['OS=="freebsd" and node_use_dtrace=="true"', {
-        'libraries': [ '-lelf' ],
-      }],
       ['OS=="freebsd"', {
         'ldflags': [
           '-Wl,--export-dynamic',

diff --git a/configure.py b/configure.py
@@ -508,18 +508,6 @@
     help='MIPS floating-point ABI ({0}) [default: %(default)s]'.format(
         ', '.join(valid_mips_float_abi)))
 
-parser.add_argument('--with-dtrace',
-    action='store_true',
-    dest='with_dtrace',
-    default=None,
-    help='build with DTrace (default is true on sunos and darwin)')
-
-parser.add_argument('--with-etw',
-    action='store_true',
-    dest='with_etw',
-    default=None,
-    help='build with ETW (default is true on Windows)')
-
 parser.add_argument('--use-largepages',
     action='store_true',
     dest='node_use_large_pages',
@@ -628,18 +616,6 @@
 
 parser.add_argument_group(http2_optgroup)
 
-parser.add_argument('--without-dtrace',
-    action='store_true',
-    dest='without_dtrace',
-    default=None,
-    help='build without DTrace')
-
-parser.add_argument('--without-etw',
-    action='store_true',
-    dest='without_etw',
-    default=None,
-    help='build without ETW')
-
 parser.add_argument('--without-npm',
     action='store_true',
     dest='without_npm',
@@ -1306,18 +1282,6 @@ def configure_node(o):
 
   o['variables']['enable_lto'] = b(options.enable_lto)
 
-  if flavor in ('solaris', 'mac', 'linux', 'freebsd'):
-    use_dtrace = not options.without_dtrace
-    # Don't enable by default on linux and freebsd
-    if flavor in ('linux', 'freebsd'):
-      use_dtrace = options.with_dtrace
-    o['variables']['node_use_dtrace'] = b(use_dtrace)
-  elif options.with_dtrace:
-    raise Exception(
-       'DTrace is currently only supported on SunOS, MacOS or Linux systems.')
-  else:
-    o['variables']['node_use_dtrace'] = 'false'
-
   if options.node_use_large_pages or options.node_use_large_pages_script_lld:
     warn('''The `--use-largepages` and `--use-largepages-script-lld` options
          have no effect during build time. Support for mapping to large pages is
@@ -1328,14 +1292,6 @@ def configure_node(o):
   if options.no_ifaddrs:
     o['defines'] += ['SUNOS_NO_IFADDRS']
 
-  # By default, enable ETW on Windows.
-  if flavor == 'win':
-    o['variables']['node_use_etw'] = b(not options.without_etw)
-  elif options.with_etw:
-    raise Exception('ETW is only supported on Windows.')
-  else:
-    o['variables']['node_use_etw'] = 'false'
-
   o['variables']['node_with_ltcg'] = b(options.with_ltcg)
   if flavor != 'win' and options.with_ltcg:
     raise Exception('Link Time Code Generation is only supported on Windows.')

diff --git a/doc/api/process.md b/doc/api/process.md
@@ -1075,7 +1075,6 @@ An example of the possible output looks like:
      node_shared_http_parser: 'false',
      node_shared_libuv: 'false',
      node_shared_zlib: 'false',
-     node_use_dtrace: 'false',
      node_use_openssl: 'true',
      node_shared_openssl: 'false',
      strict_aliasing: 'true',

diff --git a/lib/_http_client.js b/lib/_http_client.js
@@ -77,11 +77,6 @@ const {
   validateInteger,
 } = require('internal/validators');
 const { getTimerDuration } = require('internal/timers');
-const {
-  DTRACE_HTTP_CLIENT_REQUEST,
-  DTRACE_HTTP_CLIENT_RESPONSE
-} = require('internal/dtrace');
-
 const {
   hasObserver,
   startPerf,
@@ -356,7 +351,6 @@ ObjectSetPrototypeOf(ClientRequest.prototype, OutgoingMessage.prototype);
 ObjectSetPrototypeOf(ClientRequest, OutgoingMessage);
 
 ClientRequest.prototype._finish = function _finish() {
-  DTRACE_HTTP_CLIENT_REQUEST(this, this.socket);
   FunctionPrototypeCall(OutgoingMessage.prototype._finish, this);
   if (hasObserver('http')) {
     startPerf(this, kClientRequestStatistics, {
@@ -642,7 +636,6 @@ function parserOnIncomingClient(res, shouldKeepAlive) {
     req.shouldKeepAlive = false;
   }
 
-  DTRACE_HTTP_CLIENT_RESPONSE(socket, req);
   if (req[kClientRequestStatistics] && hasObserver('http')) {
     stopPerf(req, kClientRequestStatistics, {
       detail: {

diff --git a/lib/_http_server.js b/lib/_http_server.js
@@ -79,10 +79,6 @@ const {
   validateBoolean
 } = require('internal/validators');
 const Buffer = require('buffer').Buffer;
-const {
-  DTRACE_HTTP_SERVER_REQUEST,
-  DTRACE_HTTP_SERVER_RESPONSE
-} = require('internal/dtrace');
 const { setInterval, clearInterval } = require('timers');
 let debug = require('internal/util/debuglog').debuglog('http', (fn) => {
   debug = fn;
@@ -215,7 +211,6 @@ ObjectSetPrototypeOf(ServerResponse.prototype, OutgoingMessage.prototype);
 ObjectSetPrototypeOf(ServerResponse, OutgoingMessage);
 
 ServerResponse.prototype._finish = function _finish() {
-  DTRACE_HTTP_SERVER_RESPONSE(this.socket);
   if (this[kServerResponseStatistics] && hasObserver('http')) {
     stopPerf(this, kServerResponseStatistics, {
       detail: {
@@ -944,7 +939,6 @@ function parserOnIncoming(server, socket, state, req, keepAlive) {
 
   res.shouldKeepAlive = keepAlive;
   res[kUniqueHeaders] = server[kUniqueHeaders];
-  DTRACE_HTTP_SERVER_REQUEST(req, socket);
 
   if (onRequestStartChannel.hasSubscribers) {
     onRequestStartChannel.publish({

diff --git a/lib/internal/dtrace.js b/lib/internal/dtrace.js
diff --git a/lib/net.js b/lib/net.js
@@ -111,10 +111,6 @@ const {
   validateString
 } = require('internal/validators');
 const kLastWriteQueueSize = Symbol('lastWriteQueueSize');
-const {
-  DTRACE_NET_SERVER_CONNECTION,
-  DTRACE_NET_STREAM_END
-} = require('internal/dtrace');
 
 // Lazy loaded to improve startup performance.
 let cluster;
@@ -654,7 +650,6 @@ Socket.prototype._read = function(n) {
 Socket.prototype.end = function(data, encoding, callback) {
   stream.Duplex.prototype.end.call(this,
                                    data, encoding, callback);
-  DTRACE_NET_STREAM_END(this);
   return this;
 };
 
@@ -1711,7 +1706,6 @@ function onconnection(err, clientHandle) {
   socket.server = self;
   socket._server = self;
 
-  DTRACE_NET_SERVER_CONNECTION(socket);
   self.emit('connection', socket);
 }