Skip to content

fix(gocd): remove s4s, mattrobenolt-kube references from pipelines and code #7875

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mwarkentin wants to merge 2 commits into
base: master
Choose a base branch
from
+8 −97
Open

fix(gocd): remove s4s, mattrobenolt-kube references from pipelines and code #7875

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7c359b3
fix(gocd): remove s4s, mattrobenolt-kube references from pipelines an…
mwarkentin Apr 15, 2026
05ff680
Apply suggestions from code review
mwarkentin Apr 15, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 0 additions & 31 deletions gocd/templates/bash/s4s-clickhouse-queries.sh
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion gocd/templates/bash/s4s-ddog-health-check.sh
View file
Open in desktop

This file was deleted.

3 changes: 0 additions & 3 deletions gocd/templates/bash/s4s-sentry-health-check.sh
View file
Open in desktop

This file was deleted.

31 changes: 2 additions & 29 deletions gocd/templates/pipelines/snuba-py.libsonnet
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,33 +40,6 @@ local migrate_stage(stage_name, region) = [
},
];

// Snuba deploy to SaaS is blocked till S4S deploy is healthy
local s4s_health_check(region) =
if region == 's4s' then
[
{
health_check: {
jobs: {
health_check: {
environment_variables: {
SENTRY_AUTH_TOKEN: '{{SECRET:[devinfra-sentryio][token]}}',
DATADOG_API_KEY: '{{SECRET:[devinfra][st_datadog_api_key]}}',
DATADOG_APP_KEY: '{{SECRET:[devinfra][st_datadog_app_key]}}',
LABEL_SELECTOR: 'service=snuba',
},
elastic_profile_id: 'snuba',
tasks: [
gocdtasks.script(importstr '../bash/s4s-sentry-health-check.sh'),
gocdtasks.script(importstr '../bash/s4s-ddog-health-check.sh'),
],
},
},
},
},
]
else
[];

// Snuba deploy to ST is blocked till SaaS deploy is healthy
local saas_health_check(region) =
if region == 'us' || region == 'de' then
Expand Down Expand Up @@ -195,7 +168,7 @@ function(region) {
checks: {
elastic_profile_id: 'snuba',
environment_variables: {
PIPELINE_FIRST_STEP: 'deploy-snuba-py-s4s',
PIPELINE_FIRST_STEP: 'deploy-snuba-py-us',
Comment thread
mwarkentin marked this conversation as resolved.
Outdated
},
tasks: [
gocdtasks.script(importstr '../bash/check-github.sh'),
Expand Down Expand Up @@ -245,5 +218,5 @@ function(region) {
},
},

] + migrate_stage('migrate', region) + s4s_health_check(region) + saas_health_check(region),
] + migrate_stage('migrate', region) + saas_health_check(region),
}
31 changes: 2 additions & 29 deletions gocd/templates/pipelines/snuba-rs.libsonnet
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,33 +7,6 @@ local gocdtasks = import 'github.com/getsentry/gocd-jsonnet/libs/gocd-tasks.libs
// - https://www.notion.so/sentry/GoCD-New-Service-Quickstart-6d8db7a6964049b3b0e78b8a4b52e25d


// Snuba deploy to SaaS is blocked till S4S deploy is healthy
local s4s_health_check(region) =
if region == 's4s' then
[
{
health_check: {
jobs: {
health_check: {
environment_variables: {
SENTRY_AUTH_TOKEN: '{{SECRET:[devinfra-sentryio][token]}}',
DATADOG_API_KEY: '{{SECRET:[devinfra][st_datadog_api_key]}}',
DATADOG_APP_KEY: '{{SECRET:[devinfra][st_datadog_app_key]}}',
LABEL_SELECTOR: 'service=snuba',
},
elastic_profile_id: 'snuba',
tasks: [
gocdtasks.script(importstr '../bash/s4s-sentry-health-check.sh'),
gocdtasks.script(importstr '../bash/s4s-ddog-health-check.sh'),
],
},
},
},
},
]
else
[];

