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.

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

Simplify InstrumentedSslConnectionSocketFactory #2094

Merged
merged 1 commit into from
Jan 3, 2024

Conversation

carterkozak
Copy link
Contributor

==COMMIT_MSG==
Simplify InstrumentedSslConnectionSocketFactory
==COMMIT_MSG==

This takes advantage of an upstream change we made to avoid duplicating logic, which risked falling behind upstream bug fixes:
apache/httpcomponents-client#499

This takes advantage of an upstream change we made to avoid
duplicating logic:
apache/httpcomponents-client#499
sslSocket.setSoTimeout(handshakeTimeout.toMillisecondsIntBound());
}

prepareSocket(sslSocket);
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Example of how this can be dangerous -- this prepareSocket method was deprecated in the weeks since we added this instrumented implementation in favor of an overload with an additional HttpContext context parameter. While not breaking, that sort of change can cause us to miss out on bugfixes and new feature support when we replace logic as opposed to wrapping it as this PR does.

@bulldozer-bot bulldozer-bot bot merged commit 510e203 into develop Jan 3, 2024
6 checks passed
@bulldozer-bot bulldozer-bot bot deleted the ckozak/simplify_SSLConnectionSocketFactory branch January 3, 2024 21:19
@svc-autorelease
Copy link
Collaborator

Released 3.107.0

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants