Skip to content

Conversation

@laurit
Copy link
Contributor

@laurit laurit commented Nov 7, 2025

Intellij doesn't understand our inclusion of shaded dependencies into testing-common. We have tried to work around this by also adding a dependency to testing:dependencies-shaded-for-testing but this isn't done everywhere. This PR attempts to solve it by introducing a separate module that depends on both testing-common and testing:dependencies-shaded-for-testing. Dependency substitution is used to replace usages of testing-common with that module.

@github-actions github-actions bot added the test native This label can be applied to PRs to trigger them to run native tests label Nov 7, 2025
testImplementation("io.opentelemetry.javaagent:opentelemetry-testing-common")
}

testing {
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

for javaagent the same block is in

testing {
suites.withType(JvmTestSuite::class).configureEach {
dependencies {
implementation("io.opentelemetry.javaagent:opentelemetry-testing-common")
}
}
}


jar {
// When there are duplicates between multiple shaded dependencies, just ignore them.
duplicatesStrategy = DuplicatesStrategy.EXCLUDE
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

shouldn't be needed since we now have a single module that shades all the dependencies armeria, protobuf etc and duplicates should already be handled there

@laurit laurit marked this pull request as ready for review November 7, 2025 11:04
@laurit laurit requested a review from a team as a code owner November 7, 2025 11:04
@trask trask merged commit 5da7503 into open-telemetry:main Nov 7, 2025
89 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

test native This label can be applied to PRs to trigger them to run native tests

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants