Skip to content

Commit

Permalink
chore: bump WKC, schemas and content-validator (#1759)
Browse files Browse the repository at this point in the history
  • Loading branch information
@hugoArregui
hugoArregui authored Mar 19, 2024
1 parent 63dd457 commit e2974a5
Show file tree
Hide file tree
Showing 5 changed files with 55 additions and 26 deletions.
10 changes: 5 additions & 5 deletions content/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,18 +24,18 @@
"@dcl/catalyst-api-specs": "^3.2.5",
"@dcl/catalyst-contracts": "^4.3.1",
"@dcl/catalyst-storage": "^4.2.0",
"@dcl/content-validator": "^4.14.0",
"@dcl/content-validator": "^5.0.0",
"@dcl/crypto": "^3.4.5",
"@dcl/hashing": "^3.0.4",
"@dcl/schemas": "^10.3.0",
"@dcl/schemas": "^11.0.0",
"@dcl/snapshots-fetcher": "^9.0.3",
"@dcl/urn-resolver": "^3.3.1",
"@well-known-components/env-config-provider": "^1.2.0",
"@well-known-components/fetch-component": "^2.0.2",
"@well-known-components/http-server": "^2.0.0",
"@well-known-components/interfaces": "^1.4.2",
"@well-known-components/http-server": "^2.1.0",
"@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.1.0",
"@well-known-components/multipart-wrapper": "^1.0.3",
"@well-known-components/thegraph-component": "^1.6.0",
"bloom-filters": "^3.0.0",
Expand Down
6 changes: 3 additions & 3 deletions content/src/components.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ import { EntityType, EthAddress } from '@dcl/schemas'
import { createSynchronizer } from '@dcl/snapshots-fetcher'
import { createJobQueue } from '@dcl/snapshots-fetcher/dist/job-queue-port'
import { createFetchComponent } from '@well-known-components/fetch-component'
import { createServerComponent } from '@well-known-components/http-server'
import { createServerComponent, 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 { HTTPProvider } from 'eth-connect'
import ms from 'ms'
import path from 'path'
Expand Down Expand Up @@ -348,7 +348,7 @@ export async function initComponentsWithEnv(env: Environment): Promise<AppCompon
}
metrics.observe('dcl_content_server_build_info', buildInfo, 1)

await instrumentHttpServerWithMetrics({ server, metrics, config })
await instrumentHttpServerWithPromClientRegistry({ server, metrics, config, registry: metrics.registry! })

return {
env,
Expand Down
2 changes: 1 addition & 1 deletion content/src/metrics.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { metricsDefinitions as snapshotFetcherMetricsDefinitions } from '@dcl/sn
import { metricsDefinitions as blockIndexerMetricsDefinitions } from '@dcl/block-indexer'
import { metricDeclarations as loggerMetricDeclarations } from '@well-known-components/logger'
import { validateMetricsDeclaration } from '@well-known-components/metrics'
import { getDefaultHttpMetrics } from '@well-known-components/metrics/dist/http'
import { getDefaultHttpMetrics } from '@well-known-components/http-server'
import { metricDeclarations as theGraphMetricDeclarations } from '@well-known-components/thegraph-component'
import { sequentialJobMetrics } from './ports/sequecuentialTaskExecutor'

Expand Down
8 changes: 4 additions & 4 deletions lambdas/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,14 @@
"dependencies": {
"@dcl/catalyst-api-specs": "^3.2.5",
"@dcl/crypto": "^3.4.5",
"@dcl/schemas": "^10.3.0",
"@dcl/schemas": "^11.0.0",
"@dcl/urn-resolver": "^3.3.1",
"@well-known-components/env-config-provider": "^1.2.0",
"@well-known-components/fetch-component": "^2.0.2",
"@well-known-components/http-server": "^2.0.0",
"@well-known-components/interfaces": "^1.4.2",
"@well-known-components/http-server": "^2.1.0",
"@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.1.0",
"@well-known-components/thegraph-component": "^1.6.0",
"compression": "1.7.4",
"cors": "2.8.5",
Expand Down
55 changes: 42 additions & 13 deletions yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -350,15 +350,15 @@
dependencies:
ethers "^5.6.8"

"@dcl/content-validator@^4.14.0":
version "4.14.0"
resolved "https://registry.yarnpkg.com/@dcl/content-validator/-/content-validator-4.14.0.tgz#f30d1713a5bad857419cbd882248a47d6b9306b8"
integrity sha512-KA8UIi1b5aKrTd6nPu/wxk2Wedxjkw52pVOGQ5I0r4haeHc2H1RhJHQaWvYBmwENTVDM/B3O9/8GGmleZtMETQ==
"@dcl/content-validator@^5.0.0":
version "5.0.0"
resolved "https://registry.yarnpkg.com/@dcl/content-validator/-/content-validator-5.0.0.tgz#8869d29104cf9412d938e77f852ba155889b52c3"
integrity sha512-jwDb8Ak1lSNfYERvlUGcmNAggJrVQRwoDbleGpy+qOceIRLOjnw6imqyD91wmEiD7ouhp0lok9hWqUCXOfUFoA==
dependencies:
"@dcl/block-indexer" "^1.1.1"
"@dcl/content-hash-tree" "^1.1.4"
"@dcl/hashing" "^3.0.1"
"@dcl/schemas" "^10.3.0"
"@dcl/schemas" "^11.0.0"
"@dcl/urn-resolver" "^3.3.1"
"@well-known-components/interfaces" "^1.3.0"
"@well-known-components/thegraph-component" "^1.5.0"
Expand All @@ -380,10 +380,10 @@
resolved "https://registry.yarnpkg.com/@dcl/hashing/-/hashing-3.0.4.tgz#4df2a4cb3a8114765aed34cb57b91c93bf33bfb3"
integrity sha512-Cg+MoIOn+BYmQV2q8zSFnNYY+GldlnUazwBnfgrq3i66ZxOaZ65h01btd8OUtSAlfWG4VTNIOHDjtKqmuwJNBg==

"@dcl/schemas@^10.3.0":
version "10.3.0"
resolved "https://registry.yarnpkg.com/@dcl/schemas/-/schemas-10.3.0.tgz#345e3710a34e278311606620969f4b020e53052c"
integrity sha512-92CDJjG6T2g437lkXaw8uOzehPqi0QIp3qnD5uSz5UQu4djoMJYwoGB/IL2RX7pFL8ojaBPFashX/FjqHLxP+A==
"@dcl/schemas@^11.0.0":
version "11.0.0"
resolved "https://registry.yarnpkg.com/@dcl/schemas/-/schemas-11.0.0.tgz#5893fd56b2461d96465964d50d45a8f99c347468"
integrity sha512-gBwW3Sv6pIebl3xddJ7mUrIA92e5CsZXV4RdBis56UU/3w7FunwGPBcHoQLkJVvuy8SVHYHNt7PVDEkNSfVHWw==
dependencies:
ajv "^8.11.0"
ajv-errors "^3.0.0"
Expand Down Expand Up @@ -1071,6 +1071,11 @@
"@nodelib/fs.scandir" "2.1.5"
fastq "^1.6.0"

"@opentelemetry/api@^1.4.0":
version "1.8.0"
resolved "https://registry.yarnpkg.com/@opentelemetry/api/-/api-1.8.0.tgz#5aa7abb48f23f693068ed2999ae627d2f7d902ec"
integrity sha512-I/s6F7yKUDdtMsoBWXJe8Qz40Tui5vsuKCWJEWVL+5q9sSWRzzx6v2KeNsOBEwd94j0eWkpWCH4yB6rZg9Mf0w==

"@scure/base@~1.1.0":
version "1.1.1"
resolved "https://registry.yarnpkg.com/@scure/base/-/base-1.1.1.tgz#ebb651ee52ff84f420097055f4bf46cfba403938"
Expand Down Expand Up @@ -1630,10 +1635,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.1.0":
version "2.1.0"
resolved "https://registry.yarnpkg.com/@well-known-components/http-server/-/http-server-2.1.0.tgz#23a18edc82904b3a575452c2d7e618c7da37a07f"
integrity sha512-IHD7aLTA+9DYEchQubHDBwc4FmVEmQC+2TWbi8Tz+QlkiQdtndcuba8XHH+EwqlB5sna/EAJGZGXPxS7okcHKA==
dependencies:
"@types/http-errors" "^2.0.1"
destroy "^1.2.0"
Expand All @@ -1653,6 +1658,15 @@
"@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.0.0", "@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"
Expand All @@ -1665,6 +1679,13 @@
dependencies:
prom-client "^14.1.0"

"@well-known-components/metrics@^2.1.0":
version "2.1.0"
resolved "https://registry.yarnpkg.com/@well-known-components/metrics/-/metrics-2.1.0.tgz#ad3b658787d68f06588be3a8f70abccc26e9f52e"
integrity sha512-nJ3TdVMiJN2i7TtelndDtxvZERcSE7dtlmRfRV7yYZZshDZrQTC9EFH2uhmCWDWI0qnonvlq++JRSXBNJJfbvg==
dependencies:
prom-client "^15.1.0"

"@well-known-components/multipart-wrapper@^1.0.3":
version "1.0.3"
resolved "https://registry.yarnpkg.com/@well-known-components/multipart-wrapper/-/multipart-wrapper-1.0.3.tgz#c9b1a80c669348cacf57fe032beaa150a843ce4e"
Expand Down Expand Up @@ -5494,6 +5515,14 @@ prom-client@^14.1.0:
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"
integrity sha512-cCD7jLTqyPdjEPBo/Xk4Iu8jxjuZgZJ3e/oET3L+ZwOuap/7Cw3dH/TJSsZKs1TQLZ2IHpIlRAKw82ef06kmMw==
dependencies:
"@opentelemetry/api" "^1.4.0"
tdigest "^0.1.1"

prompts@^2.0.1:
version "2.4.2"
resolved "https://registry.yarnpkg.com/prompts/-/prompts-2.4.2.tgz#7b57e73b3a48029ad10ebd44f74b01722a4cb069"
Expand Down

0 comments on commit e2974a5

Please sign in to comment.