From 131f7787e929da19b07e9168742c961d4b9470c7 Mon Sep 17 00:00:00 2001 From: kimi Date: Thu, 2 May 2024 14:55:44 -0400 Subject: [PATCH 01/27] v1 --- src/trace/step-function-service.ts | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/src/trace/step-function-service.ts b/src/trace/step-function-service.ts index 76577d478..2c759395a 100644 --- a/src/trace/step-function-service.ts +++ b/src/trace/step-function-service.ts @@ -1,7 +1,7 @@ -import { Md5 } from "ts-md5"; import { logDebug } from "../utils"; import { SampleMode, TraceSource } from "./trace-context-service"; import { SpanContextWrapper } from "./span-context-wrapper"; +import { Sha256 } from '@aws-crypto/sha256-js'; export interface StepFunctionContext { "step_function.execution_name": string; @@ -151,23 +151,20 @@ export class StepFunctionContextService { } private deterministicMd5HashInBinary(s: string): string { - // Md5 here is used here because we don't need a cryptographically secure hashing method but to generate the same trace/span ids as the backend does - const hex = Md5.hashStr(s); + const hash = new Sha256(); + hash.update(s); + const hex = hash.digestSync().subarray(0, 16); let binary = ""; - for (let i = 0; i < hex.length; i++) { - const ch = hex.charAt(i); - binary = binary + this.hexToBinary(ch); + for (const num of hex) { + const currentBinary = num.toString(2) + binary = binary + currentBinary } - const res = "0" + binary.substring(1, 64); - if (res === "0".repeat(64)) { + const res = "0" + binary.substring(1, 128); + if (res === "0".repeat(128)) { return "1"; } return res; } - - private hexToBinary(hex: string) { - return parseInt(hex, 16).toString(2).padStart(4, "0"); - } } From b9032cd780038b74e0992b50454cfe66c2877c36 Mon Sep 17 00:00:00 2001 From: kimi Date: Thu, 2 May 2024 15:17:15 -0400 Subject: [PATCH 02/27] fix test --- src/trace/step-function-service.spec.ts | 41 +++++++++---------------- src/trace/step-function-service.ts | 7 +++-- 2 files changed, 20 insertions(+), 28 deletions(-) diff --git a/src/trace/step-function-service.spec.ts b/src/trace/step-function-service.spec.ts index db9ce40dd..39212d72b 100644 --- a/src/trace/step-function-service.spec.ts +++ b/src/trace/step-function-service.spec.ts @@ -194,8 +194,8 @@ describe("StepFunctionContextService", () => { expect(spanContext).not.toBeNull(); - expect(spanContext?.toTraceId()).toBe("947965466153612645"); - expect(spanContext?.toSpanId()).toBe("4602916161841036335"); + expect(spanContext?.toTraceId()).toBe("3661440683"); + expect(spanContext?.toSpanId()).toBe("2846425757"); expect(spanContext?.sampleMode()).toBe("1"); expect(spanContext?.source).toBe("event"); }); @@ -215,7 +215,7 @@ describe("StepFunctionContextService", () => { it("returns the same hash number generated in `logs backend` for a random string", () => { const instance = StepFunctionContextService.instance(); const hash = instance["deterministicMd5HashToBigIntString"]("some_testing_random_string"); - expect(hash).toEqual("2251275791555400689"); + expect(hash).toEqual("80506605202309154694697844088692857990"); }); it("returns the same hash number generated in `logs backend` for execution id # state name # entered time", () => { @@ -223,7 +223,7 @@ describe("StepFunctionContextService", () => { const hash = instance["deterministicMd5HashToBigIntString"]( "arn:aws:states:sa-east-1:601427271234:express:DatadogStateMachine:acaf1a67-336a-e854-1599-2a627eb2dd8a:c8baf081-31f1-464d-971f-70cb17d01111#step-one#2022-12-08T21:08:19.224Z", ); - expect(hash).toEqual("8034507082463708833"); + expect(hash).toEqual("80072419077927731656239868244106251139"); }); }); @@ -232,22 +232,22 @@ describe("StepFunctionContextService", () => { [ "a random string", "some_testing_random_string", - "0001111100111110001000110110011110010111000110001001001111110001", + "00111100100100010000001000010111010011000111001011011001111000000110011101111001100001011100111110110001011111001101110010000110", ], [ "an execution id", "arn:aws:states:sa-east-1:601427271234:express:DatadogStateMachine:acaf1a67-336a-e854-1599-2a627eb2dd8a:c8baf081-31f1-464d-971f-70cb17d041f4", - "0010010000101100100000101011111101111100110110001110111100111101", + "01000101001100100100101000010110011101001110110101001100100001000100010111011110010011011100010100101011110110011010110001111110", ], [ "another execution id", "arn:aws:states:sa-east-1:601427271234:express:DatadogStateMachine:acaf1a67-336a-e854-1599-2a627eb2dd8a:c8baf081-31f1-464d-971f-70cb17d01111", - "0010001100110000011011011111010000100111100000110000100100101010", + "00101111100011001000100001010011001100000000000101110111001010110100110111010111011001101001111001110001011111000111010010101001", ], [ "execution id # state name # entered time", "arn:aws:states:sa-east-1:601427271234:express:DatadogStateMachine:acaf1a67-336a-e854-1599-2a627eb2dd8a:c8baf081-31f1-464d-971f-70cb17d01111#step-one#2022-12-08T21:08:19.224Z", - "0110111110000000010011011001111101110011100111000000011010100001", + "00111100001111010110001100001111111100111110101100000000001000010011110011111110111010000100011111010100111110011000101110000011", ], ])("returns the same hash number generated in `logs backend` for %s", (_, str, expected) => { const instance = StepFunctionContextService.instance(); @@ -276,27 +276,16 @@ describe("StepFunctionContextService", () => { }); }); - describe("hexToBinary", () => { + describe("numberToBinaryString", () => { const instance = StepFunctionContextService.instance(); it.each([ - ["0", "0000"], - ["1", "0001"], - ["2", "0010"], - ["3", "0011"], - ["4", "0100"], - ["5", "0101"], - ["6", "0110"], - ["7", "0111"], - ["8", "1000"], - ["9", "1001"], - ["a", "1010"], - ["b", "1011"], - ["c", "1100"], - ["d", "1101"], - ["e", "1110"], - ["f", "1111"], + [0, "00000000"], + [1, "00000001"], + [2, "00000010"], + [3, "00000011"], + [4, "00000100"], ])("returns the right binary number for %s => %s", (hex, expected) => { - const binary = instance["hexToBinary"](hex); + const binary = instance["numberToBinaryString"](hex); expect(binary).toBe(expected); }); }); diff --git a/src/trace/step-function-service.ts b/src/trace/step-function-service.ts index 2c759395a..d21995ce1 100644 --- a/src/trace/step-function-service.ts +++ b/src/trace/step-function-service.ts @@ -157,8 +157,7 @@ export class StepFunctionContextService { let binary = ""; for (const num of hex) { - const currentBinary = num.toString(2) - binary = binary + currentBinary + binary = binary + this.numberToBinaryString(num) } const res = "0" + binary.substring(1, 128); @@ -167,4 +166,8 @@ export class StepFunctionContextService { } return res; } + + private numberToBinaryString(num: number): string { + return num.toString(2).padStart(8, "0"); + } } From aa1a0fac01eb46e62d0ee54d4387ff0ed0b7fabe Mon Sep 17 00:00:00 2001 From: kimi Date: Thu, 2 May 2024 15:26:53 -0400 Subject: [PATCH 03/27] remove md5 package and regenerate yarn lock --- package.json | 3 +- yarn.lock | 776 ++++++++++++++++++++++----------------------------- 2 files changed, 330 insertions(+), 449 deletions(-) diff --git a/package.json b/package.json index a0682cf56..7094bc6a5 100644 --- a/package.json +++ b/package.json @@ -42,8 +42,7 @@ "hot-shots": "8.5.0", "promise-retry": "^2.0.1", "serialize-error": "^8.1.0", - "shimmer": "1.2.1", - "ts-md5": "1.3.1" + "shimmer": "1.2.1" }, "jest": { "verbose": true, diff --git a/yarn.lock b/yarn.lock index 7323f0cd3..10c03fa8f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -10,15 +10,6 @@ "@jridgewell/gen-mapping" "^0.3.5" "@jridgewell/trace-mapping" "^0.3.24" -"@aws-crypto/crc32@3.0.0": - version "3.0.0" - resolved "https://registry.yarnpkg.com/@aws-crypto/crc32/-/crc32-3.0.0.tgz#07300eca214409c33e3ff769cd5697b57fdd38fa" - integrity sha512-IzSgsrxUcsrejQbPVilIKy16kAT52EwB6zSaI+M3xxIhKh5+aldEyvI+z6erM7TCLB2BJsFrtHjp6/4/sr+3dA== - dependencies: - "@aws-crypto/util" "^3.0.0" - "@aws-sdk/types" "^3.222.0" - tslib "^1.11.1" - "@aws-crypto/ie11-detection@^3.0.0": version "3.0.0" resolved "https://registry.yarnpkg.com/@aws-crypto/ie11-detection/-/ie11-detection-3.0.0.tgz#640ae66b4ec3395cee6a8e94ebcd9f80c24cd688" @@ -66,397 +57,304 @@ tslib "^1.11.1" "@aws-sdk/client-kms@^3.366.0": - version "3.540.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/client-kms/-/client-kms-3.540.0.tgz#3ac4f8959537f34edd07370eef305e5d47813d2e" - integrity sha512-tqwac58++MuPKHkadawqP/zzbDKDY2cHBoR/D9kmiacDzgAz/F8lKDqS3MCg/7XtaOtWs9OeZZ/3T12AxNv5Ig== - dependencies: - "@aws-crypto/sha256-browser" "3.0.0" - "@aws-crypto/sha256-js" "3.0.0" - "@aws-sdk/client-sts" "3.540.0" - "@aws-sdk/core" "3.535.0" - "@aws-sdk/credential-provider-node" "3.540.0" - "@aws-sdk/middleware-host-header" "3.535.0" - "@aws-sdk/middleware-logger" "3.535.0" - "@aws-sdk/middleware-recursion-detection" "3.535.0" - "@aws-sdk/middleware-user-agent" "3.540.0" - "@aws-sdk/region-config-resolver" "3.535.0" - "@aws-sdk/types" "3.535.0" - "@aws-sdk/util-endpoints" "3.540.0" - "@aws-sdk/util-user-agent-browser" "3.535.0" - "@aws-sdk/util-user-agent-node" "3.535.0" - "@smithy/config-resolver" "^2.2.0" - "@smithy/core" "^1.4.0" - "@smithy/fetch-http-handler" "^2.5.0" - "@smithy/hash-node" "^2.2.0" - "@smithy/invalid-dependency" "^2.2.0" - "@smithy/middleware-content-length" "^2.2.0" - "@smithy/middleware-endpoint" "^2.5.0" - "@smithy/middleware-retry" "^2.2.0" - "@smithy/middleware-serde" "^2.3.0" - "@smithy/middleware-stack" "^2.2.0" - "@smithy/node-config-provider" "^2.3.0" - "@smithy/node-http-handler" "^2.5.0" - "@smithy/protocol-http" "^3.3.0" - "@smithy/smithy-client" "^2.5.0" - "@smithy/types" "^2.12.0" - "@smithy/url-parser" "^2.2.0" - "@smithy/util-base64" "^2.3.0" - "@smithy/util-body-length-browser" "^2.2.0" - "@smithy/util-body-length-node" "^2.3.0" - "@smithy/util-defaults-mode-browser" "^2.2.0" - "@smithy/util-defaults-mode-node" "^2.3.0" - "@smithy/util-endpoints" "^1.2.0" - "@smithy/util-middleware" "^2.2.0" - "@smithy/util-retry" "^2.2.0" - "@smithy/util-utf8" "^2.3.0" - tslib "^2.6.2" - -"@aws-sdk/client-sso-oidc@3.540.0": - version "3.540.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/client-sso-oidc/-/client-sso-oidc-3.540.0.tgz#e4c52889d33ca969add269011b790f2d634fb6d2" - integrity sha512-LZYK0lBRQK8D8M3Sqc96XiXkAV2v70zhTtF6weyzEpgwxZMfSuFJjs0jFyhaeZBZbZv7BBghIdhJ5TPavNxGMQ== + version "3.567.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/client-kms/-/client-kms-3.567.0.tgz#549050d2635cc65aaedc0c829b960c8df589fccc" + integrity sha512-j6K3c4eFyeUFDyi7aob5XqVh4jzGPampBvDepKCKNk82daFJl6YhzNBXV0OB3/z2FLVZXaZkqaS4tRgNdVkc+Q== dependencies: "@aws-crypto/sha256-browser" "3.0.0" "@aws-crypto/sha256-js" "3.0.0" - "@aws-sdk/client-sts" "3.540.0" - "@aws-sdk/core" "3.535.0" - "@aws-sdk/middleware-host-header" "3.535.0" - "@aws-sdk/middleware-logger" "3.535.0" - "@aws-sdk/middleware-recursion-detection" "3.535.0" - "@aws-sdk/middleware-user-agent" "3.540.0" - "@aws-sdk/region-config-resolver" "3.535.0" - "@aws-sdk/types" "3.535.0" - "@aws-sdk/util-endpoints" "3.540.0" - "@aws-sdk/util-user-agent-browser" "3.535.0" - "@aws-sdk/util-user-agent-node" "3.535.0" + "@aws-sdk/core" "3.567.0" + "@aws-sdk/credential-provider-node" "3.567.0" + "@aws-sdk/middleware-host-header" "3.567.0" + "@aws-sdk/middleware-logger" "3.567.0" + "@aws-sdk/middleware-recursion-detection" "3.567.0" + "@aws-sdk/middleware-user-agent" "3.567.0" + "@aws-sdk/region-config-resolver" "3.567.0" + "@aws-sdk/types" "3.567.0" + "@aws-sdk/util-endpoints" "3.567.0" + "@aws-sdk/util-user-agent-browser" "3.567.0" + "@aws-sdk/util-user-agent-node" "3.567.0" "@smithy/config-resolver" "^2.2.0" - "@smithy/core" "^1.4.0" + "@smithy/core" "^1.4.2" "@smithy/fetch-http-handler" "^2.5.0" "@smithy/hash-node" "^2.2.0" "@smithy/invalid-dependency" "^2.2.0" "@smithy/middleware-content-length" "^2.2.0" - "@smithy/middleware-endpoint" "^2.5.0" - "@smithy/middleware-retry" "^2.2.0" + "@smithy/middleware-endpoint" "^2.5.1" + "@smithy/middleware-retry" "^2.3.1" "@smithy/middleware-serde" "^2.3.0" "@smithy/middleware-stack" "^2.2.0" "@smithy/node-config-provider" "^2.3.0" "@smithy/node-http-handler" "^2.5.0" "@smithy/protocol-http" "^3.3.0" - "@smithy/smithy-client" "^2.5.0" + "@smithy/smithy-client" "^2.5.1" "@smithy/types" "^2.12.0" "@smithy/url-parser" "^2.2.0" "@smithy/util-base64" "^2.3.0" "@smithy/util-body-length-browser" "^2.2.0" "@smithy/util-body-length-node" "^2.3.0" - "@smithy/util-defaults-mode-browser" "^2.2.0" - "@smithy/util-defaults-mode-node" "^2.3.0" + "@smithy/util-defaults-mode-browser" "^2.2.1" + "@smithy/util-defaults-mode-node" "^2.3.1" "@smithy/util-endpoints" "^1.2.0" "@smithy/util-middleware" "^2.2.0" "@smithy/util-retry" "^2.2.0" "@smithy/util-utf8" "^2.3.0" tslib "^2.6.2" -"@aws-sdk/client-sso@3.540.0": - version "3.540.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/client-sso/-/client-sso-3.540.0.tgz#732a7f325de3905a719c20ce05e555b445f82b4a" - integrity sha512-rrQZMuw4sxIo3eyAUUzPQRA336mPRnrAeSlSdVHBKZD8Fjvoy0lYry2vNhkPLpFZLso1J66KRyuIv4LzRR3v1Q== +"@aws-sdk/client-sso@3.567.0": + version "3.567.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/client-sso/-/client-sso-3.567.0.tgz#e6686d81d9fde9d1ef51285f9b701ed4fed4552b" + integrity sha512-jcnT1m+altt9Xm2QErZBnETh+4ioeCb/p9bo0adLb9JCAuI/VcnIui5+CykvCzOAxQ8c8Soa19qycqCuUcjiCw== dependencies: "@aws-crypto/sha256-browser" "3.0.0" "@aws-crypto/sha256-js" "3.0.0" - "@aws-sdk/core" "3.535.0" - "@aws-sdk/middleware-host-header" "3.535.0" - "@aws-sdk/middleware-logger" "3.535.0" - "@aws-sdk/middleware-recursion-detection" "3.535.0" - "@aws-sdk/middleware-user-agent" "3.540.0" - "@aws-sdk/region-config-resolver" "3.535.0" - "@aws-sdk/types" "3.535.0" - "@aws-sdk/util-endpoints" "3.540.0" - "@aws-sdk/util-user-agent-browser" "3.535.0" - "@aws-sdk/util-user-agent-node" "3.535.0" + "@aws-sdk/core" "3.567.0" + "@aws-sdk/middleware-host-header" "3.567.0" + "@aws-sdk/middleware-logger" "3.567.0" + "@aws-sdk/middleware-recursion-detection" "3.567.0" + "@aws-sdk/middleware-user-agent" "3.567.0" + "@aws-sdk/region-config-resolver" "3.567.0" + "@aws-sdk/types" "3.567.0" + "@aws-sdk/util-endpoints" "3.567.0" + "@aws-sdk/util-user-agent-browser" "3.567.0" + "@aws-sdk/util-user-agent-node" "3.567.0" "@smithy/config-resolver" "^2.2.0" - "@smithy/core" "^1.4.0" + "@smithy/core" "^1.4.2" "@smithy/fetch-http-handler" "^2.5.0" "@smithy/hash-node" "^2.2.0" "@smithy/invalid-dependency" "^2.2.0" "@smithy/middleware-content-length" "^2.2.0" - "@smithy/middleware-endpoint" "^2.5.0" - "@smithy/middleware-retry" "^2.2.0" + "@smithy/middleware-endpoint" "^2.5.1" + "@smithy/middleware-retry" "^2.3.1" "@smithy/middleware-serde" "^2.3.0" "@smithy/middleware-stack" "^2.2.0" "@smithy/node-config-provider" "^2.3.0" "@smithy/node-http-handler" "^2.5.0" "@smithy/protocol-http" "^3.3.0" - "@smithy/smithy-client" "^2.5.0" + "@smithy/smithy-client" "^2.5.1" "@smithy/types" "^2.12.0" "@smithy/url-parser" "^2.2.0" "@smithy/util-base64" "^2.3.0" "@smithy/util-body-length-browser" "^2.2.0" "@smithy/util-body-length-node" "^2.3.0" - "@smithy/util-defaults-mode-browser" "^2.2.0" - "@smithy/util-defaults-mode-node" "^2.3.0" + "@smithy/util-defaults-mode-browser" "^2.2.1" + "@smithy/util-defaults-mode-node" "^2.3.1" "@smithy/util-endpoints" "^1.2.0" "@smithy/util-middleware" "^2.2.0" "@smithy/util-retry" "^2.2.0" "@smithy/util-utf8" "^2.3.0" tslib "^2.6.2" -"@aws-sdk/client-sts@3.540.0": - version "3.540.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/client-sts/-/client-sts-3.540.0.tgz#16ce14db1c5387be3ad9be6dd4f8ed33b63193c8" - integrity sha512-ITHUQxvpqfQX6obfpIi3KYGzZYfe/I5Ixjfxoi5lB7ISCtmxqObKB1fzD93wonkMJytJ7LUO8panZl/ojiJ1uw== +"@aws-sdk/core@3.567.0": + version "3.567.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/core/-/core-3.567.0.tgz#f0b93ba1541dcc179438fb8d80b2a80ec865b623" + integrity sha512-zUDEQhC7blOx6sxhHdT75x98+SXQVdUIMu8z8AjqMWiYK2v4WkOS8i6dOS4E5OjL5J1Ac+ruy8op/Bk4AFqSIw== dependencies: - "@aws-crypto/sha256-browser" "3.0.0" - "@aws-crypto/sha256-js" "3.0.0" - "@aws-sdk/core" "3.535.0" - "@aws-sdk/middleware-host-header" "3.535.0" - "@aws-sdk/middleware-logger" "3.535.0" - "@aws-sdk/middleware-recursion-detection" "3.535.0" - "@aws-sdk/middleware-user-agent" "3.540.0" - "@aws-sdk/region-config-resolver" "3.535.0" - "@aws-sdk/types" "3.535.0" - "@aws-sdk/util-endpoints" "3.540.0" - "@aws-sdk/util-user-agent-browser" "3.535.0" - "@aws-sdk/util-user-agent-node" "3.535.0" - "@smithy/config-resolver" "^2.2.0" - "@smithy/core" "^1.4.0" - "@smithy/fetch-http-handler" "^2.5.0" - "@smithy/hash-node" "^2.2.0" - "@smithy/invalid-dependency" "^2.2.0" - "@smithy/middleware-content-length" "^2.2.0" - "@smithy/middleware-endpoint" "^2.5.0" - "@smithy/middleware-retry" "^2.2.0" - "@smithy/middleware-serde" "^2.3.0" - "@smithy/middleware-stack" "^2.2.0" - "@smithy/node-config-provider" "^2.3.0" - "@smithy/node-http-handler" "^2.5.0" + "@smithy/core" "^1.4.2" "@smithy/protocol-http" "^3.3.0" - "@smithy/smithy-client" "^2.5.0" - "@smithy/types" "^2.12.0" - "@smithy/url-parser" "^2.2.0" - "@smithy/util-base64" "^2.3.0" - "@smithy/util-body-length-browser" "^2.2.0" - "@smithy/util-body-length-node" "^2.3.0" - "@smithy/util-defaults-mode-browser" "^2.2.0" - "@smithy/util-defaults-mode-node" "^2.3.0" - "@smithy/util-endpoints" "^1.2.0" - "@smithy/util-middleware" "^2.2.0" - "@smithy/util-retry" "^2.2.0" - "@smithy/util-utf8" "^2.3.0" - tslib "^2.6.2" - -"@aws-sdk/core@3.535.0": - version "3.535.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/core/-/core-3.535.0.tgz#f3a726c297cea9634d19a1db4e958c918c506c8b" - integrity sha512-+Yusa9HziuaEDta1UaLEtMAtmgvxdxhPn7jgfRY6PplqAqgsfa5FR83sxy5qr2q7xjQTwHtV4MjQVuOjG9JsLw== - dependencies: - "@smithy/core" "^1.4.0" - "@smithy/protocol-http" "^3.3.0" - "@smithy/signature-v4" "^2.2.0" - "@smithy/smithy-client" "^2.5.0" + "@smithy/signature-v4" "^2.3.0" + "@smithy/smithy-client" "^2.5.1" "@smithy/types" "^2.12.0" fast-xml-parser "4.2.5" tslib "^2.6.2" -"@aws-sdk/credential-provider-env@3.535.0": - version "3.535.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-env/-/credential-provider-env-3.535.0.tgz#26248e263a8107953d5496cb3760d4e7c877abcf" - integrity sha512-XppwO8c0GCGSAvdzyJOhbtktSEaShg14VJKg8mpMa1XcgqzmcqqHQjtDWbx5rZheY1VdpXZhpEzJkB6LpQejpA== +"@aws-sdk/credential-provider-env@3.567.0": + version "3.567.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-env/-/credential-provider-env-3.567.0.tgz#6e545c047871bf91cce2dbe1db11e99283442295" + integrity sha512-2V9O9m/hrWtIBKfg+nYHTYUHSKOZdSWL53JRaN28zYoX4dPDWwP1GacP/Mq6LJhKRnByfmqh3W3ZBsKizauSug== dependencies: - "@aws-sdk/types" "3.535.0" + "@aws-sdk/types" "3.567.0" "@smithy/property-provider" "^2.2.0" "@smithy/types" "^2.12.0" tslib "^2.6.2" -"@aws-sdk/credential-provider-http@3.535.0": - version "3.535.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-http/-/credential-provider-http-3.535.0.tgz#0a42f6b1a61d927bbce9f4afd25112f486bd05da" - integrity sha512-kdj1wCmOMZ29jSlUskRqN04S6fJ4dvt0Nq9Z32SA6wO7UG8ht6Ot9h/au/eTWJM3E1somZ7D771oK7dQt9b8yw== +"@aws-sdk/credential-provider-http@3.567.0": + version "3.567.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-http/-/credential-provider-http-3.567.0.tgz#4016128d4a6cc6e8ae36890121e09bab055c589e" + integrity sha512-MVSFmKo9ukxNyMYOk/u6gupGqktsbTZWh2uyULp0KLhuHPDTvWLmk96+6h6V2+GAp/J2QRK72l0EtjnHmcn3kg== dependencies: - "@aws-sdk/types" "3.535.0" + "@aws-sdk/types" "3.567.0" "@smithy/fetch-http-handler" "^2.5.0" "@smithy/node-http-handler" "^2.5.0" "@smithy/property-provider" "^2.2.0" "@smithy/protocol-http" "^3.3.0" - "@smithy/smithy-client" "^2.5.0" + "@smithy/smithy-client" "^2.5.1" "@smithy/types" "^2.12.0" "@smithy/util-stream" "^2.2.0" tslib "^2.6.2" -"@aws-sdk/credential-provider-ini@3.540.0": - version "3.540.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.540.0.tgz#8e17b23bf242152775db1473f7d2952beb6a5ef9" - integrity sha512-igN/RbsnulIBwqXbwsWmR3srqmtbPF1dm+JteGvUY31FW65fTVvWvSr945Y/cf1UbhPmIQXntlsqESqpkhTHwg== - dependencies: - "@aws-sdk/client-sts" "3.540.0" - "@aws-sdk/credential-provider-env" "3.535.0" - "@aws-sdk/credential-provider-process" "3.535.0" - "@aws-sdk/credential-provider-sso" "3.540.0" - "@aws-sdk/credential-provider-web-identity" "3.540.0" - "@aws-sdk/types" "3.535.0" +"@aws-sdk/credential-provider-ini@3.567.0": + version "3.567.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.567.0.tgz#c9a1fc570de43ba6997631690e0910bc45fc525f" + integrity sha512-azbZ3jYZmSD3oCzbjPOrI+pilRDV6H9qtJ3J4MCnbRYQxR8eu80l4Y0tXl0+GfHZCpdOJ9+uEhqU+yTiVrrOXg== + dependencies: + "@aws-sdk/credential-provider-env" "3.567.0" + "@aws-sdk/credential-provider-process" "3.567.0" + "@aws-sdk/credential-provider-sso" "3.567.0" + "@aws-sdk/credential-provider-web-identity" "3.567.0" + "@aws-sdk/types" "3.567.0" "@smithy/credential-provider-imds" "^2.3.0" "@smithy/property-provider" "^2.2.0" "@smithy/shared-ini-file-loader" "^2.4.0" "@smithy/types" "^2.12.0" tslib "^2.6.2" -"@aws-sdk/credential-provider-node@3.540.0": - version "3.540.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-node/-/credential-provider-node-3.540.0.tgz#e6fd3404de68e7f9580f01aa542b16e9abc58e5c" - integrity sha512-HKQZJbLHlrHX9A0B1poiYNXIIQfy8whTjuosTCYKPDBhhUyVAQfxy/KG726j0v43IhaNPLgTGZCJve4hAsazSw== - dependencies: - "@aws-sdk/credential-provider-env" "3.535.0" - "@aws-sdk/credential-provider-http" "3.535.0" - "@aws-sdk/credential-provider-ini" "3.540.0" - "@aws-sdk/credential-provider-process" "3.535.0" - "@aws-sdk/credential-provider-sso" "3.540.0" - "@aws-sdk/credential-provider-web-identity" "3.540.0" - "@aws-sdk/types" "3.535.0" +"@aws-sdk/credential-provider-node@3.567.0": + version "3.567.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-node/-/credential-provider-node-3.567.0.tgz#fd14f011ade3d9704ef0f261607fab36f1c8ec68" + integrity sha512-/kwYs2URdcXjKCPClUYrvdhhh7oRh1PWC0mehzy92c0I8hMdhIIpOmwJj8IoRIWdsCnPRatWBJBuE553y+HaUQ== + dependencies: + "@aws-sdk/credential-provider-env" "3.567.0" + "@aws-sdk/credential-provider-http" "3.567.0" + "@aws-sdk/credential-provider-ini" "3.567.0" + "@aws-sdk/credential-provider-process" "3.567.0" + "@aws-sdk/credential-provider-sso" "3.567.0" + "@aws-sdk/credential-provider-web-identity" "3.567.0" + "@aws-sdk/types" "3.567.0" "@smithy/credential-provider-imds" "^2.3.0" "@smithy/property-provider" "^2.2.0" "@smithy/shared-ini-file-loader" "^2.4.0" "@smithy/types" "^2.12.0" tslib "^2.6.2" -"@aws-sdk/credential-provider-process@3.535.0": - version "3.535.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-process/-/credential-provider-process-3.535.0.tgz#ea1e8a38a32e36bbdc3f75eb03352e6eafa0c659" - integrity sha512-9O1OaprGCnlb/kYl8RwmH7Mlg8JREZctB8r9sa1KhSsWFq/SWO0AuJTyowxD7zL5PkeS4eTvzFFHWCa3OO5epA== +"@aws-sdk/credential-provider-process@3.567.0": + version "3.567.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-process/-/credential-provider-process-3.567.0.tgz#c90775b612e711914a94660d74f5460614ce5002" + integrity sha512-Bsp1bj8bnsvdLec9aXpBsHMlwCmO9TmRrZYyji7ZEUB003ZkxIgbqhe6TEKByrJd53KHfgeF+U4mWZAgBHDXfQ== dependencies: - "@aws-sdk/types" "3.535.0" + "@aws-sdk/types" "3.567.0" "@smithy/property-provider" "^2.2.0" "@smithy/shared-ini-file-loader" "^2.4.0" "@smithy/types" "^2.12.0" tslib "^2.6.2" -"@aws-sdk/credential-provider-sso@3.540.0": - version "3.540.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.540.0.tgz#1fc5c53a0df8227249c73a3cb7660b1accb79186" - integrity sha512-tKkFqK227LF5ajc5EL6asXS32p3nkofpP8G7NRpU7zOEOQCg01KUc4JRX+ItI0T007CiN1J19yNoFqHLT/SqHg== +"@aws-sdk/credential-provider-sso@3.567.0": + version "3.567.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.567.0.tgz#8b37246c1bdc82b582bd95556beb0f44fb9edd1c" + integrity sha512-7TjvMiMsyYANNBiWBArEe7SvqSkZH0FleGUzp+AgT8/CDyGDRdLk7ve2n9f1+iH28av5J0Nw8+TfscHCImrDrQ== dependencies: - "@aws-sdk/client-sso" "3.540.0" - "@aws-sdk/token-providers" "3.540.0" - "@aws-sdk/types" "3.535.0" + "@aws-sdk/client-sso" "3.567.0" + "@aws-sdk/token-providers" "3.567.0" + "@aws-sdk/types" "3.567.0" "@smithy/property-provider" "^2.2.0" "@smithy/shared-ini-file-loader" "^2.4.0" "@smithy/types" "^2.12.0" tslib "^2.6.2" -"@aws-sdk/credential-provider-web-identity@3.540.0": - version "3.540.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.540.0.tgz#775a2090e9f4f89efe2ebdf1e2c109a47561c0e9" - integrity sha512-OpDm9w3A168B44hSjpnvECP4rvnFzD86rN4VYdGADuCvEa5uEcdA/JuT5WclFPDqdWEmFBqS1pxBIJBf0g2Q9Q== +"@aws-sdk/credential-provider-web-identity@3.567.0": + version "3.567.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.567.0.tgz#57792f7854da0379b714766a832156638c78f6e1" + integrity sha512-0J7LgR7ll0glMFBz0d4ijCBB61G7ZNucbEKsCGpFk2csytXNPCZYobjzXpJO8QxxgQUGnb68CRB0bo+GQq8nPg== dependencies: - "@aws-sdk/client-sts" "3.540.0" - "@aws-sdk/types" "3.535.0" + "@aws-sdk/types" "3.567.0" "@smithy/property-provider" "^2.2.0" "@smithy/types" "^2.12.0" tslib "^2.6.2" -"@aws-sdk/middleware-host-header@3.535.0": - version "3.535.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-host-header/-/middleware-host-header-3.535.0.tgz#d5264f813592f5e77df25e5a14bbb0e6441812db" - integrity sha512-0h6TWjBWtDaYwHMQJI9ulafeS4lLaw1vIxRjbpH0svFRt6Eve+Sy8NlVhECfTU2hNz/fLubvrUxsXoThaLBIew== +"@aws-sdk/middleware-host-header@3.567.0": + version "3.567.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-host-header/-/middleware-host-header-3.567.0.tgz#52f278234458ec3035e9534fee582c95a8fec4f7" + integrity sha512-zQHHj2N3in9duKghH7AuRNrOMLnKhW6lnmb7dznou068DJtDr76w475sHp2TF0XELsOGENbbBsOlN/S5QBFBVQ== dependencies: - "@aws-sdk/types" "3.535.0" + "@aws-sdk/types" "3.567.0" "@smithy/protocol-http" "^3.3.0" "@smithy/types" "^2.12.0" tslib "^2.6.2" -"@aws-sdk/middleware-logger@3.535.0": - version "3.535.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-logger/-/middleware-logger-3.535.0.tgz#1a8ffd6c368edd6cb32e1edf7b1dced95c1820ee" - integrity sha512-huNHpONOrEDrdRTvSQr1cJiRMNf0S52NDXtaPzdxiubTkP+vni2MohmZANMOai/qT0olmEVX01LhZ0ZAOgmg6A== +"@aws-sdk/middleware-logger@3.567.0": + version "3.567.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-logger/-/middleware-logger-3.567.0.tgz#bc2fc2c7cbbcf0c6aaaeaab2df0e38ab4af4b9db" + integrity sha512-12oUmPfSqzaTxO29TXJ9GnJ5qI6ed8iOvHvRLOoqI/TrFqLJnFwCka8E9tpP/sftMchd7wfefbhHhZK4J3ek8Q== dependencies: - "@aws-sdk/types" "3.535.0" + "@aws-sdk/types" "3.567.0" "@smithy/types" "^2.12.0" tslib "^2.6.2" -"@aws-sdk/middleware-recursion-detection@3.535.0": - version "3.535.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-recursion-detection/-/middleware-recursion-detection-3.535.0.tgz#6aa1e1bd1e84730d58a73021b745e20d4341a92d" - integrity sha512-am2qgGs+gwqmR4wHLWpzlZ8PWhm4ktj5bYSgDrsOfjhdBlWNxvPoID9/pDAz5RWL48+oH7I6SQzMqxXsFDikrw== +"@aws-sdk/middleware-recursion-detection@3.567.0": + version "3.567.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-recursion-detection/-/middleware-recursion-detection-3.567.0.tgz#95d91f071b57fb5245d522db70df1652275f06ac" + integrity sha512-rFk3QhdT4IL6O/UWHmNdjJiURutBCy+ogGqaNHf/RELxgXH3KmYorLwCe0eFb5hq8f6vr3zl4/iH7YtsUOuo1w== dependencies: - "@aws-sdk/types" "3.535.0" + "@aws-sdk/types" "3.567.0" "@smithy/protocol-http" "^3.3.0" "@smithy/types" "^2.12.0" tslib "^2.6.2" -"@aws-sdk/middleware-user-agent@3.540.0": - version "3.540.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.540.0.tgz#4981c64c1eeb6b5c453bce02d060b8c71d44994d" - integrity sha512-8Rd6wPeXDnOYzWj1XCmOKcx/Q87L0K1/EHqOBocGjLVbN3gmRxBvpmR1pRTjf7IsWfnnzN5btqtcAkfDPYQUMQ== +"@aws-sdk/middleware-user-agent@3.567.0": + version "3.567.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.567.0.tgz#0dbedb18b33a7f490948f8b153301bd4bc7e825d" + integrity sha512-a7DBGMRBLWJU3BqrQjOtKS4/RcCh/BhhKqwjCE0FEhhm6A/GGuAs/DcBGOl6Y8Wfsby3vejSlppTLH/qtV1E9w== dependencies: - "@aws-sdk/types" "3.535.0" - "@aws-sdk/util-endpoints" "3.540.0" + "@aws-sdk/types" "3.567.0" + "@aws-sdk/util-endpoints" "3.567.0" "@smithy/protocol-http" "^3.3.0" "@smithy/types" "^2.12.0" tslib "^2.6.2" -"@aws-sdk/region-config-resolver@3.535.0": - version "3.535.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/region-config-resolver/-/region-config-resolver-3.535.0.tgz#20a30fb5fbbe27ab70f2ed16327bae7e367b5cec" - integrity sha512-IXOznDiaItBjsQy4Fil0kzX/J3HxIOknEphqHbOfUf+LpA5ugcsxuQQONrbEQusCBnfJyymrldBvBhFmtlU9Wg== +"@aws-sdk/region-config-resolver@3.567.0": + version "3.567.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/region-config-resolver/-/region-config-resolver-3.567.0.tgz#c3ad943d3debcfb0c50ce3556ed183195f8590f9" + integrity sha512-VMDyYi5Dh2NydDiIARZ19DwMfbyq0llS736cp47qopmO6wzdeul7WRTx8NKfEYN0/AwEaqmTW0ohx58jSB1lYg== dependencies: - "@aws-sdk/types" "3.535.0" + "@aws-sdk/types" "3.567.0" "@smithy/node-config-provider" "^2.3.0" "@smithy/types" "^2.12.0" "@smithy/util-config-provider" "^2.3.0" "@smithy/util-middleware" "^2.2.0" tslib "^2.6.2" -"@aws-sdk/token-providers@3.540.0": - version "3.540.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/token-providers/-/token-providers-3.540.0.tgz#06fb874a62d3c496875768ac648bc6cca4c75a79" - integrity sha512-9BvtiVEZe5Ev88Wa4ZIUbtT6BVcPwhxmVInQ6c12MYNb0WNL54BN6wLy/eknAfF05gpX2/NDU2pUDOyMPdm/+g== +"@aws-sdk/token-providers@3.567.0": + version "3.567.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/token-providers/-/token-providers-3.567.0.tgz#a962cae500895848fdaa247b5aec6be9d7bdb528" + integrity sha512-W9Zd7/504wGrNjHHbJeCms1j1M6/88cHtBhRTKOWa7mec1gCjrd0VB3JE1cRodc6OrbJZ9TmyarBg8er6X5aiA== dependencies: - "@aws-sdk/client-sso-oidc" "3.540.0" - "@aws-sdk/types" "3.535.0" + "@aws-sdk/types" "3.567.0" "@smithy/property-provider" "^2.2.0" "@smithy/shared-ini-file-loader" "^2.4.0" "@smithy/types" "^2.12.0" tslib "^2.6.2" -"@aws-sdk/types@3.535.0", "@aws-sdk/types@^3.222.0": - version "3.535.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/types/-/types-3.535.0.tgz#5e6479f31299dd9df170e63f4d10fe739008cf04" - integrity sha512-aY4MYfduNj+sRR37U7XxYR8wemfbKP6lx00ze2M2uubn7mZotuVrWYAafbMSXrdEMSToE5JDhr28vArSOoLcSg== +"@aws-sdk/types@3.567.0", "@aws-sdk/types@^3.222.0": + version "3.567.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/types/-/types-3.567.0.tgz#b2dc88e154140b1ff87e94f63c97447bdb1c1738" + integrity sha512-JBznu45cdgQb8+T/Zab7WpBmfEAh77gsk99xuF4biIb2Sw1mdseONdoGDjEJX57a25TzIv/WUJ2oABWumckz1A== dependencies: "@smithy/types" "^2.12.0" tslib "^2.6.2" -"@aws-sdk/util-endpoints@3.540.0": - version "3.540.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/util-endpoints/-/util-endpoints-3.540.0.tgz#a7fea1d2a5e64623353aaa6ee32dbb86ab9cd3f8" - integrity sha512-1kMyQFAWx6f8alaI6UT65/5YW/7pDWAKAdNwL6vuJLea03KrZRX3PMoONOSJpAS5m3Ot7HlWZvf3wZDNTLELZw== +"@aws-sdk/util-endpoints@3.567.0": + version "3.567.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/util-endpoints/-/util-endpoints-3.567.0.tgz#c536ad8b9acf99ad762ab949fe0fed943c6f5a12" + integrity sha512-WVhot3qmi0BKL9ZKnUqsvCd++4RF2DsJIG32NlRaml1FT9KaqSzNv0RXeA6k/kYwiiNT7y3YWu3Lbzy7c6vG9g== dependencies: - "@aws-sdk/types" "3.535.0" + "@aws-sdk/types" "3.567.0" "@smithy/types" "^2.12.0" "@smithy/util-endpoints" "^1.2.0" tslib "^2.6.2" "@aws-sdk/util-locate-window@^3.0.0": - version "3.535.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/util-locate-window/-/util-locate-window-3.535.0.tgz#0200a336fddd47dd6567ce15d01f62be50a315d7" - integrity sha512-PHJ3SL6d2jpcgbqdgiPxkXpu7Drc2PYViwxSIqvvMKhDwzSB1W3mMvtpzwKM4IE7zLFodZo0GKjJ9AsoXndXhA== + version "3.567.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/util-locate-window/-/util-locate-window-3.567.0.tgz#77c47906195e93bb4486e80142fdeba98821743a" + integrity sha512-o05vqq2+IdIHVqu2L28D1aVzZRkjheyQQE0kAIB+aS0fr4hYidsO2XqkXRRnhkaOxW3VN5/K/p2gxCaKt6A1XA== dependencies: tslib "^2.6.2" -"@aws-sdk/util-user-agent-browser@3.535.0": - version "3.535.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/util-user-agent-browser/-/util-user-agent-browser-3.535.0.tgz#d67d72e8b933051620f18ddb1c2be225f79f588f" - integrity sha512-RWMcF/xV5n+nhaA/Ff5P3yNP3Kur/I+VNZngog4TEs92oB/nwOdAg/2JL8bVAhUbMrjTjpwm7PItziYFQoqyig== +"@aws-sdk/util-user-agent-browser@3.567.0": + version "3.567.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/util-user-agent-browser/-/util-user-agent-browser-3.567.0.tgz#1ef37a87b28155274d62e31c1ac5c1c043dcd0b3" + integrity sha512-cqP0uXtZ7m7hRysf3fRyJwcY1jCgQTpJy7BHB5VpsE7DXlXHD5+Ur5L42CY7UrRPrB6lc6YGFqaAOs5ghMcLyA== dependencies: - "@aws-sdk/types" "3.535.0" + "@aws-sdk/types" "3.567.0" "@smithy/types" "^2.12.0" bowser "^2.11.0" tslib "^2.6.2" -"@aws-sdk/util-user-agent-node@3.535.0": - version "3.535.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.535.0.tgz#f5c26fb6f3f561d3cf35f96f303b1775afad0a5b" - integrity sha512-dRek0zUuIT25wOWJlsRm97nTkUlh1NDcLsQZIN2Y8KxhwoXXWtJs5vaDPT+qAg+OpcNj80i1zLR/CirqlFg/TQ== +"@aws-sdk/util-user-agent-node@3.567.0": + version "3.567.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.567.0.tgz#ed70834431df12f6248814fcee9ba09f18b1e1d1" + integrity sha512-Fph602FBhLssed0x2GsRZyqJB8thcrKzbS53v57rQ6XHSQ6T8t2BUyrlXcBfDpoZQjnqobr0Uu2DG5UI3cgR6g== dependencies: - "@aws-sdk/types" "3.535.0" + "@aws-sdk/types" "3.567.0" "@smithy/node-config-provider" "^2.3.0" "@smithy/types" "^2.12.0" tslib "^2.6.2" @@ -468,7 +366,7 @@ dependencies: tslib "^2.3.1" -"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.12.13", "@babel/code-frame@^7.23.5", "@babel/code-frame@^7.24.1", "@babel/code-frame@^7.24.2": +"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.12.13", "@babel/code-frame@^7.23.5", "@babel/code-frame@^7.24.2": version "7.24.2" resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.24.2.tgz#718b4b19841809a58b29b68cde80bc5e1aa6d9ae" integrity sha512-y5+tLQyV8pg3fsiln67BVLD1P13Eg4lh5RW9mF0zUuvLrv9uIQ4MCL+CRT+FTsBlBjcIan6PGsLcBN0m3ClUyQ== @@ -477,37 +375,37 @@ picocolors "^1.0.0" "@babel/compat-data@^7.23.5": - version "7.24.1" - resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.24.1.tgz#31c1f66435f2a9c329bb5716a6d6186c516c3742" - integrity sha512-Pc65opHDliVpRHuKfzI+gSA4zcgr65O4cl64fFJIWEEh8JoHIHh0Oez1Eo8Arz8zq/JhgKodQaxEwUPRtZylVA== + version "7.24.4" + resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.24.4.tgz#6f102372e9094f25d908ca0d34fc74c74606059a" + integrity sha512-vg8Gih2MLK+kOkHJp4gBEIkyaIi00jgWot2D9QOmmfLC8jINSOzmCLta6Bvz/JSBCqnegV0L80jhxkol5GWNfQ== "@babel/core@^7.1.0", "@babel/core@^7.12.3", "@babel/core@^7.7.2", "@babel/core@^7.8.0": - version "7.24.3" - resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.24.3.tgz#568864247ea10fbd4eff04dda1e05f9e2ea985c3" - integrity sha512-5FcvN1JHw2sHJChotgx8Ek0lyuh4kCKelgMTTqhYJJtloNvUfpAFMeNQUtdlIaktwrSV9LtCdqwk48wL2wBacQ== + version "7.24.5" + resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.24.5.tgz#15ab5b98e101972d171aeef92ac70d8d6718f06a" + integrity sha512-tVQRucExLQ02Boi4vdPp49svNGcfL2GhdTCT9aldhXgCJVAI21EtRfBettiuLUwce/7r6bFdgs6JFkcdTiFttA== dependencies: "@ampproject/remapping" "^2.2.0" "@babel/code-frame" "^7.24.2" - "@babel/generator" "^7.24.1" + "@babel/generator" "^7.24.5" "@babel/helper-compilation-targets" "^7.23.6" - "@babel/helper-module-transforms" "^7.23.3" - "@babel/helpers" "^7.24.1" - "@babel/parser" "^7.24.1" + "@babel/helper-module-transforms" "^7.24.5" + "@babel/helpers" "^7.24.5" + "@babel/parser" "^7.24.5" "@babel/template" "^7.24.0" - "@babel/traverse" "^7.24.1" - "@babel/types" "^7.24.0" + "@babel/traverse" "^7.24.5" + "@babel/types" "^7.24.5" convert-source-map "^2.0.0" debug "^4.1.0" gensync "^1.0.0-beta.2" json5 "^2.2.3" semver "^6.3.1" -"@babel/generator@^7.24.1", "@babel/generator@^7.7.2": - version "7.24.1" - resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.24.1.tgz#e67e06f68568a4ebf194d1c6014235344f0476d0" - integrity sha512-DfCRfZsBcrPEHUfuBMgbJ1Ut01Y/itOs+hY2nFLgqsqXd52/iSiVq5TITtUasIUgm+IIKdY2/1I7auiQOEeC9A== +"@babel/generator@^7.24.5", "@babel/generator@^7.7.2": + version "7.24.5" + resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.24.5.tgz#e5afc068f932f05616b66713e28d0f04e99daeb3" + integrity sha512-x32i4hEXvr+iI0NEoEfDKzlemF8AmtOP8CcrRaEcpzysWuoEb1KknpcvMsHKPONoKZiDuItklgWhB18xEhr9PA== dependencies: - "@babel/types" "^7.24.0" + "@babel/types" "^7.24.5" "@jridgewell/gen-mapping" "^0.3.5" "@jridgewell/trace-mapping" "^0.3.25" jsesc "^2.5.1" @@ -543,81 +441,81 @@ dependencies: "@babel/types" "^7.22.5" -"@babel/helper-module-imports@^7.22.15": +"@babel/helper-module-imports@^7.24.3": version "7.24.3" resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.24.3.tgz#6ac476e6d168c7c23ff3ba3cf4f7841d46ac8128" integrity sha512-viKb0F9f2s0BCS22QSF308z/+1YWKV/76mwt61NBzS5izMzDPwdq1pTrzf+Li3npBWX9KdQbkeCt1jSAM7lZqg== dependencies: "@babel/types" "^7.24.0" -"@babel/helper-module-transforms@^7.23.3": - version "7.23.3" - resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.23.3.tgz#d7d12c3c5d30af5b3c0fcab2a6d5217773e2d0f1" - integrity sha512-7bBs4ED9OmswdfDzpz4MpWgSrV7FXlc3zIagvLFjS5H+Mk7Snr21vQ6QwrsoCGMfNC4e4LQPdoULEt4ykz0SRQ== +"@babel/helper-module-transforms@^7.24.5": + version "7.24.5" + resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.24.5.tgz#ea6c5e33f7b262a0ae762fd5986355c45f54a545" + integrity sha512-9GxeY8c2d2mdQUP1Dye0ks3VDyIMS98kt/llQ2nUId8IsWqTF0l1LkSX0/uP7l7MCDrzXS009Hyhe2gzTiGW8A== dependencies: "@babel/helper-environment-visitor" "^7.22.20" - "@babel/helper-module-imports" "^7.22.15" - "@babel/helper-simple-access" "^7.22.5" - "@babel/helper-split-export-declaration" "^7.22.6" - "@babel/helper-validator-identifier" "^7.22.20" + "@babel/helper-module-imports" "^7.24.3" + "@babel/helper-simple-access" "^7.24.5" + "@babel/helper-split-export-declaration" "^7.24.5" + "@babel/helper-validator-identifier" "^7.24.5" "@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.14.5", "@babel/helper-plugin-utils@^7.24.0", "@babel/helper-plugin-utils@^7.8.0": - version "7.24.0" - resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.24.0.tgz#945681931a52f15ce879fd5b86ce2dae6d3d7f2a" - integrity sha512-9cUznXMG0+FxRuJfvL82QlTqIzhVW9sL0KjMPHhAOOvpQGL8QtdxnBKILjBqxlHyliz0yCa1G903ZXI/FuHy2w== + version "7.24.5" + resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.24.5.tgz#a924607dd254a65695e5bd209b98b902b3b2f11a" + integrity sha512-xjNLDopRzW2o6ba0gKbkZq5YWEBaK3PCyTOY1K2P/O07LGMhMqlMXPxwN4S5/RhWuCobT8z0jrlKGlYmeR1OhQ== -"@babel/helper-simple-access@^7.22.5": - version "7.22.5" - resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.22.5.tgz#4938357dc7d782b80ed6dbb03a0fba3d22b1d5de" - integrity sha512-n0H99E/K+Bika3++WNL17POvo4rKWZ7lZEp1Q+fStVbUi8nxPQEBOlTmCOxW/0JsS56SKKQ+ojAe2pHKJHN35w== +"@babel/helper-simple-access@^7.24.5": + version "7.24.5" + resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.24.5.tgz#50da5b72f58c16b07fbd992810be6049478e85ba" + integrity sha512-uH3Hmf5q5n7n8mz7arjUlDOCbttY/DW4DYhE6FUsjKJ/oYC1kQQUvwEQWxRwUpX9qQKRXeqLwWxrqilMrf32sQ== dependencies: - "@babel/types" "^7.22.5" + "@babel/types" "^7.24.5" -"@babel/helper-split-export-declaration@^7.22.6": - version "7.22.6" - resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.22.6.tgz#322c61b7310c0997fe4c323955667f18fcefb91c" - integrity sha512-AsUnxuLhRYsisFiaJwvp1QF+I3KjD5FOxut14q/GzovUe6orHLesW2C7d754kRm53h5gqrz6sFl6sxc4BVtE/g== +"@babel/helper-split-export-declaration@^7.24.5": + version "7.24.5" + resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.24.5.tgz#b9a67f06a46b0b339323617c8c6213b9055a78b6" + integrity sha512-5CHncttXohrHk8GWOFCcCl4oRD9fKosWlIRgWm4ql9VYioKm52Mk2xsmoohvm7f3JoiLSM5ZgJuRaf5QZZYd3Q== dependencies: - "@babel/types" "^7.22.5" + "@babel/types" "^7.24.5" -"@babel/helper-string-parser@^7.23.4": +"@babel/helper-string-parser@^7.24.1": version "7.24.1" resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.24.1.tgz#f99c36d3593db9540705d0739a1f10b5e20c696e" integrity sha512-2ofRCjnnA9y+wk8b9IAREroeUP02KHp431N2mhKniy2yKIDKpbrHv9eXwm8cBeWQYcJmzv5qKCu65P47eCF7CQ== -"@babel/helper-validator-identifier@^7.22.20": - version "7.22.20" - resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.20.tgz#c4ae002c61d2879e724581d96665583dbc1dc0e0" - integrity sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A== +"@babel/helper-validator-identifier@^7.24.5": + version "7.24.5" + resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.24.5.tgz#918b1a7fa23056603506370089bd990d8720db62" + integrity sha512-3q93SSKX2TWCG30M2G2kwaKeTYgEUp5Snjuj8qm729SObL6nbtUldAi37qbxkD5gg3xnBio+f9nqpSepGZMvxA== "@babel/helper-validator-option@^7.23.5": version "7.23.5" resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.23.5.tgz#907a3fbd4523426285365d1206c423c4c5520307" integrity sha512-85ttAOMLsr53VgXkTbkx8oA6YTfT4q7/HzXSLEYmjcSTJPMPQtvq1BD79Byep5xMUYbGRzEpDsjUf3dyp54IKw== -"@babel/helpers@^7.24.1": - version "7.24.1" - resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.24.1.tgz#183e44714b9eba36c3038e442516587b1e0a1a94" - integrity sha512-BpU09QqEe6ZCHuIHFphEFgvNSrubve1FtyMton26ekZ85gRGi6LrTF7zArARp2YvyFxloeiRmtSCq5sjh1WqIg== +"@babel/helpers@^7.24.5": + version "7.24.5" + resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.24.5.tgz#fedeb87eeafa62b621160402181ad8585a22a40a" + integrity sha512-CiQmBMMpMQHwM5m01YnrM6imUG1ebgYJ+fAIW4FZe6m4qHTPaRHti+R8cggAwkdz4oXhtO4/K9JWlh+8hIfR2Q== dependencies: "@babel/template" "^7.24.0" - "@babel/traverse" "^7.24.1" - "@babel/types" "^7.24.0" + "@babel/traverse" "^7.24.5" + "@babel/types" "^7.24.5" "@babel/highlight@^7.24.2": - version "7.24.2" - resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.24.2.tgz#3f539503efc83d3c59080a10e6634306e0370d26" - integrity sha512-Yac1ao4flkTxTteCDZLEvdxg2fZfz1v8M4QpaGypq/WPDqg3ijHYbDfs+LG5hvzSoqaSZ9/Z9lKSP3CjZjv+pA== + version "7.24.5" + resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.24.5.tgz#bc0613f98e1dd0720e99b2a9ee3760194a704b6e" + integrity sha512-8lLmua6AVh/8SLJRRVD6V8p73Hir9w5mJrhE+IPpILG31KKlI9iz5zmBYKcWPS59qSfgP9RaSBQSHHE81WKuEw== dependencies: - "@babel/helper-validator-identifier" "^7.22.20" + "@babel/helper-validator-identifier" "^7.24.5" chalk "^2.4.2" js-tokens "^4.0.0" picocolors "^1.0.0" -"@babel/parser@^7.1.0", "@babel/parser@^7.14.7", "@babel/parser@^7.20.7", "@babel/parser@^7.24.0", "@babel/parser@^7.24.1": - version "7.24.1" - resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.24.1.tgz#1e416d3627393fab1cb5b0f2f1796a100ae9133a" - integrity sha512-Zo9c7N3xdOIQrNip7Lc9wvRPzlRtovHVE4lkz8WEDr7uYh/GMQhSiIgFxGIArRHYdJE5kxtZjAf8rT0xhdLCzg== +"@babel/parser@^7.1.0", "@babel/parser@^7.14.7", "@babel/parser@^7.20.7", "@babel/parser@^7.24.0", "@babel/parser@^7.24.5": + version "7.24.5" + resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.24.5.tgz#4a4d5ab4315579e5398a82dcf636ca80c3392790" + integrity sha512-EOv5IK8arwh3LI47dz1b0tKUb/1uhHAnHJOrjgtQMIpu1uXd9mlFrJg9IUgGUgZ41Ch0K8REPTYpO7B76b4vJg== "@babel/plugin-syntax-async-generators@^7.8.4": version "7.8.4" @@ -719,29 +617,29 @@ "@babel/parser" "^7.24.0" "@babel/types" "^7.24.0" -"@babel/traverse@^7.24.1", "@babel/traverse@^7.7.2": - version "7.24.1" - resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.24.1.tgz#d65c36ac9dd17282175d1e4a3c49d5b7988f530c" - integrity sha512-xuU6o9m68KeqZbQuDt2TcKSxUw/mrsvavlEqQ1leZ/B+C9tk6E4sRWy97WaXgvq5E+nU3cXMxv3WKOCanVMCmQ== +"@babel/traverse@^7.24.5", "@babel/traverse@^7.7.2": + version "7.24.5" + resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.24.5.tgz#972aa0bc45f16983bf64aa1f877b2dd0eea7e6f8" + integrity sha512-7aaBLeDQ4zYcUFDUD41lJc1fG8+5IU9DaNSJAgal866FGvmD5EbWQgnEC6kO1gGLsX0esNkfnJSndbTXA3r7UA== dependencies: - "@babel/code-frame" "^7.24.1" - "@babel/generator" "^7.24.1" + "@babel/code-frame" "^7.24.2" + "@babel/generator" "^7.24.5" "@babel/helper-environment-visitor" "^7.22.20" "@babel/helper-function-name" "^7.23.0" "@babel/helper-hoist-variables" "^7.22.5" - "@babel/helper-split-export-declaration" "^7.22.6" - "@babel/parser" "^7.24.1" - "@babel/types" "^7.24.0" + "@babel/helper-split-export-declaration" "^7.24.5" + "@babel/parser" "^7.24.5" + "@babel/types" "^7.24.5" debug "^4.3.1" globals "^11.1.0" -"@babel/types@^7.0.0", "@babel/types@^7.20.7", "@babel/types@^7.22.5", "@babel/types@^7.23.0", "@babel/types@^7.24.0", "@babel/types@^7.3.3": - version "7.24.0" - resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.24.0.tgz#3b951f435a92e7333eba05b7566fd297960ea1bf" - integrity sha512-+j7a5c253RfKh8iABBhywc8NSfP5LURe7Uh4qpsh6jc+aLJguvmIUBdjSdEMQv2bENrCR5MfRdjGo7vzS/ob7w== +"@babel/types@^7.0.0", "@babel/types@^7.20.7", "@babel/types@^7.22.5", "@babel/types@^7.23.0", "@babel/types@^7.24.0", "@babel/types@^7.24.5", "@babel/types@^7.3.3": + version "7.24.5" + resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.24.5.tgz#7661930afc638a5383eb0c4aee59b74f38db84d7" + integrity sha512-6mQNsaLeXTw0nxYUYu+NSa4Hx4BlF1x1x8/PMFbiR+GBSr+2DkECc69b8hgy2frEodNcvPffeH8YfWd3LI6jhQ== dependencies: - "@babel/helper-string-parser" "^7.23.4" - "@babel/helper-validator-identifier" "^7.22.20" + "@babel/helper-string-parser" "^7.24.1" + "@babel/helper-validator-identifier" "^7.24.5" to-fast-properties "^2.0.0" "@bcoe/v8-coverage@^0.2.3": @@ -749,10 +647,10 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@datadog/native-appsec@7.1.0": - version "7.1.0" - resolved "https://registry.yarnpkg.com/@datadog/native-appsec/-/native-appsec-7.1.0.tgz#e8e6254236ac6fd7d4fb8b1156b34de64ec3e174" - integrity sha512-5FATunIxmvuSGDwPmbXfOi21wC7rjfbdLX4QiT5LR+iRLjRLT5iETqwdTsqy0WOQIHmxdWuddRvuakAg3921aA== +"@datadog/native-appsec@7.1.1": + version "7.1.1" + resolved "https://registry.yarnpkg.com/@datadog/native-appsec/-/native-appsec-7.1.1.tgz#eee96ae4c309e5b811611e968668f6744452c584" + integrity sha512-1XVrCY4g1ArN79SQANMtiIkaxKSPfgdAGv0VAM4Pz+NQuxKfl+2xQPXjQPm87LI1KQIO6MU6qzv3sUUSesb9lA== dependencies: node-gyp-build "^3.9.0" @@ -791,9 +689,9 @@ source-map "^0.7.4" "@datadog/sketches-js@^2.1.0": - version "2.1.0" - resolved "https://registry.yarnpkg.com/@datadog/sketches-js/-/sketches-js-2.1.0.tgz#8c7e8028a5fc22ad102fa542b0a446c956830455" - integrity sha512-smLocSfrt3s53H/XSVP3/1kP42oqvrkjUPtyaFd1F79ux24oE31BKt+q0c6lsa6hOYrFzsIwyc5GXAI5JmfOew== + version "2.1.1" + resolved "https://registry.yarnpkg.com/@datadog/sketches-js/-/sketches-js-2.1.1.tgz#9ec2251b3c932b4f43e1d164461fa6cb6f28b7d0" + integrity sha512-d5RjycE+MObE/hU+8OM5Zp4VjTwiPLRa8299fj7muOmR16fb942z8byoMbCErnGh0lBevvgkGrLclQDvINbIyg== "@istanbuljs/load-nyc-config@^1.0.0": version "1.1.0" @@ -1029,16 +927,16 @@ integrity sha512-I/s6F7yKUDdtMsoBWXJe8Qz40Tui5vsuKCWJEWVL+5q9sSWRzzx6v2KeNsOBEwd94j0eWkpWCH4yB6rZg9Mf0w== "@opentelemetry/core@^1.14.0": - version "1.22.0" - resolved "https://registry.yarnpkg.com/@opentelemetry/core/-/core-1.22.0.tgz#a9f33689acd4703ac780c6595497374e2113c7e5" - integrity sha512-0VoAlT6x+Xzik1v9goJ3pZ2ppi6+xd3aUfg4brfrLkDBHRIVjMP0eBHrKrhB+NKcDyMAg8fAbGL3Npg/F6AwWA== + version "1.24.0" + resolved "https://registry.yarnpkg.com/@opentelemetry/core/-/core-1.24.0.tgz#5568b6c1328a6b9c94a77f9b2c7f872b852bba40" + integrity sha512-FP2oN7mVPqcdxJDTTnKExj4mi91EH+DNuArKfHTjPuJWe2K1JfMIVXNfahw1h3onJxQnxS8K0stKkogX05s+Aw== dependencies: - "@opentelemetry/semantic-conventions" "1.22.0" + "@opentelemetry/semantic-conventions" "1.24.0" -"@opentelemetry/semantic-conventions@1.22.0": - version "1.22.0" - resolved "https://registry.yarnpkg.com/@opentelemetry/semantic-conventions/-/semantic-conventions-1.22.0.tgz#d7502533a7c96e25baab86bac965468e0703a8b4" - integrity sha512-CAOgFOKLybd02uj/GhCdEeeBjOS0yeoDeo/CA7ASBSmenpZHAKGB3iDm/rv3BQLcabb/OprDEsSQ1y0P8A7Siw== +"@opentelemetry/semantic-conventions@1.24.0": + version "1.24.0" + resolved "https://registry.yarnpkg.com/@opentelemetry/semantic-conventions/-/semantic-conventions-1.24.0.tgz#f074db930a7feb4d64103a9a576c5fbad046fcac" + integrity sha512-yL0jI6Ltuz8R+Opj7jClGrul6pOoYrdfVmzQS4SITXRPH7I5IRZbrwe/6/v8v4WYMa6MYZG480S1+uc/IGfqsA== "@protobufjs/aspromise@^1.1.1", "@protobufjs/aspromise@^1.1.2": version "1.1.2" @@ -1126,16 +1024,16 @@ "@smithy/util-middleware" "^2.2.0" tslib "^2.6.2" -"@smithy/core@^1.4.0": - version "1.4.0" - resolved "https://registry.yarnpkg.com/@smithy/core/-/core-1.4.0.tgz#5f9f86b681b9cbf23904041dad6f0531efe8375e" - integrity sha512-uu9ZDI95Uij4qk+L6kyFjdk11zqBkcJ3Lv0sc6jZrqHvLyr0+oeekD3CnqMafBn/5PRI6uv6ulW3kNLRBUHeVw== +"@smithy/core@^1.4.2": + version "1.4.2" + resolved "https://registry.yarnpkg.com/@smithy/core/-/core-1.4.2.tgz#1c3ed886d403041ce5bd2d816448420c57baa19c" + integrity sha512-2fek3I0KZHWJlRLvRTqxTEri+qV0GRHrJIoLFuBMZB4EMg4WgeBGfF0X6abnrNYpq55KJ6R4D6x4f0vLnhzinA== dependencies: - "@smithy/middleware-endpoint" "^2.5.0" - "@smithy/middleware-retry" "^2.2.0" + "@smithy/middleware-endpoint" "^2.5.1" + "@smithy/middleware-retry" "^2.3.1" "@smithy/middleware-serde" "^2.3.0" "@smithy/protocol-http" "^3.3.0" - "@smithy/smithy-client" "^2.5.0" + "@smithy/smithy-client" "^2.5.1" "@smithy/types" "^2.12.0" "@smithy/util-middleware" "^2.2.0" tslib "^2.6.2" @@ -1151,16 +1049,6 @@ "@smithy/url-parser" "^2.2.0" tslib "^2.6.2" -"@smithy/eventstream-codec@^2.2.0": - version "2.2.0" - resolved "https://registry.yarnpkg.com/@smithy/eventstream-codec/-/eventstream-codec-2.2.0.tgz#63d74fa817188995eb55e792a38060b0ede98dc4" - integrity sha512-8janZoJw85nJmQZc4L8TuePp2pk1nxLgkxIR0TUjKJ5Dkj5oelB9WtiSSGXCQvNsJl0VSTvK/2ueMXxvpa9GVw== - dependencies: - "@aws-crypto/crc32" "3.0.0" - "@smithy/types" "^2.12.0" - "@smithy/util-hex-encoding" "^2.2.0" - tslib "^2.6.2" - "@smithy/fetch-http-handler@^2.5.0": version "2.5.0" resolved "https://registry.yarnpkg.com/@smithy/fetch-http-handler/-/fetch-http-handler-2.5.0.tgz#0b8e1562807fdf91fe7dd5cde620d7a03ddc10ac" @@ -1206,10 +1094,10 @@ "@smithy/types" "^2.12.0" tslib "^2.6.2" -"@smithy/middleware-endpoint@^2.5.0": - version "2.5.0" - resolved "https://registry.yarnpkg.com/@smithy/middleware-endpoint/-/middleware-endpoint-2.5.0.tgz#9f1459e9b4cbf00fadfd99e98f88d4b1a2aeb987" - integrity sha512-OBhI9ZEAG8Xen0xsFJwwNOt44WE2CWkfYIxTognC8x42Lfsdf0VN/wCMqpdkySMDio/vts10BiovAxQp0T0faA== +"@smithy/middleware-endpoint@^2.5.1": + version "2.5.1" + resolved "https://registry.yarnpkg.com/@smithy/middleware-endpoint/-/middleware-endpoint-2.5.1.tgz#1333c58304aff4d843e8ef4b85c8cb88975dd5ad" + integrity sha512-1/8kFp6Fl4OsSIVTWHnNjLnTL8IqpIb/D3sTSczrKFnrE9VMNWxnrRKNvpUHOJ6zpGD5f62TPm7+17ilTJpiCQ== dependencies: "@smithy/middleware-serde" "^2.3.0" "@smithy/node-config-provider" "^2.3.0" @@ -1219,20 +1107,20 @@ "@smithy/util-middleware" "^2.2.0" tslib "^2.6.2" -"@smithy/middleware-retry@^2.2.0": - version "2.2.0" - resolved "https://registry.yarnpkg.com/@smithy/middleware-retry/-/middleware-retry-2.2.0.tgz#ff48ac01ad57394eeea15a0146a86079cf6364b7" - integrity sha512-PsjDOLpbevgn37yJbawmfVoanru40qVA8UEf2+YA1lvOefmhuhL6ZbKtGsLAWDRnE1OlAmedsbA/htH6iSZjNA== +"@smithy/middleware-retry@^2.3.1": + version "2.3.1" + resolved "https://registry.yarnpkg.com/@smithy/middleware-retry/-/middleware-retry-2.3.1.tgz#d6fdce94f2f826642c01b4448e97a509c4556ede" + integrity sha512-P2bGufFpFdYcWvqpyqqmalRtwFUNUA8vHjJR5iGqbfR6mp65qKOLcUd6lTr4S9Gn/enynSrSf3p3FVgVAf6bXA== dependencies: "@smithy/node-config-provider" "^2.3.0" "@smithy/protocol-http" "^3.3.0" "@smithy/service-error-classification" "^2.1.5" - "@smithy/smithy-client" "^2.5.0" + "@smithy/smithy-client" "^2.5.1" "@smithy/types" "^2.12.0" "@smithy/util-middleware" "^2.2.0" "@smithy/util-retry" "^2.2.0" tslib "^2.6.2" - uuid "^8.3.2" + uuid "^9.0.1" "@smithy/middleware-serde@^2.3.0": version "2.3.0" @@ -1319,12 +1207,11 @@ "@smithy/types" "^2.12.0" tslib "^2.6.2" -"@smithy/signature-v4@^2.2.0": - version "2.2.0" - resolved "https://registry.yarnpkg.com/@smithy/signature-v4/-/signature-v4-2.2.0.tgz#8fe6a574188b71fba6056111b88d50c84babb060" - integrity sha512-+B5TNzj/fRZzVW3z8UUJOkNx15+4E0CLuvJmJUA1JUIZFp3rdJ/M2H5r2SqltaVPXL0oIxv/6YK92T9TsFGbFg== +"@smithy/signature-v4@^2.3.0": + version "2.3.0" + resolved "https://registry.yarnpkg.com/@smithy/signature-v4/-/signature-v4-2.3.0.tgz#c30dd4028ae50c607db99459981cce8cdab7a3fd" + integrity sha512-ui/NlpILU+6HAQBfJX8BBsDXuKSNrjTSuOYArRblcrErwKFutjrCNb/OExfVRyj9+26F9J+ZmfWT+fKWuDrH3Q== dependencies: - "@smithy/eventstream-codec" "^2.2.0" "@smithy/is-array-buffer" "^2.2.0" "@smithy/types" "^2.12.0" "@smithy/util-hex-encoding" "^2.2.0" @@ -1333,12 +1220,12 @@ "@smithy/util-utf8" "^2.3.0" tslib "^2.6.2" -"@smithy/smithy-client@^2.5.0": - version "2.5.0" - resolved "https://registry.yarnpkg.com/@smithy/smithy-client/-/smithy-client-2.5.0.tgz#8de4fff221d232dda34a8e706d6a4f2911dffe2e" - integrity sha512-DDXWHWdimtS3y/Kw1Jo46KQ0ZYsDKcldFynQERUGBPDpkW1lXOTHy491ALHjwfiBQvzsVKVxl5+ocXNIgJuX4g== +"@smithy/smithy-client@^2.5.1": + version "2.5.1" + resolved "https://registry.yarnpkg.com/@smithy/smithy-client/-/smithy-client-2.5.1.tgz#0fd2efff09dc65500d260e590f7541f8a387eae3" + integrity sha512-jrbSQrYCho0yDaaf92qWgd+7nAeap5LtHTI51KXqmpIFCceKU3K9+vIVTUH72bOJngBMqa4kyu1VJhRcSrk/CQ== dependencies: - "@smithy/middleware-endpoint" "^2.5.0" + "@smithy/middleware-endpoint" "^2.5.1" "@smithy/middleware-stack" "^2.2.0" "@smithy/protocol-http" "^3.3.0" "@smithy/types" "^2.12.0" @@ -1399,27 +1286,27 @@ dependencies: tslib "^2.6.2" -"@smithy/util-defaults-mode-browser@^2.2.0": - version "2.2.0" - resolved "https://registry.yarnpkg.com/@smithy/util-defaults-mode-browser/-/util-defaults-mode-browser-2.2.0.tgz#963a9d3c3351272764dd1c5dc07c26f2c8abcb02" - integrity sha512-2okTdZaCBvOJszAPU/KSvlimMe35zLOKbQpHhamFJmR7t95HSe0K3C92jQPjKY3PmDBD+7iMkOnuW05F5OlF4g== +"@smithy/util-defaults-mode-browser@^2.2.1": + version "2.2.1" + resolved "https://registry.yarnpkg.com/@smithy/util-defaults-mode-browser/-/util-defaults-mode-browser-2.2.1.tgz#9db31416daf575d2963c502e0528cfe8055f0c4e" + integrity sha512-RtKW+8j8skk17SYowucwRUjeh4mCtnm5odCL0Lm2NtHQBsYKrNW0od9Rhopu9wF1gHMfHeWF7i90NwBz/U22Kw== dependencies: "@smithy/property-provider" "^2.2.0" - "@smithy/smithy-client" "^2.5.0" + "@smithy/smithy-client" "^2.5.1" "@smithy/types" "^2.12.0" bowser "^2.11.0" tslib "^2.6.2" -"@smithy/util-defaults-mode-node@^2.3.0": - version "2.3.0" - resolved "https://registry.yarnpkg.com/@smithy/util-defaults-mode-node/-/util-defaults-mode-node-2.3.0.tgz#5005058ca0a299f0948b47c288f7c3d4f36cb26e" - integrity sha512-hfKXnNLmsW9cmLb/JXKIvtuO6Cf4SuqN5PN1C2Ru/TBIws+m1wSgb+A53vo0r66xzB6E82inKG2J7qtwdi+Kkw== +"@smithy/util-defaults-mode-node@^2.3.1": + version "2.3.1" + resolved "https://registry.yarnpkg.com/@smithy/util-defaults-mode-node/-/util-defaults-mode-node-2.3.1.tgz#4613210a3d107aadb3f85bd80cb71c796dd8bf0a" + integrity sha512-vkMXHQ0BcLFysBMWgSBLSk3+leMpFSyyFj8zQtv5ZyUBx8/owVh1/pPEkzmW/DR/Gy/5c8vjLDD9gZjXNKbrpA== dependencies: "@smithy/config-resolver" "^2.2.0" "@smithy/credential-provider-imds" "^2.3.0" "@smithy/node-config-provider" "^2.3.0" "@smithy/property-provider" "^2.2.0" - "@smithy/smithy-client" "^2.5.0" + "@smithy/smithy-client" "^2.5.1" "@smithy/types" "^2.12.0" tslib "^2.6.2" @@ -1491,9 +1378,9 @@ integrity sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw== "@types/aws-lambda@^8.10.136": - version "8.10.136" - resolved "https://registry.yarnpkg.com/@types/aws-lambda/-/aws-lambda-8.10.136.tgz#12a2af86b9123f4e4549992b27e1bf0dcf60d9f9" - integrity sha512-cmmgqxdVGhxYK9lZMYYXYRJk6twBo53ivtXjIUEFZxfxe4TkZTZBK3RRWrY2HjJcUIix0mdifn15yjOAat5lTA== + version "8.10.137" + resolved "https://registry.yarnpkg.com/@types/aws-lambda/-/aws-lambda-8.10.137.tgz#c9998a944541afdd6df0d159e9ec9c23dfe5fb40" + integrity sha512-YNFwzVarXAOXkjuFxONyDw1vgRNzyH8AuyN19s0bM+ChSu/bzxb5XPxYFLXoqoM+tvgzwR3k7fXcEOW125yJxg== "@types/aws-sdk@^2.7.0": version "2.7.0" @@ -1577,9 +1464,9 @@ "@types/node" "*" "@types/node@*", "@types/node@>=13.7.0": - version "20.11.30" - resolved "https://registry.yarnpkg.com/@types/node/-/node-20.11.30.tgz#9c33467fc23167a347e73834f788f4b9f399d66f" - integrity sha512-dHM6ZxwlmuZaRmUPfv1p+KrdD1Dci04FbdEm/9wEMouFqxYoFl5aMkt0VMAUtYRQDyYvD41WJLukhq/ha3YuTw== + version "20.12.8" + resolved "https://registry.yarnpkg.com/@types/node/-/node-20.12.8.tgz#35897bf2bfe3469847ab04634636de09552e8256" + integrity sha512-NU0rJLJnshZWdE/097cdCBbyW1h4hEg0xpovcoAQYHl8dnEyp/NAOiE45pvc+Bd1Dt+2r94v2eGFpQJ4R7g+2w== dependencies: undici-types "~5.26.4" @@ -1647,10 +1534,10 @@ acorn-globals@^6.0.0: acorn "^7.1.1" acorn-walk "^7.1.1" -acorn-import-assertions@^1.9.0: - version "1.9.0" - resolved "https://registry.yarnpkg.com/acorn-import-assertions/-/acorn-import-assertions-1.9.0.tgz#507276249d684797c84e0734ef84860334cfb1ac" - integrity sha512-cmMwop9x+8KFhxvKrKfPYmN6/pKTYYHBqLa0DfvVZcKMJWNyWLnaqND7dx/qn66R7ewM1UX5XMaDVP5wlVTaVA== +acorn-import-attributes@^1.9.5: + version "1.9.5" + resolved "https://registry.yarnpkg.com/acorn-import-attributes/-/acorn-import-attributes-1.9.5.tgz#7eb1557b1ba05ef18b5ed0ec67591bfab04688ef" + integrity sha512-n02Vykv5uA3eHGM/Z2dQrcD56kL8TyDb2p1+0P83PClMnC/nc+anbQRhIOWnSq4Ke/KvDPrY3C9hDtC/A3eHnQ== acorn-walk@^7.1.1: version "7.2.0" @@ -1733,9 +1620,9 @@ available-typed-arrays@^1.0.7: possible-typed-array-names "^1.0.0" aws-sdk@*: - version "2.1589.0" - resolved "https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.1589.0.tgz#b000aff456e2046c45c0d6a5d1e1281c14a7a7fe" - integrity sha512-Tt3UHH6hoUEAjbCscqvfEAoq9VSTN5iSQO9XSisiiH/QJo8sf+iLCYmfJHM4tVkd92bQH61/xxj9t2Mazwc/WQ== + version "2.1612.0" + resolved "https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.1612.0.tgz#9b55523e578f3094ff149f475bea216a84271b88" + integrity sha512-UNwmKh2IChGQzDm6Stxor2SbjealVld2awmf1Q8rxVO1UVvjRrQ97ArD2gWouJT7BuSqDsUpgMgf/LBAbLjMxQ== dependencies: buffer "4.9.2" events "1.1.1" @@ -1921,9 +1808,9 @@ camelcase@^6.2.0: integrity sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA== caniuse-lite@^1.0.30001587: - version "1.0.30001600" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001600.tgz#93a3ee17a35aa6a9f0c6ef1b2ab49507d1ab9079" - integrity sha512-+2S9/2JFhYmYaDpZvo0lKkfvuKIglrx68MwOBqMGHhQsNkLjB5xtc/TGoEPs+MxjSyN/72qer2g97nzR641mOQ== + version "1.0.30001615" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001615.tgz#7c2c8772db681b6dee74d81d6550db68f2d28842" + integrity sha512-1IpazM5G3r38meiae0bHRnPhz+CBQ3ZLqbQMtrg+AsTPKAXgW38JNsXkyZ+v8waCsDmPq87lmfun5Q2AGysNEQ== chalk@^2.3.0, chalk@^2.4.2: version "2.4.2" @@ -1953,9 +1840,9 @@ ci-info@^3.2.0: integrity sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ== cjs-module-lexer@^1.0.0, cjs-module-lexer@^1.2.2: - version "1.2.3" - resolved "https://registry.yarnpkg.com/cjs-module-lexer/-/cjs-module-lexer-1.2.3.tgz#6c370ab19f8a3394e318fe682686ec0ac684d107" - integrity sha512-0TNiGstbQmCFwt4akjjBg5pLRTSyj/PkWQ1ZoO2zntmg9yLqSRxwEa4iCfQLGjqhiqBfOJa7W/E8wfGrTDmlZQ== + version "1.3.1" + resolved "https://registry.yarnpkg.com/cjs-module-lexer/-/cjs-module-lexer-1.3.1.tgz#c485341ae8fd999ca4ee5af2d7a1c9ae01e0099c" + integrity sha512-a3KdPAANPbNE4ZUv9h6LckSl9zLsYOP4MBmhIPkRaeyybt+r4UghLvq+xw/YwUcC1gqylCkL4rdVs3Lwupjm4Q== cliui@^7.0.2: version "7.0.4" @@ -2073,11 +1960,11 @@ dc-polyfill@^0.1.3, dc-polyfill@^0.1.4: integrity sha512-8iwEduR2jR9wWYggeaYtYZWRiUe3XZPyAQtMTL1otv8X3kfR8xUIVb4l5awHEeyDrH6Je7N324lKzMKlMMN6Yw== dd-trace@^4.30.0: - version "4.33.0" - resolved "https://registry.yarnpkg.com/dd-trace/-/dd-trace-4.33.0.tgz#b4172018834e84aabc991213084532adb0628cbe" - integrity sha512-hO+2cIIiZJ8lbjRiIMs5mdMXNcTyi/D/kGreEnh/HuZPptngsF7HpDRFxhVls1hFOg1y4uYqYCUcTT5U0KXrHA== + version "4.36.0" + resolved "https://registry.yarnpkg.com/dd-trace/-/dd-trace-4.36.0.tgz#43050d26cdbfd28b2a5a3b0789b8ec5a3d6c6710" + integrity sha512-laJAgOoz9ly+6h7pcizAjl28oKZYndZr1VMzxuJRpgSIjmeXfCOuILTtF4cY7OC1LKSGH43wjHRAP6FYw9793g== dependencies: - "@datadog/native-appsec" "7.1.0" + "@datadog/native-appsec" "7.1.1" "@datadog/native-iast-rewriter" "2.3.0" "@datadog/native-iast-taint-tracking" "1.7.0" "@datadog/native-metrics" "^2.0.0" @@ -2179,9 +2066,9 @@ domexception@^2.0.1: webidl-conversions "^5.0.0" electron-to-chromium@^1.4.668: - version "1.4.717" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.717.tgz#99db370cae8cd090d5b01f8748e9ad369924d0f8" - integrity sha512-6Fmg8QkkumNOwuZ/5mIbMU9WI3H2fmn5ajcVya64I5Yr5CcNmO7vcLt0Y7c96DCiMO5/9G+4sI2r6eEvdg1F7A== + version "1.4.754" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.754.tgz#20a9f3cc80e0fb6a804b86605e55da16918a58b0" + integrity sha512-7Kr5jUdns5rL/M9wFFmMZAgFDuL2YOnanFH4OI4iFzUqyh3XOL7nAGbSlSMZdzKMIyyTpNSbqZsWG9odwLeKvA== emittery@^0.8.1: version "0.8.1" @@ -2217,7 +2104,7 @@ es-errors@^1.3.0: resolved "https://registry.yarnpkg.com/es-errors/-/es-errors-1.3.0.tgz#05f75a25dab98e4fb1dcd5e1472c0546d5057c8f" integrity sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw== -escalade@^3.1.1: +escalade@^3.1.1, escalade@^3.1.2: version "3.1.2" resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.2.tgz#54076e9ab29ea5bf3d8f1ed62acffbb88272df27" integrity sha512-ErCHMCae19vR8vQGe50xIsVomy19rg6gFu3+r3jkEO46suLMWBksvVyoGgQV+jOfl84ZSOSlmv6Gxa89PmTGmA== @@ -2533,12 +2420,12 @@ ignore@^5.2.4: integrity sha512-5Fytz/IraMjqpwfd34ke28PTVMjZjJG2MPn5t7OE4eUCUNf8BAa7b5WUS9/Qvr6mwOQS7Mk6vdsMno5he+T8Xw== import-in-the-middle@^1.7.3: - version "1.7.3" - resolved "https://registry.yarnpkg.com/import-in-the-middle/-/import-in-the-middle-1.7.3.tgz#ffa784cdd57a47d2b68d2e7dd33070ff06baee43" - integrity sha512-R2I11NRi0lI3jD2+qjqyVlVEahsejw7LDnYEbGb47QEFjczE3bZYsmWheCTQA+LFs2DzOQxR7Pms7naHW1V4bQ== + version "1.7.4" + resolved "https://registry.yarnpkg.com/import-in-the-middle/-/import-in-the-middle-1.7.4.tgz#508da6e91cfa84f210dcdb6c0a91ab0c9e8b3ebc" + integrity sha512-Lk+qzWmiQuRPPulGQeK5qq0v32k2bHnWrRPFgqyvhw7Kkov5L6MOLOIU3pcWeujc9W4q54Cp3Q2WV16eQkc7Bg== dependencies: acorn "^8.8.2" - acorn-import-assertions "^1.9.0" + acorn-import-attributes "^1.9.5" cjs-module-lexer "^1.2.2" module-details-from-path "^1.0.3" @@ -2574,9 +2461,9 @@ int64-buffer@^0.1.9: integrity sha512-v7cSY1J8ydZ0GyjUHqF+1bshJ6cnEVLo9EnjB8p+4HDRPZc9N5jjmvUV7NvEsqQOKyH0pmIBFWXVQbiS0+OBbA== ipaddr.js@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-2.1.0.tgz#2119bc447ff8c257753b196fc5f1ce08a4cdf39f" - integrity sha512-LlbxQ7xKzfBusov6UMi4MFpEg0m+mAm9xyNGEduwXMEDuf4WfzB/RZwMVYEd7IKGvh4IUkEXYxtAVu9T3OelJQ== + version "2.2.0" + resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-2.2.0.tgz#d33fa7bac284f4de7af949638c9d68157c6b92e8" + integrity sha512-Ag3wB2o37wslZS19hZqorUnrnzSkpOVy+IiiDEiTqNubEYpYuHWIf6K4psgN2ZWKExS4xhVCrRVfb/wfW8fWJA== is-arguments@^1.0.4: version "1.1.1" @@ -3406,9 +3293,9 @@ node-gyp-build@<4.0, node-gyp-build@^3.9.0: integrity sha512-zLcTg6P4AbcHPq465ZMFNXx7XpKKJh+7kkN699NiQWisR2uWYOWNWqRHAmbnmKiL4e9aLSlmy5U7rEMUXV59+A== node-gyp-build@^4.5.0: - version "4.8.0" - resolved "https://registry.yarnpkg.com/node-gyp-build/-/node-gyp-build-4.8.0.tgz#3fee9c1731df4581a3f9ead74664369ff00d26dd" - integrity sha512-u6fs2AEUljNho3EYTJNBfImO5QTo/J/1Etd+NVdCj7qWKUSN/bSLkZwhDv7I+w/MSC6qJ4cknepkAYykDdK8og== + version "4.8.1" + resolved "https://registry.yarnpkg.com/node-gyp-build/-/node-gyp-build-4.8.1.tgz#976d3ad905e71b76086f4f0b0d3637fe79b6cda5" + integrity sha512-OSs33Z9yWr148JZcbZd5WiAXhh/n9z8TxQcdMhIOlpN9AhWpLfvVFO73+m77bBABQMaY9XSvIa+qk0jlI7Gcaw== node-int64@^0.4.0: version "0.4.0" @@ -3433,9 +3320,9 @@ npm-run-path@^4.0.1: path-key "^3.0.0" nwsapi@^2.2.0: - version "2.2.7" - resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.2.7.tgz#738e0707d3128cb750dddcfe90e4610482df0f30" - integrity sha512-ub5E4+FBPKwAZx0UwIQOjYWGHTEq5sPqHQNRN8Z9e4A7u3Tj1weLJsL59yH9vmvqEtBHaOmT6cYQKIZOxp35FQ== + version "2.2.9" + resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.2.9.tgz#7f3303218372db2e9f27c27766bcfc59ae7e61c6" + integrity sha512-2f3F0SEEer8bBu0dsNCFF50N0cTThV1nWFYcEYFZttdW0lDAoybv9cQoK7X7/68Z89S7FoRrVjP1LPX4XRf9vg== once@^1.3.0: version "1.4.0" @@ -3518,9 +3405,9 @@ path-parse@^1.0.7: integrity sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw== path-to-regexp@^0.1.2: - version "0.1.7" - resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.7.tgz#df604178005f522f15eb4490e7247a1bfaa67f8c" - integrity sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ== + version "0.1.8" + resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.8.tgz#5124958014ebf90d4c0d3f29d996a86bdc959ca8" + integrity sha512-EErxvEqTuliG5GCVHNt3K3UmfKhlOM26QtiJZ6XBnZgCd7n+P5aHNV37wFHGJSpbjN4danT+1CpOFT4giETmRQ== picocolors@^1.0.0: version "1.0.0" @@ -3953,9 +3840,9 @@ to-regex-range@^5.0.1: is-number "^7.0.0" tough-cookie@^4.0.0: - version "4.1.3" - resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-4.1.3.tgz#97b9adb0728b42280aa3d814b6b999b2ff0318bf" - integrity sha512-aX/y5pVRkfRnfmuX+OdbSdXvPe6ieKX/G2s7e98f4poJHnqH3281gDPm/metm6E/WRamfx7WC4HUqkWHfQHprw== + version "4.1.4" + resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-4.1.4.tgz#945f1461b45b5a8c76821c33ea49c3ac192c1b36" + integrity sha512-Loo5UUvLD9ScZ6jh8beX1T6sO1w2/MpCRpEP7V280GKMVUQ0Jzar2U3UJPsrdbziLEMMhu3Ujnq//rhiFuIeag== dependencies: psl "^1.1.33" punycode "^2.1.1" @@ -3983,11 +3870,6 @@ ts-jest@^27.0.1: semver "7.x" yargs-parser "20.x" -ts-md5@1.3.1: - version "1.3.1" - resolved "https://registry.yarnpkg.com/ts-md5/-/ts-md5-1.3.1.tgz#f5b860c0d5241dd9bb4e909dd73991166403f511" - integrity sha512-DiwiXfwvcTeZ5wCE0z+2A9EseZsztaiZtGrtSaY5JOD7ekPnR/GoIVD5gXZAlK9Na9Kvpo9Waz5rW64WKAWApg== - tslib@^1.11.1, tslib@^1.13.0, tslib@^1.8.1: version "1.14.1" resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00" @@ -4070,11 +3952,11 @@ unix-dgram@2.0.x: nan "^2.16.0" update-browserslist-db@^1.0.13: - version "1.0.13" - resolved "https://registry.yarnpkg.com/update-browserslist-db/-/update-browserslist-db-1.0.13.tgz#3c5e4f5c083661bd38ef64b6328c26ed6c8248c4" - integrity sha512-xebP81SNcPuNpPP3uzeW1NYXxI3rxyJzF3pD6sH4jE7o/IX+WtSpwnVU+qIsDPyk0d3hmFQ7mjqc6AtV604hbg== + version "1.0.14" + resolved "https://registry.yarnpkg.com/update-browserslist-db/-/update-browserslist-db-1.0.14.tgz#46a9367c323f8ade9a9dddb7f3ae7814b3a0b31c" + integrity sha512-JixKH8GR2pWYshIPUg/NujK3JO7JiqEEUiNArE86NQyrgUuZeTlZQN3xuS/yiV5Kb48ev9K6RqNkaJjXsdg7Jw== dependencies: - escalade "^3.1.1" + escalade "^3.1.2" picocolors "^1.0.0" url-parse@^1.5.3: @@ -4109,10 +3991,10 @@ uuid@8.0.0: resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.0.0.tgz#bc6ccf91b5ff0ac07bbcdbf1c7c4e150db4dbb6c" integrity sha512-jOXGuXZAWdsTH7eZLtyXMqUb9EcWMGZNbL9YcGBJl4MH4nrxHmZJhEHvyLFrkxo+28uLb/NYRcStH48fnD0Vzw== -uuid@^8.3.2: - version "8.3.2" - resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2" - integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg== +uuid@^9.0.1: + version "9.0.1" + resolved "https://registry.yarnpkg.com/uuid/-/uuid-9.0.1.tgz#e188d4c8853cc722220392c424cd637f32293f30" + integrity sha512-b+1eJOlsR9K8HJpow9Ok3fiWOWSIcIzXodvv0rQjVoOVNpWMpxf1wZNpt4y9h10odCNrqnYp1OBzRktckBe3sA== v8-to-istanbul@^8.1.0: version "8.1.1" From 60e0445986b68aea7b68d244faf1f7074bd0c137 Mon Sep 17 00:00:00 2001 From: kimi Date: Thu, 2 May 2024 15:31:15 -0400 Subject: [PATCH 04/27] lint --- src/trace/step-function-service.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/trace/step-function-service.ts b/src/trace/step-function-service.ts index d21995ce1..128f2a656 100644 --- a/src/trace/step-function-service.ts +++ b/src/trace/step-function-service.ts @@ -1,7 +1,7 @@ import { logDebug } from "../utils"; import { SampleMode, TraceSource } from "./trace-context-service"; import { SpanContextWrapper } from "./span-context-wrapper"; -import { Sha256 } from '@aws-crypto/sha256-js'; +import { Sha256 } from "@aws-crypto/sha256-js"; export interface StepFunctionContext { "step_function.execution_name": string; @@ -157,7 +157,7 @@ export class StepFunctionContextService { let binary = ""; for (const num of hex) { - binary = binary + this.numberToBinaryString(num) + binary = binary + this.numberToBinaryString(num); } const res = "0" + binary.substring(1, 128); From 1617e1a2a4a7569e74424588a5f556e7a15e693e Mon Sep 17 00:00:00 2001 From: kimi Date: Mon, 6 May 2024 23:19:26 -0400 Subject: [PATCH 05/27] upgrade node/type --- package.json | 2 +- yarn.lock | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 7094bc6a5..6f4c04cfc 100644 --- a/package.json +++ b/package.json @@ -25,7 +25,7 @@ "@types/aws-sdk": "^2.7.0", "@types/jest": "^26.0.23", "@types/mock-fs": "4.13.0", - "@types/node": "^15.6.1", + "@types/node": "^20.12.10", "@types/promise-retry": "^1.1.3", "@types/shimmer": "^1.0.1", "dd-trace": "^4.30.0", diff --git a/yarn.lock b/yarn.lock index 10c03fa8f..12d75e8b8 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1470,10 +1470,12 @@ dependencies: undici-types "~5.26.4" -"@types/node@^15.6.1": - version "15.14.9" - resolved "https://registry.yarnpkg.com/@types/node/-/node-15.14.9.tgz#bc43c990c3c9be7281868bbc7b8fdd6e2b57adfa" - integrity sha512-qjd88DrCxupx/kJD5yQgZdcYKZKSIGBVDIBE1/LTGcNm3d2Np/jxojkdePDdfnBHJc5W7vSMpbJ1aB7p/Py69A== +"@types/node@^20.12.10": + version "20.12.10" + resolved "https://registry.yarnpkg.com/@types/node/-/node-20.12.10.tgz#8f0c3f12b0f075eee1fe20c1afb417e9765bef76" + integrity sha512-Eem5pH9pmWBHoGAT8Dr5fdc5rYA+4NAovdM4EktRPVAAiJhmWWfQrA0cFhAbOsQdSfIHjAud6YdkbL69+zSKjw== + dependencies: + undici-types "~5.26.4" "@types/prettier@^2.1.5": version "2.7.3" From 858cfd5d0c3617d372c77439eb550a6623518f6f Mon Sep 17 00:00:00 2001 From: kimi Date: Mon, 6 May 2024 23:22:01 -0400 Subject: [PATCH 06/27] fix 3 tests --- src/trace/context/extractor.spec.ts | 2 +- src/trace/context/extractors/step-function.spec.ts | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/trace/context/extractor.spec.ts b/src/trace/context/extractor.spec.ts index 3f39cb9ba..537e8aca2 100644 --- a/src/trace/context/extractor.spec.ts +++ b/src/trace/context/extractor.spec.ts @@ -688,7 +688,7 @@ describe("TraceContextExtractor", () => { const traceContext = await extractor.extract(event, {} as Context); expect(traceContext).not.toBeNull(); - expect(traceContext?.toTraceId()).toBe("947965466153612645"); + expect(traceContext?.toTraceId()).toBe("3661440683"); expect(traceContext?.toSpanId()).toBe("4602916161841036335"); expect(traceContext?.sampleMode()).toBe("1"); expect(traceContext?.source).toBe("event"); diff --git a/src/trace/context/extractors/step-function.spec.ts b/src/trace/context/extractors/step-function.spec.ts index c7f172585..726128932 100644 --- a/src/trace/context/extractors/step-function.spec.ts +++ b/src/trace/context/extractors/step-function.spec.ts @@ -36,7 +36,7 @@ describe("StepFunctionEventTraceExtractor", () => { const traceContext = extractor.extract(payload); expect(traceContext).not.toBeNull(); - expect(traceContext?.toTraceId()).toBe("947965466153612645"); + expect(traceContext?.toTraceId()).toBe("3661440683"); expect(traceContext?.toSpanId()).toBe("4602916161841036335"); expect(traceContext?.sampleMode()).toBe("1"); expect(traceContext?.source).toBe("event"); @@ -49,7 +49,7 @@ describe("StepFunctionEventTraceExtractor", () => { const traceContext = extractor.extract(payload); expect(traceContext).not.toBeNull(); - expect(traceContext?.toTraceId()).toBe("947965466153612645"); + expect(traceContext?.toTraceId()).toBe("3661440683"); expect(traceContext?.toSpanId()).toBe("4602916161841036335"); expect(traceContext?.sampleMode()).toBe("1"); expect(traceContext?.source).toBe("event"); From 333852626bdc34ac36a0d53839fa95309505410b Mon Sep 17 00:00:00 2001 From: kimi Date: Mon, 6 May 2024 23:23:26 -0400 Subject: [PATCH 07/27] fix span ids for the same tests (previous commit was for trace id --- src/trace/context/extractor.spec.ts | 2 +- src/trace/context/extractors/step-function.spec.ts | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/trace/context/extractor.spec.ts b/src/trace/context/extractor.spec.ts index 537e8aca2..adc777e87 100644 --- a/src/trace/context/extractor.spec.ts +++ b/src/trace/context/extractor.spec.ts @@ -689,7 +689,7 @@ describe("TraceContextExtractor", () => { expect(traceContext).not.toBeNull(); expect(traceContext?.toTraceId()).toBe("3661440683"); - expect(traceContext?.toSpanId()).toBe("4602916161841036335"); + expect(traceContext?.toSpanId()).toBe("2846425757"); expect(traceContext?.sampleMode()).toBe("1"); expect(traceContext?.source).toBe("event"); }); diff --git a/src/trace/context/extractors/step-function.spec.ts b/src/trace/context/extractors/step-function.spec.ts index 726128932..6ace44675 100644 --- a/src/trace/context/extractors/step-function.spec.ts +++ b/src/trace/context/extractors/step-function.spec.ts @@ -37,7 +37,7 @@ describe("StepFunctionEventTraceExtractor", () => { expect(traceContext).not.toBeNull(); expect(traceContext?.toTraceId()).toBe("3661440683"); - expect(traceContext?.toSpanId()).toBe("4602916161841036335"); + expect(traceContext?.toSpanId()).toBe("2846425757"); expect(traceContext?.sampleMode()).toBe("1"); expect(traceContext?.source).toBe("event"); }); @@ -50,7 +50,7 @@ describe("StepFunctionEventTraceExtractor", () => { expect(traceContext).not.toBeNull(); expect(traceContext?.toTraceId()).toBe("3661440683"); - expect(traceContext?.toSpanId()).toBe("4602916161841036335"); + expect(traceContext?.toSpanId()).toBe("2846425757"); expect(traceContext?.sampleMode()).toBe("1"); expect(traceContext?.source).toBe("event"); }); From 3c7b4566dff8f58a434b3fe1c60bf4813f54834c Mon Sep 17 00:00:00 2001 From: kimi Date: Tue, 7 May 2024 11:44:08 -0400 Subject: [PATCH 08/27] add @aws-crypto/sha256-js --- package.json | 1 + scripts/run_integration_tests.sh | 4 ++-- yarn.lock | 20 +++++++++++++++++++- 3 files changed, 22 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index 6f4c04cfc..d4ca4c3a7 100644 --- a/package.json +++ b/package.json @@ -38,6 +38,7 @@ "typescript": "^4.3.2" }, "dependencies": { + "@aws-crypto/sha256-js": "5.2.0", "dc-polyfill": "^0.1.3", "hot-shots": "8.5.0", "promise-retry": "^2.0.1", diff --git a/scripts/run_integration_tests.sh b/scripts/run_integration_tests.sh index 57d943b84..a1a02d701 100755 --- a/scripts/run_integration_tests.sh +++ b/scripts/run_integration_tests.sh @@ -2,9 +2,9 @@ # Usage - run commands from repo root: # To check if new changes to the layer cause changes to any snapshots: -# BUILD_LAYERS=true DD_API_KEY=XXXX aws-vault exec sso-serverless-sandbox-account-admin -- ./scripts/run_integration_tests +# BUILD_LAYERS=true DD_API_KEY=XXXX aws-vault exec sso-serverless-sandbox-account-admin-8h -- ./scripts/run_integration_tests # To regenerate snapshots: -# UPDATE_SNAPSHOTS=true DD_API_KEY=XXXX aws-vault exec sso-serverless-sandbox-account-admin -- ./scripts/run_integration_tests +# UPDATE_SNAPSHOTS=true DD_API_KEY=XXXX aws-vault exec sso-serverless-sandbox-account-admin-8h -- ./scripts/run_integration_tests set -e diff --git a/yarn.lock b/yarn.lock index 12d75e8b8..42849b302 100644 --- a/yarn.lock +++ b/yarn.lock @@ -40,6 +40,15 @@ "@aws-sdk/types" "^3.222.0" tslib "^1.11.1" +"@aws-crypto/sha256-js@^5.2.0": + version "5.2.0" + resolved "https://registry.yarnpkg.com/@aws-crypto/sha256-js/-/sha256-js-5.2.0.tgz#c4fdb773fdbed9a664fc1a95724e206cf3860042" + integrity sha512-FFQQyu7edu4ufvIZ+OadFpHHOt+eSTBaYaki44c+akjg7qZg9oOQeLlk77F6tSYqjDAFClrHJk9tMf0HdVyOvA== + dependencies: + "@aws-crypto/util" "^5.2.0" + "@aws-sdk/types" "^3.222.0" + tslib "^2.6.2" + "@aws-crypto/supports-web-crypto@^3.0.0": version "3.0.0" resolved "https://registry.yarnpkg.com/@aws-crypto/supports-web-crypto/-/supports-web-crypto-3.0.0.tgz#5d1bf825afa8072af2717c3e455f35cda0103ec2" @@ -56,6 +65,15 @@ "@aws-sdk/util-utf8-browser" "^3.0.0" tslib "^1.11.1" +"@aws-crypto/util@^5.2.0": + version "5.2.0" + resolved "https://registry.yarnpkg.com/@aws-crypto/util/-/util-5.2.0.tgz#71284c9cffe7927ddadac793c14f14886d3876da" + integrity sha512-4RkU9EsI6ZpBve5fseQlGNUWKMa1RLPQ1dnjnQoe07ldfIzcsGb5hC5W0Dm7u423KWzawlrpbjXBrXCEv9zazQ== + dependencies: + "@aws-sdk/types" "^3.222.0" + "@smithy/util-utf8" "^2.0.0" + tslib "^2.6.2" + "@aws-sdk/client-kms@^3.366.0": version "3.567.0" resolved "https://registry.yarnpkg.com/@aws-sdk/client-kms/-/client-kms-3.567.0.tgz#549050d2635cc65aaedc0c829b960c8df589fccc" @@ -1364,7 +1382,7 @@ dependencies: tslib "^2.6.2" -"@smithy/util-utf8@^2.3.0": +"@smithy/util-utf8@^2.0.0", "@smithy/util-utf8@^2.3.0": version "2.3.0" resolved "https://registry.yarnpkg.com/@smithy/util-utf8/-/util-utf8-2.3.0.tgz#dd96d7640363259924a214313c3cf16e7dd329c5" integrity sha512-R8Rdn8Hy72KKcebgLiv8jQcQkXoLMOGGv5uI1/k0l+snqkOzQ1R0ChUBCxWMlBsFMekWjq0wRudIweFs7sKT5A== From 89a3ce3526144c91ed8b679ad8cd1e7c3683081d Mon Sep 17 00:00:00 2001 From: kimi Date: Tue, 7 May 2024 11:51:47 -0400 Subject: [PATCH 09/27] remove 8h --- scripts/run_integration_tests.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/run_integration_tests.sh b/scripts/run_integration_tests.sh index a1a02d701..57d943b84 100755 --- a/scripts/run_integration_tests.sh +++ b/scripts/run_integration_tests.sh @@ -2,9 +2,9 @@ # Usage - run commands from repo root: # To check if new changes to the layer cause changes to any snapshots: -# BUILD_LAYERS=true DD_API_KEY=XXXX aws-vault exec sso-serverless-sandbox-account-admin-8h -- ./scripts/run_integration_tests +# BUILD_LAYERS=true DD_API_KEY=XXXX aws-vault exec sso-serverless-sandbox-account-admin -- ./scripts/run_integration_tests # To regenerate snapshots: -# UPDATE_SNAPSHOTS=true DD_API_KEY=XXXX aws-vault exec sso-serverless-sandbox-account-admin-8h -- ./scripts/run_integration_tests +# UPDATE_SNAPSHOTS=true DD_API_KEY=XXXX aws-vault exec sso-serverless-sandbox-account-admin -- ./scripts/run_integration_tests set -e From 43fe7b84d7f5375c291f6159c88db0d8cf918107 Mon Sep 17 00:00:00 2001 From: kimi Date: Tue, 7 May 2024 13:19:31 -0400 Subject: [PATCH 10/27] Empty-Commit From 4ed002fff59b85b80eefcd022f82703d0d9e5690 Mon Sep 17 00:00:00 2001 From: kimi Date: Tue, 7 May 2024 13:28:59 -0400 Subject: [PATCH 11/27] update yarn.lock --- yarn.lock | 301 +++++++++++++++++++++++++++++++++--------------------- 1 file changed, 187 insertions(+), 114 deletions(-) diff --git a/yarn.lock b/yarn.lock index 42849b302..d3f70a6f5 100644 --- a/yarn.lock +++ b/yarn.lock @@ -40,7 +40,7 @@ "@aws-sdk/types" "^3.222.0" tslib "^1.11.1" -"@aws-crypto/sha256-js@^5.2.0": +"@aws-crypto/sha256-js@5.2.0": version "5.2.0" resolved "https://registry.yarnpkg.com/@aws-crypto/sha256-js/-/sha256-js-5.2.0.tgz#c4fdb773fdbed9a664fc1a95724e206cf3860042" integrity sha512-FFQQyu7edu4ufvIZ+OadFpHHOt+eSTBaYaki44c+akjg7qZg9oOQeLlk77F6tSYqjDAFClrHJk9tMf0HdVyOvA== @@ -75,23 +75,25 @@ tslib "^2.6.2" "@aws-sdk/client-kms@^3.366.0": - version "3.567.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/client-kms/-/client-kms-3.567.0.tgz#549050d2635cc65aaedc0c829b960c8df589fccc" - integrity sha512-j6K3c4eFyeUFDyi7aob5XqVh4jzGPampBvDepKCKNk82daFJl6YhzNBXV0OB3/z2FLVZXaZkqaS4tRgNdVkc+Q== + version "3.569.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/client-kms/-/client-kms-3.569.0.tgz#11d2bbc9fe0decc5a3d21c78e258b38f05af5000" + integrity sha512-sMNhW+UWVOpg7OHmFUOQ6XLBr5S4p74vH6csNTImgOAKwQiXYFNRh0KxlckpxJe/RmM/jN7tcFJdtc5M3OSKOQ== dependencies: "@aws-crypto/sha256-browser" "3.0.0" "@aws-crypto/sha256-js" "3.0.0" + "@aws-sdk/client-sso-oidc" "3.569.0" + "@aws-sdk/client-sts" "3.569.0" "@aws-sdk/core" "3.567.0" - "@aws-sdk/credential-provider-node" "3.567.0" + "@aws-sdk/credential-provider-node" "3.569.0" "@aws-sdk/middleware-host-header" "3.567.0" - "@aws-sdk/middleware-logger" "3.567.0" + "@aws-sdk/middleware-logger" "3.568.0" "@aws-sdk/middleware-recursion-detection" "3.567.0" "@aws-sdk/middleware-user-agent" "3.567.0" "@aws-sdk/region-config-resolver" "3.567.0" "@aws-sdk/types" "3.567.0" "@aws-sdk/util-endpoints" "3.567.0" "@aws-sdk/util-user-agent-browser" "3.567.0" - "@aws-sdk/util-user-agent-node" "3.567.0" + "@aws-sdk/util-user-agent-node" "3.568.0" "@smithy/config-resolver" "^2.2.0" "@smithy/core" "^1.4.2" "@smithy/fetch-http-handler" "^2.5.0" @@ -119,23 +121,115 @@ "@smithy/util-utf8" "^2.3.0" tslib "^2.6.2" -"@aws-sdk/client-sso@3.567.0": - version "3.567.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/client-sso/-/client-sso-3.567.0.tgz#e6686d81d9fde9d1ef51285f9b701ed4fed4552b" - integrity sha512-jcnT1m+altt9Xm2QErZBnETh+4ioeCb/p9bo0adLb9JCAuI/VcnIui5+CykvCzOAxQ8c8Soa19qycqCuUcjiCw== +"@aws-sdk/client-sso-oidc@3.569.0": + version "3.569.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/client-sso-oidc/-/client-sso-oidc-3.569.0.tgz#4dc90be9a35119238112455f8d9080b2ccdf0e24" + integrity sha512-u5DEjNEvRvlKKh1QLCDuQ8GIrx+OFvJFLfhorsp4oCxDylvORs+KfyKKnJAw4wYEEHyxyz9GzHD7p6a8+HLVHw== + dependencies: + "@aws-crypto/sha256-browser" "3.0.0" + "@aws-crypto/sha256-js" "3.0.0" + "@aws-sdk/client-sts" "3.569.0" + "@aws-sdk/core" "3.567.0" + "@aws-sdk/credential-provider-node" "3.569.0" + "@aws-sdk/middleware-host-header" "3.567.0" + "@aws-sdk/middleware-logger" "3.568.0" + "@aws-sdk/middleware-recursion-detection" "3.567.0" + "@aws-sdk/middleware-user-agent" "3.567.0" + "@aws-sdk/region-config-resolver" "3.567.0" + "@aws-sdk/types" "3.567.0" + "@aws-sdk/util-endpoints" "3.567.0" + "@aws-sdk/util-user-agent-browser" "3.567.0" + "@aws-sdk/util-user-agent-node" "3.568.0" + "@smithy/config-resolver" "^2.2.0" + "@smithy/core" "^1.4.2" + "@smithy/fetch-http-handler" "^2.5.0" + "@smithy/hash-node" "^2.2.0" + "@smithy/invalid-dependency" "^2.2.0" + "@smithy/middleware-content-length" "^2.2.0" + "@smithy/middleware-endpoint" "^2.5.1" + "@smithy/middleware-retry" "^2.3.1" + "@smithy/middleware-serde" "^2.3.0" + "@smithy/middleware-stack" "^2.2.0" + "@smithy/node-config-provider" "^2.3.0" + "@smithy/node-http-handler" "^2.5.0" + "@smithy/protocol-http" "^3.3.0" + "@smithy/smithy-client" "^2.5.1" + "@smithy/types" "^2.12.0" + "@smithy/url-parser" "^2.2.0" + "@smithy/util-base64" "^2.3.0" + "@smithy/util-body-length-browser" "^2.2.0" + "@smithy/util-body-length-node" "^2.3.0" + "@smithy/util-defaults-mode-browser" "^2.2.1" + "@smithy/util-defaults-mode-node" "^2.3.1" + "@smithy/util-endpoints" "^1.2.0" + "@smithy/util-middleware" "^2.2.0" + "@smithy/util-retry" "^2.2.0" + "@smithy/util-utf8" "^2.3.0" + tslib "^2.6.2" + +"@aws-sdk/client-sso@3.568.0": + version "3.568.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/client-sso/-/client-sso-3.568.0.tgz#4e06fa9c052931641921a0a723f58f81513c673c" + integrity sha512-LSD7k0ZBQNWouTN5dYpUkeestoQ+r5u6cp6o+FATKeiFQET85RNA3xJ4WPnOI5rBC1PETKhQXvF44863P3hCaQ== + dependencies: + "@aws-crypto/sha256-browser" "3.0.0" + "@aws-crypto/sha256-js" "3.0.0" + "@aws-sdk/core" "3.567.0" + "@aws-sdk/middleware-host-header" "3.567.0" + "@aws-sdk/middleware-logger" "3.568.0" + "@aws-sdk/middleware-recursion-detection" "3.567.0" + "@aws-sdk/middleware-user-agent" "3.567.0" + "@aws-sdk/region-config-resolver" "3.567.0" + "@aws-sdk/types" "3.567.0" + "@aws-sdk/util-endpoints" "3.567.0" + "@aws-sdk/util-user-agent-browser" "3.567.0" + "@aws-sdk/util-user-agent-node" "3.568.0" + "@smithy/config-resolver" "^2.2.0" + "@smithy/core" "^1.4.2" + "@smithy/fetch-http-handler" "^2.5.0" + "@smithy/hash-node" "^2.2.0" + "@smithy/invalid-dependency" "^2.2.0" + "@smithy/middleware-content-length" "^2.2.0" + "@smithy/middleware-endpoint" "^2.5.1" + "@smithy/middleware-retry" "^2.3.1" + "@smithy/middleware-serde" "^2.3.0" + "@smithy/middleware-stack" "^2.2.0" + "@smithy/node-config-provider" "^2.3.0" + "@smithy/node-http-handler" "^2.5.0" + "@smithy/protocol-http" "^3.3.0" + "@smithy/smithy-client" "^2.5.1" + "@smithy/types" "^2.12.0" + "@smithy/url-parser" "^2.2.0" + "@smithy/util-base64" "^2.3.0" + "@smithy/util-body-length-browser" "^2.2.0" + "@smithy/util-body-length-node" "^2.3.0" + "@smithy/util-defaults-mode-browser" "^2.2.1" + "@smithy/util-defaults-mode-node" "^2.3.1" + "@smithy/util-endpoints" "^1.2.0" + "@smithy/util-middleware" "^2.2.0" + "@smithy/util-retry" "^2.2.0" + "@smithy/util-utf8" "^2.3.0" + tslib "^2.6.2" + +"@aws-sdk/client-sts@3.569.0": + version "3.569.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/client-sts/-/client-sts-3.569.0.tgz#dc2e0e791081c37dede1b58a2057c26488fcddbf" + integrity sha512-3AyipQ2zHszkcTr8n1Sp7CiMUi28aMf1vOhEo0KKi0DWGo1Z1qJEpWeRP363KG0n9/8U3p1IkXGz5FRbpXZxIw== dependencies: "@aws-crypto/sha256-browser" "3.0.0" "@aws-crypto/sha256-js" "3.0.0" + "@aws-sdk/client-sso-oidc" "3.569.0" "@aws-sdk/core" "3.567.0" + "@aws-sdk/credential-provider-node" "3.569.0" "@aws-sdk/middleware-host-header" "3.567.0" - "@aws-sdk/middleware-logger" "3.567.0" + "@aws-sdk/middleware-logger" "3.568.0" "@aws-sdk/middleware-recursion-detection" "3.567.0" "@aws-sdk/middleware-user-agent" "3.567.0" "@aws-sdk/region-config-resolver" "3.567.0" "@aws-sdk/types" "3.567.0" "@aws-sdk/util-endpoints" "3.567.0" "@aws-sdk/util-user-agent-browser" "3.567.0" - "@aws-sdk/util-user-agent-node" "3.567.0" + "@aws-sdk/util-user-agent-node" "3.568.0" "@smithy/config-resolver" "^2.2.0" "@smithy/core" "^1.4.2" "@smithy/fetch-http-handler" "^2.5.0" @@ -176,20 +270,20 @@ fast-xml-parser "4.2.5" tslib "^2.6.2" -"@aws-sdk/credential-provider-env@3.567.0": - version "3.567.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-env/-/credential-provider-env-3.567.0.tgz#6e545c047871bf91cce2dbe1db11e99283442295" - integrity sha512-2V9O9m/hrWtIBKfg+nYHTYUHSKOZdSWL53JRaN28zYoX4dPDWwP1GacP/Mq6LJhKRnByfmqh3W3ZBsKizauSug== +"@aws-sdk/credential-provider-env@3.568.0": + version "3.568.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-env/-/credential-provider-env-3.568.0.tgz#fc7fda0bc48bbc75065a9084e41d429037e0e1c5" + integrity sha512-MVTQoZwPnP1Ev5A7LG+KzeU6sCB8BcGkZeDT1z1V5Wt7GPq0MgFQTSSjhImnB9jqRSZkl1079Bt3PbO6lfIS8g== dependencies: "@aws-sdk/types" "3.567.0" "@smithy/property-provider" "^2.2.0" "@smithy/types" "^2.12.0" tslib "^2.6.2" -"@aws-sdk/credential-provider-http@3.567.0": - version "3.567.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-http/-/credential-provider-http-3.567.0.tgz#4016128d4a6cc6e8ae36890121e09bab055c589e" - integrity sha512-MVSFmKo9ukxNyMYOk/u6gupGqktsbTZWh2uyULp0KLhuHPDTvWLmk96+6h6V2+GAp/J2QRK72l0EtjnHmcn3kg== +"@aws-sdk/credential-provider-http@3.568.0": + version "3.568.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-http/-/credential-provider-http-3.568.0.tgz#7f7239bed7c23db7356ebeae5f3b3bda9f751b08" + integrity sha512-gL0NlyI2eW17hnCrh45hZV+qjtBquB+Bckiip9R6DIVRKqYcoILyiFhuOgf2bXeF23gVh6j18pvUvIoTaFWs5w== dependencies: "@aws-sdk/types" "3.567.0" "@smithy/fetch-http-handler" "^2.5.0" @@ -201,15 +295,15 @@ "@smithy/util-stream" "^2.2.0" tslib "^2.6.2" -"@aws-sdk/credential-provider-ini@3.567.0": - version "3.567.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.567.0.tgz#c9a1fc570de43ba6997631690e0910bc45fc525f" - integrity sha512-azbZ3jYZmSD3oCzbjPOrI+pilRDV6H9qtJ3J4MCnbRYQxR8eu80l4Y0tXl0+GfHZCpdOJ9+uEhqU+yTiVrrOXg== +"@aws-sdk/credential-provider-ini@3.568.0": + version "3.568.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.568.0.tgz#3ed29a48fb2f9f44f614d268f3f5a70daf22ba85" + integrity sha512-m5DUN9mpto5DhEvo6w3+8SS6q932ja37rTNvpPqWJIaWhj7OorAwVirSaJQAQB/M8+XCUIrUonxytphZB28qGQ== dependencies: - "@aws-sdk/credential-provider-env" "3.567.0" - "@aws-sdk/credential-provider-process" "3.567.0" - "@aws-sdk/credential-provider-sso" "3.567.0" - "@aws-sdk/credential-provider-web-identity" "3.567.0" + "@aws-sdk/credential-provider-env" "3.568.0" + "@aws-sdk/credential-provider-process" "3.568.0" + "@aws-sdk/credential-provider-sso" "3.568.0" + "@aws-sdk/credential-provider-web-identity" "3.568.0" "@aws-sdk/types" "3.567.0" "@smithy/credential-provider-imds" "^2.3.0" "@smithy/property-provider" "^2.2.0" @@ -217,17 +311,17 @@ "@smithy/types" "^2.12.0" tslib "^2.6.2" -"@aws-sdk/credential-provider-node@3.567.0": - version "3.567.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-node/-/credential-provider-node-3.567.0.tgz#fd14f011ade3d9704ef0f261607fab36f1c8ec68" - integrity sha512-/kwYs2URdcXjKCPClUYrvdhhh7oRh1PWC0mehzy92c0I8hMdhIIpOmwJj8IoRIWdsCnPRatWBJBuE553y+HaUQ== - dependencies: - "@aws-sdk/credential-provider-env" "3.567.0" - "@aws-sdk/credential-provider-http" "3.567.0" - "@aws-sdk/credential-provider-ini" "3.567.0" - "@aws-sdk/credential-provider-process" "3.567.0" - "@aws-sdk/credential-provider-sso" "3.567.0" - "@aws-sdk/credential-provider-web-identity" "3.567.0" +"@aws-sdk/credential-provider-node@3.569.0": + version "3.569.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-node/-/credential-provider-node-3.569.0.tgz#714f3c3ccb4cec717f02535edde7c5eeb8bb8828" + integrity sha512-7jH4X2qlPU3PszZP1zvHJorhLARbU1tXvp8ngBe8ArXBrkFpl/dQ2Y/IRAICPm/pyC1IEt8L/CvKp+dz7v/eRw== + dependencies: + "@aws-sdk/credential-provider-env" "3.568.0" + "@aws-sdk/credential-provider-http" "3.568.0" + "@aws-sdk/credential-provider-ini" "3.568.0" + "@aws-sdk/credential-provider-process" "3.568.0" + "@aws-sdk/credential-provider-sso" "3.568.0" + "@aws-sdk/credential-provider-web-identity" "3.568.0" "@aws-sdk/types" "3.567.0" "@smithy/credential-provider-imds" "^2.3.0" "@smithy/property-provider" "^2.2.0" @@ -235,10 +329,10 @@ "@smithy/types" "^2.12.0" tslib "^2.6.2" -"@aws-sdk/credential-provider-process@3.567.0": - version "3.567.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-process/-/credential-provider-process-3.567.0.tgz#c90775b612e711914a94660d74f5460614ce5002" - integrity sha512-Bsp1bj8bnsvdLec9aXpBsHMlwCmO9TmRrZYyji7ZEUB003ZkxIgbqhe6TEKByrJd53KHfgeF+U4mWZAgBHDXfQ== +"@aws-sdk/credential-provider-process@3.568.0": + version "3.568.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-process/-/credential-provider-process-3.568.0.tgz#9c6202d64bd9bead77dc10fb6b61b2a64c819749" + integrity sha512-r01zbXbanP17D+bQUb7mD8Iu2SuayrrYZ0Slgvx32qgz47msocV9EPCSwI4Hkw2ZtEPCeLQR4XCqFJB1D9P50w== dependencies: "@aws-sdk/types" "3.567.0" "@smithy/property-provider" "^2.2.0" @@ -246,23 +340,23 @@ "@smithy/types" "^2.12.0" tslib "^2.6.2" -"@aws-sdk/credential-provider-sso@3.567.0": - version "3.567.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.567.0.tgz#8b37246c1bdc82b582bd95556beb0f44fb9edd1c" - integrity sha512-7TjvMiMsyYANNBiWBArEe7SvqSkZH0FleGUzp+AgT8/CDyGDRdLk7ve2n9f1+iH28av5J0Nw8+TfscHCImrDrQ== +"@aws-sdk/credential-provider-sso@3.568.0": + version "3.568.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.568.0.tgz#7120d27181daeb7a2ca809e7f2c86b71a0595ed2" + integrity sha512-+TA77NWOEXMUcfLoOuim6xiyXFg1GqHj55ggI1goTKGVvdHYZ+rhxZbwjI29+ewzPt/qcItDJcvhrjOrg9lCag== dependencies: - "@aws-sdk/client-sso" "3.567.0" - "@aws-sdk/token-providers" "3.567.0" + "@aws-sdk/client-sso" "3.568.0" + "@aws-sdk/token-providers" "3.568.0" "@aws-sdk/types" "3.567.0" "@smithy/property-provider" "^2.2.0" "@smithy/shared-ini-file-loader" "^2.4.0" "@smithy/types" "^2.12.0" tslib "^2.6.2" -"@aws-sdk/credential-provider-web-identity@3.567.0": - version "3.567.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.567.0.tgz#57792f7854da0379b714766a832156638c78f6e1" - integrity sha512-0J7LgR7ll0glMFBz0d4ijCBB61G7ZNucbEKsCGpFk2csytXNPCZYobjzXpJO8QxxgQUGnb68CRB0bo+GQq8nPg== +"@aws-sdk/credential-provider-web-identity@3.568.0": + version "3.568.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.568.0.tgz#b4e7958dc92a6cbbf5e9fd065cecd76573d4b70f" + integrity sha512-ZJSmTmoIdg6WqAULjYzaJ3XcbgBzVy36lir6Y0UBMRGaxDgos1AARuX6EcYzXOl+ksLvxt/xMQ+3aYh1LWfKSw== dependencies: "@aws-sdk/types" "3.567.0" "@smithy/property-provider" "^2.2.0" @@ -279,10 +373,10 @@ "@smithy/types" "^2.12.0" tslib "^2.6.2" -"@aws-sdk/middleware-logger@3.567.0": - version "3.567.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-logger/-/middleware-logger-3.567.0.tgz#bc2fc2c7cbbcf0c6aaaeaab2df0e38ab4af4b9db" - integrity sha512-12oUmPfSqzaTxO29TXJ9GnJ5qI6ed8iOvHvRLOoqI/TrFqLJnFwCka8E9tpP/sftMchd7wfefbhHhZK4J3ek8Q== +"@aws-sdk/middleware-logger@3.568.0": + version "3.568.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-logger/-/middleware-logger-3.568.0.tgz#aeb85cc8f7da431442d0f5914f3a3e262eb55a09" + integrity sha512-BinH72RG7K3DHHC1/tCulocFv+ZlQ9SrPF9zYT0T1OT95JXuHhB7fH8gEABrc6DAtOdJJh2fgxQjPy5tzPtsrA== dependencies: "@aws-sdk/types" "3.567.0" "@smithy/types" "^2.12.0" @@ -321,10 +415,10 @@ "@smithy/util-middleware" "^2.2.0" tslib "^2.6.2" -"@aws-sdk/token-providers@3.567.0": - version "3.567.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/token-providers/-/token-providers-3.567.0.tgz#a962cae500895848fdaa247b5aec6be9d7bdb528" - integrity sha512-W9Zd7/504wGrNjHHbJeCms1j1M6/88cHtBhRTKOWa7mec1gCjrd0VB3JE1cRodc6OrbJZ9TmyarBg8er6X5aiA== +"@aws-sdk/token-providers@3.568.0": + version "3.568.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/token-providers/-/token-providers-3.568.0.tgz#8efe5a3d97e5346dd8cb473accdcbfec466f9cba" + integrity sha512-mCQElYzY5N2JlXB7LyjOoLvRN/JiSV+E9szLwhYN3dleTUCMbGqWb7RiAR2V3fO+mz8f9kR7DThTExKJbKogKw== dependencies: "@aws-sdk/types" "3.567.0" "@smithy/property-provider" "^2.2.0" @@ -351,9 +445,9 @@ tslib "^2.6.2" "@aws-sdk/util-locate-window@^3.0.0": - version "3.567.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/util-locate-window/-/util-locate-window-3.567.0.tgz#77c47906195e93bb4486e80142fdeba98821743a" - integrity sha512-o05vqq2+IdIHVqu2L28D1aVzZRkjheyQQE0kAIB+aS0fr4hYidsO2XqkXRRnhkaOxW3VN5/K/p2gxCaKt6A1XA== + version "3.568.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/util-locate-window/-/util-locate-window-3.568.0.tgz#2acc4b2236af0d7494f7e517401ba6b3c4af11ff" + integrity sha512-3nh4TINkXYr+H41QaPelCceEB2FXP3fxp93YZXB/kqJvX0U9j0N0Uk45gvsjmEPzG8XxkPEeLIfT2I1M7A6Lig== dependencies: tslib "^2.6.2" @@ -367,10 +461,10 @@ bowser "^2.11.0" tslib "^2.6.2" -"@aws-sdk/util-user-agent-node@3.567.0": - version "3.567.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.567.0.tgz#ed70834431df12f6248814fcee9ba09f18b1e1d1" - integrity sha512-Fph602FBhLssed0x2GsRZyqJB8thcrKzbS53v57rQ6XHSQ6T8t2BUyrlXcBfDpoZQjnqobr0Uu2DG5UI3cgR6g== +"@aws-sdk/util-user-agent-node@3.568.0": + version "3.568.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.568.0.tgz#8bfb81b23d4947462f1e49c70187b85e7cd3837a" + integrity sha512-NVoZoLnKF+eXPBvXg+KqixgJkPSrerR6Gqmbjwqbv14Ini+0KNKB0/MXas1mDGvvEgtNkHI/Cb9zlJ3KXpti2A== dependencies: "@aws-sdk/types" "3.567.0" "@smithy/node-config-provider" "^2.3.0" @@ -945,16 +1039,16 @@ integrity sha512-I/s6F7yKUDdtMsoBWXJe8Qz40Tui5vsuKCWJEWVL+5q9sSWRzzx6v2KeNsOBEwd94j0eWkpWCH4yB6rZg9Mf0w== "@opentelemetry/core@^1.14.0": - version "1.24.0" - resolved "https://registry.yarnpkg.com/@opentelemetry/core/-/core-1.24.0.tgz#5568b6c1328a6b9c94a77f9b2c7f872b852bba40" - integrity sha512-FP2oN7mVPqcdxJDTTnKExj4mi91EH+DNuArKfHTjPuJWe2K1JfMIVXNfahw1h3onJxQnxS8K0stKkogX05s+Aw== + version "1.24.1" + resolved "https://registry.yarnpkg.com/@opentelemetry/core/-/core-1.24.1.tgz#35ab9d2ac9ca938e0ffbdfa40c49c169ac8ba80d" + integrity sha512-wMSGfsdmibI88K9wB498zXY04yThPexo8jvwNNlm542HZB7XrrMRBbAyKJqG8qDRJwIBdBrPMi4V9ZPW/sqrcg== dependencies: - "@opentelemetry/semantic-conventions" "1.24.0" + "@opentelemetry/semantic-conventions" "1.24.1" -"@opentelemetry/semantic-conventions@1.24.0": - version "1.24.0" - resolved "https://registry.yarnpkg.com/@opentelemetry/semantic-conventions/-/semantic-conventions-1.24.0.tgz#f074db930a7feb4d64103a9a576c5fbad046fcac" - integrity sha512-yL0jI6Ltuz8R+Opj7jClGrul6pOoYrdfVmzQS4SITXRPH7I5IRZbrwe/6/v8v4WYMa6MYZG480S1+uc/IGfqsA== +"@opentelemetry/semantic-conventions@1.24.1": + version "1.24.1" + resolved "https://registry.yarnpkg.com/@opentelemetry/semantic-conventions/-/semantic-conventions-1.24.1.tgz#d4bcebda1cb5146d47a2a53daaa7922f8e084dfb" + integrity sha512-VkliWlS4/+GHLLW7J/rVBA00uXus1SWvwFvcUDxDwmFxYfg/2VI6ekwdXS28cjI8Qz2ky2BzG8OUHo+WeYIWqw== "@protobufjs/aspromise@^1.1.1", "@protobufjs/aspromise@^1.1.2": version "1.1.2" @@ -1481,14 +1575,7 @@ dependencies: "@types/node" "*" -"@types/node@*", "@types/node@>=13.7.0": - version "20.12.8" - resolved "https://registry.yarnpkg.com/@types/node/-/node-20.12.8.tgz#35897bf2bfe3469847ab04634636de09552e8256" - integrity sha512-NU0rJLJnshZWdE/097cdCBbyW1h4hEg0xpovcoAQYHl8dnEyp/NAOiE45pvc+Bd1Dt+2r94v2eGFpQJ4R7g+2w== - dependencies: - undici-types "~5.26.4" - -"@types/node@^20.12.10": +"@types/node@*", "@types/node@>=13.7.0", "@types/node@^20.12.10": version "20.12.10" resolved "https://registry.yarnpkg.com/@types/node/-/node-20.12.10.tgz#8f0c3f12b0f075eee1fe20c1afb417e9765bef76" integrity sha512-Eem5pH9pmWBHoGAT8Dr5fdc5rYA+4NAovdM4EktRPVAAiJhmWWfQrA0cFhAbOsQdSfIHjAud6YdkbL69+zSKjw== @@ -1640,9 +1727,9 @@ available-typed-arrays@^1.0.7: possible-typed-array-names "^1.0.0" aws-sdk@*: - version "2.1612.0" - resolved "https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.1612.0.tgz#9b55523e578f3094ff149f475bea216a84271b88" - integrity sha512-UNwmKh2IChGQzDm6Stxor2SbjealVld2awmf1Q8rxVO1UVvjRrQ97ArD2gWouJT7BuSqDsUpgMgf/LBAbLjMxQ== + version "2.1614.0" + resolved "https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.1614.0.tgz#de824297ef6d3bd6d7cbe68b25b7f1b49d0edb15" + integrity sha512-dsfoOk/1UBGfELJ9skBma1RzfYXalK+0QdStuwKCqrYHgpF/mlf7BqYOB0acNQHzxgVxEP0LOGjWZOzWWwdGhw== dependencies: buffer "4.9.2" events "1.1.1" @@ -1828,9 +1915,9 @@ camelcase@^6.2.0: integrity sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA== caniuse-lite@^1.0.30001587: - version "1.0.30001615" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001615.tgz#7c2c8772db681b6dee74d81d6550db68f2d28842" - integrity sha512-1IpazM5G3r38meiae0bHRnPhz+CBQ3ZLqbQMtrg+AsTPKAXgW38JNsXkyZ+v8waCsDmPq87lmfun5Q2AGysNEQ== + version "1.0.30001616" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001616.tgz#4342712750d35f71ebba9fcac65e2cf8870013c3" + integrity sha512-RHVYKov7IcdNjVHJFNY/78RdG4oGVjbayxv8u5IO74Wv7Hlq4PnJE6mo/OjFijjVFNy5ijnCt6H3IIo4t+wfEw== chalk@^2.3.0, chalk@^2.4.2: version "2.4.2" @@ -2086,9 +2173,9 @@ domexception@^2.0.1: webidl-conversions "^5.0.0" electron-to-chromium@^1.4.668: - version "1.4.754" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.754.tgz#20a9f3cc80e0fb6a804b86605e55da16918a58b0" - integrity sha512-7Kr5jUdns5rL/M9wFFmMZAgFDuL2YOnanFH4OI4iFzUqyh3XOL7nAGbSlSMZdzKMIyyTpNSbqZsWG9odwLeKvA== + version "1.4.757" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.757.tgz#45f7c9341b538f8c4b9ca8af9692e0ed1a776a44" + integrity sha512-jftDaCknYSSt/+KKeXzH3LX5E2CvRLm75P3Hj+J/dv3CL0qUYcOt13d5FN1NiL5IJbbhzHrb3BomeG2tkSlZmw== emittery@^0.8.1: version "0.8.1" @@ -3168,13 +3255,6 @@ lru-cache@^5.1.1: dependencies: yallist "^3.0.2" -lru-cache@^6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-6.0.0.tgz#6d6fe6570ebd96aaf90fcad1dafa3b2566db3a94" - integrity sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA== - dependencies: - yallist "^4.0.0" - lru-cache@^7.14.0: version "7.18.3" resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-7.18.3.tgz#f793896e0fd0e954a59dfdd82f0773808df6aa89" @@ -3630,11 +3710,9 @@ saxes@^5.0.1: xmlchars "^2.2.0" semver@7.x, semver@^7.3.2, semver@^7.5.3, semver@^7.5.4: - version "7.6.0" - resolved "https://registry.yarnpkg.com/semver/-/semver-7.6.0.tgz#1a46a4db4bffcccd97b743b5005c8325f23d4e2d" - integrity sha512-EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg== - dependencies: - lru-cache "^6.0.0" + version "7.6.1" + resolved "https://registry.yarnpkg.com/semver/-/semver-7.6.1.tgz#60bfe090bf907a25aa8119a72b9f90ef7ca281b2" + integrity sha512-f/vbBsu+fOiYt+lmwZV0rVwJScl46HppnOA1ZvIuBWKOTlllpyJ3bfVax76/OrhCH38dyxoDIA8K7uB963IYgA== semver@^5.3.0: version "5.7.2" @@ -3972,9 +4050,9 @@ unix-dgram@2.0.x: nan "^2.16.0" update-browserslist-db@^1.0.13: - version "1.0.14" - resolved "https://registry.yarnpkg.com/update-browserslist-db/-/update-browserslist-db-1.0.14.tgz#46a9367c323f8ade9a9dddb7f3ae7814b3a0b31c" - integrity sha512-JixKH8GR2pWYshIPUg/NujK3JO7JiqEEUiNArE86NQyrgUuZeTlZQN3xuS/yiV5Kb48ev9K6RqNkaJjXsdg7Jw== + version "1.0.15" + resolved "https://registry.yarnpkg.com/update-browserslist-db/-/update-browserslist-db-1.0.15.tgz#60ed9f8cba4a728b7ecf7356f641a31e3a691d97" + integrity sha512-K9HWH62x3/EalU1U6sjSZiylm9C8tgq2mSvshZpqc7QE69RaA2qjhkW2HlNA0tFpEbtyFz7HTqbSdN4MSwUodA== dependencies: escalade "^3.1.2" picocolors "^1.0.0" @@ -4157,11 +4235,6 @@ yallist@^3.0.2: resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.1.1.tgz#dbb7daf9bfd8bac9ab45ebf602b8cbad0d5d08fd" integrity sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g== -yallist@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72" - integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A== - yargs-parser@20.x, yargs-parser@^20.2.2: version "20.2.9" resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.9.tgz#2eb7dc3b0289718fc295f362753845c41a0c94ee" From 1a22e0a0b58b6e92f5c8d1c219e382c1d7c1c61f Mon Sep 17 00:00:00 2001 From: kimi Date: Thu, 16 May 2024 10:42:12 -0400 Subject: [PATCH 12/27] update 65th bit to be 0 and tests all accidentally pass --- src/trace/step-function-service.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/trace/step-function-service.ts b/src/trace/step-function-service.ts index 128f2a656..2a03d3ea0 100644 --- a/src/trace/step-function-service.ts +++ b/src/trace/step-function-service.ts @@ -155,12 +155,12 @@ export class StepFunctionContextService { hash.update(s); const hex = hash.digestSync().subarray(0, 16); - let binary = ""; + let binaryString = ""; for (const num of hex) { - binary = binary + this.numberToBinaryString(num); + binaryString = binaryString + this.numberToBinaryString(num); } - const res = "0" + binary.substring(1, 128); + const res = "0" + binaryString.substring(1, 64) + "0" + binaryString.substring(65, 128); if (res === "0".repeat(128)) { return "1"; } From ee7d6bd619fd8b230c9042e4954aa4c3d1cc8486 Mon Sep 17 00:00:00 2001 From: kimi Date: Thu, 16 May 2024 11:10:51 -0400 Subject: [PATCH 13/27] rename --- src/trace/step-function-service.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/trace/step-function-service.ts b/src/trace/step-function-service.ts index 2a03d3ea0..bc5afbbd3 100644 --- a/src/trace/step-function-service.ts +++ b/src/trace/step-function-service.ts @@ -146,11 +146,11 @@ export class StepFunctionContextService { } private deterministicMd5HashToBigIntString(s: string): string { - const binaryString = this.deterministicMd5HashInBinary(s); + const binaryString = this.deterministicSha256Hash(s); return BigInt("0b" + binaryString).toString(); } - private deterministicMd5HashInBinary(s: string): string { + private deterministicSha256Hash(s: string): string { const hash = new Sha256(); hash.update(s); const hex = hash.digestSync().subarray(0, 16); From eb49ebfa9f7e8927b60696ca2f3a386839487836 Mon Sep 17 00:00:00 2001 From: kimi Date: Thu, 16 May 2024 11:20:54 -0400 Subject: [PATCH 14/27] rename --- src/trace/step-function-service.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/trace/step-function-service.ts b/src/trace/step-function-service.ts index bc5afbbd3..deda77311 100644 --- a/src/trace/step-function-service.ts +++ b/src/trace/step-function-service.ts @@ -123,8 +123,8 @@ export class StepFunctionContextService { public get spanContext(): SpanContextWrapper | null { if (this.context === undefined) return null; - const traceId = this.deterministicMd5HashToBigIntString(this.context["step_function.execution_id"]); - const parentId = this.deterministicMd5HashToBigIntString( + const traceId = this.deterministicSha256HashToBigIntString(this.context["step_function.execution_id"]); + const parentId = this.deterministicSha256HashToBigIntString( this.context["step_function.execution_id"] + "#" + this.context["step_function.state_name"] + @@ -145,7 +145,7 @@ export class StepFunctionContextService { return spanContext; } - private deterministicMd5HashToBigIntString(s: string): string { + private deterministicSha256HashToBigIntString(s: string): string { const binaryString = this.deterministicSha256Hash(s); return BigInt("0b" + binaryString).toString(); } From f3c87db46ea59484fe66b927055bc37d1a2f0525 Mon Sep 17 00:00:00 2001 From: kimi Date: Thu, 16 May 2024 15:36:31 -0400 Subject: [PATCH 15/27] add option to hashing to 64 bits or 128 bits --- src/trace/context/extractor.spec.ts | 2 +- .../context/extractors/step-function.spec.ts | 4 +- src/trace/step-function-service.spec.ts | 40 ++++++++++++++----- src/trace/step-function-service.ts | 24 ++++++++--- 4 files changed, 51 insertions(+), 19 deletions(-) diff --git a/src/trace/context/extractor.spec.ts b/src/trace/context/extractor.spec.ts index adc777e87..ef06e74bd 100644 --- a/src/trace/context/extractor.spec.ts +++ b/src/trace/context/extractor.spec.ts @@ -689,7 +689,7 @@ describe("TraceContextExtractor", () => { expect(traceContext).not.toBeNull(); expect(traceContext?.toTraceId()).toBe("3661440683"); - expect(traceContext?.toSpanId()).toBe("2846425757"); + expect(traceContext?.toSpanId()).toBe("5892738536804826142"); expect(traceContext?.sampleMode()).toBe("1"); expect(traceContext?.source).toBe("event"); }); diff --git a/src/trace/context/extractors/step-function.spec.ts b/src/trace/context/extractors/step-function.spec.ts index 6ace44675..0e7a9d241 100644 --- a/src/trace/context/extractors/step-function.spec.ts +++ b/src/trace/context/extractors/step-function.spec.ts @@ -37,7 +37,7 @@ describe("StepFunctionEventTraceExtractor", () => { expect(traceContext).not.toBeNull(); expect(traceContext?.toTraceId()).toBe("3661440683"); - expect(traceContext?.toSpanId()).toBe("2846425757"); + expect(traceContext?.toSpanId()).toBe("5892738536804826142"); expect(traceContext?.sampleMode()).toBe("1"); expect(traceContext?.source).toBe("event"); }); @@ -50,7 +50,7 @@ describe("StepFunctionEventTraceExtractor", () => { expect(traceContext).not.toBeNull(); expect(traceContext?.toTraceId()).toBe("3661440683"); - expect(traceContext?.toSpanId()).toBe("2846425757"); + expect(traceContext?.toSpanId()).toBe("5892738536804826142"); expect(traceContext?.sampleMode()).toBe("1"); expect(traceContext?.source).toBe("event"); }); diff --git a/src/trace/step-function-service.spec.ts b/src/trace/step-function-service.spec.ts index 39212d72b..685f5d16b 100644 --- a/src/trace/step-function-service.spec.ts +++ b/src/trace/step-function-service.spec.ts @@ -1,4 +1,4 @@ -import { StepFunctionContextService } from "./step-function-service"; +import { _128_BITS, _64_BITS, StepFunctionContextService } from "./step-function-service"; describe("StepFunctionContextService", () => { const stepFunctionEvent = { @@ -195,7 +195,7 @@ describe("StepFunctionContextService", () => { expect(spanContext).not.toBeNull(); expect(spanContext?.toTraceId()).toBe("3661440683"); - expect(spanContext?.toSpanId()).toBe("2846425757"); + expect(spanContext?.toSpanId()).toBe("5892738536804826142"); expect(spanContext?.sampleMode()).toBe("1"); expect(spanContext?.source).toBe("event"); }); @@ -211,23 +211,24 @@ describe("StepFunctionContextService", () => { }); }); - describe("deterministicMd5HashToBigIntString", () => { + describe("deterministicSha256HashToBigIntString", () => { it("returns the same hash number generated in `logs backend` for a random string", () => { const instance = StepFunctionContextService.instance(); - const hash = instance["deterministicMd5HashToBigIntString"]("some_testing_random_string"); + const hash = instance["deterministicSha256HashToBigIntString"]("some_testing_random_string", _128_BITS); expect(hash).toEqual("80506605202309154694697844088692857990"); }); it("returns the same hash number generated in `logs backend` for execution id # state name # entered time", () => { const instance = StepFunctionContextService.instance(); - const hash = instance["deterministicMd5HashToBigIntString"]( + const hash = instance["deterministicSha256HashToBigIntString"]( "arn:aws:states:sa-east-1:601427271234:express:DatadogStateMachine:acaf1a67-336a-e854-1599-2a627eb2dd8a:c8baf081-31f1-464d-971f-70cb17d01111#step-one#2022-12-08T21:08:19.224Z", + _128_BITS, ); expect(hash).toEqual("80072419077927731656239868244106251139"); }); }); - describe("deterministicMd5HashInBinary", () => { + describe("deterministicSha256Hash", () => { it.each([ [ "a random string", @@ -251,14 +252,14 @@ describe("StepFunctionContextService", () => { ], ])("returns the same hash number generated in `logs backend` for %s", (_, str, expected) => { const instance = StepFunctionContextService.instance(); - const hash = instance["deterministicMd5HashInBinary"](str); + const hash = instance["deterministicSha256Hash"](str, _128_BITS); expect(hash).toEqual(expected); }); it("returns a hash always leading with 0", () => { const instance = StepFunctionContextService.instance(); for (let i = 0; i < 20; i++) { - const hash = instance["deterministicMd5HashInBinary"](i.toString()); + const hash = instance["deterministicSha256Hash"](i.toString(), _128_BITS); expect(hash.substring(0, 1)).toMatch("0"); } }); @@ -268,8 +269,8 @@ describe("StepFunctionContextService", () => { const times = 20; for (let i = 0; i < times; i++) { for (let j = i + 1; j < times; j++) { - const hash1 = instance["deterministicMd5HashInBinary"](i.toString()); - const hash2 = instance["deterministicMd5HashInBinary"](j.toString()); + const hash1 = instance["deterministicSha256Hash"](i.toString(), _128_BITS); + const hash2 = instance["deterministicSha256Hash"](j.toString(), _128_BITS); expect(hash1).not.toMatch(hash2); } } @@ -289,4 +290,23 @@ describe("StepFunctionContextService", () => { expect(binary).toBe(expected); }); }); + + describe("test 64 bits deterministicMd5HashToBigIntString for span id", () => { + const instance = StepFunctionContextService.instance(); + it("first test of #1", () => { + const actual = instance["deterministicSha256HashToBigIntString"]( + "arn:aws:states:sa-east-1:425362996713:stateMachine:MyStateMachine-b276uka1j#lambda#1", + _64_BITS, + ); + expect(actual).toEqual("3711631873188331089"); + }); + + it("test same hashing number is generated as logs-backend for execution id # state name # entered time", () => { + const actual = instance["deterministicSha256HashToBigIntString"]( + "arn:aws:states:sa-east-1:425362996713:stateMachine:MyStateMachine-b276uka1j#lambda#2", + _64_BITS, + ); + expect(actual).toEqual("5759173372325510050"); + }); + }); }); diff --git a/src/trace/step-function-service.ts b/src/trace/step-function-service.ts index deda77311..bdf9fd86d 100644 --- a/src/trace/step-function-service.ts +++ b/src/trace/step-function-service.ts @@ -16,6 +16,9 @@ export interface StepFunctionContext { "step_function.state_retry_count": number; } +export const _64_BITS = 64; +export const _128_BITS = 128; + export class StepFunctionContextService { private static _instance: StepFunctionContextService; public context?: StepFunctionContext; @@ -123,14 +126,15 @@ export class StepFunctionContextService { public get spanContext(): SpanContextWrapper | null { if (this.context === undefined) return null; - const traceId = this.deterministicSha256HashToBigIntString(this.context["step_function.execution_id"]); + const traceId = this.deterministicSha256HashToBigIntString(this.context["step_function.execution_id"], _128_BITS); // returning 128 bits traceId const parentId = this.deterministicSha256HashToBigIntString( this.context["step_function.execution_id"] + "#" + this.context["step_function.state_name"] + "#" + this.context["step_function.state_entered_time"], - ); + _64_BITS, + ); // returning 64 bits const sampleMode = SampleMode.AUTO_KEEP; const spanContext = SpanContextWrapper.fromTraceContext({ @@ -145,12 +149,14 @@ export class StepFunctionContextService { return spanContext; } - private deterministicSha256HashToBigIntString(s: string): string { - const binaryString = this.deterministicSha256Hash(s); + private deterministicSha256HashToBigIntString(s: string, numberOfBits: number): string { + const binaryString = this.deterministicSha256Hash(s, numberOfBits); return BigInt("0b" + binaryString).toString(); } - private deterministicSha256Hash(s: string): string { + private deterministicSha256Hash(s: string, numberOfBits: number): string { + // returns 128 bits hash unless mostSignificant64Bits options is set to true. + const hash = new Sha256(); hash.update(s); const hex = hash.digestSync().subarray(0, 16); @@ -160,7 +166,13 @@ export class StepFunctionContextService { binaryString = binaryString + this.numberToBinaryString(num); } - const res = "0" + binaryString.substring(1, 64) + "0" + binaryString.substring(65, 128); + let res; + if (numberOfBits === _128_BITS) { + res = "0" + binaryString.substring(1, 64) + "0" + binaryString.substring(65, 128); + } else { + // 64 bits + res = "0" + binaryString.substring(1, 64); + } if (res === "0".repeat(128)) { return "1"; } From d9c4072dc0ff708fa8e6974633f8d1d361c8f84b Mon Sep 17 00:00:00 2001 From: kimi Date: Thu, 16 May 2024 15:44:58 -0400 Subject: [PATCH 16/27] update test name --- src/trace/step-function-service.spec.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/trace/step-function-service.spec.ts b/src/trace/step-function-service.spec.ts index 685f5d16b..c5cfc1356 100644 --- a/src/trace/step-function-service.spec.ts +++ b/src/trace/step-function-service.spec.ts @@ -291,7 +291,7 @@ describe("StepFunctionContextService", () => { }); }); - describe("test 64 bits deterministicMd5HashToBigIntString for span id", () => { + describe("test 64 bits deterministicSha256HashToBigIntString for span id", () => { const instance = StepFunctionContextService.instance(); it("first test of #1", () => { const actual = instance["deterministicSha256HashToBigIntString"]( From b3d76cd9d65d2f29e1444965ccda54decc3feade Mon Sep 17 00:00:00 2001 From: kimi Date: Tue, 21 May 2024 21:19:21 -0400 Subject: [PATCH 17/27] try log-backend log --- src/trace/context/extractor.spec.ts | 2 +- .../context/extractors/step-function.spec.ts | 4 +- src/trace/step-function-service.spec.ts | 32 +++++----- src/trace/step-function-service.ts | 60 ++++++++++++------- 4 files changed, 56 insertions(+), 42 deletions(-) diff --git a/src/trace/context/extractor.spec.ts b/src/trace/context/extractor.spec.ts index ef06e74bd..0e888fefe 100644 --- a/src/trace/context/extractor.spec.ts +++ b/src/trace/context/extractor.spec.ts @@ -688,7 +688,7 @@ describe("TraceContextExtractor", () => { const traceContext = await extractor.extract(event, {} as Context); expect(traceContext).not.toBeNull(); - expect(traceContext?.toTraceId()).toBe("3661440683"); + expect(traceContext?.toTraceId()).toBe("1139193989631387307"); expect(traceContext?.toSpanId()).toBe("5892738536804826142"); expect(traceContext?.sampleMode()).toBe("1"); expect(traceContext?.source).toBe("event"); diff --git a/src/trace/context/extractors/step-function.spec.ts b/src/trace/context/extractors/step-function.spec.ts index 0e7a9d241..199ad7593 100644 --- a/src/trace/context/extractors/step-function.spec.ts +++ b/src/trace/context/extractors/step-function.spec.ts @@ -36,7 +36,7 @@ describe("StepFunctionEventTraceExtractor", () => { const traceContext = extractor.extract(payload); expect(traceContext).not.toBeNull(); - expect(traceContext?.toTraceId()).toBe("3661440683"); + expect(traceContext?.toTraceId()).toBe("1139193989631387307"); expect(traceContext?.toSpanId()).toBe("5892738536804826142"); expect(traceContext?.sampleMode()).toBe("1"); expect(traceContext?.source).toBe("event"); @@ -49,7 +49,7 @@ describe("StepFunctionEventTraceExtractor", () => { const traceContext = extractor.extract(payload); expect(traceContext).not.toBeNull(); - expect(traceContext?.toTraceId()).toBe("3661440683"); + expect(traceContext?.toTraceId()).toBe("1139193989631387307"); expect(traceContext?.toSpanId()).toBe("5892738536804826142"); expect(traceContext?.sampleMode()).toBe("1"); expect(traceContext?.source).toBe("event"); diff --git a/src/trace/step-function-service.spec.ts b/src/trace/step-function-service.spec.ts index c5cfc1356..481a98da6 100644 --- a/src/trace/step-function-service.spec.ts +++ b/src/trace/step-function-service.spec.ts @@ -1,4 +1,4 @@ -import { _128_BITS, _64_BITS, StepFunctionContextService } from "./step-function-service"; +import { PARENT_ID, StepFunctionContextService } from "./step-function-service"; describe("StepFunctionContextService", () => { const stepFunctionEvent = { @@ -194,7 +194,7 @@ describe("StepFunctionContextService", () => { expect(spanContext).not.toBeNull(); - expect(spanContext?.toTraceId()).toBe("3661440683"); + expect(spanContext?.toTraceId()).toBe("1139193989631387307"); expect(spanContext?.toSpanId()).toBe("5892738536804826142"); expect(spanContext?.sampleMode()).toBe("1"); expect(spanContext?.source).toBe("event"); @@ -214,17 +214,17 @@ describe("StepFunctionContextService", () => { describe("deterministicSha256HashToBigIntString", () => { it("returns the same hash number generated in `logs backend` for a random string", () => { const instance = StepFunctionContextService.instance(); - const hash = instance["deterministicSha256HashToBigIntString"]("some_testing_random_string", _128_BITS); - expect(hash).toEqual("80506605202309154694697844088692857990"); + const hash = instance["deterministicSha256HashToBigIntString"]("some_testing_random_string", PARENT_ID); + expect(hash).toEqual("4364271812988819936"); }); it("returns the same hash number generated in `logs backend` for execution id # state name # entered time", () => { const instance = StepFunctionContextService.instance(); const hash = instance["deterministicSha256HashToBigIntString"]( "arn:aws:states:sa-east-1:601427271234:express:DatadogStateMachine:acaf1a67-336a-e854-1599-2a627eb2dd8a:c8baf081-31f1-464d-971f-70cb17d01111#step-one#2022-12-08T21:08:19.224Z", - _128_BITS, + PARENT_ID, ); - expect(hash).toEqual("80072419077927731656239868244106251139"); + expect(hash).toEqual("4340734536022949921"); }); }); @@ -233,33 +233,33 @@ describe("StepFunctionContextService", () => { [ "a random string", "some_testing_random_string", - "00111100100100010000001000010111010011000111001011011001111000000110011101111001100001011100111110110001011111001101110010000110", + "0011110010010001000000100001011101001100011100101101100111100000", ], [ "an execution id", "arn:aws:states:sa-east-1:601427271234:express:DatadogStateMachine:acaf1a67-336a-e854-1599-2a627eb2dd8a:c8baf081-31f1-464d-971f-70cb17d041f4", - "01000101001100100100101000010110011101001110110101001100100001000100010111011110010011011100010100101011110110011010110001111110", + "0100010100110010010010100001011001110100111011010100110010000100", ], [ "another execution id", "arn:aws:states:sa-east-1:601427271234:express:DatadogStateMachine:acaf1a67-336a-e854-1599-2a627eb2dd8a:c8baf081-31f1-464d-971f-70cb17d01111", - "00101111100011001000100001010011001100000000000101110111001010110100110111010111011001101001111001110001011111000111010010101001", + "0010111110001100100010000101001100110000000000010111011100101011", ], [ "execution id # state name # entered time", "arn:aws:states:sa-east-1:601427271234:express:DatadogStateMachine:acaf1a67-336a-e854-1599-2a627eb2dd8a:c8baf081-31f1-464d-971f-70cb17d01111#step-one#2022-12-08T21:08:19.224Z", - "00111100001111010110001100001111111100111110101100000000001000010011110011111110111010000100011111010100111110011000101110000011", + "0011110000111101011000110000111111110011111010110000000000100001", ], ])("returns the same hash number generated in `logs backend` for %s", (_, str, expected) => { const instance = StepFunctionContextService.instance(); - const hash = instance["deterministicSha256Hash"](str, _128_BITS); + const hash = instance["deterministicSha256Hash"](str, PARENT_ID); expect(hash).toEqual(expected); }); it("returns a hash always leading with 0", () => { const instance = StepFunctionContextService.instance(); for (let i = 0; i < 20; i++) { - const hash = instance["deterministicSha256Hash"](i.toString(), _128_BITS); + const hash = instance["deterministicSha256Hash"](i.toString(), PARENT_ID); expect(hash.substring(0, 1)).toMatch("0"); } }); @@ -269,8 +269,8 @@ describe("StepFunctionContextService", () => { const times = 20; for (let i = 0; i < times; i++) { for (let j = i + 1; j < times; j++) { - const hash1 = instance["deterministicSha256Hash"](i.toString(), _128_BITS); - const hash2 = instance["deterministicSha256Hash"](j.toString(), _128_BITS); + const hash1 = instance["deterministicSha256Hash"](i.toString(), PARENT_ID); + const hash2 = instance["deterministicSha256Hash"](j.toString(), PARENT_ID); expect(hash1).not.toMatch(hash2); } } @@ -296,7 +296,7 @@ describe("StepFunctionContextService", () => { it("first test of #1", () => { const actual = instance["deterministicSha256HashToBigIntString"]( "arn:aws:states:sa-east-1:425362996713:stateMachine:MyStateMachine-b276uka1j#lambda#1", - _64_BITS, + PARENT_ID, ); expect(actual).toEqual("3711631873188331089"); }); @@ -304,7 +304,7 @@ describe("StepFunctionContextService", () => { it("test same hashing number is generated as logs-backend for execution id # state name # entered time", () => { const actual = instance["deterministicSha256HashToBigIntString"]( "arn:aws:states:sa-east-1:425362996713:stateMachine:MyStateMachine-b276uka1j#lambda#2", - _64_BITS, + PARENT_ID, ); expect(actual).toEqual("5759173372325510050"); }); diff --git a/src/trace/step-function-service.ts b/src/trace/step-function-service.ts index bdf9fd86d..417c0bad6 100644 --- a/src/trace/step-function-service.ts +++ b/src/trace/step-function-service.ts @@ -16,8 +16,9 @@ export interface StepFunctionContext { "step_function.state_retry_count": number; } -export const _64_BITS = 64; -export const _128_BITS = 128; +export const TRACE_ID = "traceId"; +export const PARENT_ID = "spanId"; +export const DD_P_TID = "_dd.p.tid"; export class StepFunctionContextService { private static _instance: StepFunctionContextService; @@ -126,53 +127,66 @@ export class StepFunctionContextService { public get spanContext(): SpanContextWrapper | null { if (this.context === undefined) return null; - const traceId = this.deterministicSha256HashToBigIntString(this.context["step_function.execution_id"], _128_BITS); // returning 128 bits traceId + const traceId = this.deterministicSha256HashToBigIntString(this.context["step_function.execution_id"], TRACE_ID); const parentId = this.deterministicSha256HashToBigIntString( this.context["step_function.execution_id"] + "#" + this.context["step_function.state_name"] + "#" + this.context["step_function.state_entered_time"], - _64_BITS, - ); // returning 64 bits + PARENT_ID, + ); const sampleMode = SampleMode.AUTO_KEEP; - - const spanContext = SpanContextWrapper.fromTraceContext({ - traceId, - parentId, - sampleMode, - source: TraceSource.Event, + const _DatadogSpanContext = require("dd-trace/packages/dd-trace/src/opentracing/span_context"); + const id = require("dd-trace/packages/dd-trace/src/id"); + console.log(`executionArn is ${this.context["step_function.execution_id"]}`); + console.log(`traceId: ${traceId}`); + + const ddTraceContext = new _DatadogSpanContext({ + traceId: id(traceId, 10), + spanId: id(parentId, 10), + sampling: { priority: sampleMode.toString(2) }, }); + const ptid = this.deterministicSha256HashToBigIntString(this.context["step_function.execution_id"], DD_P_TID); + if (ptid === "0".repeat(16)) { + return ddTraceContext; + } + console.log(`ptid: ${ptid}`); + ddTraceContext._trace.tags["_dd.p.tid"] = ptid; + // ddTraceContext._trace.tags["_dd.p.tid"] = id(higher64BitsTraceId, 10).toString(16); + const spanContext = new SpanContextWrapper(ddTraceContext, TraceSource.Event); + if (spanContext === null) return null; logDebug(`Extracted trace context from StepFunctionContext`, { traceContext: this.context }); return spanContext; } - private deterministicSha256HashToBigIntString(s: string, numberOfBits: number): string { - const binaryString = this.deterministicSha256Hash(s, numberOfBits); + private deterministicSha256HashToBigIntString(s: string, type: string): string { + const binaryString = this.deterministicSha256Hash(s, type); return BigInt("0b" + binaryString).toString(); } - private deterministicSha256Hash(s: string, numberOfBits: number): string { + private deterministicSha256Hash(s: string, type: string): string { // returns 128 bits hash unless mostSignificant64Bits options is set to true. const hash = new Sha256(); hash.update(s); - const hex = hash.digestSync().subarray(0, 16); - + const uint8Array = hash.digestSync(); + let hex; + if (type === TRACE_ID) { + hex = uint8Array.subarray(8, 16); + } else { + // type === SPAN_ID || type === DD_P_TID + hex = uint8Array.subarray(0, 8); + } + console.log(hex.toString()); let binaryString = ""; for (const num of hex) { binaryString = binaryString + this.numberToBinaryString(num); } - let res; - if (numberOfBits === _128_BITS) { - res = "0" + binaryString.substring(1, 64) + "0" + binaryString.substring(65, 128); - } else { - // 64 bits - res = "0" + binaryString.substring(1, 64); - } + const res = "0" + binaryString.substring(1, 64); if (res === "0".repeat(128)) { return "1"; } From 36f39428f1daadcdd7ace97609e476d9a48267da Mon Sep 17 00:00:00 2001 From: kimi Date: Wed, 22 May 2024 11:52:07 -0400 Subject: [PATCH 18/27] remote print --- src/trace/step-function-service.ts | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/trace/step-function-service.ts b/src/trace/step-function-service.ts index 417c0bad6..9bf6696be 100644 --- a/src/trace/step-function-service.ts +++ b/src/trace/step-function-service.ts @@ -139,8 +139,6 @@ export class StepFunctionContextService { const sampleMode = SampleMode.AUTO_KEEP; const _DatadogSpanContext = require("dd-trace/packages/dd-trace/src/opentracing/span_context"); const id = require("dd-trace/packages/dd-trace/src/id"); - console.log(`executionArn is ${this.context["step_function.execution_id"]}`); - console.log(`traceId: ${traceId}`); const ddTraceContext = new _DatadogSpanContext({ traceId: id(traceId, 10), @@ -152,9 +150,7 @@ export class StepFunctionContextService { if (ptid === "0".repeat(16)) { return ddTraceContext; } - console.log(`ptid: ${ptid}`); - ddTraceContext._trace.tags["_dd.p.tid"] = ptid; - // ddTraceContext._trace.tags["_dd.p.tid"] = id(higher64BitsTraceId, 10).toString(16); + ddTraceContext._trace.tags["_dd.p.tid"] = id(ptid, 10).toString(16); const spanContext = new SpanContextWrapper(ddTraceContext, TraceSource.Event); if (spanContext === null) return null; From a3b7bd79b8f9e17f2af056a87d26b0ea766123c4 Mon Sep 17 00:00:00 2001 From: kimi Date: Wed, 22 May 2024 13:18:13 -0400 Subject: [PATCH 19/27] update 64 zeros case --- src/trace/step-function-service.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/trace/step-function-service.ts b/src/trace/step-function-service.ts index 9bf6696be..b695ac7c2 100644 --- a/src/trace/step-function-service.ts +++ b/src/trace/step-function-service.ts @@ -183,7 +183,7 @@ export class StepFunctionContextService { } const res = "0" + binaryString.substring(1, 64); - if (res === "0".repeat(128)) { + if (res === "0".repeat(64)) { return "1"; } return res; From e3be794324849953f92d9d2fe54eea554a389c66 Mon Sep 17 00:00:00 2001 From: kimi Date: Wed, 22 May 2024 14:13:29 -0400 Subject: [PATCH 20/27] Empty-Commit From 848a3b227b9e2e0ca611dcda51413bdc43af237d Mon Sep 17 00:00:00 2001 From: kimi Date: Wed, 22 May 2024 15:19:19 -0400 Subject: [PATCH 21/27] Empty-Commit From 0de000f7a72f34184b2ceb15f881427cca63788d Mon Sep 17 00:00:00 2001 From: kimi Date: Wed, 22 May 2024 15:22:21 -0400 Subject: [PATCH 22/27] lint --- src/trace/step-function-service.ts | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/trace/step-function-service.ts b/src/trace/step-function-service.ts index b695ac7c2..b3038a941 100644 --- a/src/trace/step-function-service.ts +++ b/src/trace/step-function-service.ts @@ -169,16 +169,15 @@ export class StepFunctionContextService { const hash = new Sha256(); hash.update(s); const uint8Array = hash.digestSync(); - let hex; + let intArray; if (type === TRACE_ID) { - hex = uint8Array.subarray(8, 16); + intArray = uint8Array.subarray(8, 16); } else { // type === SPAN_ID || type === DD_P_TID - hex = uint8Array.subarray(0, 8); + intArray = uint8Array.subarray(0, 8); } - console.log(hex.toString()); let binaryString = ""; - for (const num of hex) { + for (const num of intArray) { binaryString = binaryString + this.numberToBinaryString(num); } From cf96c989279d99bb8c050d7b2ffed435a91c338c Mon Sep 17 00:00:00 2001 From: kimi Date: Fri, 31 May 2024 11:16:11 -0400 Subject: [PATCH 23/27] remove unnecessary edge case check --- src/trace/step-function-service.ts | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/trace/step-function-service.ts b/src/trace/step-function-service.ts index b3038a941..320efb41a 100644 --- a/src/trace/step-function-service.ts +++ b/src/trace/step-function-service.ts @@ -147,9 +147,6 @@ export class StepFunctionContextService { }); const ptid = this.deterministicSha256HashToBigIntString(this.context["step_function.execution_id"], DD_P_TID); - if (ptid === "0".repeat(16)) { - return ddTraceContext; - } ddTraceContext._trace.tags["_dd.p.tid"] = id(ptid, 10).toString(16); const spanContext = new SpanContextWrapper(ddTraceContext, TraceSource.Event); From 0debb2a0bdfa8bd05e9f2ca1adef6643b35b412a Mon Sep 17 00:00:00 2001 From: kimi <47579703+kimi-p@users.noreply.github.com> Date: Tue, 4 Jun 2024 16:17:41 -0400 Subject: [PATCH 24/27] small logic update from comment MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: jordan gonzález <30836115+duncanista@users.noreply.github.com> --- src/trace/step-function-service.ts | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/trace/step-function-service.ts b/src/trace/step-function-service.ts index 320efb41a..19fe1e537 100644 --- a/src/trace/step-function-service.ts +++ b/src/trace/step-function-service.ts @@ -166,12 +166,10 @@ export class StepFunctionContextService { const hash = new Sha256(); hash.update(s); const uint8Array = hash.digestSync(); - let intArray; + // type === SPAN_ID || type === DD_P_TID + let intArray = uint8Array.subarray(0, 8); if (type === TRACE_ID) { intArray = uint8Array.subarray(8, 16); - } else { - // type === SPAN_ID || type === DD_P_TID - intArray = uint8Array.subarray(0, 8); } let binaryString = ""; for (const num of intArray) { From 1837ffebf391262c1c00c6dc9a5e1cf0fc54f11b Mon Sep 17 00:00:00 2001 From: kimi <47579703+kimi-p@users.noreply.github.com> Date: Tue, 4 Jun 2024 16:19:36 -0400 Subject: [PATCH 25/27] use .reduce() MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: jordan gonzález <30836115+duncanista@users.noreply.github.com> --- src/trace/step-function-service.ts | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/trace/step-function-service.ts b/src/trace/step-function-service.ts index 19fe1e537..98c2631e4 100644 --- a/src/trace/step-function-service.ts +++ b/src/trace/step-function-service.ts @@ -171,10 +171,7 @@ export class StepFunctionContextService { if (type === TRACE_ID) { intArray = uint8Array.subarray(8, 16); } - let binaryString = ""; - for (const num of intArray) { - binaryString = binaryString + this.numberToBinaryString(num); - } + const binaryString = intArray.reduce((acc, num) => acc + this.numberToBinaryString(num), ""); const res = "0" + binaryString.substring(1, 64); if (res === "0".repeat(64)) { From b38561440c61e67f431b8d68f6ed7f7753b8f495 Mon Sep 17 00:00:00 2001 From: kimi Date: Tue, 4 Jun 2024 16:29:38 -0400 Subject: [PATCH 26/27] lazy load require dd-trace/packages/dd-trace/src/opentracing/span_context --- src/trace/step-function-service.ts | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/trace/step-function-service.ts b/src/trace/step-function-service.ts index 98c2631e4..056af9998 100644 --- a/src/trace/step-function-service.ts +++ b/src/trace/step-function-service.ts @@ -137,7 +137,11 @@ export class StepFunctionContextService { PARENT_ID, ); const sampleMode = SampleMode.AUTO_KEEP; - const _DatadogSpanContext = require("dd-trace/packages/dd-trace/src/opentracing/span_context"); + function getDatadogSpanContext() { + return require("dd-trace/packages/dd-trace/src/opentracing/span_context"); + } + + const _DatadogSpanContext = getDatadogSpanContext(); const id = require("dd-trace/packages/dd-trace/src/id"); const ddTraceContext = new _DatadogSpanContext({ From d3e6fbfcda9d2ca8037552794100411f83d4c489 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?jordan=20gonz=C3=A1lez?= <30836115+duncanista@users.noreply.github.com> Date: Wed, 5 Jun 2024 14:40:17 -0400 Subject: [PATCH 27/27] lazy load tracer classes --- src/trace/step-function-service.ts | 43 +++++++++++++++++------------- 1 file changed, 24 insertions(+), 19 deletions(-) diff --git a/src/trace/step-function-service.ts b/src/trace/step-function-service.ts index 056af9998..d438a78fe 100644 --- a/src/trace/step-function-service.ts +++ b/src/trace/step-function-service.ts @@ -137,26 +137,31 @@ export class StepFunctionContextService { PARENT_ID, ); const sampleMode = SampleMode.AUTO_KEEP; - function getDatadogSpanContext() { - return require("dd-trace/packages/dd-trace/src/opentracing/span_context"); - } - - const _DatadogSpanContext = getDatadogSpanContext(); - const id = require("dd-trace/packages/dd-trace/src/id"); - - const ddTraceContext = new _DatadogSpanContext({ - traceId: id(traceId, 10), - spanId: id(parentId, 10), - sampling: { priority: sampleMode.toString(2) }, - }); - const ptid = this.deterministicSha256HashToBigIntString(this.context["step_function.execution_id"], DD_P_TID); - ddTraceContext._trace.tags["_dd.p.tid"] = id(ptid, 10).toString(16); - const spanContext = new SpanContextWrapper(ddTraceContext, TraceSource.Event); - - if (spanContext === null) return null; - logDebug(`Extracted trace context from StepFunctionContext`, { traceContext: this.context }); - return spanContext; + try { + // Try requiring class from the tracer. + const _DatadogSpanContext = require("dd-trace/packages/dd-trace/src/opentracing/span_context"); + const id = require("dd-trace/packages/dd-trace/src/id"); + + const ddSpanContext = new _DatadogSpanContext({ + traceId: id(traceId, 10), + spanId: id(parentId, 10), + sampling: { priority: sampleMode.toString(2) }, + }); + + const ptid = this.deterministicSha256HashToBigIntString(this.context["step_function.execution_id"], DD_P_TID); + ddSpanContext._trace.tags["_dd.p.tid"] = id(ptid, 10).toString(16); + if (ddSpanContext === null) return null; + + logDebug(`Extracted trace context from StepFunctionContext`, { traceContext: ddSpanContext }); + + return new SpanContextWrapper(ddSpanContext, TraceSource.Event); + } catch (error) { + if (error instanceof Error) { + logDebug("Couldn't generate SpanContext with tracer.", error); + } + return null; + } } private deterministicSha256HashToBigIntString(s: string, type: string): string {