From 6c8b08b3e4e0dd81b715427ede59933c7ebadc80 Mon Sep 17 00:00:00 2001 From: MasterPtato Date: Tue, 7 May 2024 18:18:26 +0000 Subject: [PATCH] fix: remove trace from ops --- gen/secrets.baseline.json | 489 +++++++++--------- lib/api-helper/build/src/macro_util.rs | 1 - lib/chirp/client/src/client.rs | 4 + lib/chirp/worker/src/manager.rs | 1 - lib/chirp/worker/src/test.rs | 1 - lib/connection/src/lib.rs | 8 +- lib/operation/core/src/lib.rs | 49 +- svc/api/admin/tests/basic.rs | 1 - svc/api/auth/tests/basic.rs | 1 - svc/api/cf-verification/tests/basic.rs | 1 - svc/api/cloud/tests/basic.rs | 1 - svc/api/group/tests/basic.rs | 1 - svc/api/identity/tests/basic.rs | 1 - svc/api/job/tests/basic.rs | 1 - svc/api/kv/tests/basic.rs | 1 - svc/api/matchmaker/tests/common.rs | 1 - svc/api/portal/tests/basic.rs | 1 - svc/api/status/tests/basic.rs | 1 - svc/api/traefik-provider/tests/basic.rs | 1 - .../standalone/default-create/src/lib.rs | 1 - .../datacenter-tls-renew/src/lib.rs | 1 - .../standalone/default-update/src/lib.rs | 1 - svc/pkg/cluster/standalone/gc/src/lib.rs | 1 - .../standalone/metrics-publish/src/lib.rs | 1 - svc/pkg/job/standalone/gc/src/lib.rs | 1 - svc/pkg/linode/standalone/gc/src/lib.rs | 1 - .../load-test/standalone/api-cloud/src/lib.rs | 1 - .../standalone/mm-sustain/src/lib.rs | 1 - svc/pkg/load-test/standalone/mm/src/lib.rs | 1 - svc/pkg/load-test/standalone/sqlx/src/lib.rs | 1 - .../standalone/watch-requests/src/lib.rs | 1 - svc/pkg/mm/standalone/gc/src/lib.rs | 1 - .../telemetry/standalone/beacon/src/lib.rs | 1 - .../standalone/provider-fill/src/lib.rs | 1 - .../user/standalone/delete-pending/src/lib.rs | 1 - .../user/standalone/search-user-gc/src/lib.rs | 1 - svc/templates/api/tests/basic.rs | 1 - svc/templates/standalone/src/lib.rs | 1 - 38 files changed, 264 insertions(+), 320 deletions(-) diff --git a/gen/secrets.baseline.json b/gen/secrets.baseline.json index 6775e241d..6f897c414 100644 --- a/gen/secrets.baseline.json +++ b/gen/secrets.baseline.json @@ -1,248 +1,245 @@ { - "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 7a71ceb4b..563710c24 100644 --- a/lib/api-helper/build/src/macro_util.rs +++ b/lib/api-helper/build/src/macro_util.rs @@ -332,7 +332,6 @@ 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 8938167ea..35188d541 100644 --- a/lib/chirp/client/src/client.rs +++ b/lib/chirp/client/src/client.rs @@ -238,6 +238,10 @@ 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 19d42882e..da2ef1e49 100644 --- a/lib/chirp/worker/src/manager.rs +++ b/lib/chirp/worker/src/manager.rs @@ -743,7 +743,6 @@ 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 a8f65cbd8..f41199c91 100644 --- a/lib/chirp/worker/src/test.rs +++ b/lib/chirp/worker/src/test.rs @@ -37,7 +37,6 @@ 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 442f51439..a5c0955c7 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: Vec, + trace_entry: chirp_client::TraceEntry, ) -> 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,7 +41,11 @@ impl Connection { parent_req_id, ray_id, ts, - trace, + { + let mut x = self.client.trace().to_vec(); + x.push(trace_entry); + x + }, 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 90bb750ca..7f30e5a44 100644 --- a/lib/operation/core/src/lib.rs +++ b/lib/operation/core/src/lib.rs @@ -40,9 +40,6 @@ 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 @@ -58,7 +55,6 @@ where ts: i64, req_ts: i64, body: B, - trace: Vec, ) -> Self { OperationContext { name, @@ -69,7 +65,6 @@ where ts, req_ts, body, - trace, } } @@ -136,46 +131,25 @@ 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(); - // 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 + 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, }; Ok(OperationContext { name: O::NAME.to_string(), timeout: O::TIMEOUT, - 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 - })?, + conn: self.conn.wrap(self.req_id, ray_id, trace_entry)?, req_id: self.req_id, ray_id, ts: util::timestamp::now(), req_ts: self.req_ts, body, - trace, }) } @@ -191,7 +165,6 @@ where ts: self.ts, req_ts: self.req_ts, body: (), - trace: self.trace.clone(), } } @@ -231,11 +204,11 @@ where } pub fn trace(&self) -> &[chirp_client::TraceEntry] { - &self.trace + self.conn.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 f1bba8766..d614faefc 100644 --- a/svc/api/admin/tests/basic.rs +++ b/svc/api/admin/tests/basic.rs @@ -39,7 +39,6 @@ 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 2955dfc67..0ff59d86c 100644 --- a/svc/api/auth/tests/basic.rs +++ b/svc/api/auth/tests/basic.rs @@ -46,7 +46,6 @@ // 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 12bf6704b..63bb90733 100644 --- a/svc/api/cf-verification/tests/basic.rs +++ b/svc/api/cf-verification/tests/basic.rs @@ -37,7 +37,6 @@ // 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 596f2cf15..ce98bf4f3 100644 --- a/svc/api/cloud/tests/basic.rs +++ b/svc/api/cloud/tests/basic.rs @@ -46,7 +46,6 @@ // 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 8f31faecf..cbab0367e 100644 --- a/svc/api/group/tests/basic.rs +++ b/svc/api/group/tests/basic.rs @@ -40,7 +40,6 @@ 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 7df9cabe0..4401fd085 100644 --- a/svc/api/identity/tests/basic.rs +++ b/svc/api/identity/tests/basic.rs @@ -47,7 +47,6 @@ // 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 6caa1f7a0..dfb4ba24e 100644 --- a/svc/api/job/tests/basic.rs +++ b/svc/api/job/tests/basic.rs @@ -41,7 +41,6 @@ // 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 009ede160..c7a964140 100644 --- a/svc/api/kv/tests/basic.rs +++ b/svc/api/kv/tests/basic.rs @@ -52,7 +52,6 @@ // 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 5b6fa9803..affa697dc 100644 --- a/svc/api/matchmaker/tests/common.rs +++ b/svc/api/matchmaker/tests/common.rs @@ -56,7 +56,6 @@ 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 d8f1d02b8..9c1873652 100644 --- a/svc/api/portal/tests/basic.rs +++ b/svc/api/portal/tests/basic.rs @@ -39,7 +39,6 @@ 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 f9d9f5867..4055c3080 100644 --- a/svc/api/status/tests/basic.rs +++ b/svc/api/status/tests/basic.rs @@ -40,7 +40,6 @@ // 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 84e1f3a6d..42bd1d277 100644 --- a/svc/api/traefik-provider/tests/basic.rs +++ b/svc/api/traefik-provider/tests/basic.rs @@ -53,7 +53,6 @@ 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 350d388e7..121712d52 100644 --- a/svc/pkg/build/standalone/default-create/src/lib.rs +++ b/svc/pkg/build/standalone/default-create/src/lib.rs @@ -82,7 +82,6 @@ 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 75c8108d3..6e4a489a5 100644 --- a/svc/pkg/cluster/standalone/datacenter-tls-renew/src/lib.rs +++ b/svc/pkg/cluster/standalone/datacenter-tls-renew/src/lib.rs @@ -19,7 +19,6 @@ 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 db8a96b79..0f21eac74 100644 --- a/svc/pkg/cluster/standalone/default-update/src/lib.rs +++ b/svc/pkg/cluster/standalone/default-update/src/lib.rs @@ -110,7 +110,6 @@ 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 de8bf0463..4a2c2fd93 100644 --- a/svc/pkg/cluster/standalone/gc/src/lib.rs +++ b/svc/pkg/cluster/standalone/gc/src/lib.rs @@ -23,7 +23,6 @@ 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 86cfbfcf2..c5770f181 100644 --- a/svc/pkg/cluster/standalone/metrics-publish/src/lib.rs +++ b/svc/pkg/cluster/standalone/metrics-publish/src/lib.rs @@ -57,7 +57,6 @@ 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 f3cf545e4..1d93bacdf 100644 --- a/svc/pkg/job/standalone/gc/src/lib.rs +++ b/svc/pkg/job/standalone/gc/src/lib.rs @@ -42,7 +42,6 @@ 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 543741470..de7d1279c 100644 --- a/svc/pkg/linode/standalone/gc/src/lib.rs +++ b/svc/pkg/linode/standalone/gc/src/lib.rs @@ -29,7 +29,6 @@ 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 60714ef6e..28afb0c20 100644 --- a/svc/pkg/load-test/standalone/api-cloud/src/lib.rs +++ b/svc/pkg/load-test/standalone/api-cloud/src/lib.rs @@ -18,7 +18,6 @@ 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 28dc9fa51..5c128216f 100644 --- a/svc/pkg/load-test/standalone/mm-sustain/src/lib.rs +++ b/svc/pkg/load-test/standalone/mm-sustain/src/lib.rs @@ -22,7 +22,6 @@ 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 fd5a93bde..8d4b3dcd5 100644 --- a/svc/pkg/load-test/standalone/mm/src/lib.rs +++ b/svc/pkg/load-test/standalone/mm/src/lib.rs @@ -72,7 +72,6 @@ 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 00b700985..51d2598f4 100644 --- a/svc/pkg/load-test/standalone/sqlx/src/lib.rs +++ b/svc/pkg/load-test/standalone/sqlx/src/lib.rs @@ -14,7 +14,6 @@ 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 e713c689e..adc761fc4 100644 --- a/svc/pkg/load-test/standalone/watch-requests/src/lib.rs +++ b/svc/pkg/load-test/standalone/watch-requests/src/lib.rs @@ -18,7 +18,6 @@ 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 cd728135a..0695a8a64 100644 --- a/svc/pkg/mm/standalone/gc/src/lib.rs +++ b/svc/pkg/mm/standalone/gc/src/lib.rs @@ -15,7 +15,6 @@ 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 505671ca4..dc0167acb 100644 --- a/svc/pkg/telemetry/standalone/beacon/src/lib.rs +++ b/svc/pkg/telemetry/standalone/beacon/src/lib.rs @@ -28,7 +28,6 @@ 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 230638b7b..1ff012e6c 100644 --- a/svc/pkg/upload/standalone/provider-fill/src/lib.rs +++ b/svc/pkg/upload/standalone/provider-fill/src/lib.rs @@ -17,7 +17,6 @@ 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 055bbdf23..c3b8fbd63 100644 --- a/svc/pkg/user/standalone/delete-pending/src/lib.rs +++ b/svc/pkg/user/standalone/delete-pending/src/lib.rs @@ -18,7 +18,6 @@ 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 bb86ebe18..c0a7d0464 100644 --- a/svc/pkg/user/standalone/search-user-gc/src/lib.rs +++ b/svc/pkg/user/standalone/search-user-gc/src/lib.rs @@ -18,7 +18,6 @@ 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 2f3f541ed..a8bd083d4 100644 --- a/svc/templates/api/tests/basic.rs +++ b/svc/templates/api/tests/basic.rs @@ -37,7 +37,6 @@ 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 a46d1d1d6..8b67c5586 100644 --- a/svc/templates/standalone/src/lib.rs +++ b/svc/templates/standalone/src/lib.rs @@ -15,7 +15,6 @@ pub async fn run_from_env(ts: i64) -> GlobalResult<()> { util::timestamp::now(), util::timestamp::now(), (), - Vec::new(), ); todo!();