Skip to content
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

Implement timeout for dns hostname lookup #179

Merged
merged 5 commits into from
Jul 7, 2022
Merged

Implement timeout for dns hostname lookup #179

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f94c6fd
Implement timeout for dns hostname lookup
yousif-bugsnag Jun 21, 2022
7db3287
update changelog
yousif-bugsnag Jul 7, 2022
0a3ef8b
updates after review
yousif-bugsnag Jul 7, 2022
efff40e
Initialize the hostname cache on a background thread
yousif-bugsnag Jul 7, 2022
0e9f139
Resolve hostname on a background thread
yousif-bugsnag Jul 7, 2022
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
21 changes: 14 additions & 7 deletions bugsnag/src/main/java/com/bugsnag/callbacks/DeviceCallback.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,18 +45,15 @@ private static String lookupHostname() {
return hostname;
}

// Resort to dns hostname lookup.
// Look up the hostname in a daemon thread, with a timeout of HOSTNAME_LOOKUP_TIMEOUT.
// This is to prevent applications hanging waiting for the dns lookup to resolve
// Resort to dns hostname lookup with a timeout of HOSTNAME_LOOKUP_TIMEOUT,
// as this can potentially take a very long time to resolve
FutureTask<String> future = new FutureTask<String>(new Callable<String>() {
@Override
public String call() throws UnknownHostException {
return InetAddress.getLocalHost().getHostName();
}
});
Thread resolverThread = new Thread(future, "Hostname Resolver");
resolverThread.setDaemon(true);
resolverThread.start();
future.run();
Copy link
Contributor

Choose a reason for hiding this comment

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

This will need to be threaded. future.run() will wait for the hostname to be resolved before returning, which means that future.get(HOSTNAME_LOOKUP_TIMEOUT... will return immediately (and never timeout).


try {
return future.get(HOSTNAME_LOOKUP_TIMEOUT, TimeUnit.MILLISECONDS);
Expand All @@ -70,8 +67,18 @@ public String call() throws UnknownHostException {
return null;
}

/**
* Cache the hostname on a background thread to avoid blocking on initialization
*/
public static void initializeCache() {
getHostnameValue();
Thread hostnameLookup = new Thread("Hostname Lookup") {
@Override
public void run() {
getHostnameValue();
}
};
hostnameLookup.setDaemon(true);
hostnameLookup.start();
}

@Override
Expand Down