Skip to content

Fix AWS instrumentation destination.service.resource handling#2947

Merged
JonasKunz merged 5 commits intoelastic:mainfrom
JonasKunz:aws-resource-fix
Jan 17, 2023
Merged

Fix AWS instrumentation destination.service.resource handling#2947
JonasKunz merged 5 commits intoelastic:mainfrom
JonasKunz:aws-resource-fix

Conversation

@JonasKunz
Copy link
Contributor

@JonasKunz JonasKunz commented Jan 3, 2023 •
edited
Loading

What does this PR do?

Closes #2946, closes #2849 .

While implementing these fixes I enhanced the test cases of all AWS instrumentations to check for the correct service.target.* and destination.service.resource fields.
These tests unconvered that at least to my reading we currently deviate from the spec for DynamoDB:
Currently service.target.name is always null for DynamoDB, according to the spec it should be the AWS region instead.

I changed the DynamoDB instrumentation to follow the spec with this PR aswell. If my reading is wrong here, we should remove this change from the PR.

Checklist

  • This is a bugfix
@JonasKunz JonasKunz added the ci:agent-integration Enables agent integration tests in build pipeline label Jan 3, 2023
@ghost
Copy link

ghost commented Jan 3, 2023 •
edited by ghost
Loading

💚 Build Succeeded

the below badges are clickable and redirect to their specific view in the CI or DOCS
Pipeline View Test View Changes Artifacts preview preview

Expand to view the summary

Build stats

  • Start Time: 2023-01-17T15:39:22.990+0000

  • Duration: 64 min 13 sec

Test stats 🧪

Test Results
Failed 0
Passed 3398
Skipped 42
Total 3440

💚 Flaky test report

Tests succeeded.

🤖 GitHub comments

Expand to view the GitHub comments

To re-run your PR in the CI, just comment with:

  • /test : Re-trigger the build.

  • run benchmark tests : Run the benchmark tests.

  • run jdk compatibility tests : Run the JDK Compatibility tests.

  • run integration tests : Run the Agent Integration tests.

  • run end-to-end tests : Run the APM-ITs.

  • run windows tests : Build & tests on windows.

  • run elasticsearch-ci/docs : Re-trigger the docs validation. (use unformatted text in the comment!)
@JonasKunz JonasKunz marked this pull request as ready for review January 11, 2023 08:09
@github-actions
Copy link

github-actions bot commented Jan 11, 2023

/test
@JonasKunz JonasKunz enabled auto-merge (squash) January 17, 2023 16:02
@JonasKunz JonasKunz merged commit b39aa05 into elastic:main Jan 17, 2023
@JonasKunz JonasKunz deleted the aws-resource-fix branch January 17, 2023 17:16
v1v added a commit that referenced this pull request Jan 25, 2023
@v1v
Merge remote-tracking branch 'upstream/main' into feature/use-github-…
1469de7 
…actions

* upstream/main: (76 commits)
  Bump version.byte-buddy from 1.12.20 to 1.12.21 (#2953)
  Fix instrumentation for WebFlux with Spring 6.x (#2936)
  Fix SQS instrumentation within messaging transactions (#2979)
  Add test for unsampled Transaction (#2950)
  clarify about dropped requests for sampling in documentation (#2957)
  Doc add first stack trace detail (#2978)
  SpanBuilder.addLink is supported, so delete wrong comment (#2975)
  [doc] document log sending (#2929)
  Fix agent log sending (#2974)
  Bump version.aws.sdk from 2.19.8 to 2.19.18 in /apm-agent-plugins (#2973)
  test: synchronizing gherkin specs (#2965)
  Bump aws-java-sdk from 1.12.353 to 1.12.376 in /apm-agent-plugins (#2944)
  Fixed AgentOverheadMetricsTest flakyness (#2918)
  Fix AWS instrumentation destination.service.resource handling (#2947)
  [doc] restructure logs doc (#2916)
  Junit5 test with dependencies runner (#2962)
  Set service target for non-sampled ES client spans (#2959)
  Send logs via intake API (#2694)
  [doc] setup with docker image (#2956)
  Increase CI build timeout (#2955)
  ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

agent-java ci:agent-integration Enables agent integration tests in build pipeline

2 participants

@JonasKunz @jackshirazi