Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
target/
.DS_Store

# Generated relay credentials for the ingest-router
relay-credentials.json

# Python virtual environment
.venv/
__pycache__/
Expand Down
185 changes: 179 additions & 6 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,10 @@ run-ingest-router:
cargo run ingest-router --config-file-path example_config_ingest_router.yaml
.PHONY: run-ingest-router

generate-credentials:
@test -f relay-credentials.json || cargo run generate-relay-credentials > relay-credentials.json
.PHONY: generate-credentials

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

Failed run leaves empty credentials

Medium Severity

The generate-credentials target writes to relay-credentials.json via shell redirection and only skips generation when the file exists. If cargo run generate-relay-credentials fails after the shell truncates the file, an empty or partial file remains and later runs never regenerate valid credentials.

Fix in Cursor Fix in Web

Reviewed by Cursor Bugbot for commit 2f7944a. Configure here.

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

we can live with this - it's a convenience for dev

@GabeVillalobos GabeVillalobos Jun 16, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

I don't think it's very likely that this will fail, but fair. It probably should overwrite the file when rerun though 🤔

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Wrote this before seeing your comment Lyn, for sure it's a super minor issue.


run-mock-control-api:
python scripts/mock_control_api.py
.PHONY: run-mock-control-api
Expand Down
5 changes: 5 additions & 0 deletions devservices/devservices-relay-credentials.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"id": "7835bea9-7df4-42d7-ab67-d344d026f9f6",
"public_key": "Pr9zR1197orWo8Ekw85tTje4zjAGpMdIg9DgrVhFQ70",
"secret_key": "oc00dWQcHUmh1qD9IZkuIaRb_EYJP9ZtU2WI5yHeY6o"
}
5 changes: 5 additions & 0 deletions devservices/ingest-router.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,11 @@ ingest_router:
host: "0.0.0.0"
port: 3001

relay_keys:
# As defined in https://github.com/getsentry/relay/blob/526f63779017d108dbaef134f65a9205f702d8a4/devservices/config/devservices-credentials.json
"88888888-4444-4444-8444-cccccccccccc":
public_key: "SMSesqan65THCV6M4qs4kBzPai60LzuDn-xNsvYpuP8"

locator:
type: in_process
control_plane:
Expand Down
2 changes: 2 additions & 0 deletions ingest-router/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ async-trait = { workspace = true }
base64 = { workspace = true }
chrono = { version = "0.4", features = ["clock", "serde"] }
ed25519-dalek = "2"
getrandom = "0.4.2"
http = { workspace = true }
http-body-util = { workspace = true }
hyper = { workspace = true }
Expand All @@ -23,6 +24,7 @@ thiserror = { workspace = true }
tokio = { workspace = true }
tracing = { workspace = true }
url = { workspace = true }
uuid = { version = "1.23.3", features = ["v4"] }

[dev-dependencies]
serde_yaml = { workspace = true }
Expand Down
Loading
Loading