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

Add support for OpenSearch 1.x and 2.x auto-instrumentation #6998

Merged
merged 12 commits into from
Nov 10, 2022
Merged

Add support for OpenSearch 1.x and 2.x auto-instrumentation #6998

merged 12 commits into from
Nov 10, 2022

Conversation

sharp-pixel
Copy link
Contributor

@sharp-pixel sharp-pixel commented Oct 27, 2022 •
edited
Loading

This PR adds support for OpenSearch 1.x and 2.x Java clients auto-instrumentation.

This is made possible by OpenTelemetry specification v1.14.0 and OpenTelemetry Java SDK v1.19.0.

Testing is being done using org.opensearch:opensearch-testcontainers:2.0.0 (https://github.com/opensearch-project/opensearch-testcontainers)

Resolves #7007

Signed-off-by: Cédric Pelvet cedric.pelvet@gmail.com

@sharp-pixel sharp-pixel requested a review from a team October 27, 2022 13:48
@sharp-pixel
Copy link
Contributor Author

org.opensearch:opensearch-testcontainers:2.0.0 has been built for Java 11 (class file version 55.0) so this would not support Java 1.8.

Is Java 1.8 support mandatory?

@trask
Copy link
Member

trask commented Oct 28, 2022 •
edited
Loading

Is Java 1.8 support mandatory?

no, see

opentelemetry-java-instrumentation/instrumentation/java-http-client/javaagent/build.gradle.kts

Line 12 in c170ec5

minJavaVersionSupported.set(JavaVersion.VERSION_11)

@sharp-pixel sharp-pixel mentioned this pull request Oct 29, 2022
Closed
@sharp-pixel
Copy link
Contributor Author

The test-latest-deps test seems to have suffered a transient error.

trask
trask approved these changes Nov 5, 2022
View reviewed changes
Copy link
Member

@trask trask left a comment

Choose a reason for hiding this comment

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

👍

.../opentelemetry/javaagent/instrumentation/opensearch/rest/v1_0/RestClientInstrumentation.java Outdated Show resolved Hide resolved
...mentation/opensearch/opensearch-rest-1.0/javaagent/src/test/groovy/OpenSearchRestTest.groovy Outdated Show resolved Hide resolved
@sharp-pixel
Add support for OpenSearch 1.x and 2.x auto-instrumentation
bae0274 
Signed-off-by: Cédric Pelvet <cedric.pelvet@gmail.com>
@sharp-pixel
Fix Muzzle
f1395bc 
Signed-off-by: Cédric Pelvet <cedric.pelvet@gmail.com>
@sharp-pixel
Fix Muzzle
e15ffe2 
Signed-off-by: Cédric Pelvet <cedric.pelvet@gmail.com>
@sharp-pixel
Set minimum Java version to 11
4599c7d 
Signed-off-by: Cédric Pelvet <cedric.pelvet@gmail.com>
@sharp-pixel
Remove orphan lombok usage
f2c170a 
Signed-off-by: Cédric Pelvet <cedric.pelvet@gmail.com>
@sharp-pixel
Remove version number from class name to be more consistent
a2e8bb8 
Signed-off-by: Cédric Pelvet <cedric.pelvet@gmail.com>
@sharp-pixel
Update OpenSearch client version to 1.3.6
3e034df 
Signed-off-by: Cédric Pelvet <cedric.pelvet@gmail.com>
@sharp-pixel
Downgrade the library dependency for `org.opensearch.client:opensea…
56b9475 
…rch-rest-client` to version `1.0.0`

Signed-off-by: Cédric Pelvet <cedric.pelvet@gmail.com>
@sharp-pixel
Change integration test from Groovy to Java.
66d9972 
Signed-off-by: Cédric Pelvet <cedric.pelvet@gmail.com>
@sharp-pixel
Fix annotation on return value.
27e8a4e 
Signed-off-by: Cédric Pelvet <cedric.pelvet@gmail.com>
@sharp-pixel
Fix spotless issues
ead5d22 
Signed-off-by: Cédric Pelvet <cedric.pelvet@gmail.com>
@sharp-pixel
Copy link
Contributor Author

Muzzle tests seem to be very sensitive and fail randomly, is this normal?

@trask
Copy link
Member

trask commented Nov 8, 2022

Muzzle tests seem to be very sensitive and fail randomly, is this normal?

Muzzle runs against the latest versions found on maven central, in this case there was a new release of project reactor with a breaking API change that is causing muzzle to fail, see #7106

@trask
Copy link
Member

trask commented Nov 8, 2022

@sharp-pixel fyi I merged main into your branch

@trask trask added this to the v1.20.0 milestone Nov 8, 2022
@trask
Copy link
Member

trask commented Nov 8, 2022

@sharp-pixel we will plan on merging before next release, just going to leave it open for another day or two in case anyone else wants to review it, thx!

@trask trask merged commit 31f4d12 into open-telemetry:main Nov 10, 2022
@sharp-pixel sharp-pixel deleted the opensearch branch November 10, 2022 06:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@trask trask trask approved these changes

@theletterf theletterf theletterf approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
v1.20.0
Development

Successfully merging this pull request may close these issues.

Support OpenSearch client auto-instrumentation
3 participants
@sharp-pixel @trask @theletterf