Fix aws sdk instrumentation #3373
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
JonasKunz
added
the
ci:agent-integration
JonasKunz
added
ci:agent-integration
3 tasks
jackshirazi
approved these changes
Oct 19, 2023
|
Yes, the AWS integration tests failed. I also had a stab at adding a test for older versions via |
v1v
added a commit
to v1v/apm-agent-java
that referenced
this pull request
Oct 27, 2023
* 'main' of https://github.com/elastic/apm-agent-java: (35 commits) buildkite: opentelemetry+elastic agent overhead benchmark on a weekly basis (elastic#3371) ci(action): remove unrequired action (elastic#3387) Bump org.springframework.boot:spring-boot-dependencies from 2.7.16 to 3.1.5 (elastic#3380) ci(action): archive benchmarks.jar (elastic#3386) remove noise (elastic#3385) Process otel benchmark (elastic#3384) Update tests for Jedis 5 (elastic#3382) added entry to community plugins (elastic#3383) added capturing s3 otel attributes from lamba S3Event (elastic#3364) Bump version.log4j from 2.12.4 to 2.21.0 (elastic#3366) Fix aws sdk instrumentation (elastic#3373) action: remove leftover from Jenkins (elastic#3368) Bump org.apache.logging.log4j:log4j-bom from 2.20.0 to 2.21.0 (elastic#3367) Bump io.micrometer:micrometer-core from 1.11.4 to 1.11.5 (elastic#3360) Add guard against invalid end timestamps (elastic#3363) Added otel to dependabot config, upgraded dependencies (elastic#3359) Bump version.byte-buddy from 1.14.8 to 1.14.9 (elastic#3361) Fix off-by-one error in tests which effectively disabled recycling validation (elastic#3357) Fix multiple spans being created for HTTPUrlConnection HEAD requests (elastic#3353) Bump org.ow2.asm:asm-tree from 9.5 to 9.6 (elastic#3349) ...
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.
What does this PR do?
Closes #3372 .
The private
clientConfigurationour instrumentation has been relying on was moved to a superclass, but remained private. Therefore, it is not directly accessible anymore from the Advice code.Instead of trying to access that field reflectively, which can become problematic with Java modules, I've decided to instrument the constructors instead and "remember" the
clientConfiguration.I've manually checked the source of the oldest
2.xaws sdk and verified that the constructor accepting theclientConfigurationwas already present there.Checklist
I have added tests that prove my fix is effective or that my feature worksAdded an API method or config option? Document in which version this will be introduced