Skip to content

Expose resolution diagnostics when Muzzle assertPass fails #20581

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
laurit merged 3 commits into from
Oct 14, 2026
Merged

Expose resolution diagnostics when Muzzle assertPass fails #20581

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0686a68
Initial plan
Copilot Oct 13, 2026
67c6e32
Expose lenient resolution diagnostics on failed Muzzle pass checks
Copilot Oct 13, 2026
2c9b1d8
Remove Muzzle resolution diagnostics functional tests as requested
Copilot Oct 13, 2026
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
31 changes: 23 additions & 8 deletions gradle-plugins/src/main/kotlin/io.opentelemetry.instrumentation.muzzle-check.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -380,13 +380,20 @@ fun addMuzzleTask(muzzleDirective: MuzzleDirective, versionArtifact: Artifact?,
// add more mismatches. For assertPass a missing transitive can cause a
// false muzzle failure but never a false pass; such versions should be
// skipped in the module's build.gradle.kts when found.
val configFiles = config.incoming.artifactView { lenient(true) }.files
val artifactView = config.incoming.artifactView { lenient(true) }
val configFiles = artifactView.files
val muzzleShadowJarFile = shadowModule.flatMap { it.archiveFile }
val muzzleToolingShadowJarFile = shadowMuzzleTooling.flatMap { it.archiveFile }
val muzzleBootstrapShadowJarFile = shadowMuzzleBootstrap.flatMap { it.archiveFile }
val excludedNames = muzzleDirective.excludedInstrumentationNames.get()
val excludedModules = muzzleDirective.excludedInstrumentationModules.get()
val shouldAssertPass = muzzleDirective.assertPass.get()
// Snapshot diagnostics as text: resolution objects cannot be captured by configuration cache.
val resolutionFailures = if (shouldAssertPass) {
artifactView.artifacts.failures.map { it.stackTraceToString() }
} else {
emptyList()
}
Comment thread
trask marked this conversation as resolved.

dependsOn(configurations.named("runtimeClasspath"))
dependsOn(shadowModule)
Expand All @@ -405,13 +412,21 @@ fun addMuzzleTask(muzzleDirective: MuzzleDirective, versionArtifact: Artifact?,
val userUrls = (configFiles + muzzleBootstrapShadowJarFile.get().asFile).map { it.toURI().toURL() }.toTypedArray()
val userCL = URLClassLoader(userUrls, ClassLoader.getPlatformClassLoader())

MuzzleGradlePluginUtil.assertInstrumentationMuzzled(
instrumentationCL,
userCL,
excludedNames,
excludedModules,
shouldAssertPass
)
try {
MuzzleGradlePluginUtil.assertInstrumentationMuzzled(
instrumentationCL,
userCL,
excludedNames,
excludedModules,
shouldAssertPass
)
} catch (e: Exception) {
if (shouldAssertPass && resolutionFailures.isNotEmpty()) {
logger.error("Dependency resolution failures collected for $path (lenient resolution):")
resolutionFailures.forEach { logger.error(it) }
}
throw e
}
}
}

Expand Down
Loading