Skip to content

fix: swap status monitor dns resolver with native resolver #2432

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

Jump to bottom
Closed
wants to merge 1 commit into from
Closed

fix: swap status monitor dns resolver with native resolver #2432

wants to merge 1 commit into from

Conversation

MasterPtato
Copy link
Contributor

Changes

@MasterPtato MasterPtato requested a review from NathanFlurry May 7, 2025 20:36
@MasterPtato MasterPtato mentioned this pull request May 7, 2025
Closed
@MasterPtato Graphite App
Copy link
Contributor Author

MasterPtato commented May 7, 2025 •
edited
Loading

Warning

This pull request is not mergeable via GitHub because a downstack PR is open. Once all requirements are satisfied, merge this PR as a stack on Graphite.
Learn more

How to use the Graphite Merge Queue

Add the label merge-queue to this PR to add it to the merge queue.

You must have a Graphite account in order to use the merge queue. Sign up using this link.

An organization admin has enabled the Graphite Merge Queue in this repository.

Please do not merge from GitHub as this will restart CI on PRs being processed by the merge queue.

This stack of pull requests is managed by Graphite. Learn more about stacking.

greptile-apps[bot]
greptile-apps bot reviewed May 7, 2025
View reviewed changes
Copy link

@greptile-apps greptile-apps bot left a comment

Choose a reason for hiding this comment

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

PR Summary

This PR replaces the DNS resolver in the status monitor with the native system resolver, improving reliability by leveraging the system's built-in DNS resolution capabilities.

  • Modified packages/core/api/status/src/route/actor.rs to use ToSocketAddrs for native DNS resolution
  • Updated lookup_dns function to accept port parameter and run in a blocking task
  • Adapted test_actor_connection to pass port to lookup_dns for complete socket address resolution
  • Removed dependency on hickory_resolver in favor of system DNS resolver

1 file(s) reviewed, 1 comment(s)
Edit PR Review Bot Settings | Greptile

packages/core/api/status/src/route/actor.rs
Comment on lines +321 to +330
// Use native resolver in a blocking task
let addrs = tokio::task::spawn_blocking(move || {
GlobalResult::Ok(
addr.to_socket_addrs()?
.into_iter()
.map(|x| x.ip())
.collect::<Vec<_>>(),
)
})
.await??;
Copy link

Choose a reason for hiding this comment

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

logic: Double unwrap (??) of Result types could mask underlying errors. Consider handling each error case separately for better error reporting.

@cloudflare-workers-and-pages Cloudflare Workers and Pages
Copy link

Deploying rivet with  Cloudflare Pages  Cloudflare Pages

Latest commit: 13d14bb
Status: ✅  Deploy successful!
Preview URL: https://a51738b2.rivet.pages.dev
Branch Preview URL: https://05-07-fix-swap-status-monito.rivet.pages.dev

View logs

@MasterPtato MasterPtato mentioned this pull request May 9, 2025
Closed
@MasterPtato MasterPtato force-pushed the 05-07-fix_swap_status_monitor_dns_resolver_with_native_resolver branch from 13d14bb to 35fc915 Compare May 9, 2025 23:59
@cloudflare-workers-and-pages Cloudflare Workers and Pages
Copy link

cloudflare-workers-and-pages bot commented May 9, 2025 •
edited
Loading

Deploying rivet-studio with  Cloudflare Pages  Cloudflare Pages

Latest commit: 35fc915
Status:⚡️  Build in progress...

View logs

@graphite-app Graphite App
Copy link
Contributor

graphite-app bot commented May 9, 2025 •
edited
Loading

Merge activity

  • May 9, 7:59 PM EDT: MasterPtato added this pull request to the Graphite merge queue.
  • May 9, 8:00 PM EDT: CI is running for this pull request on a draft pull request (#2435) due to your merge queue CI optimization settings.
  • May 9, 8:01 PM EDT: Merged by the Graphite merge queue via draft PR: #2435.

graphite-app bot pushed a commit that referenced this pull request May 10, 2025
@MasterPtato
fix: swap status monitor dns resolver with native resolver (#2432)
d450f12 
<!-- Please make sure there is an issue that this PR is correlated to. -->

## Changes

<!-- If there are frontend changes, please include screenshots. -->
@graphite-app graphite-app bot closed this May 10, 2025
@graphite-app graphite-app bot deleted the 05-07-fix_swap_status_monitor_dns_resolver_with_native_resolver branch May 10, 2025 00:01
@github-actions github-actions bot mentioned this pull request May 10, 2025
Merged
This was referenced May 16, 2025
Closed
Closed
Closed
@MasterPtato MasterPtato mentioned this pull request May 23, 2025
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@NathanFlurry NathanFlurry NathanFlurry approved these changes

+1 more reviewer

@greptile-apps greptile-apps[bot] greptile-apps[bot] left review comments

Reviewers whose approvals may not affect merge requirements
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@MasterPtato @NathanFlurry