// Snuba deploy to ST is blocked till SaaS deploy is healthy
local saas_health_check(region) =
if region == 'us' || region == 'de' then
Expand Down Expand Up @@ -177,7 +150,7 @@ function(region) {
checks: {
elastic_profile_id: 'snuba',
environment_variables: {
PIPELINE_FIRST_STEP: 'deploy-snuba-rs-s4s',
PIPELINE_FIRST_STEP: 'deploy-snuba-rs-us',
Comment thread
mwarkentin marked this conversation as resolved.
Outdated
},
tasks: [
gocdtasks.script(importstr '../bash/check-github.sh'),
Expand Down Expand Up @@ -226,5 +199,5 @@ function(region) {
},
},

] + s4s_health_check(region) + saas_health_check(region),
] + saas_health_check(region),
}
4 changes: 2 additions & 2 deletions rust_snuba/src/factory_v2.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,8 +186,8 @@ impl ProcessingStrategyFactory<KafkaPayload> for ConsumerStrategyFactoryV2 {
self.max_batch_size,
self.max_batch_time,
compute_batch_size,
// we need to enable this to deal with storages where we skip 100% of values, such as
Copy link
Copy Markdown
Member Author

@mwarkentin mwarkentin Apr 15, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe this means we can update the code? Not sure if there are non-s4s places where this applied.

// gen-metrics-gauges in s4s. we still need to commit there
// we need to enable this to deal with storages where we skip 100% of values.
// we still need to commit there
)
.flush_empty_batches(true);

Expand Down
2 changes: 1 addition & 1 deletion scripts/fetch_service_refs.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ def main(pipeline_name: str = "deploy-snuba-us", repo: str = "snuba") -> int:

if __name__ == "__main__":
parser = argparse.ArgumentParser()
parser.add_argument("--pipeline", default="deploy-snuba-s4s")
parser.add_argument("--pipeline", default="deploy-snuba-us")
Copy link
Copy Markdown
Member

@mchen-sentry mchen-sentry Apr 15, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should this also be s4s2 here?

Copy link
Copy Markdown
Member Author

@mwarkentin mwarkentin Apr 15, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@mchen-sentry I wasn't sure exactly what this was doing - if it's supposed to be the first stage of the pipeline then yes.

Copy link
Copy Markdown

@cursor cursor Bot Apr 15, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Default pipeline name likely references nonexistent pipeline

Medium Severity

The default pipeline was changed from deploy-snuba-s4s to deploy-snuba-us, but the GoCD pipeline configs in this repo only define names snuba-py and snuba-rs, which generate pipelines like deploy-snuba-py-{region} and deploy-snuba-rs-{region}. There's no evidence a deploy-snuba-us pipeline exists. Since PIPELINE_FIRST_STEP was updated to deploy-snuba-py-s4s2 and deploy-snuba-rs-s4s2, the reviewers also flagged that this default likely needs to reference an s4s2 pipeline instead.

Fix in Cursor Fix in Web

Reviewed by Cursor Bugbot for commit 05ff680. Configure here.

parser.add_argument("--repo", default="snuba")
args = parser.parse_args()
main(args.pipeline, args.repo)
2 changes: 1 addition & 1 deletion snuba/admin/clickhouse/trace_log_parsing.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ def from_log(log_line: str) -> StreamSummary | None:
)


# [ snuba-st-1-2.c.mattrobenolt-kube.internal ] [ 848231 ] {f3fb112a-583f-4125-a424-bd1d21b6ecf2} <Trace> AggregatingTransform: Aggregated. 1 to 1 rows (from 17.00 B) in 0.024679052 sec. (40.520 rows/sec., 688.84 B/sec.)
# [ snuba-host-1-2 ] [ 848231 ] {f3fb112a-583f-4125-a424-bd1d21b6ecf2} <Trace> AggregatingTransform: Aggregated. 1 to 1 rows (from 17.00 B) in 0.024679052 sec. (40.520 rows/sec., 688.84 B/sec.)
AGGREGATION_MATCHER_RE = re.compile(
r"AggregatingTransform: Aggregated. (?P<before_row_count>\d+) to (?P<after_row_count>\d+) rows \(from (?P<memory_size>.*)\) in (?P<seconds>[0-9.]+) sec. \((?P<rows_per_second>[0-9.]+) rows/sec., (?P<bytes_per_second>.+)/sec.\)"
)
Expand Down
Loading