Skip to content

Commit

Permalink
fix: ray id typescript error (#344)
Browse files Browse the repository at this point in the history
  • Loading branch information
@NathanFlurry
NathanFlurry committed Jun 8, 2024
1 parent 8cec012 commit 43b9e6b
Show file tree
Hide file tree
Showing 4 changed files with 22 additions and 59 deletions.
2 changes: 1 addition & 1 deletion artifacts/runtime_archive.json
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src/project/registry.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ export async function loadDefaultRegistry(projectRoot: string, signal?: AbortSig
ssh: "git@github.com:rivet-gg/opengb-modules.git",
},
// TODO: https://github.com/rivet-gg/opengb/issues/151
rev: "3c40379899162d848cea88afc58b4dc6ab4cc546",
rev: "de982be345b2834095f04485b1817131c10dd3ae",
directory: "./modules",
},
},
Expand Down
6 changes: 3 additions & 3 deletions src/runtime/trace.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,11 +60,11 @@ export function newTrace(entryType: TraceEntryType, runtime: BuildRuntime = Buil
let rayId: string;
if (runtime == BuildRuntime.Cloudflare && "httpRequest" in entry) {
rayId = (entry.httpRequest as TraceEntryTypeHttpRequest).headers["x-opengb-ray-id"];
} else {
// Generate random ray ID
rayId = crypto.randomUUID();
}

// Generate random ray ID
if (!rayId) rayId = crypto.randomUUID();

return {
rayId,
entries: [entry],
Expand Down
71 changes: 17 additions & 54 deletions tests/basic/deno.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,8 @@
"specifiers": {
"npm:@aws-sdk/client-s3": "npm:@aws-sdk/client-s3@3.556.0_@aws-sdk+credential-provider-node@3.556.0",
"npm:@aws-sdk/s3-request-presigner": "npm:@aws-sdk/s3-request-presigner@3.556.0",
"npm:@prisma/adapter-pg@^5.12.0": "npm:@prisma/adapter-pg@5.14.0_pg@8.11.5",
"npm:@types/node": "npm:@types/node@18.16.19",
"npm:pg@^8.11.3": "npm:pg@8.11.5"
"npm:@prisma/adapter-pg@^5.12.0": "npm:@prisma/adapter-pg@5.15.0_pg@8.12.0",
"npm:pg@^8.11.3": "npm:pg@8.12.0"
},
"npm": {
"@aws-crypto/crc32@3.0.0": {
Expand Down Expand Up @@ -606,22 +605,22 @@
"tslib": "tslib@2.6.2"
}
},
"@prisma/adapter-pg@5.14.0_pg@8.11.5": {
"integrity": "sha512-AcV1DKY4ps3zvBIKolCzmBD+resdG4oH14I0iG3SntMjjnCbC/COefIInSV038c8g20RoHJO7fPyf1WPKicRgQ==",
"@prisma/adapter-pg@5.15.0_pg@8.12.0": {
"integrity": "sha512-BH22FGKDGBjJRVOLiA1H45G7yRzeQ9IX5Kx+8oqISWzxxOcN6vNDHSmio9cJn6iMA7ygqTFi0gj5HvpmHB7DQA==",
"dependencies": {
"@prisma/driver-adapter-utils": "@prisma/driver-adapter-utils@5.14.0",
"pg": "pg@8.11.5",
"@prisma/driver-adapter-utils": "@prisma/driver-adapter-utils@5.15.0",
"pg": "pg@8.12.0",
"postgres-array": "postgres-array@3.0.2"
}
},
"@prisma/debug@5.14.0": {
"integrity": "sha512-iq56qBZuFfX3fCxoxT8gBX33lQzomBU0qIUaEj1RebsKVz1ob/BVH1XSBwwwvRVtZEV1b7Fxx2eVu34Ge/mg3w==",
"@prisma/debug@5.15.0": {
"integrity": "sha512-QpEAOjieLPc/4sMny/WrWqtpIAmBYsgqwWlWwIctqZO0AbhQ9QcT6x2Ut3ojbDo/pFRCCA1Z1+xm2MUy7fAkZA==",
"dependencies": {}
},
"@prisma/driver-adapter-utils@5.14.0": {
"integrity": "sha512-EyAfdKjk0M7CaA7BfiwDTPLs7udOwt+RUnyWIPSg7uBEFp2GS/l9Ig7CCgMZFcBFc62v0c6Z/R3WFuQ+bNxfnA==",
"@prisma/driver-adapter-utils@5.15.0": {
"integrity": "sha512-p4jxptZE3p5WCdfE+dvHTNvrtlqPllAMkbAnR9BGr48nBwl15QDMDjZdvbubgO9VH30Nc5XWHINx0dyI+RlxSw==",
"dependencies": {
"@prisma/debug": "@prisma/debug@5.14.0"
"@prisma/debug": "@prisma/debug@5.15.0"
}
},
"@smithy/abort-controller@2.2.0": {
Expand Down Expand Up @@ -1038,10 +1037,6 @@
"tslib": "tslib@2.6.2"
}
},
"@types/node@18.16.19": {
"integrity": "sha512-IXl7o+R9iti9eBW4Wg2hx1xQDig183jj7YLn8F7udNceyfkbn1ZxmzZXuak20gR40D7pIkIY1kYGx5VIGbaHKA==",
"dependencies": {}
},
"bowser@2.11.0": {
"integrity": "sha512-AlcaJBi/pqqJBIQ8U9Mcpc9i8Aqxn88Skv5d+xBX006BY5u8N3mGLHa5Lgppa7L/HfwgwLgZ6NYs+Ag6uUmJRA==",
"dependencies": {}
Expand All @@ -1064,10 +1059,10 @@
"integrity": "sha512-WCtabS6t3c8SkpDBUlb1kjOs7l66xsGdKpIPZsg4wR+B3+u9UAum2odSsF9tnvxg80h4ZxLWMy4pRjOsFIqQpw==",
"dependencies": {}
},
"pg-pool@3.6.2_pg@8.11.5": {
"pg-pool@3.6.2_pg@8.12.0": {
"integrity": "sha512-Htjbg8BlwXqSBQ9V8Vjtc+vzf/6fVUuak/3/XXKA9oxZprwW3IMDQTGHP+KDmVL7rtd+R1QjbnCFPuTHm3G4hg==",
"dependencies": {
"pg": "pg@8.11.5"
"pg": "pg@8.12.0"
}
},
"pg-protocol@1.6.1": {
Expand All @@ -1084,12 +1079,12 @@
"postgres-interval": "postgres-interval@1.2.0"
}
},
"pg@8.11.5": {
"integrity": "sha512-jqgNHSKL5cbDjFlHyYsCXmQDrfIX/3RsNwYqpd4N0Kt8niLuNoRNH+aazv6cOd43gPh9Y4DjQCtb+X0MH0Hvnw==",
"pg@8.12.0": {
"integrity": "sha512-A+LHUSnwnxrnL/tZ+OLfqR1SxLN3c/pgDztZ47Rpbsd4jUytsTtwQo/TLPRzPJMp/1pbhYVhH9cuSZLAajNfjQ==",
"dependencies": {
"pg-cloudflare": "pg-cloudflare@1.1.1",
"pg-connection-string": "pg-connection-string@2.6.4",
"pg-pool": "pg-pool@3.6.2_pg@8.11.5",
"pg-pool": "pg-pool@3.6.2_pg@8.12.0",
"pg-protocol": "pg-protocol@1.6.1",
"pg-types": "pg-types@2.2.0",
"pgpass": "pgpass@1.0.5"
Expand Down Expand Up @@ -1154,38 +1149,6 @@
"https://esm.sh/ajv@^8.12.0": "https://esm.sh/ajv@8.12.0"
},
"remote": {
"https://deno.land/std@0.208.0/assert/_constants.ts": "8a9da298c26750b28b326b297316cdde860bc237533b07e1337c021379e6b2a9",
"https://deno.land/std@0.208.0/assert/_diff.ts": "58e1461cc61d8eb1eacbf2a010932bf6a05b79344b02ca38095f9b805795dc48",
"https://deno.land/std@0.208.0/assert/_format.ts": "a69126e8a469009adf4cf2a50af889aca364c349797e63174884a52ff75cf4c7",
"https://deno.land/std@0.208.0/assert/assert.ts": "9a97dad6d98c238938e7540736b826440ad8c1c1e54430ca4c4e623e585607ee",
"https://deno.land/std@0.208.0/assert/assert_almost_equals.ts": "e15ca1f34d0d5e0afae63b3f5d975cbd18335a132e42b0c747d282f62ad2cd6c",
"https://deno.land/std@0.208.0/assert/assert_array_includes.ts": "6856d7f2c3544bc6e62fb4646dfefa3d1df5ff14744d1bca19f0cbaf3b0d66c9",
"https://deno.land/std@0.208.0/assert/assert_equals.ts": "d8ec8a22447fbaf2fc9d7c3ed2e66790fdb74beae3e482855d75782218d68227",
"https://deno.land/std@0.208.0/assert/assert_exists.ts": "407cb6b9fb23a835cd8d5ad804e2e2edbbbf3870e322d53f79e1c7a512e2efd7",
"https://deno.land/std@0.208.0/assert/assert_false.ts": "0ccbcaae910f52c857192ff16ea08bda40fdc79de80846c206bfc061e8c851c6",
"https://deno.land/std@0.208.0/assert/assert_greater.ts": "ae2158a2d19313bf675bf7251d31c6dc52973edb12ac64ac8fc7064152af3e63",
"https://deno.land/std@0.208.0/assert/assert_greater_or_equal.ts": "1439da5ebbe20855446cac50097ac78b9742abe8e9a43e7de1ce1426d556e89c",
"https://deno.land/std@0.208.0/assert/assert_instance_of.ts": "3aedb3d8186e120812d2b3a5dea66a6e42bf8c57a8bd927645770bd21eea554c",
"https://deno.land/std@0.208.0/assert/assert_is_error.ts": "c21113094a51a296ffaf036767d616a78a2ae5f9f7bbd464cd0197476498b94b",
"https://deno.land/std@0.208.0/assert/assert_less.ts": "aec695db57db42ec3e2b62e97e1e93db0063f5a6ec133326cc290ff4b71b47e4",
"https://deno.land/std@0.208.0/assert/assert_less_or_equal.ts": "5fa8b6a3ffa20fd0a05032fe7257bf985d207b85685fdbcd23651b70f928c848",
"https://deno.land/std@0.208.0/assert/assert_match.ts": "c4083f80600bc190309903c95e397a7c9257ff8b5ae5c7ef91e834704e672e9b",
"https://deno.land/std@0.208.0/assert/assert_not_equals.ts": "9f1acab95bd1f5fc9a1b17b8027d894509a745d91bac1718fdab51dc76831754",
"https://deno.land/std@0.208.0/assert/assert_not_instance_of.ts": "0c14d3dfd9ab7a5276ed8ed0b18c703d79a3d106102077ec437bfe7ed912bd22",
"https://deno.land/std@0.208.0/assert/assert_not_match.ts": "3796a5b0c57a1ce6c1c57883dd4286be13a26f715ea662318ab43a8491a13ab0",
"https://deno.land/std@0.208.0/assert/assert_not_strict_equals.ts": "4cdef83df17488df555c8aac1f7f5ec2b84ad161b6d0645ccdbcc17654e80c99",
"https://deno.land/std@0.208.0/assert/assert_object_match.ts": "d8fc2867cfd92eeacf9cea621e10336b666de1874a6767b5ec48988838370b54",
"https://deno.land/std@0.208.0/assert/assert_rejects.ts": "45c59724de2701e3b1f67c391d6c71c392363635aad3f68a1b3408f9efca0057",
"https://deno.land/std@0.208.0/assert/assert_strict_equals.ts": "b1f538a7ea5f8348aeca261d4f9ca603127c665e0f2bbfeb91fa272787c87265",
"https://deno.land/std@0.208.0/assert/assert_string_includes.ts": "b821d39ebf5cb0200a348863c86d8c4c4b398e02012ce74ad15666fc4b631b0c",
"https://deno.land/std@0.208.0/assert/assert_throws.ts": "63784e951475cb7bdfd59878cd25a0931e18f6dc32a6077c454b2cd94f4f4bcd",
"https://deno.land/std@0.208.0/assert/assertion_error.ts": "4d0bde9b374dfbcbe8ac23f54f567b77024fb67dbb1906a852d67fe050d42f56",
"https://deno.land/std@0.208.0/assert/equal.ts": "9f1a46d5993966d2596c44e5858eec821859b45f783a5ee2f7a695dfc12d8ece",
"https://deno.land/std@0.208.0/assert/fail.ts": "c36353d7ae6e1f7933d45f8ea51e358c8c4b67d7e7502028598fe1fea062e278",
"https://deno.land/std@0.208.0/assert/mod.ts": "37c49a26aae2b254bbe25723434dc28cd7532e444cf0b481a97c045d110ec085",
"https://deno.land/std@0.208.0/assert/unimplemented.ts": "d56fbeecb1f108331a380f72e3e010a1f161baa6956fd0f7cf3e095ae1a4c75a",
"https://deno.land/std@0.208.0/assert/unreachable.ts": "4600dc0baf7d9c15a7f7d234f00c23bca8f3eba8b140286aaca7aa998cf9a536",
"https://deno.land/std@0.208.0/fmt/colors.ts": "34b3f77432925eb72cf0bfb351616949746768620b8e5ead66da532f93d10ba2",
"https://deno.land/std@0.214.0/assert/assert.ts": "bec068b2fccdd434c138a555b19a2c2393b71dfaada02b7d568a01541e67cdc5",
"https://deno.land/std@0.214.0/assert/assertion_error.ts": "9f689a101ee586c4ce92f52fa7ddd362e86434ffdf1f848e45987dc7689976b8",
"https://deno.land/std@0.214.0/async/delay.ts": "8e1d18fe8b28ff95885e2bc54eccec1713f57f756053576d8228e6ca110793ad",
Expand Down Expand Up @@ -1309,7 +1272,7 @@
"https://deno.land/x/postgres@v0.17.2/utils/deferred.ts": "5420531adb6c3ea29ca8aac57b9b59bd3e4b9a938a4996bbd0947a858f611080",
"https://deno.land/x/postgres@v0.17.2/utils/utils.ts": "ca47193ea03ff5b585e487a06f106d367e509263a960b787197ce0c03113a738",
"https://esm.sh/ajv-formats@2.1.1": "575b3830618970ddc3aba96310bf4df7358bb37fcea101f58b36897ff3ac2ea7",
"https://esm.sh/ajv@8.12.0": "cc1a73af661466c7f4e6a94d93ece78542d700f2165bdb16a531e9db8856c5aa",
"https://esm.sh/ajv@8.12.0": "965ce16eff0cefef99e67478c5ee760928bd8931d40c3b958325cdd6ab6149f2",
"https://esm.sh/v135/ajv-formats@2.1.1/denonext/ajv-formats.mjs": "06092e00b42202633ae6dab4b53287c133af882ddb14c6707277cdb237634967",
"https://esm.sh/v135/ajv@8.12.0/denonext/ajv.mjs": "4645df9093d0f8be0e964070a4a7aea8adea06e8883660340931f7a3f979fc65",
"https://esm.sh/v135/ajv@8.12.0/denonext/dist/compile/codegen.js": "d981238e5b1e78217e1c6db59cbd594369279722c608ed630d08717ee44edd84",
Expand Down

0 comments on commit 43b9e6b

Please sign in to comment.