Convert aws 1.11 client tests from groovy to java #12606
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
laurit
reviewed
Nov 11, 2024
...gent/src/test/java/io/opentelemetry/javaagent/instrumentation/awssdk/v1_11/S3ClientTest.java
Outdated
Show resolved
Hide resolved
laurit
reviewed
Nov 11, 2024
...gent/src/test/java/io/opentelemetry/javaagent/instrumentation/awssdk/v1_11/S3ClientTest.java
Outdated
Show resolved
Hide resolved
laurit
reviewed
Nov 11, 2024
...g/src/main/java/io/opentelemetry/instrumentation/awssdk/v1_11/AbstractBaseAwsClientTest.java
Show resolved
Hide resolved
laurit
reviewed
Nov 11, 2024
...g/src/main/java/io/opentelemetry/instrumentation/awssdk/v1_11/AbstractBaseAwsClientTest.java
Outdated
Show resolved
Hide resolved
laurit
reviewed
Nov 11, 2024
...g/src/main/java/io/opentelemetry/instrumentation/awssdk/v1_11/AbstractBaseAwsClientTest.java
Outdated
Show resolved
Hide resolved
laurit
reviewed
Nov 11, 2024
Comment on lines
190
to
198
| try { | ||
| span.hasException( | ||
| new AmazonClientException("Unable to execute HTTP request")); | ||
| } catch (AssertionError e) { | ||
| span.hasException( | ||
| new SdkClientException( | ||
| "Unable to execute HTTP request: Request did not complete before the request timeout configuration.")); | ||
| } | ||
| })); |
There was a problem hiding this comment.
Do you know when it gets which exception? If the exception depends on whether it is regular or latest dep test then we could simplify this and the ERROR_TYPE assertion.
There was a problem hiding this comment.
seems like its always SdkClientException, so I was able to simplify. great catch!
steverao
reviewed
Nov 11, 2024
...gent/src/test/java/io/opentelemetry/javaagent/instrumentation/awssdk/v1_11/S3ClientTest.java
Outdated
Show resolved
Hide resolved
laurit
approved these changes
Nov 12, 2024
akats7
pushed a commit
to akats7/opentelemetry-java-instrumentation
that referenced
this pull request
Nov 21, 2024
akats7
pushed a commit
to akats7/opentelemetry-java-instrumentation
that referenced
this pull request
Nov 21, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Related to #7195