[DI] Improve internal caching algorithm resource overhead (#4864)

watson · web-flow · commit 51e63506ba92 · 2025-01-21T13:24:22.000+01:00
diff --git a/LICENSE-3rdparty.csv b/LICENSE-3rdparty.csv
@@ -30,6 +30,7 @@ require,rfdc,MIT,Copyright 2019 David Mark Clements
 require,semver,ISC,Copyright Isaac Z. Schlueter and Contributors
 require,shell-quote,mit,Copyright (c) 2013 James Halliday
 require,source-map,BSD-3-Clause,Copyright (c) 2009-2011, Mozilla Foundation and contributors
+require,ttl-set,MIT,Copyright (c) 2024 Thomas Watson
 dev,@apollo/server,MIT,Copyright (c) 2016-2020 Apollo Graph, Inc. (Formerly Meteor Development Group, Inc.)
 dev,@types/node,MIT,Copyright Authors
 dev,@eslint/eslintrc,MIT,Copyright OpenJS Foundation and other contributors, <www.openjsf.org>
diff --git a/package.json b/package.json
@@ -111,7 +111,8 @@
     "semver": "^7.5.4",
     "shell-quote": "^1.8.1",
     "source-map": "^0.7.4",
-    "tlhunter-sorted-set": "^0.1.0"
+    "tlhunter-sorted-set": "^0.1.0",
+    "ttl-set": "^1.0.0"
   },
   "devDependencies": {
     "@apollo/server": "^4.11.0",
diff --git a/packages/dd-trace/src/debugger/devtools_client/status.js b/packages/dd-trace/src/debugger/devtools_client/status.js
@@ -1,6 +1,6 @@
 'use strict'
 
-const LRUCache = require('lru-cache')
+const TTLSet = require('ttl-set')
 const config = require('./config')
 const JSONBuffer = require('./json-buffer')
 const request = require('../../exporters/common/request')
@@ -18,13 +18,7 @@ const ddsource = 'dd_debugger'
 const service = config.service
 const runtimeId = config.runtimeId
 
-const cache = new LRUCache({
-  ttl: 1000 * 60 * 60, // 1 hour
-  // Unfortunate requirement when using LRUCache:
-  // It will emit a warning unless `ttlAutopurge`, `max`, or `maxSize` is set when using `ttl`.
-  // TODO: Consider alternative as this is NOT performant :(
-  ttlAutopurge: true
-})
+const cache = new TTLSet(60 * 60 * 1000) // 1 hour
 
 const jsonBuffer = new JSONBuffer({ size: config.maxTotalPayloadSize, timeout: 1000, onFlush })
 
@@ -120,5 +114,5 @@ function onlyUniqueUpdates (type, id, version, fn) {
   const key = `${type}-${id}-${version}`
   if (cache.has(key)) return
   fn()
-  cache.set(key)
+  cache.add(key)
 }
diff --git a/yarn.lock b/yarn.lock
@@ -2422,6 +2422,11 @@ fast-deep-equal@^3.1.1, fast-deep-equal@^3.1.3:
   resolved "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz"
   integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==
 
+fast-fifo@^1.3.2:
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/fast-fifo/-/fast-fifo-1.3.2.tgz#286e31de96eb96d38a97899815740ba2a4f3640c"
+  integrity sha512-/d9sfos4yxzpwkDkuN7k2SqFKtYNmCTzgfEpz82x34IM9/zc8KGxQoXg1liNC/izpRM/MBdt44Nmx41ZWqk+FQ==
+
 fast-json-stable-stringify@^2.0.0:
   version "2.1.0"
   resolved "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz"
@@ -4887,6 +4892,13 @@ tslib@^2.4.0:
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.8.0.tgz#d124c86c3c05a40a91e6fdea4021bd31d377971b"
   integrity sha512-jWVzBLplnCmoaTr13V9dYbiQ99wvZRd0vNWaDRg+aVYRcjDF3nDksxFDE/+fkXnKhpnUUkmx5pK/v8mCtLVqZA==
 
+ttl-set@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/ttl-set/-/ttl-set-1.0.0.tgz#e7895d946ad9cedfadcf6e3384ea97322a86dd3b"
+  integrity sha512-2fuHn/UR+8Z9HK49r97+p2Ru1b5Eewg2QqPrU14BVCQ9QoyU3+vLLZk2WEiyZ9sgJh6W8G1cZr9I2NBLywAHrA==
+  dependencies:
+    fast-fifo "^1.3.2"
+
 type-check@^0.4.0, type-check@~0.4.0:
   version "0.4.0"
   resolved "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz"
