Skip to content

Use resolved address for peer.hostname when available without hitting the cache #8915

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

Merged
amarziali merged 5 commits into from
Jun 4, 2025
Merged

Use resolved address for peer.hostname when available without hitting the cache #8915

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2b66505
Use resolved address for peer.hostname when available without hitting…
amarziali Jun 3, 2025
e45ff39
Update dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/boot…
amarziali Jun 3, 2025
5bcf241
try to fork the test
amarziali Jun 3, 2025
c9b7da4
Open java.net for hostnameresolver tests
amarziali Jun 3, 2025
fef3bcd
Do not mock sealed classes with java 21
amarziali Jun 3, 2025
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
Prev Previous commit
Do not mock sealed classes with java 21
  • Loading branch information
@amarziali
amarziali committed Jun 4, 2025
commit fef3bcd449dfe4c54dedb3d439ab67ae40a92c82
14 changes: 6 additions & 8 deletions ...groovy/datadog/trace/bootstrap/instrumentation/java/net/HostNameResolverForkedTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,20 +26,18 @@ class HostNameResolverForkedTest extends DDSpecification {
}

def "should use the cache for unresolved addresses"() {
setup:
def inet1 = Mock(InetAddress)
def inet2 = Mock(InetAddress)
given:
def inet1 = new Inet4Address(null, InetAddress.getLocalHost().getAddress())
def inet2 = new Inet4Address(null, 0) // this will fail if a resolution will happen
when:
def address = new InetSocketAddress(inet1, 666)
def host = HostNameResolver.hostName(address.getAddress(), "127.0.0.1")
then:
host == "somehost"
1 * inet1.getHostName() >> "somehost"
host != null
when:
address = new InetSocketAddress(inet2, 666)
host = HostNameResolver.hostName(address.getAddress(), "127.0.0.1")
def host2 = HostNameResolver.hostName(address.getAddress(), "127.0.0.1")
then:
0 * inet2.getHostName()
host == "somehost"
host == host2
}
}