Remove build usages of Jetty ALPN

It wasn't actually being used. Since Java 8u252 in early 2020 we've been
using ALPN from the JDK. The Jetty ALPN Agent has been a noop.

We do keep the Jetty ALPN support in the code and tests, but we don't
have the infrastructure to actually run it.
This commit is contained in:
Eric Anderson 2023-06-16 09:12:15 -07:00
parent 569956e022
commit f768c4222b
6 changed files with 0 additions and 54 deletions

View File

@ -52,19 +52,6 @@ for reviewers:
Project maintainers are obligated to squash those commits into one when Project maintainers are obligated to squash those commits into one when
merging. merging.
## Running tests
### Jetty ALPN setup for IntelliJ
The tests in interop-testing project require jetty-alpn agent running in the background
otherwise they'll fail. Here are instructions on how to setup IntellJ IDEA to enable running
those tests in IDE:
* Settings -> Build Tools -> Gradle -> Runner -> select Gradle Test Runner
* View -> Tool Windows -> Gradle -> Edit Run Configuration -> Defaults -> JUnit -> Before lauch -> + -> Run Gradle task, enter the task in the build.gradle that sets the javaagent.
Step 1 must be taken, otherwise by the default JUnit Test Runner running a single test in IDE will trigger all the tests.
## Guidelines for Pull Requests ## Guidelines for Pull Requests
How to get your contributions merged smoothly and quickly. How to get your contributions merged smoothly and quickly.

View File

