-
Notifications
You must be signed in to change notification settings - Fork 791
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Test undertow and armeria http2 server (#11361)
- Loading branch information
Showing
12 changed files
with
219 additions
and
89 deletions.
There are no files selected for viewing
39 changes: 39 additions & 0 deletions
39
...ion-api/src/main/java/io/opentelemetry/instrumentation/api/internal/HttpProtocolUtil.java
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,39 @@ | ||
/* | ||
* Copyright The OpenTelemetry Authors | ||
* SPDX-License-Identifier: Apache-2.0 | ||
*/ | ||
|
||
package io.opentelemetry.instrumentation.api.internal; | ||
|
||
import javax.annotation.Nullable; | ||
|
||
/** | ||
* This class is internal and is hence not for public use. Its APIs are unstable and can change at | ||
* any time. | ||
*/ | ||
public final class HttpProtocolUtil { | ||
|
||
public static String getProtocol(@Nullable String protocol) { | ||
if (protocol != null && protocol.startsWith("HTTP/")) { | ||
return "http"; | ||
} | ||
return null; | ||
} | ||
|
||
public static String getVersion(@Nullable String protocol) { | ||
if (protocol != null && protocol.startsWith("HTTP/")) { | ||
return normalizeHttpVersion(protocol.substring("HTTP/".length())); | ||
} | ||
return null; | ||
} | ||
|
||
public static String normalizeHttpVersion(String version) { | ||
if ("2.0".equals(version)) { | ||
return "2"; | ||
} | ||
|
||
return version; | ||
} | ||
|
||
private HttpProtocolUtil() {} | ||
} |
17 changes: 17 additions & 0 deletions
17
.../java/io/opentelemetry/javaagent/instrumentation/armeria/v1_3/ArmeriaHttp2ServerTest.java
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,17 @@ | ||
/* | ||
* Copyright The OpenTelemetry Authors | ||
* SPDX-License-Identifier: Apache-2.0 | ||
*/ | ||
|
||
package io.opentelemetry.javaagent.instrumentation.armeria.v1_3; | ||
|
||
import io.opentelemetry.instrumentation.testing.junit.http.HttpServerTestOptions; | ||
|
||
class ArmeriaHttp2ServerTest extends ArmeriaHttpServerTest { | ||
|
||
@Override | ||
protected void configure(HttpServerTestOptions options) { | ||
super.configure(options); | ||
options.useHttp2(); | ||
} | ||
} |
17 changes: 17 additions & 0 deletions
17
...y/src/test/java/io/opentelemetry/instrumentation/armeria/v1_3/ArmeriaHttp2ServerTest.java
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,17 @@ | ||
/* | ||
* Copyright The OpenTelemetry Authors | ||
* SPDX-License-Identifier: Apache-2.0 | ||
*/ | ||
|
||
package io.opentelemetry.instrumentation.armeria.v1_3; | ||
|
||
import io.opentelemetry.instrumentation.testing.junit.http.HttpServerTestOptions; | ||
|
||
class ArmeriaHttp2ServerTest extends ArmeriaHttpServerTest { | ||
|
||
@Override | ||
protected void configure(HttpServerTestOptions options) { | ||
super.configure(options); | ||
options.useHttp2(); | ||
} | ||
} |
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
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
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
18 changes: 18 additions & 0 deletions
18
instrumentation/undertow-1.4/javaagent/src/test/groovy/UndertowHttp2ServerTest.groovy
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,18 @@ | ||
/* | ||
* Copyright The OpenTelemetry Authors | ||
* SPDX-License-Identifier: Apache-2.0 | ||
*/ | ||
|
||
import io.undertow.Undertow | ||
import io.undertow.UndertowOptions | ||
|
||
class UndertowHttp2ServerTest extends UndertowServerTest { | ||
|
||
void configureUndertow(Undertow.Builder builder) { | ||
builder.setServerOption(UndertowOptions.ENABLE_HTTP2, true) | ||
} | ||
|
||
boolean useHttp2() { | ||
true | ||
} | ||
} |
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
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
Oops, something went wrong.