diff --git a/gen/secrets.baseline.json b/gen/secrets.baseline.json index 6f897c414..6775e241d 100644 --- a/gen/secrets.baseline.json +++ b/gen/secrets.baseline.json @@ -1,245 +1,248 @@ { - "version": "1.4.0", - "plugins_used": [ - { - "name": "ArtifactoryDetector" - }, - { - "name": "AWSKeyDetector" - }, - { - "name": "AzureStorageKeyDetector" - }, - { - "name": "Base64HighEntropyString", - "limit": 4.5 - }, - { - "name": "BasicAuthDetector" - }, - { - "name": "CloudantDetector" - }, - { - "name": "DiscordBotTokenDetector" - }, - { - "name": "GitHubTokenDetector" - }, - { - "name": "HexHighEntropyString", - "limit": 3.0 - }, - { - "name": "IbmCloudIamDetector" - }, - { - "name": "IbmCosHmacDetector" - }, - { - "name": "JwtTokenDetector" - }, - { - "name": "KeywordDetector", - "keyword_exclude": "" - }, - { - "name": "MailchimpDetector" - }, - { - "name": "NpmDetector" - }, - { - "name": "PrivateKeyDetector" - }, - { - "name": "SendGridDetector" - }, - { - "name": "SlackDetector" - }, - { - "name": "SoftlayerDetector" - }, - { - "name": "SquareOAuthDetector" - }, - { - "name": "StripeDetector" - }, - { - "name": "TwilioKeyDetector" - } - ], - "filters_used": [ - { - "path": "detect_secrets.filters.allowlist.is_line_allowlisted" - }, - { - "path": "detect_secrets.filters.common.is_baseline_file", - "filename": "gen/secrets.baseline.json" - }, - { - "path": "detect_secrets.filters.gibberish.should_exclude_secret", - "limit": 3.7 - }, - { - "path": "detect_secrets.filters.heuristic.is_indirect_reference" - }, - { - "path": "detect_secrets.filters.heuristic.is_likely_id_string" - }, - { - "path": "detect_secrets.filters.heuristic.is_lock_file" - }, - { - "path": "detect_secrets.filters.heuristic.is_not_alphanumeric_string" - }, - { - "path": "detect_secrets.filters.heuristic.is_potential_uuid" - }, - { - "path": "detect_secrets.filters.heuristic.is_prefixed_with_dollar_sign" - }, - { - "path": "detect_secrets.filters.heuristic.is_sequential_string" - }, - { - "path": "detect_secrets.filters.heuristic.is_swagger_file" - }, - { - "path": "detect_secrets.filters.heuristic.is_templated_secret" - }, - { - "path": "detect_secrets.filters.regex.should_exclude_file", - "pattern": ["^gen/secrets.baseline.json$", "^target/"] - } - ], - "results": { - "infra/nix/bolt/default.nix": [ - { - "type": "Base64 High Entropy String", - "filename": "infra/nix/bolt/default.nix", - "hashed_secret": "7096ce78355a7fc302686472413e82c32dcd89cc", - "is_verified": false, - "line_number": 58 - }, - { - "type": "Base64 High Entropy String", - "filename": "infra/nix/bolt/default.nix", - "hashed_secret": "80a11fe90031acb43c4de1afdc8fee4bb665d183", - "is_verified": false, - "line_number": 59 - } - ], - "infra/nix/pkgs/clickhouse.nix": [ - { - "type": "Base64 High Entropy String", - "filename": "infra/nix/pkgs/clickhouse.nix", - "hashed_secret": "e3a7dca573dcaf190ffc1b960638016ea80fd7e7", - "is_verified": false, - "line_number": 9 - } - ], - "lib/bolt/core/src/utils/telemetry.rs": [ - { - "type": "Base64 High Entropy String", - "filename": "lib/bolt/core/src/utils/telemetry.rs", - "hashed_secret": "92d0371dc865b3b610449f0d8603671feaa5b356", - "is_verified": false, - "line_number": 39 - } - ], - "lib/cache/build/Cargo.toml": [ - { - "type": "Hex High Entropy String", - "filename": "lib/cache/build/Cargo.toml", - "hashed_secret": "094ac283ac093cc8b5dfcd1ac2540aca3eb8cecb", - "is_verified": false, - "line_number": 28 - } - ], - "lib/chirp/perf/Cargo.toml": [ - { - "type": "Hex High Entropy String", - "filename": "lib/chirp/perf/Cargo.toml", - "hashed_secret": "094ac283ac093cc8b5dfcd1ac2540aca3eb8cecb", - "is_verified": false, - "line_number": 25 - } - ], - "lib/chirp/worker/Cargo.toml": [ - { - "type": "Hex High Entropy String", - "filename": "lib/chirp/worker/Cargo.toml", - "hashed_secret": "094ac283ac093cc8b5dfcd1ac2540aca3eb8cecb", - "is_verified": false, - "line_number": 51 - } - ], - "lib/pools/Cargo.toml": [ - { - "type": "Hex High Entropy String", - "filename": "lib/pools/Cargo.toml", - "hashed_secret": "094ac283ac093cc8b5dfcd1ac2540aca3eb8cecb", - "is_verified": false, - "line_number": 42 - } - ], - "lib/redis-util/Cargo.toml": [ - { - "type": "Hex High Entropy String", - "filename": "lib/redis-util/Cargo.toml", - "hashed_secret": "094ac283ac093cc8b5dfcd1ac2540aca3eb8cecb", - "is_verified": false, - "line_number": 15 - } - ], - "lib/util/core/src/faker.rs": [ - { - "type": "Base64 High Entropy String", - "filename": "lib/util/core/src/faker.rs", - "hashed_secret": "b39537a6f0d7454712113567b565b69f38acd0f4", - "is_verified": false, - "line_number": 3, - "is_secret": false - }, - { - "type": "Base64 High Entropy String", - "filename": "lib/util/core/src/faker.rs", - "hashed_secret": "dea3c171abcdfb3e8380d6860630f618eb6e074f", - "is_verified": false, - "line_number": 4, - "is_secret": false - } - ], - "svc/pkg/cdn/ops/namespace-auth-user-update/tests/integration.rs": [ - { - "type": "Secret Keyword", - "filename": "svc/pkg/cdn/ops/namespace-auth-user-update/tests/integration.rs", - "hashed_secret": "1902e3d6fc4e78a0bcc50ba12b882769afbf4a8c", - "is_verified": false, - "line_number": 63 - } - ], - "svc/pkg/email-verification/ops/create/src/lib.rs": [ - { - "type": "Base64 High Entropy String", - "filename": "svc/pkg/email-verification/ops/create/src/lib.rs", - "hashed_secret": "670988a3ad6d12dc80cb21cf98d44dd470e653d1", - "is_verified": false, - "line_number": 106 - } - ], - "svc/pkg/telemetry/standalone/beacon/src/lib.rs": [ - { - "type": "Base64 High Entropy String", - "filename": "svc/pkg/telemetry/standalone/beacon/src/lib.rs", - "hashed_secret": "92d0371dc865b3b610449f0d8603671feaa5b356", - "is_verified": false, - "line_number": 7 - } - ] - }, - "generated_at": "2024-05-09T01:02:48Z" + "version": "1.4.0", + "plugins_used": [ + { + "name": "ArtifactoryDetector" + }, + { + "name": "AWSKeyDetector" + }, + { + "name": "AzureStorageKeyDetector" + }, + { + "name": "Base64HighEntropyString", + "limit": 4.5 + }, + { + "name": "BasicAuthDetector" + }, + { + "name": "CloudantDetector" + }, + { + "name": "DiscordBotTokenDetector" + }, + { + "name": "GitHubTokenDetector" + }, + { + "name": "HexHighEntropyString", + "limit": 3.0 + }, + { + "name": "IbmCloudIamDetector" + }, + { + "name": "IbmCosHmacDetector" + }, + { + "name": "JwtTokenDetector" + }, + { + "name": "KeywordDetector", + "keyword_exclude": "" + }, + { + "name": "MailchimpDetector" + }, + { + "name": "NpmDetector" + }, + { + "name": "PrivateKeyDetector" + }, + { + "name": "SendGridDetector" + }, + { + "name": "SlackDetector" + }, + { + "name": "SoftlayerDetector" + }, + { + "name": "SquareOAuthDetector" + }, + { + "name": "StripeDetector" + }, + { + "name": "TwilioKeyDetector" + } + ], + "filters_used": [ + { + "path": "detect_secrets.filters.allowlist.is_line_allowlisted" + }, + { + "path": "detect_secrets.filters.common.is_baseline_file", + "filename": "gen/secrets.baseline.json" + }, + { + "path": "detect_secrets.filters.gibberish.should_exclude_secret", + "limit": 3.7 + }, + { + "path": "detect_secrets.filters.heuristic.is_indirect_reference" + }, + { + "path": "detect_secrets.filters.heuristic.is_likely_id_string" + }, + { + "path": "detect_secrets.filters.heuristic.is_lock_file" + }, + { + "path": "detect_secrets.filters.heuristic.is_not_alphanumeric_string" + }, + { + "path": "detect_secrets.filters.heuristic.is_potential_uuid" + }, + { + "path": "detect_secrets.filters.heuristic.is_prefixed_with_dollar_sign" + }, + { + "path": "detect_secrets.filters.heuristic.is_sequential_string" + }, + { + "path": "detect_secrets.filters.heuristic.is_swagger_file" + }, + { + "path": "detect_secrets.filters.heuristic.is_templated_secret" + }, + { + "path": "detect_secrets.filters.regex.should_exclude_file", + "pattern": [ + "^gen/secrets.baseline.json$", + "^target/" + ] + } + ], + "results": { + "infra/nix/bolt/default.nix": [ + { + "type": "Base64 High Entropy String", + "filename": "infra/nix/bolt/default.nix", + "hashed_secret": "7096ce78355a7fc302686472413e82c32dcd89cc", + "is_verified": false, + "line_number": 58 + }, + { + "type": "Base64 High Entropy String", + "filename": "infra/nix/bolt/default.nix", + "hashed_secret": "80a11fe90031acb43c4de1afdc8fee4bb665d183", + "is_verified": false, + "line_number": 59 + } + ], + "infra/nix/pkgs/clickhouse.nix": [ + { + "type": "Base64 High Entropy String", + "filename": "infra/nix/pkgs/clickhouse.nix", + "hashed_secret": "e3a7dca573dcaf190ffc1b960638016ea80fd7e7", + "is_verified": false, + "line_number": 9 + } + ], + "lib/bolt/core/src/utils/telemetry.rs": [ + { + "type": "Base64 High Entropy String", + "filename": "lib/bolt/core/src/utils/telemetry.rs", + "hashed_secret": "92d0371dc865b3b610449f0d8603671feaa5b356", + "is_verified": false, + "line_number": 39 + } + ], + "lib/cache/build/Cargo.toml": [ + { + "type": "Hex High Entropy String", + "filename": "lib/cache/build/Cargo.toml", + "hashed_secret": "094ac283ac093cc8b5dfcd1ac2540aca3eb8cecb", + "is_verified": false, + "line_number": 28 + } + ], + "lib/chirp/perf/Cargo.toml": [ + { + "type": "Hex High Entropy String", + "filename": "lib/chirp/perf/Cargo.toml", + "hashed_secret": "094ac283ac093cc8b5dfcd1ac2540aca3eb8cecb", + "is_verified": false, + "line_number": 25 + } + ], + "lib/chirp/worker/Cargo.toml": [ + { + "type": "Hex High Entropy String", + "filename": "lib/chirp/worker/Cargo.toml", + "hashed_secret": "094ac283ac093cc8b5dfcd1ac2540aca3eb8cecb", + "is_verified": false, + "line_number": 51 + } + ], + "lib/pools/Cargo.toml": [ + { + "type": "Hex High Entropy String", + "filename": "lib/pools/Cargo.toml", + "hashed_secret": "094ac283ac093cc8b5dfcd1ac2540aca3eb8cecb", + "is_verified": false, + "line_number": 42 + } + ], + "lib/redis-util/Cargo.toml": [ + { + "type": "Hex High Entropy String", + "filename": "lib/redis-util/Cargo.toml", + "hashed_secret": "094ac283ac093cc8b5dfcd1ac2540aca3eb8cecb", + "is_verified": false, + "line_number": 15 + } + ], + "lib/util/core/src/faker.rs": [ + { + "type": "Base64 High Entropy String", + "filename": "lib/util/core/src/faker.rs", + "hashed_secret": "b39537a6f0d7454712113567b565b69f38acd0f4", + "is_verified": false, + "line_number": 3, + "is_secret": false + }, + { + "type": "Base64 High Entropy String", + "filename": "lib/util/core/src/faker.rs", + "hashed_secret": "dea3c171abcdfb3e8380d6860630f618eb6e074f", + "is_verified": false, + "line_number": 4, + "is_secret": false + } + ], + "svc/pkg/cdn/ops/namespace-auth-user-update/tests/integration.rs": [ + { + "type": "Secret Keyword", + "filename": "svc/pkg/cdn/ops/namespace-auth-user-update/tests/integration.rs", + "hashed_secret": "1902e3d6fc4e78a0bcc50ba12b882769afbf4a8c", + "is_verified": false, + "line_number": 63 + } + ], + "svc/pkg/email-verification/ops/create/src/lib.rs": [ + { + "type": "Base64 High Entropy String", + "filename": "svc/pkg/email-verification/ops/create/src/lib.rs", + "hashed_secret": "670988a3ad6d12dc80cb21cf98d44dd470e653d1", + "is_verified": false, + "line_number": 106 + } + ], + "svc/pkg/telemetry/standalone/beacon/src/lib.rs": [ + { + "type": "Base64 High Entropy String", + "filename": "svc/pkg/telemetry/standalone/beacon/src/lib.rs", + "hashed_secret": "92d0371dc865b3b610449f0d8603671feaa5b356", + "is_verified": false, + "line_number": 7 + } + ] + }, + "generated_at": "2024-05-09T01:02:48Z" } diff --git a/lib/api-helper/build/src/macro_util.rs b/lib/api-helper/build/src/macro_util.rs index 563710c24..7a71ceb4b 100644 --- a/lib/api-helper/build/src/macro_util.rs +++ b/lib/api-helper/build/src/macro_util.rs @@ -332,6 +332,7 @@ pub async fn __with_ctx( ts, ts, (), + Vec::new(), ); // Create auth diff --git a/lib/chirp/client/src/client.rs b/lib/chirp/client/src/client.rs index 35188d541..8938167ea 100644 --- a/lib/chirp/client/src/client.rs +++ b/lib/chirp/client/src/client.rs @@ -238,10 +238,6 @@ impl Client { pub fn ts(&self) -> i64 { self.ts } - - pub fn trace(&self) -> &[chirp::TraceEntry] { - &self.trace - } } impl Drop for Client { diff --git a/lib/chirp/worker/src/manager.rs b/lib/chirp/worker/src/manager.rs index da2ef1e49..19d42882e 100644 --- a/lib/chirp/worker/src/manager.rs +++ b/lib/chirp/worker/src/manager.rs @@ -743,6 +743,7 @@ where ts, req_ts, req_body, + trace, ), dont_log_body, allow_recursive, diff --git a/lib/chirp/worker/src/test.rs b/lib/chirp/worker/src/test.rs index f41199c91..a8f65cbd8 100644 --- a/lib/chirp/worker/src/test.rs +++ b/lib/chirp/worker/src/test.rs @@ -37,6 +37,7 @@ impl TestCtx { rivet_util::timestamp::now(), rivet_util::timestamp::now(), (), + Vec::new(), ); Ok(TestCtx { diff --git a/lib/connection/src/lib.rs b/lib/connection/src/lib.rs index a5c0955c7..442f51439 100644 --- a/lib/connection/src/lib.rs +++ b/lib/connection/src/lib.rs @@ -30,7 +30,7 @@ impl Connection { &self, parent_req_id: Uuid, ray_id: Uuid, - trace_entry: chirp_client::TraceEntry, + trace: Vec, ) -> GlobalResult { // Not the same as the operation ctx's ts because this cannot be overridden by debug start ts let ts = rivet_util::timestamp::now(); @@ -41,11 +41,7 @@ impl Connection { parent_req_id, ray_id, ts, - { - let mut x = self.client.trace().to_vec(); - x.push(trace_entry); - x - }, + trace, chirp_perf::PerfCtxInner::new(redis_cache, ts, parent_req_id, ray_id), ), self.pools.clone(), diff --git a/lib/operation/core/src/lib.rs b/lib/operation/core/src/lib.rs index 7f30e5a44..90bb750ca 100644 --- a/lib/operation/core/src/lib.rs +++ b/lib/operation/core/src/lib.rs @@ -40,6 +40,9 @@ where ts: i64, req_ts: i64, body: B, + // Trace of all requests not including this request. The client does include + // this request in the trace, though. + trace: Vec, } impl OperationContext @@ -55,6 +58,7 @@ where ts: i64, req_ts: i64, body: B, + trace: Vec, ) -> Self { OperationContext { name, @@ -65,6 +69,7 @@ where ts, req_ts, body, + trace, } } @@ -131,25 +136,46 @@ where /// Adds trace and correctly wraps `Connection` (and subsequently `chirp_client::Client`). fn wrap(&self, body: O::Request) -> GlobalResult> { let ray_id = Uuid::new_v4(); - let trace_entry = chirp_client::TraceEntry { - context_name: self.name.clone(), - req_id: Some(self.req_id.into()), - ts: rivet_util::timestamp::now(), - run_context: match rivet_util::env::run_context() { - rivet_util::env::RunContext::Service => chirp_client::RunContext::Service, - rivet_util::env::RunContext::Test => chirp_client::RunContext::Test, - } as i32, + // Add self to new operation's trace + let trace = { + let mut x = self.trace.clone(); + x.push(chirp_client::TraceEntry { + context_name: self.name.clone(), + req_id: Some(self.req_id.into()), + ts: rivet_util::timestamp::now(), + run_context: match rivet_util::env::run_context() { + rivet_util::env::RunContext::Service => chirp_client::RunContext::Service, + rivet_util::env::RunContext::Test => chirp_client::RunContext::Test, + } as i32, + }); + x }; Ok(OperationContext { name: O::NAME.to_string(), timeout: O::TIMEOUT, - conn: self.conn.wrap(self.req_id, ray_id, trace_entry)?, + conn: self.conn.wrap(self.req_id, ray_id, { + let mut x = trace.clone(); + + // Add new operation's trace to its connection (and chirp client) + x.push(chirp_client::TraceEntry { + context_name: O::NAME.to_string(), + req_id: Some(self.req_id.into()), + ts: rivet_util::timestamp::now(), + run_context: match rivet_util::env::run_context() { + rivet_util::env::RunContext::Service => chirp_client::RunContext::Service, + rivet_util::env::RunContext::Test => chirp_client::RunContext::Test, + } as i32, + }); + + x + })?, req_id: self.req_id, ray_id, ts: util::timestamp::now(), req_ts: self.req_ts, body, + trace, }) } @@ -165,6 +191,7 @@ where ts: self.ts, req_ts: self.req_ts, body: (), + trace: self.trace.clone(), } } @@ -204,11 +231,11 @@ where } pub fn trace(&self) -> &[chirp_client::TraceEntry] { - self.conn.trace() + &self.trace } pub fn test(&self) -> bool { - self.trace() + self.trace .iter() .any(|x| x.run_context == chirp_client::RunContext::Test as i32) } diff --git a/svc/api/admin/tests/basic.rs b/svc/api/admin/tests/basic.rs index d614faefc..f1bba8766 100644 --- a/svc/api/admin/tests/basic.rs +++ b/svc/api/admin/tests/basic.rs @@ -39,6 +39,7 @@ impl Ctx { util::timestamp::now(), util::timestamp::now(), (), + Vec::new(), ); Ctx { op_ctx } diff --git a/svc/api/auth/tests/basic.rs b/svc/api/auth/tests/basic.rs index 0ff59d86c..2955dfc67 100644 --- a/svc/api/auth/tests/basic.rs +++ b/svc/api/auth/tests/basic.rs @@ -46,6 +46,7 @@ // util::timestamp::now(), // util::timestamp::now(), // (), +// Vec::new(), // ); // let (user_id, user_token) = Self::issue_user_token(&op_ctx).await; diff --git a/svc/api/cf-verification/tests/basic.rs b/svc/api/cf-verification/tests/basic.rs index 63bb90733..12bf6704b 100644 --- a/svc/api/cf-verification/tests/basic.rs +++ b/svc/api/cf-verification/tests/basic.rs @@ -37,6 +37,7 @@ // util::timestamp::now(), // util::timestamp::now(), // (), +// Vec::new(), // ); // let http_client = rivet_cf_verification::Config::builder() diff --git a/svc/api/cloud/tests/basic.rs b/svc/api/cloud/tests/basic.rs index ce98bf4f3..596f2cf15 100644 --- a/svc/api/cloud/tests/basic.rs +++ b/svc/api/cloud/tests/basic.rs @@ -46,6 +46,7 @@ // util::timestamp::now(), // util::timestamp::now(), // (), +// Vec::new(), // ); // // Create temp team diff --git a/svc/api/group/tests/basic.rs b/svc/api/group/tests/basic.rs index cbab0367e..8f31faecf 100644 --- a/svc/api/group/tests/basic.rs +++ b/svc/api/group/tests/basic.rs @@ -40,6 +40,7 @@ impl Ctx { util::timestamp::now(), util::timestamp::now(), (), + Vec::new(), ); let (_user_id, user_token) = Self::issue_user_token(&op_ctx).await; diff --git a/svc/api/identity/tests/basic.rs b/svc/api/identity/tests/basic.rs index 4401fd085..7df9cabe0 100644 --- a/svc/api/identity/tests/basic.rs +++ b/svc/api/identity/tests/basic.rs @@ -47,6 +47,7 @@ // util::timestamp::now(), // util::timestamp::now(), // (), +// Vec::new(), // ); // let (primary_region_id, _) = Self::setup_region(&op_ctx).await; diff --git a/svc/api/job/tests/basic.rs b/svc/api/job/tests/basic.rs index dfb4ba24e..6caa1f7a0 100644 --- a/svc/api/job/tests/basic.rs +++ b/svc/api/job/tests/basic.rs @@ -41,6 +41,7 @@ // util::timestamp::now(), // util::timestamp::now(), // (), +// Vec::new(), // ); // let nomad_config = nomad_util::config_from_env().unwrap(); diff --git a/svc/api/kv/tests/basic.rs b/svc/api/kv/tests/basic.rs index c7a964140..009ede160 100644 --- a/svc/api/kv/tests/basic.rs +++ b/svc/api/kv/tests/basic.rs @@ -52,6 +52,7 @@ // util::timestamp::now(), // util::timestamp::now(), // (), +// Vec::new(), // ); // let (primary_region_id, _) = Self::setup_region(&op_ctx).await; diff --git a/svc/api/matchmaker/tests/common.rs b/svc/api/matchmaker/tests/common.rs index affa697dc..5b6fa9803 100644 --- a/svc/api/matchmaker/tests/common.rs +++ b/svc/api/matchmaker/tests/common.rs @@ -56,6 +56,7 @@ impl Ctx { util::timestamp::now(), util::timestamp::now(), (), + Vec::new(), ); let (primary_region_id, primary_region_name_id) = Self::setup_region(&op_ctx).await; diff --git a/svc/api/portal/tests/basic.rs b/svc/api/portal/tests/basic.rs index 9c1873652..d8f1d02b8 100644 --- a/svc/api/portal/tests/basic.rs +++ b/svc/api/portal/tests/basic.rs @@ -39,6 +39,7 @@ impl Ctx { util::timestamp::now(), util::timestamp::now(), (), + Vec::new(), ); let (_user_id, user_token) = Self::issue_user_token(&op_ctx).await; diff --git a/svc/api/status/tests/basic.rs b/svc/api/status/tests/basic.rs index 4055c3080..f9d9f5867 100644 --- a/svc/api/status/tests/basic.rs +++ b/svc/api/status/tests/basic.rs @@ -40,6 +40,7 @@ // util::timestamp::now(), // util::timestamp::now(), // (), +// Vec::new(), // ); // let http_client = rivet_status::Config::builder() diff --git a/svc/api/traefik-provider/tests/basic.rs b/svc/api/traefik-provider/tests/basic.rs index 42bd1d277..84e1f3a6d 100644 --- a/svc/api/traefik-provider/tests/basic.rs +++ b/svc/api/traefik-provider/tests/basic.rs @@ -53,6 +53,7 @@ impl Ctx { util::timestamp::now(), util::timestamp::now(), (), + Vec::new(), ); Ctx { op_ctx } diff --git a/svc/pkg/build/standalone/default-create/src/lib.rs b/svc/pkg/build/standalone/default-create/src/lib.rs index 121712d52..350d388e7 100644 --- a/svc/pkg/build/standalone/default-create/src/lib.rs +++ b/svc/pkg/build/standalone/default-create/src/lib.rs @@ -82,6 +82,7 @@ pub async fn run_from_env() -> GlobalResult<()> { util::timestamp::now(), util::timestamp::now(), (), + Vec::new(), ); for build in DEFAULT_BUILDS { diff --git a/svc/pkg/cluster/standalone/datacenter-tls-renew/src/lib.rs b/svc/pkg/cluster/standalone/datacenter-tls-renew/src/lib.rs index 6e4a489a5..75c8108d3 100644 --- a/svc/pkg/cluster/standalone/datacenter-tls-renew/src/lib.rs +++ b/svc/pkg/cluster/standalone/datacenter-tls-renew/src/lib.rs @@ -19,6 +19,7 @@ pub async fn run_from_env(pools: rivet_pools::Pools) -> GlobalResult<()> { util::timestamp::now(), util::timestamp::now(), (), + Vec::new(), ); let updated_datacenter_ids = rivet_pools::utils::crdb::tx(&ctx.crdb().await?, |tx| { diff --git a/svc/pkg/cluster/standalone/default-update/src/lib.rs b/svc/pkg/cluster/standalone/default-update/src/lib.rs index 0f21eac74..db8a96b79 100644 --- a/svc/pkg/cluster/standalone/default-update/src/lib.rs +++ b/svc/pkg/cluster/standalone/default-update/src/lib.rs @@ -110,6 +110,7 @@ pub async fn run_from_env(use_autoscaler: bool) -> GlobalResult<()> { util::timestamp::now(), util::timestamp::now(), (), + Vec::new(), ); // Read config from env diff --git a/svc/pkg/cluster/standalone/gc/src/lib.rs b/svc/pkg/cluster/standalone/gc/src/lib.rs index b520f539e..f8c4a8dc0 100644 --- a/svc/pkg/cluster/standalone/gc/src/lib.rs +++ b/svc/pkg/cluster/standalone/gc/src/lib.rs @@ -23,6 +23,7 @@ pub async fn run_from_env(ts: i64, pools: rivet_pools::Pools) -> GlobalResult<() util::timestamp::now(), util::timestamp::now(), (), + Vec::new(), ); let datacenter_ids = rivet_pools::utils::crdb::tx(&ctx.crdb().await?, |tx| { diff --git a/svc/pkg/cluster/standalone/metrics-publish/src/lib.rs b/svc/pkg/cluster/standalone/metrics-publish/src/lib.rs index c5770f181..86cfbfcf2 100644 --- a/svc/pkg/cluster/standalone/metrics-publish/src/lib.rs +++ b/svc/pkg/cluster/standalone/metrics-publish/src/lib.rs @@ -57,6 +57,7 @@ pub async fn run_from_env(_ts: i64, pools: rivet_pools::Pools) -> GlobalResult<( util::timestamp::now(), util::timestamp::now(), (), + Vec::new(), ); let servers = select_servers(&ctx).await?; diff --git a/svc/pkg/job/standalone/gc/src/lib.rs b/svc/pkg/job/standalone/gc/src/lib.rs index 1d93bacdf..f3cf545e4 100644 --- a/svc/pkg/job/standalone/gc/src/lib.rs +++ b/svc/pkg/job/standalone/gc/src/lib.rs @@ -42,6 +42,7 @@ pub async fn run_from_env(ts: i64, pools: rivet_pools::Pools) -> GlobalResult<() ts, ts, (), + Vec::new(), ); // Find jobs to stop. diff --git a/svc/pkg/linode/standalone/gc/src/lib.rs b/svc/pkg/linode/standalone/gc/src/lib.rs index de7d1279c..543741470 100644 --- a/svc/pkg/linode/standalone/gc/src/lib.rs +++ b/svc/pkg/linode/standalone/gc/src/lib.rs @@ -29,6 +29,7 @@ pub async fn run_from_env(pools: rivet_pools::Pools) -> GlobalResult<()> { util::timestamp::now(), util::timestamp::now(), (), + Vec::new(), ); let dc_rows = sql_fetch_all!( diff --git a/svc/pkg/load-test/standalone/api-cloud/src/lib.rs b/svc/pkg/load-test/standalone/api-cloud/src/lib.rs index b24ea0652..c07d88510 100644 --- a/svc/pkg/load-test/standalone/api-cloud/src/lib.rs +++ b/svc/pkg/load-test/standalone/api-cloud/src/lib.rs @@ -18,6 +18,7 @@ pub async fn run_from_env(_ts: i64) -> GlobalResult<()> { util::timestamp::now(), util::timestamp::now(), (), + Vec::new(), ); // Create temp team diff --git a/svc/pkg/load-test/standalone/mm-sustain/src/lib.rs b/svc/pkg/load-test/standalone/mm-sustain/src/lib.rs index 5c128216f..28dc9fa51 100644 --- a/svc/pkg/load-test/standalone/mm-sustain/src/lib.rs +++ b/svc/pkg/load-test/standalone/mm-sustain/src/lib.rs @@ -22,6 +22,7 @@ pub async fn run_from_env(_ts: i64) -> GlobalResult<()> { util::timestamp::now(), util::timestamp::now(), (), + Vec::new(), ); // Region diff --git a/svc/pkg/load-test/standalone/mm/src/lib.rs b/svc/pkg/load-test/standalone/mm/src/lib.rs index 8d4b3dcd5..fd5a93bde 100644 --- a/svc/pkg/load-test/standalone/mm/src/lib.rs +++ b/svc/pkg/load-test/standalone/mm/src/lib.rs @@ -72,6 +72,7 @@ pub async fn run_from_env(_ts: i64) -> GlobalResult<()> { util::timestamp::now(), util::timestamp::now(), (), + Vec::new(), ); // Setup diff --git a/svc/pkg/load-test/standalone/sqlx/src/lib.rs b/svc/pkg/load-test/standalone/sqlx/src/lib.rs index 51d2598f4..00b700985 100644 --- a/svc/pkg/load-test/standalone/sqlx/src/lib.rs +++ b/svc/pkg/load-test/standalone/sqlx/src/lib.rs @@ -14,6 +14,7 @@ pub async fn run_from_env(_ts: i64) -> GlobalResult<()> { util::timestamp::now(), util::timestamp::now(), (), + Vec::new(), ); let mut interval = tokio::time::interval(std::time::Duration::from_millis(100)); diff --git a/svc/pkg/load-test/standalone/watch-requests/src/lib.rs b/svc/pkg/load-test/standalone/watch-requests/src/lib.rs index adc761fc4..e713c689e 100644 --- a/svc/pkg/load-test/standalone/watch-requests/src/lib.rs +++ b/svc/pkg/load-test/standalone/watch-requests/src/lib.rs @@ -18,6 +18,7 @@ pub async fn run_from_env(_ts: i64) -> GlobalResult<()> { util::timestamp::now(), util::timestamp::now(), (), + Vec::new(), ); // Create temp team diff --git a/svc/pkg/mm/standalone/gc/src/lib.rs b/svc/pkg/mm/standalone/gc/src/lib.rs index 0695a8a64..cd728135a 100644 --- a/svc/pkg/mm/standalone/gc/src/lib.rs +++ b/svc/pkg/mm/standalone/gc/src/lib.rs @@ -15,6 +15,7 @@ pub async fn run_from_env(ts: i64, pools: rivet_pools::Pools) -> GlobalResult<() ts, ts, (), + Vec::new(), ); let redis_mm = ctx.redis_mm().await?; diff --git a/svc/pkg/telemetry/standalone/beacon/src/lib.rs b/svc/pkg/telemetry/standalone/beacon/src/lib.rs index dc0167acb..505671ca4 100644 --- a/svc/pkg/telemetry/standalone/beacon/src/lib.rs +++ b/svc/pkg/telemetry/standalone/beacon/src/lib.rs @@ -28,6 +28,7 @@ pub async fn run_from_env(ts: i64) -> GlobalResult<()> { util::timestamp::now(), util::timestamp::now(), (), + Vec::new(), ); if std::env::var("RIVET_TELEMETRY_DISABLE") diff --git a/svc/pkg/upload/standalone/provider-fill/src/lib.rs b/svc/pkg/upload/standalone/provider-fill/src/lib.rs index 1ff012e6c..230638b7b 100644 --- a/svc/pkg/upload/standalone/provider-fill/src/lib.rs +++ b/svc/pkg/upload/standalone/provider-fill/src/lib.rs @@ -17,6 +17,7 @@ pub async fn run_from_env() -> GlobalResult<()> { util::timestamp::now(), util::timestamp::now(), (), + Vec::new(), ); let Ok(backfill_provider) = std::env::var("S3_BACKFILL_PROVIDER") else { diff --git a/svc/pkg/user/standalone/delete-pending/src/lib.rs b/svc/pkg/user/standalone/delete-pending/src/lib.rs index c3b8fbd63..055bbdf23 100644 --- a/svc/pkg/user/standalone/delete-pending/src/lib.rs +++ b/svc/pkg/user/standalone/delete-pending/src/lib.rs @@ -18,6 +18,7 @@ pub async fn run_from_env(ts: i64) -> GlobalResult<()> { util::timestamp::now(), util::timestamp::now(), (), + Vec::new(), ); let user_ids = sql_fetch_all!( diff --git a/svc/pkg/user/standalone/search-user-gc/src/lib.rs b/svc/pkg/user/standalone/search-user-gc/src/lib.rs index c0a7d0464..bb86ebe18 100644 --- a/svc/pkg/user/standalone/search-user-gc/src/lib.rs +++ b/svc/pkg/user/standalone/search-user-gc/src/lib.rs @@ -18,6 +18,7 @@ pub async fn run_from_env(ts: i64) -> GlobalResult<()> { util::timestamp::now(), util::timestamp::now(), (), + Vec::new(), ); let mut total_removed = 0; diff --git a/svc/templates/api/tests/basic.rs b/svc/templates/api/tests/basic.rs index a8bd083d4..2f3f541ed 100644 --- a/svc/templates/api/tests/basic.rs +++ b/svc/templates/api/tests/basic.rs @@ -37,6 +37,7 @@ impl Ctx { util::timestamp::now(), util::timestamp::now(), (), + Vec::new(), ); Ctx { op_ctx } diff --git a/svc/templates/standalone/src/lib.rs b/svc/templates/standalone/src/lib.rs index 8b67c5586..a46d1d1d6 100644 --- a/svc/templates/standalone/src/lib.rs +++ b/svc/templates/standalone/src/lib.rs @@ -15,6 +15,7 @@ pub async fn run_from_env(ts: i64) -> GlobalResult<()> { util::timestamp::now(), util::timestamp::now(), (), + Vec::new(), ); todo!();