Skip to content

Improve ASM support in vert.x 5.0 #8285

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
manuel-alvarez-alvarez merged 4 commits into from
Feb 4, 2025
Merged

Improve ASM support in vert.x 5.0 #8285

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8ca3493
Fix failing ASM tests in vert.x 5.0
manuel-alvarez-alvarez Jan 27, 2025
9212120
Remove max versions limits
manuel-alvarez-alvarez Jan 29, 2025
710b06e
Add comment to the call depth usage in vert.x
manuel-alvarez-alvarez Jan 29, 2025
89632ae
Join routing context instrumentations again
manuel-alvarez-alvarez Jan 29, 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
50 changes: 28 additions & 22 deletions buildSrc/src/main/groovy/MuzzlePlugin.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -338,7 +338,7 @@ class MuzzlePlugin implements Plugin<Project> {
*/
private static Set<Artifact> muzzleDirectiveToArtifacts(MuzzleDirective muzzleDirective, VersionRangeResult rangeResult) {

final Set<Version> versions = filterAndLimitVersions(rangeResult, muzzleDirective.skipVersions)
final Set<Version> versions = filterAndLimitVersions(rangeResult, muzzleDirective.skipVersions, muzzleDirective.includeSnapshots)

final Set<Artifact> allVersionArtifacts = versions.collect { version ->
new DefaultArtifact(muzzleDirective.group, muzzleDirective.module, muzzleDirective.classifier ?: "", "jar", version.toString())
Expand Down Expand Up @@ -371,20 +371,21 @@ class MuzzlePlugin implements Plugin<Project> {
final Set<Version> versions = rangeResult.versions.toSet()
allRangeResult.versions.removeAll(versions)

return filterAndLimitVersions(allRangeResult, muzzleDirective.skipVersions).collect { version ->
return filterAndLimitVersions(allRangeResult, muzzleDirective.skipVersions, muzzleDirective.includeSnapshots).collect { version ->
final MuzzleDirective inverseDirective = new MuzzleDirective()
inverseDirective.name = muzzleDirective.name
inverseDirective.group = muzzleDirective.group
inverseDirective.module = muzzleDirective.module
inverseDirective.versions = "$version"
inverseDirective.assertPass = !muzzleDirective.assertPass
inverseDirective.excludedDependencies = muzzleDirective.excludedDependencies
inverseDirective.includeSnapshots = muzzleDirective.includeSnapshots
inverseDirective
}.toSet()
}

private static Set<Version> filterAndLimitVersions(VersionRangeResult result, Set<String> skipVersions) {
return limitLargeRanges(result, filterVersion(result.versions.toSet(), skipVersions), skipVersions)
private static Set<Version> filterAndLimitVersions(VersionRangeResult result, Set<String> skipVersions, boolean includeSnapshots) {
return limitLargeRanges(result, filterVersion(result.versions.toSet(), skipVersions, includeSnapshots), skipVersions)
}

private static Set<Version> limitLargeRanges(VersionRangeResult result, Set<Version> versions, Set<String> skipVersions) {
Expand Down Expand Up @@ -506,26 +507,30 @@ class MuzzlePlugin implements Plugin<Project> {
/**
* Filter out snapshot-type builds from versions list.
*/
private static filterVersion(Set<Version> list, Set<String> skipVersions) {
private static filterVersion(Set<Version> list, Set<String> skipVersions, boolean includeSnapshots) {
list.removeIf {
def version = it.toString().toLowerCase(Locale.ROOT)
return version.endsWith("-snapshot") ||
version.contains("rc") ||
version.contains(".cr") ||
version.contains("alpha") ||
version.contains("beta") ||
version.contains("-b") ||
version.contains(".m") ||
version.contains("-m") ||
version.contains("-dev") ||
version.contains("-ea") ||
version.contains("-atlassian-") ||
version.contains("public_draft") ||
version.contains("-cr") ||
version.contains("-preview") ||
skipVersions.contains(version) ||
version.matches(END_NMN_PATTERN) ||
version.matches(GIT_SHA_PATTERN)
if (includeSnapshots) {
return skipVersions.contains(version)
} else {
return version.endsWith("-snapshot") ||
version.contains("rc") ||
version.contains(".cr") ||
version.contains("alpha") ||
version.contains("beta") ||
version.contains("-b") ||
version.contains(".m") ||
version.contains("-m") ||
version.contains("-dev") ||
version.contains("-ea") ||
version.contains("-atlassian-") ||
version.contains("public_draft") ||
version.contains("-cr") ||
version.contains("-preview") ||
skipVersions.contains(version) ||
version.matches(END_NMN_PATTERN) ||
version.matches(GIT_SHA_PATTERN)
}
}
return list
}
Expand Down Expand Up @@ -559,6 +564,7 @@ class MuzzleDirective {
boolean assertInverse = false
boolean skipFromReport = false
boolean coreJdk = false
boolean includeSnapshots = false
String javaVersion

void coreJdk(version = null) {
Expand Down
16 changes: 3 additions & 13 deletions dd-java-agent/instrumentation/vertx-web-4.0/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@ ext {
// unbound it for latest
latestDepTestMinJavaVersionForTests = JavaVersion.VERSION_11
latestDepForkedTestMinJavaVersionForTests = JavaVersion.VERSION_11
latest4xTestMaxJavaVersionForTests = JavaVersion.VERSION_25
latest4xForkedTestMaxJavaVersionForTests = JavaVersion.VERSION_25
latestDepTestMaxJavaVersionForTests = JavaVersion.VERSION_25
latestDepForkedTestMaxJavaVersionForTests = JavaVersion.VERSION_25
}
Expand All @@ -17,15 +15,13 @@ muzzle {
pass {
group = 'io.vertx'
module = "vertx-web"
versions = "[4.0.0,)"
versions = "[4.0.0,5)"
assertInverse = true
}
}

addTestSuiteForDir('latestDepTest', 'latestDepTest')
addTestSuiteExtendingForDir('latestDepForkedTest', 'latestDepTest', 'latestDepTest')
addTestSuiteForDir('latest4xTest', 'test')
addTestSuiteExtendingForDir('latest4xForkedTest', 'latest4xTest', 'test')

configurations {
testArtifacts
Expand Down Expand Up @@ -54,11 +50,8 @@ dependencies {
testRuntimeOnly project(':dd-java-agent:instrumentation:jackson-core')
testRuntimeOnly project(':dd-java-agent:instrumentation:netty-buffer-4')

latest4xTestImplementation group: 'io.vertx', name: 'vertx-web', version: '4.+'
latest4xTestImplementation group: 'io.vertx', name: 'vertx-web-client', version: '4.+'

latestDepTestImplementation group: 'io.vertx', name: 'vertx-web', version: '+'
latestDepTestImplementation group: 'io.vertx', name: 'vertx-web-client', version: '+'
latestDepTestImplementation group: 'io.vertx', name: 'vertx-web', version: '4.+'
latestDepTestImplementation group: 'io.vertx', name: 'vertx-web-client', version: '4.+'
}

[compileLatestDepTestJava, compileLatestDepForkedTestJava].each {
Expand All @@ -67,6 +60,3 @@ dependencies {
[compileLatestDepForkedTestGroovy, compileLatestDepTestGroovy].each {
it.javaLauncher = getJavaLauncherFor(11)
}
[latest4xForkedTest, latest4xTest].each {
it.jvmArgs += '-Dtest.dd.latest4xTest=true'
}
Loading
Loading