Test undertow and armeria http2 server #11361
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
laurit
commented
May 15, 2024
|
|
||
| public static String normalizeHttpVersion(String version) { | ||
| if ("2.0".equals(version)) { | ||
| return "2"; |
There was a problem hiding this comment.
https://github.com/open-telemetry/semantic-conventions/blob/main/docs/http/http-spans.md uses 2 instead of 2.0
laurit
commented
May 15, 2024
| } | ||
|
|
||
| public static String getVersion(@Nullable String protocol) { | ||
| if (protocol != null && protocol.startsWith("HTTP/")) { |
There was a problem hiding this comment.
I extracted an util class because this same pattern is used in many instrumentations and all of them probably report http2 version as 2.0 instead of 2.
trask
reviewed
May 15, 2024
testing-common/src/main/groovy/io/opentelemetry/instrumentation/test/base/HttpServerTest.groovy
Show resolved
Hide resolved
trask
reviewed
May 15, 2024
Comment on lines
-754
to
+766
| .hasEntrySatisfying( | ||
| NetworkAttributes.NETWORK_PROTOCOL_VERSION, | ||
| entry -> assertThat(entry).isIn("1.1", "2.0")); | ||
| .containsEntry( | ||
| NetworkAttributes.NETWORK_PROTOCOL_VERSION, options.useHttp2 ? "2" : "1.1"); |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR adds http2 server tests for armeria and undertow. It also fixes a bug in undertow instrumentation where
HttpServerResponseMutatordidn't work in undertow with http2.