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.

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

Cloud metadata #3729

Merged
merged 6 commits into from
May 5, 2020
Merged

Cloud metadata #3729

merged 6 commits into from
May 5, 2020

Conversation

axw
Copy link
Member

@axw axw commented May 4, 2020

Motivation/summary

Add cloud metadata to Elastic APM event schema. See elastic/apm#256 for rationale.

Checklist

  • I have signed the Contributor License Agreement.
  • My code follows the style guidelines of this project (run make check-full for static code checks and linting)
  • I have rebased my changes on top of the latest master branch
    - [ ] I have made corresponding changes to the documentation
  • I have added tests that prove my fix is effective or that my feature works
  • New and existing unit tests pass locally with my changes
  • I have updated CHANGELOG.asciidoc

How to test these changes

  1. Implement agent-side support for detecting and sending cloud metadata (Agents should collect cloud identification metadata apm#256)
  2. Have the agent send some transactions to the server
  3. Check that the new fields are indexed

Related issues

Closes #3660

@axw axw added the enhancement label May 4, 2020
@axw axw force-pushed the cloud-metadata branch from 58e0fc2 to 0856577 Compare May 4, 2020 04:51
@apmmachine
Copy link
Contributor

apmmachine commented May 4, 2020

💚 Build Succeeded

Pipeline View Test View Changes Artifacts preview stats

Expand to view the summary

Build stats

  • Build Cause: [Branch indexing]

  • Start Time: 2020-05-04T11:52:40.912+0000

  • Duration: 49 min 10 sec (2949880)

  • Commit: e54e831

Test stats 🧪

Test Results
Failed 0
Passed 3008
Skipped 142
Total 3150

Steps errors

Expand to view the steps failures

  • Name: Test Sync
    • Description: ./script/jenkins/sync.sh

    • Result: FAILURE

    • Duration: 3 min 39 sec<

    • Start Time: 2020-05-04T12:03:07.914+0000

@axw
Copy link
Member Author

axw commented May 4, 2020

jenkins run the tests please

axw added 2 commits May 4, 2020 13:14
- Add cloud metadata to testdata
- Add cloud fields to _meta/fields.common.yml for tests :(
- Update approvals docs
- Update package_tests (cargo-culted)
@axw axw force-pushed the cloud-metadata branch from eb7acb8 to e54e831 Compare May 4, 2020 05:14
@axw axw marked this pull request as ready for review May 4, 2020 06:12
@axw axw requested a review from a team May 4, 2020 06:12
@apmmachine
Copy link
Contributor

apmmachine commented May 4, 2020

💚 Build Succeeded

Pipeline View Test View Changes Artifacts preview stats

Expand to view the summary

Build stats

  • Build Cause: [Pull request Cloud metadata #3729 updated]

  • Start Time: 2020-05-05T02:10:35.988+0000

  • Duration: 53 min 54 sec (3174363)

  • Commit: 6b9fd32

Test stats 🧪

Test Results
Failed 0
Passed 3008
Skipped 142
Total 3150

Steps errors

Expand to view the steps failures

  • Name: Test Sync
    • Description: ./script/jenkins/sync.sh

    • Result: FAILURE

    • Duration: 3 min 55 sec<

    • Start Time: 2020-05-05T02:24:17.810+0000

@axw axw merged commit 7b07336 into elastic:master May 5, 2020
@axw axw deleted the cloud-metadata branch May 5, 2020 03:06
@axw axw mentioned this pull request May 5, 2020
axw added a commit to axw/apm-server that referenced this pull request May 5, 2020
* model: add Cloud type, Metadata.Cloud field

* docs/spec: add cloud to metadata schema

* modeldecoder: decode Cloud metadata

* Update integration tests

- Add cloud metadata to testdata
- Add cloud fields to _meta/fields.common.yml for tests :(
- Update approvals docs
- Update package_tests (cargo-culted)

* Add changelog entry

* _meta: add 'overwrite: true' to duplicated fields
axw added a commit that referenced this pull request May 5, 2020
* model: add Cloud type, Metadata.Cloud field

* docs/spec: add cloud to metadata schema

* modeldecoder: decode Cloud metadata

* Update integration tests

- Add cloud metadata to testdata
- Add cloud fields to _meta/fields.common.yml for tests :(
- Update approvals docs
- Update package_tests (cargo-culted)

* Add changelog entry

* _meta: add 'overwrite: true' to duplicated fields
watson added a commit to watson/apm-agent-nodejs that referenced this pull request May 7, 2020
watson added a commit to elastic/apm-agent-nodejs that referenced this pull request May 7, 2020
watson added a commit to watson/apm-agent-nodejs that referenced this pull request May 7, 2020
watson added a commit to watson/apm-agent-nodejs that referenced this pull request May 11, 2020
watson added a commit to elastic/apm-agent-nodejs that referenced this pull request May 11, 2020
Backport two commits to fix the tests in 2.x:

* test: fix APM Server cert test to work with 13.9.0+ (c3c119b)
* test: add missing APM Server API Scheme file cloud.json (#1738)

This file was added to the APM Server repo in:
elastic/apm-server#3729
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Cloud provider intake
4 participants