diff --git a/Cargo.lock b/Cargo.lock index 4798714d86..d62795ea3c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -209,9 +209,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.71" +version = "1.0.72" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c7d0618f0e0b7e8ff11427422b64564d5fb0be1940354bfe2e0529b18a9d9b8" +checksum = "3b13c32d80ecc7ab747b80c3784bce54ee8a7a0cc4fbda9bf4cda2cf6fe90854" [[package]] name = "apollo-compiler" @@ -289,7 +289,7 @@ dependencies = [ "buildstructor 0.5.3", "bytes", "ci_info", - "clap 4.3.11", + "clap 4.3.15", "console-subscriber", "dashmap", "derivative", @@ -431,7 +431,7 @@ version = "1.24.0" dependencies = [ "anyhow", "cargo-scaffold", - "clap 4.3.11", + "clap 4.3.15", "copy_dir", "regex", "str_inflector", @@ -1056,9 +1056,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.3.11" +version = "4.3.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1640e5cc7fb47dbb8338fd471b105e7ed6c3cb2aeb00c2e067127ffd3764a05d" +checksum = "8f644d0dac522c8b05ddc39aaaccc5b136d5dc4ff216610c5641e3be5becf56c" dependencies = [ "clap_builder", "clap_derive", @@ -1067,9 +1067,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.3.11" +version = "4.3.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98c59138d527eeaf9b53f35a77fcc1fad9d883116070c63d5de1c7dc7b00c72b" +checksum = "af410122b9778e024f9e0fb35682cc09cc3f85cad5e8d3ba8f47a9702df6e73d" dependencies = [ "anstream", "anstyle", @@ -1079,9 +1079,9 @@ dependencies = [ [[package]] name = "clap_derive" -version = "4.3.2" +version = "4.3.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8cd2b2a819ad6eec39e8f1d6b53001af1e5469f8c177579cdaeb313115b825f" +checksum = "54a9bb5758fc5dfe728d1019941681eccaf0cf8a4189b692a0ee2f2ecf90a050" dependencies = [ "heck 0.4.1", "proc-macro2", @@ -3009,9 +3009,9 @@ dependencies = [ [[package]] name = "insta" -version = "1.30.0" +version = "1.31.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28491f7753051e5704d4d0ae7860d45fae3238d7d235bc4289dcd45c48d3cec3" +checksum = "a0770b0a3d4c70567f0d58331f3088b0e4c4f56c9b8d764efe654b4a5d46de3a" dependencies = [ "console 0.15.7", "lazy_static", @@ -4119,9 +4119,9 @@ dependencies = [ [[package]] name = "paste" -version = "1.0.13" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4b27ab7be369122c218afc2079489cdcb4b517c0a3fc386ff11e1fedfcc2b35" +checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" [[package]] name = "pem" @@ -5366,9 +5366,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.102" +version = "1.0.103" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5062a995d481b2308b6064e9af76011f2921c35f97b0468811ed9f6cd91dfed" +checksum = "d03b412469450d4404fe8499a268edd7f8b79fecb074b0d812ad64ca21f4031b" dependencies = [ "indexmap 2.0.0", "itoa", @@ -6780,9 +6780,9 @@ checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" [[package]] name = "uuid" -version = "1.4.0" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d023da39d1fde5a8a3fe1f3e01ca9632ada0a63e9797de55a879d6e2236277be" +checksum = "79daa5ed5740825c40b389c5e50312b9c86df53fccd33f281df655642b43869d" dependencies = [ "getrandom 0.2.10", "serde", diff --git a/apollo-router-scaffold/Cargo.toml b/apollo-router-scaffold/Cargo.toml index 795d3a0ca2..5cf7491811 100644 --- a/apollo-router-scaffold/Cargo.toml +++ b/apollo-router-scaffold/Cargo.toml @@ -7,8 +7,8 @@ license = "Elastic-2.0" publish = false [dependencies] -anyhow = "1.0.71" -clap = { version = "4.3.11", features = ["derive"] } +anyhow = "1.0.72" +clap = { version = "4.3.15", features = ["derive"] } cargo-scaffold = { version = "0.8.9", default-features = false } regex = "1" str_inflector = "0.12.0" diff --git a/apollo-router/Cargo.toml b/apollo-router/Cargo.toml index b2ef376566..9a30429a7c 100644 --- a/apollo-router/Cargo.toml +++ b/apollo-router/Cargo.toml @@ -52,7 +52,7 @@ features = ["docs_rs"] [dependencies] askama = "0.11.1" access-json = "0.1.0" -anyhow = "1.0.71" +anyhow = "1.0.72" apollo-compiler = "0.10.0" apollo-encoder = "0.5.1" apollo-parser = "0.5.3" @@ -69,7 +69,7 @@ axum = { version = "0.6.18", features = ["headers", "json", "original-uri"] } base64 = "0.20.0" buildstructor = "0.5.3" bytes = "1.4.0" -clap = { version = "4.3.11", default-features = false, features = [ +clap = { version = "4.3.15", default-features = false, features = [ "env", "derive", "std", @@ -155,7 +155,7 @@ opentelemetry-zipkin = { version = "0.17.0", default-features = false, features "reqwest-rustls", ] } opentelemetry-prometheus = "0.12.0" -paste = "1.0.13" +paste = "1.0.14" pin-project-lite = "0.2.10" prometheus = "0.13" prost = "0.11.9" @@ -180,7 +180,7 @@ shellexpand = "3.1.0" sha2 = "0.10.7" serde = { version = "1.0.171", features = ["derive", "rc"] } serde_json_bytes = { version = "0.2.1", features = ["preserve_order"] } -serde_json = { version = "1.0.102", features = ["preserve_order", "float_roundtrip"] } +serde_json = { version = "1.0.103", features = ["preserve_order", "float_roundtrip"] } serde_urlencoded = "0.7.1" serde_yaml = "0.8.26" static_assertions = "1.1.0" @@ -212,7 +212,7 @@ tracing-opentelemetry = "0.19.0" tracing-subscriber = { version = "0.3.11", features = ["env-filter", "json"] } url = { version = "2.4.0", features = ["serde"] } urlencoding = "2.1.2" -uuid = { version = "1.4.0", features = ["serde", "v4"] } +uuid = { version = "1.4.1", features = ["serde", "v4"] } yaml-rust = "0.4.5" wiremock = "0.5.19" wsl = "0.1.0" @@ -241,7 +241,7 @@ axum = { version = "0.6.18", features = ["headers", "json", "original-uri", "ws" ecdsa = { version = "0.15.1", features = ["signing", "pem", "pkcs8"] } fred = { version = "6.3.0", features = ["enable-rustls", "no-client-setname"] } futures-test = "0.3.28" -insta = { version = "1.30.0", features = ["json", "redactions", "yaml"] } +insta = { version = "1.31.0", features = ["json", "redactions", "yaml"] } introspector-gadget = "0.2.2" maplit = "1.0.2" memchr = { version = "2.5.0", default-features = false } diff --git a/dockerfiles/tracing/datadog-subgraph/package-lock.json b/dockerfiles/tracing/datadog-subgraph/package-lock.json index 94c8bcfb8b..f0ba53b869 100644 --- a/dockerfiles/tracing/datadog-subgraph/package-lock.json +++ b/dockerfiles/tracing/datadog-subgraph/package-lock.json @@ -257,18 +257,16 @@ } }, "node_modules/@datadog/pprof": { - "version": "2.2.3", - "resolved": "https://registry.npmjs.org/@datadog/pprof/-/pprof-2.2.3.tgz", - "integrity": "sha512-cZXvNBBzvTMUx2xOxp49cZJ7/HOF7geVxqeRbveeJUVKwi8ZxmU1rQGcWPFX4iEEtfQu1M3NqbhmNtYsMJdEsQ==", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/@datadog/pprof/-/pprof-3.0.0.tgz", + "integrity": "sha512-nE/iWBX6h61SXrVWA6DeJ/m2iJX9ZNHrcoxFzHkK0LnSbNzrMlQZ0yw24ExhvIPLOFP4uFW057Cm48rsgr0NyQ==", "hasInstallScript": true, "dependencies": { "delay": "^5.0.0", - "node-gyp-build": "^3.9.0", + "node-gyp-build": "<4.0", "p-limit": "^3.1.0", - "pify": "^5.0.0", "pprof-format": "^2.0.7", - "source-map": "^0.7.3", - "split": "^1.0.1" + "source-map": "^0.7.4" }, "engines": { "node": ">=12" @@ -771,16 +769,16 @@ "integrity": "sha512-FAaLDaplstoRsDR8XGYH51znUN0UY7nMc6Z9/fvE8EXGwvJE9hu7W2vHwx1+bd6gCYnln9nLbzxFTrcO9YQDZw==" }, "node_modules/dd-trace": { - "version": "4.6.0", - "resolved": "https://registry.npmjs.org/dd-trace/-/dd-trace-4.6.0.tgz", - "integrity": "sha512-vGXtkp2iVAvELZoxLNyh0+raEV3nwr4SDvdFn0B7WVgMOXH+SKZ6/Ne2RORB1uh8t8HTbASYk1AR078790yYRg==", + "version": "4.7.0", + "resolved": "https://registry.npmjs.org/dd-trace/-/dd-trace-4.7.0.tgz", + "integrity": "sha512-oqA/ddu0YK2k3h4qe0wcjwT+p1ZXZBokBxNANhUZcr9Ieyv+27Gi0SbmpiTTe8jU2bLwSRWnKmzsOuwU2dJUmg==", "hasInstallScript": true, "dependencies": { "@datadog/native-appsec": "^3.2.0", "@datadog/native-iast-rewriter": "2.0.1", "@datadog/native-iast-taint-tracking": "^1.5.0", "@datadog/native-metrics": "^2.0.0", - "@datadog/pprof": "2.2.3", + "@datadog/pprof": "3.0.0", "@datadog/sketches-js": "^2.1.0", "@opentelemetry/api": "^1.0.0", "@opentelemetry/core": "^1.14.0", @@ -804,7 +802,7 @@ "node-abort-controller": "^3.0.1", "opentracing": ">=0.12.1", "path-to-regexp": "^0.1.2", - "protobufjs": "^7.1.2", + "protobufjs": "^7.2.4", "retry": "^0.10.1", "semver": "^7.3.8" }, @@ -1406,26 +1404,15 @@ "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz", "integrity": "sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ==" }, - "node_modules/pify": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/pify/-/pify-5.0.0.tgz", - "integrity": "sha512-eW/gHNMlxdSP6dmG6uJip6FXN0EQBwm2clYYd8Wul42Cwu/DK8HEftzsapcNdYe2MfLiIwZqsDk2RDEsTE79hA==", - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, "node_modules/pprof-format": { "version": "2.0.7", "resolved": "https://registry.npmjs.org/pprof-format/-/pprof-format-2.0.7.tgz", "integrity": "sha512-1qWaGAzwMpaXJP9opRa23nPnt2Egi7RMNoNBptEE/XwHbcn4fC2b/4U4bKc5arkGkIh2ZabpF2bEb+c5GNHEKA==" }, "node_modules/protobufjs": { - "version": "7.2.3", - "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-7.2.3.tgz", - "integrity": "sha512-TtpvOqwB5Gdz/PQmOjgsrGH1nHjAQVCN7JG4A6r1sXRWESL5rNMAiRcBQlCAdKxZcAbstExQePYG8xof/JVRgg==", + "version": "7.2.4", + "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-7.2.4.tgz", + "integrity": "sha512-AT+RJgD2sH8phPmCf7OUZR8xGdcJRga4+1cOaXJ64hvcSkVhNcRHOwIxUatPH15+nj59WAGTDv3LSGZPEQbJaQ==", "hasInstallScript": true, "dependencies": { "@protobufjs/aspromise": "^1.1.2", @@ -1629,17 +1616,6 @@ "node": ">= 8" } }, - "node_modules/split": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/split/-/split-1.0.1.tgz", - "integrity": "sha512-mTyOoPbrivtXnwnIxZRFYRrPNtEFKlpB2fvjSnCQUiAA6qAZzqwna5envK4uk6OIeP17CsdF3rSBGYVBsU0Tkg==", - "dependencies": { - "through": "2" - }, - "engines": { - "node": "*" - } - }, "node_modules/statuses": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz", @@ -1648,11 +1624,6 @@ "node": ">= 0.8" } }, - "node_modules/through": { - "version": "2.3.8", - "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz", - "integrity": "sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==" - }, "node_modules/toidentifier": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz", @@ -1956,17 +1927,15 @@ } }, "@datadog/pprof": { - "version": "2.2.3", - "resolved": "https://registry.npmjs.org/@datadog/pprof/-/pprof-2.2.3.tgz", - "integrity": "sha512-cZXvNBBzvTMUx2xOxp49cZJ7/HOF7geVxqeRbveeJUVKwi8ZxmU1rQGcWPFX4iEEtfQu1M3NqbhmNtYsMJdEsQ==", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/@datadog/pprof/-/pprof-3.0.0.tgz", + "integrity": "sha512-nE/iWBX6h61SXrVWA6DeJ/m2iJX9ZNHrcoxFzHkK0LnSbNzrMlQZ0yw24ExhvIPLOFP4uFW057Cm48rsgr0NyQ==", "requires": { "delay": "^5.0.0", - "node-gyp-build": "^3.9.0", + "node-gyp-build": "<4.0", "p-limit": "^3.1.0", - "pify": "^5.0.0", "pprof-format": "^2.0.7", - "source-map": "^0.7.3", - "split": "^1.0.1" + "source-map": "^0.7.4" } }, "@datadog/sketches-js": { @@ -2376,15 +2345,15 @@ "integrity": "sha512-FAaLDaplstoRsDR8XGYH51znUN0UY7nMc6Z9/fvE8EXGwvJE9hu7W2vHwx1+bd6gCYnln9nLbzxFTrcO9YQDZw==" }, "dd-trace": { - "version": "4.6.0", - "resolved": "https://registry.npmjs.org/dd-trace/-/dd-trace-4.6.0.tgz", - "integrity": "sha512-vGXtkp2iVAvELZoxLNyh0+raEV3nwr4SDvdFn0B7WVgMOXH+SKZ6/Ne2RORB1uh8t8HTbASYk1AR078790yYRg==", + "version": "4.7.0", + "resolved": "https://registry.npmjs.org/dd-trace/-/dd-trace-4.7.0.tgz", + "integrity": "sha512-oqA/ddu0YK2k3h4qe0wcjwT+p1ZXZBokBxNANhUZcr9Ieyv+27Gi0SbmpiTTe8jU2bLwSRWnKmzsOuwU2dJUmg==", "requires": { "@datadog/native-appsec": "^3.2.0", "@datadog/native-iast-rewriter": "2.0.1", "@datadog/native-iast-taint-tracking": "^1.5.0", "@datadog/native-metrics": "^2.0.0", - "@datadog/pprof": "2.2.3", + "@datadog/pprof": "3.0.0", "@datadog/sketches-js": "^2.1.0", "@opentelemetry/api": "^1.0.0", "@opentelemetry/core": "^1.14.0", @@ -2408,7 +2377,7 @@ "node-abort-controller": "^3.0.1", "opentracing": ">=0.12.1", "path-to-regexp": "^0.1.2", - "protobufjs": "^7.1.2", + "protobufjs": "^7.2.4", "retry": "^0.10.1", "semver": "^7.3.8" }, @@ -2836,20 +2805,15 @@ "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz", "integrity": "sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ==" }, - "pify": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/pify/-/pify-5.0.0.tgz", - "integrity": "sha512-eW/gHNMlxdSP6dmG6uJip6FXN0EQBwm2clYYd8Wul42Cwu/DK8HEftzsapcNdYe2MfLiIwZqsDk2RDEsTE79hA==" - }, "pprof-format": { "version": "2.0.7", "resolved": "https://registry.npmjs.org/pprof-format/-/pprof-format-2.0.7.tgz", "integrity": "sha512-1qWaGAzwMpaXJP9opRa23nPnt2Egi7RMNoNBptEE/XwHbcn4fC2b/4U4bKc5arkGkIh2ZabpF2bEb+c5GNHEKA==" }, "protobufjs": { - "version": "7.2.3", - "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-7.2.3.tgz", - "integrity": "sha512-TtpvOqwB5Gdz/PQmOjgsrGH1nHjAQVCN7JG4A6r1sXRWESL5rNMAiRcBQlCAdKxZcAbstExQePYG8xof/JVRgg==", + "version": "7.2.4", + "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-7.2.4.tgz", + "integrity": "sha512-AT+RJgD2sH8phPmCf7OUZR8xGdcJRga4+1cOaXJ64hvcSkVhNcRHOwIxUatPH15+nj59WAGTDv3LSGZPEQbJaQ==", "requires": { "@protobufjs/aspromise": "^1.1.2", "@protobufjs/base64": "^1.1.2", @@ -3000,24 +2964,11 @@ "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.4.tgz", "integrity": "sha512-l3BikUxvPOcn5E74dZiq5BGsTb5yEwhaTSzccU6t4sDOH8NWJCstKO5QT2CvtFoK6F0saL7p9xHAqHOlCPJygA==" }, - "split": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/split/-/split-1.0.1.tgz", - "integrity": "sha512-mTyOoPbrivtXnwnIxZRFYRrPNtEFKlpB2fvjSnCQUiAA6qAZzqwna5envK4uk6OIeP17CsdF3rSBGYVBsU0Tkg==", - "requires": { - "through": "2" - } - }, "statuses": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz", "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==" }, - "through": { - "version": "2.3.8", - "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz", - "integrity": "sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==" - }, "toidentifier": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz", diff --git a/xtask/Cargo.lock b/xtask/Cargo.lock index 31c97f1d37..9cbd3e678a 100644 --- a/xtask/Cargo.lock +++ b/xtask/Cargo.lock @@ -232,9 +232,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.3.11" +version = "4.3.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1640e5cc7fb47dbb8338fd471b105e7ed6c3cb2aeb00c2e067127ffd3764a05d" +checksum = "8f644d0dac522c8b05ddc39aaaccc5b136d5dc4ff216610c5641e3be5becf56c" dependencies = [ "clap_builder", "clap_derive", @@ -243,9 +243,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.3.11" +version = "4.3.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98c59138d527eeaf9b53f35a77fcc1fad9d883116070c63d5de1c7dc7b00c72b" +checksum = "af410122b9778e024f9e0fb35682cc09cc3f85cad5e8d3ba8f47a9702df6e73d" dependencies = [ "anstream", "anstyle", @@ -255,9 +255,9 @@ dependencies = [ [[package]] name = "clap_derive" -version = "4.3.2" +version = "4.3.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8cd2b2a819ad6eec39e8f1d6b53001af1e5469f8c177579cdaeb313115b825f" +checksum = "54a9bb5758fc5dfe728d1019941681eccaf0cf8a4189b692a0ee2f2ecf90a050" dependencies = [ "heck", "proc-macro2", @@ -766,9 +766,9 @@ dependencies = [ [[package]] name = "insta" -version = "1.30.0" +version = "1.31.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28491f7753051e5704d4d0ae7860d45fae3238d7d235bc4289dcd45c48d3cec3" +checksum = "a0770b0a3d4c70567f0d58331f3088b0e4c4f56c9b8d764efe654b4a5d46de3a" dependencies = [ "console", "lazy_static", diff --git a/xtask/Cargo.toml b/xtask/Cargo.toml index 6483241d4a..c553bec760 100644 --- a/xtask/Cargo.toml +++ b/xtask/Cargo.toml @@ -11,7 +11,7 @@ publish = false [dependencies] anyhow = "1" camino = "1" -clap = { version = "4.3.11", features = ["derive"] } +clap = { version = "4.3.15", features = ["derive"] } cargo_metadata = "0.15" # Only use the `clock` features of `chrono` to avoid the `time` dependency # impacted by CVE-2020-26235. https://github.com/chronotope/chrono/issues/602 @@ -46,4 +46,4 @@ base64 = "0.20" zip = { version = "0.6", default-features = false } [dev-dependencies] -insta = { version = "1.30.0", features = ["json", "redactions", "yaml"] } +insta = { version = "1.31.0", features = ["json", "redactions", "yaml"] }