Skip to content
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

Jump to bottom

Convert mongo-common tests from groovy to java #12382

Merged
merged 15 commits into from
Oct 17, 2024
Merged

Convert mongo-common tests from groovy to java #12382

merged 15 commits into from
Oct 17, 2024
+1,947 −1,555

Conversation

xiepuhuan
Copy link
Contributor

Related to #7195

@xiepuhuan xiepuhuan requested a review from a team as a code owner October 2, 2024 15:15
@xiepuhuan
1. Rename the function names "setupSpec" and "cleanupSpec" to "setup"…
3f52cab 
… and "cleanup"

2. Collection tool class methods use static import

Signed-off-by: xiepuhuan <puhuanxie@gmail.com>
jeanbisutti
jeanbisutti reviewed Oct 3, 2024
View reviewed changes
...ing/src/main/java/io/opentelemetry/instrumentation/mongo/v3_1/AbstractMongo31ClientTest.java Outdated Show resolved Hide resolved
...ing/src/main/java/io/opentelemetry/instrumentation/mongo/v3_1/AbstractMongo31ClientTest.java Outdated Show resolved Hide resolved
...ing/src/main/java/io/opentelemetry/instrumentation/mongo/v3_1/AbstractMongo31ClientTest.java Outdated Show resolved Hide resolved
...ing/src/main/java/io/opentelemetry/instrumentation/mongo/v3_1/AbstractMongo31ClientTest.java Outdated Show resolved Hide resolved
...est/java/io/opentelemetry/javaagent/instrumentation/mongo/v4_0/Mongo4ReactiveClientTest.java Outdated Show resolved Hide resolved
...est/java/io/opentelemetry/javaagent/instrumentation/mongo/v4_0/Mongo4ReactiveClientTest.java Outdated Show resolved Hide resolved
...ent/src/test/java/io/opentelemetry/javaagent/instrumentation/mongo/v4_0/MongoClientTest.java Outdated Show resolved Hide resolved
...ent/src/test/java/io/opentelemetry/javaagent/instrumentation/mongo/v4_0/MongoClientTest.java Outdated Show resolved Hide resolved
@xiepuhuan
Make function to package private
ad90b35 
Signed-off-by: xiepuhuan <puhuanxie@gmail.com>
@xiepuhuan
Remove local variable definition
b65591d 
Signed-off-by: xiepuhuan <puhuanxie@gmail.com>
@xiepuhuan
1. Remove useless lines of code.
c3b848b 
2. Convert long to int using `Math.toIntExam`.

Signed-off-by: xiepuhuan <puhuanxie@gmail.com>
steverao
steverao reviewed Oct 7, 2024
View reviewed changes
Copy link
Contributor

@steverao steverao left a comment

Choose a reason for hiding this comment

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

BTW, don't forget to delete following unnecessary dependencies

opentelemetry-java-instrumentation/instrumentation/mongo/mongo-common/testing/build.gradle.kts

Line 9 in d156afb

implementation("org.apache.groovy:groovy")

opentelemetry-java-instrumentation/instrumentation/mongo/mongo-common/testing/build.gradle.kts

Line 11 in d156afb

implementation("org.spockframework:spock-core")

@xiepuhuan
Copy link
Contributor Author

BTW, don't forget to delete following unnecessary dependencies

opentelemetry-java-instrumentation/instrumentation/mongo/mongo-common/testing/build.gradle.kts

Line 9 in d156afb

implementation("org.apache.groovy:groovy")

opentelemetry-java-instrumentation/instrumentation/mongo/mongo-common/testing/build.gradle.kts

Line 11 in d156afb

implementation("org.spockframework:spock-core")

Thanks.

@xiepuhuan
1. Use assertThat instead of waitAndAssertTraces
dda22cb 
2. Close resources using AutoCleanupExtension
3. Reconstruct the mongoSpan method
@laurit laurit mentioned this pull request Oct 16, 2024
Open
xiepuhuan and others added 5 commits October 17, 2024 00:13
@xiepuhuan
1. Removing Annotations for Simple Names @DisplayName.
3beaf38 
2. Change the return type of the involved method from int to long.
3. Using isIn instead of containsAnyOf for correct assertions.
4. Directly throw InterruptedException without capturing it.
5. Latch calls await method with timeout.
6. Merge comment lines.
7. Use the get method to wait for the future to complete, just like the original Groovy code.
8. In the mongoSpan method parameters, use SpanDataAsset instead of trace and index.
9. In the mongoSpan method, optimizing assertion error prompts.

Signed-off-by: xiepuhuan <puhuanxie@gmail.com>
@xiepuhuan
Merge branch 'main' into mongo-common-java-tests
0295025
@xiepuhuan
Fix testLatestDeps
66f55ce
@laurit
change get back to join
a3be8d9
@laurit
simplify
f9f8003
@trask trask merged commit c743b6d into open-telemetry:main Oct 17, 2024
56 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jeanbisutti jeanbisutti jeanbisutti left review comments

@steverao steverao steverao left review comments

@laurit laurit laurit approved these changes

@jaydeluca jaydeluca jaydeluca approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@xiepuhuan @laurit @jaydeluca @jeanbisutti @steverao @trask