bump wkc (#71)

core/package.json

@@ -39,10 +39,10 @@
     "@dcl/crypto": "^3.4.5",
     "@dcl/protocol": "https://sdk-team-cdn.decentraland.org/@dcl/protocol/branch//dcl-protocol-1.0.0-6276153891.commit-3946d15.tgz",
     "@well-known-components/env-config-provider": "^1.2.0",
-    "@well-known-components/http-server": "^2.0.0",
-    "@well-known-components/interfaces": "^1.4.2",
+    "@well-known-components/http-server": "^2.0.1-20240313124908.commit-80c33da",
+    "@well-known-components/interfaces": "^1.4.3",
     "@well-known-components/logger": "^3.1.3",
-    "@well-known-components/metrics": "^2.0.1",
+    "@well-known-components/metrics": "^2.0.2-20240314122215.commit-df469cb",
     "@well-known-components/nats-component": "^2.0.0",
     "eth-connect": "^6.2.4",
     "google-protobuf": "^3.20.1",

core/src/components.ts

@@ -1,7 +1,11 @@
 import { createDotEnvConfigComponent } from '@well-known-components/env-config-provider'
-import { createServerComponent, createStatusCheckComponent } from '@well-known-components/http-server'
+import {
+  createServerComponent,
+  createStatusCheckComponent,
+  instrumentHttpServerWithPromClientRegistry
+} from '@well-known-components/http-server'
 import { createLogComponent } from '@well-known-components/logger'
-import { createMetricsComponent, instrumentHttpServerWithMetrics } from '@well-known-components/metrics'
+import { createMetricsComponent } from '@well-known-components/metrics'
 import { AppComponents, GlobalContext, Transport } from './types'
 import { metricDeclarations } from './metrics'
 import { createNatsComponent } from '@well-known-components/nats-component'
@@ -51,7 +55,7 @@ export async function initComponents(): Promise<AppComponents> {
 
   const metrics = await createMetricsComponent(metricDeclarations, { config })
   const server = await createServerComponent<GlobalContext>({ config, logs }, {})
-  await instrumentHttpServerWithMetrics({ server, metrics, config })
+  await instrumentHttpServerWithPromClientRegistry({ server, metrics, config, registry: metrics.registry! })
 
   const statusChecks = await createStatusCheckComponent({ server, config })
   const nats = await createNatsComponent({ config, logs })

core/src/metrics.ts

@@ -1,5 +1,6 @@
 import { IMetricsComponent } from '@well-known-components/interfaces'
-import { getDefaultHttpMetrics, validateMetricsDeclaration } from '@well-known-components/metrics'
+import { validateMetricsDeclaration } from '@well-known-components/metrics'
+import { getDefaultHttpMetrics } from '@well-known-components/http-server'
 import { metricDeclarations as logMetricDeclarations } from '@well-known-components/logger'
 
 export const metricDeclarations = {

stats/package.json

@@ -28,10 +28,10 @@
     "@dcl/protocol": "https://sdk-team-cdn.decentraland.org/@dcl/protocol/branch//dcl-protocol-1.0.0-6276153891.commit-3946d15.tgz",
     "@well-known-components/env-config-provider": "^1.1.1",
     "@well-known-components/fetch-component": "^2.0.2",
-    "@well-known-components/http-server": "^2.0.0",
-    "@well-known-components/interfaces": "^1.4.1",
+    "@well-known-components/http-server": "^2.0.1-20240313124908.commit-80c33da",
+    "@well-known-components/interfaces": "^1.4.3",
     "@well-known-components/logger": "^3.1.3",
-    "@well-known-components/metrics": "^2.0.1",
+    "@well-known-components/metrics": "^2.0.2-20240314122215.commit-df469cb",
     "@well-known-components/nats-component": "^2.0.0",
     "dcl-catalyst-client": "^21.5.5",
     "google-protobuf": "^3.20.1"

stats/src/components.ts

@@ -2,12 +2,13 @@ import { createDotEnvConfigComponent } from '@well-known-components/env-config-p
 import {
   createServerComponent,
   createStatusCheckComponent,
-  IHttpServerOptions
+  IHttpServerOptions,
+  instrumentHttpServerWithPromClientRegistry
 } from '@well-known-components/http-server'
 import { createFetchComponent } from '@well-known-components/fetch-component'
 import { createLogComponent } from '@well-known-components/logger'
 import { createNatsComponent } from '@well-known-components/nats-component'
-import { createMetricsComponent, instrumentHttpServerWithMetrics } from '@well-known-components/metrics'
+import { createMetricsComponent } from '@well-known-components/metrics'
 import { createContentComponent } from './adapters/content'
 import { AppComponents, GlobalContext } from './types'
 import { metricDeclarations } from './metrics'
@@ -41,7 +42,7 @@ export async function initComponents(): Promise<AppComponents> {
   const clock = createClockComponent()
   const coreStatus = createCoreStatusComponent({ clock })
 
-  await instrumentHttpServerWithMetrics({ server, metrics, config })
+  await instrumentHttpServerWithPromClientRegistry({ server, metrics, config, registry: metrics.registry! })
   return {
     config,
     logs,

stats/src/metrics.ts

@@ -1,4 +1,5 @@
-import { getDefaultHttpMetrics, validateMetricsDeclaration } from '@well-known-components/metrics'
+import { validateMetricsDeclaration } from '@well-known-components/metrics'
+import { getDefaultHttpMetrics } from '@well-known-components/http-server'
 import { metricDeclarations as logMetricDeclarations } from '@well-known-components/logger'
 
 export const metricDeclarations = {

ws-connector/package.json

@@ -34,10 +34,11 @@
     "@dcl/protocol": "https://sdk-team-cdn.decentraland.org/@dcl/protocol/branch//dcl-protocol-1.0.0-6276153891.commit-3946d15.tgz",
     "@well-known-components/env-config-provider": "^1.2.0",
     "@well-known-components/fetch-component": "^2.0.2",
-    "@well-known-components/interfaces": "^1.4.2",
+    "@well-known-components/interfaces": "^1.4.3",
     "@well-known-components/logger": "^3.1.3",
+    "@well-known-components/metrics": "^2.0.2-20240314122215.commit-df469cb",
     "@well-known-components/nats-component": "^2.0.0",
-    "@well-known-components/uws-http-server": "^0.0.1-20240212165828.commit-d5f5caf",
+    "@well-known-components/uws-http-server": "^0.0.1-20240314125425.commit-711dd8f",
     "eth-connect": "^6.2.4",
     "google-protobuf": "^3.20.1"
   }

ws-connector/src/components.ts

@@ -1,12 +1,13 @@
 import { HTTPProvider } from 'eth-connect'
-import { createDotEnvConfigComponent } from '@well-known-components/env-config-provider'
+import { createConfigComponent, createDotEnvConfigComponent } from '@well-known-components/env-config-provider'
 import { createLogComponent } from '@well-known-components/logger'
 import { AppComponents } from './types'
 import { metricDeclarations } from './metrics'
 import { createNatsComponent } from '@well-known-components/nats-component'
 import { createPeersRegistry } from './adapters/peers-registry'
 import { createFetchComponent } from '@well-known-components/fetch-component'
-import { createUWsComponent, createMetricsComponent } from '@well-known-components/uws-http-server'
+import { createUWsComponent } from '@well-known-components/uws-http-server'
+import { createMetricsComponent } from '@well-known-components/metrics'
 
 // Initialize all the components of the app
 export async function initComponents(): Promise<AppComponents> {
@@ -18,7 +19,9 @@ export async function initComponents(): Promise<AppComponents> {
   const server = await createUWsComponent({ config, logs })
 
   const fetch = createFetchComponent()
-  const nats = await createNatsComponent({ config, logs })
+
+  const natsLogs = await createLogComponent({ config: createConfigComponent({ LOG_LEVEL: 'WARN' }) })
+  const nats = await createNatsComponent({ config, logs: natsLogs })
   const peersRegistry = await createPeersRegistry()
 
   const ethNetwork = (await config.getString('ETH_NETWORK')) ?? 'sepolia'

ws-connector/src/controllers/routes.ts

@@ -54,7 +54,7 @@ export async function setupRoutes(components: AppComponents | TestComponents): P
   }
 
   {
-    const { path, handler } = await createMetricsHandler(components)
+    const { path, handler } = await createMetricsHandler(components, metrics.registry!)
     server.app.get(path, handler)
   }
 

ws-connector/src/metrics.ts

@@ -1,5 +1,6 @@
-import { getDefaultHttpMetrics, validateMetricsDeclaration } from '@well-known-components/metrics'
+import { validateMetricsDeclaration } from '@well-known-components/metrics'
 import { metricDeclarations as logMetricDeclarations } from '@well-known-components/logger'
+import { getDefaultHttpMetrics } from '@well-known-components/uws-http-server'
 
 export const metricDeclarations = {
   ...getDefaultHttpMetrics(),

yarn.lock

@@ -1063,9 +1063,9 @@
     fastq "^1.6.0"
 
 "@opentelemetry/api@^1.4.0":
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/@opentelemetry/api/-/api-1.7.0.tgz#b139c81999c23e3c8d3c0a7234480e945920fc40"
-  integrity sha512-AdY5wvN0P2vXBi3b29hxZgSFvdhdxPB9+f0B6s//P9Q8nibRWeA3cHm8UmLpio9ABigkVHJ5NMPk+Mz8VCCyrw==
+  version "1.8.0"
+  resolved "https://registry.yarnpkg.com/@opentelemetry/api/-/api-1.8.0.tgz#5aa7abb48f23f693068ed2999ae627d2f7d902ec"
+  integrity sha512-I/s6F7yKUDdtMsoBWXJe8Qz40Tui5vsuKCWJEWVL+5q9sSWRzzx6v2KeNsOBEwd94j0eWkpWCH4yB6rZg9Mf0w==
 
 "@pkgr/core@^0.1.0":
   version "0.1.1"
@@ -1513,10 +1513,10 @@
     "@well-known-components/interfaces" "^1.4.1"
     cross-fetch "^3.1.5"
 
-"@well-known-components/http-server@^2.0.0":
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/@well-known-components/http-server/-/http-server-2.0.0.tgz#85ec93080ae64f962782699db3eeecd597f59405"
-  integrity sha512-baDP0+MpgqTnKLFFXS41WBbg9QIGCXTEA7BHf6JqW1evrTW10MKEx+rgEvQQlhCA5oXxUdKOD+xNnR3GqzGw9w==
+"@well-known-components/http-server@^2.0.1-20240313124908.commit-80c33da":
+  version "2.0.1-20240313124908.commit-80c33da"
+  resolved "https://registry.yarnpkg.com/@well-known-components/http-server/-/http-server-2.0.1-20240313124908.commit-80c33da.tgz#8d5cdca3b39784b9fd4eb0702224b9a268444832"
+  integrity sha512-Po6/QodzvbzJYJydBg+8Ga3+JagGyfOm7o9Iweosr/SdfbdPY8+BmvfN3bLaNh0tOkT3UA6uvhqAD4ADCSKoaQ==
   dependencies:
     "@types/http-errors" "^2.0.1"
     destroy "^1.2.0"
@@ -1527,7 +1527,7 @@
     on-finished "^2.4.1"
     path-to-regexp "^6.2.1"
 
-"@well-known-components/interfaces@^1.1.1", "@well-known-components/interfaces@^1.4.1", "@well-known-components/interfaces@^1.4.2":
+"@well-known-components/interfaces@^1.1.1", "@well-known-components/interfaces@^1.4.1":
   version "1.4.2"
   resolved "https://registry.yarnpkg.com/@well-known-components/interfaces/-/interfaces-1.4.2.tgz#e37eb296280abfcab14f0608b3bdfc84d5a21929"
   integrity sha512-1tkr/OhZ4UmnQiST2svKznEiJ86crV2S+AIhokhowR4MexAKWgYlmZpoP6VIcgDVPf7nu8hOtIPMQaCZ+COC0A==
@@ -1536,17 +1536,27 @@
     "@types/node-fetch" "^2.5.12"
     typed-url-params "^1.0.1"
 
+"@well-known-components/interfaces@^1.4.3":
+  version "1.4.3"
+  resolved "https://registry.yarnpkg.com/@well-known-components/interfaces/-/interfaces-1.4.3.tgz#026047966db480bd561a315fdc8116b88bf8d27a"
+  integrity sha512-roVtoOHG6uaH+nL4C0ISnAwkkopc2FLsS7fqX+roI22EdX9PAknPoImhPU8/3u6jgRAVpglX5Zj4nWZkSaXPkQ==
+  dependencies:
+    "@types/node" "^20.3.1"
+    "@types/node-fetch" "^2.5.12"
+    typed-url-params "^1.0.1"
+
 "@well-known-components/logger@^3.1.3":
   version "3.1.3"
   resolved "https://registry.yarnpkg.com/@well-known-components/logger/-/logger-3.1.3.tgz#b1f4a76ac5e0d89c276cf339fe44a61f46023d2f"
   integrity sha512-tTjD27CdfU4SVe+kPfjRbPSqdrw0Crg+M31RNejinCuMEBtEGbhYLtB1M4gn+PSTy2Oi3cI3iOdeQ1xVhMSerQ==
 
-"@well-known-components/metrics@^2.0.1":
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/@well-known-components/metrics/-/metrics-2.0.1.tgz#b5f5410c3ba6e5658ef80926a1f7bd81d7aa1f56"
-  integrity sha512-jgT9TuxVS9GzVMMYWXNJRM2qXvexuf4xfrFNBYa3w+gqEWCK4Id5R4zBee/bm6/F5yIPauAWxbOS6KNNDBIrGw==
+"@well-known-components/metrics@^2.0.2-20240314122215.commit-df469cb":
+  version "2.0.2-20240314122215.commit-df469cb"
+  resolved "https://registry.yarnpkg.com/@well-known-components/metrics/-/metrics-2.0.2-20240314122215.commit-df469cb.tgz#98546b0c57660a2df70f4e13bc7a8a870d56e70d"
+  integrity sha512-O7IGqEasy2ykv2YXaIHKRtCp9Tn12RbcqesV0lpjD0KW3Uj814Vi5OJWTlvsH1azSNvmvdVWoHN0pShDocwUrw==
   dependencies:
-    prom-client "^14.1.0"
+    "@well-known-components/http-server" "^2.0.1-20240313124908.commit-80c33da"
+    prom-client "^15.1.0"
 
 "@well-known-components/nats-component@^2.0.0":
   version "2.0.0"
@@ -1576,14 +1586,13 @@
     sinon "^17.0.0"
     ts-jest "^29.1.0"
 
-"@well-known-components/uws-http-server@^0.0.1-20240212165828.commit-d5f5caf":
-  version "0.0.1-20240212165828.commit-d5f5caf"
-  resolved "https://registry.yarnpkg.com/@well-known-components/uws-http-server/-/uws-http-server-0.0.1-20240212165828.commit-d5f5caf.tgz#8e8e2918bdd74ddfb9f4d580eb52bf0110419d16"
-  integrity sha512-2j7qNjK4CcXRPO/cE6mjvNTTBNgyTSzUd/fNXBJXs24esgLiE+XrpDdM+aiUDezrRQ+pw7EZ5YaWAq4OuUBBDQ==
+"@well-known-components/uws-http-server@^0.0.1-20240314125425.commit-711dd8f":
+  version "0.0.1-20240314125425.commit-711dd8f"
+  resolved "https://registry.yarnpkg.com/@well-known-components/uws-http-server/-/uws-http-server-0.0.1-20240314125425.commit-711dd8f.tgz#7108aeb88e986737f3a167dfa2dcec5671b73dc5"
+  integrity sha512-+xKbp+HJknWRb8/PoXXOwEo2K0KbYlw1WiN3QNYIbmGGkujx7clXSalgGOMa1Vzs1HF4NwdZI6d/LRe1UtoWmQ==
   dependencies:
-    "@well-known-components/interfaces" "^1.4.2"
-    prom-client "^15.1.0"
-    uWebSockets.js "github:uNetworking/uWebSockets.js#v20.41.0"
+    "@well-known-components/interfaces" "^1.4.3"
+    uWebSockets.js "github:uNetworking/uWebSockets.js#v20.43.0"
 
 acorn-jsx@^5.3.2:
   version "5.3.2"
@@ -4133,13 +4142,6 @@ pretty-format@^29.0.0, pretty-format@^29.7.0:
     ansi-styles "^5.0.0"
     react-is "^18.0.0"
 
-prom-client@^14.1.0:
-  version "14.2.0"
-  resolved "https://registry.yarnpkg.com/prom-client/-/prom-client-14.2.0.tgz#ca94504e64156f6506574c25fb1c34df7812cf11"
-  integrity sha512-sF308EhTenb/pDRPakm+WgiN+VdM/T1RaHj1x+MvAuT8UiQP8JmOEbxVqtkbfR4LrvOg5n7ic01kRBDGXjYikA==
-  dependencies:
-    tdigest "^0.1.1"
-
 prom-client@^15.1.0:
   version "15.1.0"
   resolved "https://registry.yarnpkg.com/prom-client/-/prom-client-15.1.0.tgz#816a4a2128da169d0471093baeccc6d2f17a4613"
@@ -4669,9 +4671,9 @@ typescript@^4.7.4, typescript@^4.9.4:
   resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.9.5.tgz#095979f9bcc0d09da324d58d03ce8f8374cbe65a"
   integrity sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==
 
-"uWebSockets.js@github:uNetworking/uWebSockets.js#v20.41.0":
-  version "20.41.0"
-  resolved "https://codeload.github.com/uNetworking/uWebSockets.js/tar.gz/105d9ec47126cb82e4a6f3a08aa2ac78b4bb14f1"
+"uWebSockets.js@github:uNetworking/uWebSockets.js#v20.43.0":
+  version "20.43.0"
+  resolved "https://codeload.github.com/uNetworking/uWebSockets.js/tar.gz/1977b5039938ad863d42fc4958d48c17e5a1fa06"
 
 undici-types@~5.26.4:
   version "5.26.5"