@ -14,10 +14,6 @@ tasks.named("jmh").configure {
jvmArgs = ["-server", "-Xms2g", "-Xmx2g"] jvmArgs = ["-server", "-Xms2g", "-Xmx2g"]
} }
configurations {
alpnagent
}
tasks.named("jar").configure { tasks.named("jar").configure {
manifest { manifest {
attributes('Automatic-Module-Name': 'io.grpc.benchmarks') attributes('Automatic-Module-Name': 'io.grpc.benchmarks')
@ -43,7 +39,6 @@ dependencies {
} }
} }
compileOnly libraries.javax.annotation compileOnly libraries.javax.annotation
alpnagent libraries.jetty.alpn.agent
testImplementation libraries.junit, testImplementation libraries.junit,
libraries.mockito.core libraries.mockito.core

View File

@ -42,7 +42,6 @@ guava-jre = "com.google.guava:guava:32.1.3-jre"
hdrhistogram = "org.hdrhistogram:HdrHistogram:2.1.12" hdrhistogram = "org.hdrhistogram:HdrHistogram:2.1.12"
javax-annotation = "org.apache.tomcat:annotations-api:6.0.53" javax-annotation = "org.apache.tomcat:annotations-api:6.0.53"
j2objc-annotations = " com.google.j2objc:j2objc-annotations:2.8" j2objc-annotations = " com.google.j2objc:j2objc-annotations:2.8"
jetty-alpn-agent = "org.mortbay.jetty.alpn:jetty-alpn-agent:2.0.10"
jsr305 = "com.google.code.findbugs:jsr305:3.0.2" jsr305 = "com.google.code.findbugs:jsr305:3.0.2"
junit = "junit:junit:4.13.2" junit = "junit:junit:4.13.2"
# Update notes / 2023-07-19 sergiitk: # Update notes / 2023-07-19 sergiitk:

View File

@ -9,10 +9,6 @@ plugins {
description = "gRPC: Integration Testing" description = "gRPC: Integration Testing"
configurations {
alpnagent
}
dependencies { dependencies {
implementation project(path: ':grpc-alts', configuration: 'shadow'), implementation project(path: ':grpc-alts', configuration: 'shadow'),
project(':grpc-auth'), project(':grpc-auth'),
@ -54,7 +50,6 @@ dependencies {
project(':grpc-core'), project(':grpc-core'),
libraries.mockito.core, libraries.mockito.core,
libraries.okhttp libraries.okhttp
alpnagent libraries.jetty.alpn.agent
signature libraries.signature.java signature libraries.signature.java
signature libraries.signature.android signature libraries.signature.android
@ -68,10 +63,6 @@ tasks.named("compileJava").configure {
// This isn't a library; it can use beta APIs // This isn't a library; it can use beta APIs
options.errorprone.check("BetaApi", CheckSeverity.OFF) options.errorprone.check("BetaApi", CheckSeverity.OFF)
} }
tasks.named("test").configure {
// For the automated tests, use Jetty ALPN.
jvmArgs "-javaagent:" + configurations.alpnagent.asPath
}
// For the generated scripts, use Netty tcnative (i.e. OpenSSL). // For the generated scripts, use Netty tcnative (i.e. OpenSSL).
// Note that OkHttp currently only supports ALPN, so OpenSSL version >= 1.0.2 is required. // Note that OkHttp currently only supports ALPN, so OpenSSL version >= 1.0.2 is required.
@ -79,15 +70,8 @@ tasks.named("test").configure {
def test_client = tasks.register("test_client", CreateStartScripts) { def test_client = tasks.register("test_client", CreateStartScripts) {
mainClass = "io.grpc.testing.integration.TestServiceClient" mainClass = "io.grpc.testing.integration.TestServiceClient"
applicationName = "test-client" applicationName = "test-client"
defaultJvmOpts = [
"-javaagent:JAVAAGENT_APP_HOME" + configurations.alpnagent.singleFile.name
]
outputDir = new File(project.buildDir, 'tmp/scripts/' + name) outputDir = new File(project.buildDir, 'tmp/scripts/' + name)
classpath = startScripts.classpath classpath = startScripts.classpath
doLast {
unixScript.text = unixScript.text.replace('JAVAAGENT_APP_HOME', '\'"\$APP_HOME"\'/lib/')
windowsScript.text = windowsScript.text.replace('JAVAAGENT_APP_HOME', '%APP_HOME%\\lib\\')
}
} }
def test_server = tasks.register("test_server", CreateStartScripts) { def test_server = tasks.register("test_server", CreateStartScripts) {
@ -177,10 +161,6 @@ application {
from(xds_federation_test_client) from(xds_federation_test_client)
fileMode = 0755 fileMode = 0755
} }
applicationDistribution.into("lib") {
from(configurations.alpnagent)
}
} }
publishing { publishing {

View File

@ -9,10 +9,6 @@ plugins {
description = "gRPC: Istio Interop testing" description = "gRPC: Istio Interop testing"
configurations {
alpnagent
}
dependencies { dependencies {
implementation project(':grpc-core'), implementation project(':grpc-core'),
project(':grpc-netty'), project(':grpc-netty'),
@ -31,7 +27,6 @@ dependencies {
libraries.mockito.core, libraries.mockito.core,
libraries.junit, libraries.junit,
libraries.truth libraries.truth
alpnagent libraries.jetty.alpn.agent
signature libraries.signature.java signature libraries.signature.java
} }

View File

@ -9,10 +9,6 @@ plugins {
description = "gRPC: Netty" description = "gRPC: Netty"
configurations {
alpnagent
}
tasks.named("jar").configure { tasks.named("jar").configure {
manifest { manifest {
attributes('Automatic-Module-Name': 'io.grpc.netty') attributes('Automatic-Module-Name': 'io.grpc.netty')
@ -71,7 +67,6 @@ dependencies {
} }
signature libraries.signature.java signature libraries.signature.java
signature libraries.signature.android signature libraries.signature.android
alpnagent libraries.jetty.alpn.agent
} }
import net.ltgt.gradle.errorprone.CheckSeverity import net.ltgt.gradle.errorprone.CheckSeverity
@ -89,11 +84,6 @@ tasks.named("javadoc").configure {
exclude 'io/grpc/netty/ProtocolNegotiationEvent.java' exclude 'io/grpc/netty/ProtocolNegotiationEvent.java'
} }
tasks.named("test").configure {
// Allow testing Jetty ALPN in TlsTest
jvmArgs "-javaagent:" + configurations.alpnagent.asPath
}
tasks.named("jmh").configure { tasks.named("jmh").configure {
// Workaround // Workaround
// https://github.com/melix/jmh-gradle-plugin/issues/97#issuecomment-316664026 // https://github.com/melix/jmh-gradle-plugin/issues/97#issuecomment-316664026