From b3eebe2e4d04233b133d58317d9fa4912fc1715f Mon Sep 17 00:00:00 2001
From: James M Snell <jasnell@gmail.com>
Date: Mon, 8 Jan 2018 13:32:30 -0800
Subject: [PATCH 1/2] perf_hooks,http2: add clearHttp2 to remove http2 entries

Add missing clearHttp2 method to `perf_hooks.performance` to
remove the http2 entries from the master timeline to prevent
that from being a memory leak.
---
 doc/api/perf_hooks.md                  | 7 +++++++
 lib/perf_hooks.js                      | 4 ++++
 test/parallel/test-http2-perf_hooks.js | 8 +++++++-
 3 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/doc/api/perf_hooks.md b/doc/api/perf_hooks.md
index 5ce94624cb9d22..1c852da77058db 100644
--- a/doc/api/perf_hooks.md
+++ b/doc/api/perf_hooks.md
@@ -39,6 +39,13 @@ added: v8.5.0
 If `name` is not provided, removes all `PerformanceFunction` objects from the
 Performance Timeline. If `name` is provided, removes entries with `name`.
 
+### performance.clearHttp2()
+<!-- YAML
+added: REPLACEME
+-->
+
+Remove all `http2` performance entry objects from the Performance Timeline.
+
 ### performance.clearMarks([name])
 <!-- YAML
 added: v8.5.0
diff --git a/lib/perf_hooks.js b/lib/perf_hooks.js
index 4a05f7ccba7bc8..3a7d8a2cd5997f 100644
--- a/lib/perf_hooks.js
+++ b/lib/perf_hooks.js
@@ -471,6 +471,10 @@ class Performance extends PerformanceObserverEntryList {
     this[kClearEntry]('function', name);
   }
 
+  clearHttp2() {
+    this[kClearEntry]('http2');
+  }
+
   timerify(fn) {
     if (typeof fn !== 'function') {
       const errors = lazyErrors();
diff --git a/test/parallel/test-http2-perf_hooks.js b/test/parallel/test-http2-perf_hooks.js
index 07d9c55ed7e0d2..dc09c7570e735f 100644
--- a/test/parallel/test-http2-perf_hooks.js
+++ b/test/parallel/test-http2-perf_hooks.js
@@ -6,7 +6,7 @@ if (!common.hasCrypto)
 const assert = require('assert');
 const h2 = require('http2');
 
-const { PerformanceObserver } = require('perf_hooks');
+const { PerformanceObserver, performance } = require('perf_hooks');
 
 const obs = new PerformanceObserver(common.mustCall((items) => {
   const entry = items.getEntries()[0];
@@ -46,6 +46,7 @@ const obs = new PerformanceObserver(common.mustCall((items) => {
     default:
       assert.fail('invalid entry name');
   }
+  performance.clearHttp2();
 }, 4));
 obs.observe({ entryTypes: ['http2'] });
 
@@ -100,3 +101,8 @@ server.on('listening', common.mustCall(() => {
   }));
 
 }));
+
+process.on('exit', () => {
+  // There shouldn't be any http2 entries left over.
+  assert.strictEqual(performance.getEntries().length, 1);
+});

From 95dde14ee302e9daa31f4a4990cdc93221098bc0 Mon Sep 17 00:00:00 2001
From: James M Snell <jasnell@gmail.com>
Date: Wed, 10 Jan 2018 07:43:12 -0800
Subject: [PATCH 2/2] [Squash] Address feedback

---
 doc/api/perf_hooks.md                  | 15 ++++++++-------
 lib/perf_hooks.js                      |  4 ++--
 test/parallel/test-http2-perf_hooks.js |  6 ++++--
 3 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/doc/api/perf_hooks.md b/doc/api/perf_hooks.md
index 1c852da77058db..3f2cc506f3148a 100644
--- a/doc/api/perf_hooks.md
+++ b/doc/api/perf_hooks.md
@@ -29,6 +29,14 @@ added: v8.5.0
 The `Performance` provides access to performance metric data. A single
 instance of this class is provided via the `performance` property.
 
+### performance.clearEntries(name)
+<!-- YAML
+added: REPLACEME
+-->
+
+Remove all performance entry objects with `entryType` equal to `name` from the
+Performance Timeline.
+
 ### performance.clearFunctions([name])
 <!-- YAML
 added: v8.5.0
@@ -39,13 +47,6 @@ added: v8.5.0
 If `name` is not provided, removes all `PerformanceFunction` objects from the
 Performance Timeline. If `name` is provided, removes entries with `name`.
 
-### performance.clearHttp2()
-<!-- YAML
-added: REPLACEME
--->
-
-Remove all `http2` performance entry objects from the Performance Timeline.
-
 ### performance.clearMarks([name])
 <!-- YAML
 added: v8.5.0
diff --git a/lib/perf_hooks.js b/lib/perf_hooks.js
index 3a7d8a2cd5997f..15256a63c0b97c 100644
--- a/lib/perf_hooks.js
+++ b/lib/perf_hooks.js
@@ -471,8 +471,8 @@ class Performance extends PerformanceObserverEntryList {
     this[kClearEntry]('function', name);
   }
 
-  clearHttp2() {
-    this[kClearEntry]('http2');
+  clearEntries(name) {
+    this[kClearEntry](name);
   }
 
   timerify(fn) {
diff --git a/test/parallel/test-http2-perf_hooks.js b/test/parallel/test-http2-perf_hooks.js
index dc09c7570e735f..e30d0ac83e0d1f 100644
--- a/test/parallel/test-http2-perf_hooks.js
+++ b/test/parallel/test-http2-perf_hooks.js
@@ -46,7 +46,7 @@ const obs = new PerformanceObserver(common.mustCall((items) => {
     default:
       assert.fail('invalid entry name');
   }
-  performance.clearHttp2();
+  performance.clearEntries('http2');
 }, 4));
 obs.observe({ entryTypes: ['http2'] });
 
@@ -103,6 +103,8 @@ server.on('listening', common.mustCall(() => {
 }));
 
 process.on('exit', () => {
+  const entries = performance.getEntries();
   // There shouldn't be any http2 entries left over.
-  assert.strictEqual(performance.getEntries().length, 1);
+  assert.strictEqual(entries.length, 1);
+  assert.strictEqual(entries[0], performance.nodeTiming);
 });