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

Consolidate Elastic APM dependencies #162686

Merged
merged 4 commits into from
Aug 4, 2023

Conversation

watson
Copy link
Contributor

@watson watson commented Jul 28, 2023

APM Synthtrace added a direct dependency to elastic-apm-http-client in #136530. This wasn't kept up to date with the client used by the main elastic-apm-node dependency when that was recently upgraded. This PR fixes that and also consolidates the elastic-apm-node dependency to only have one version (the other was depended upon by the backtrace dependency, which luckily is only used in development).

Update 1: There were a compatibility issue with the newest version of elastic-apm-node and backport, so I had to slightly walk this one back. I've updated backport as well to meet half way.

Update 2: After the discussion below, I've removed the APM Synthtrace dependency on elastic-apm-http-client as it was no longer used

The only breaking change in the elastic-apm-http-client upgrade is that the hostname config property is now named configuredHostname according to the CHANGELOG.md. So I think the change I made is sufficient. But we should probably get someone with knowledge of APM Synthtrace to review.

@watson watson added release_note:skip Skip the PR/issue when compiling release notes backport:all-open Backport to all branches that could still receive a release labels Jul 28, 2023
@watson watson requested a review from a team as a code owner July 28, 2023 08:40
@watson watson self-assigned this Jul 28, 2023
@botelastic botelastic bot added the Team:APM All issues that need APM UI Team support label Jul 28, 2023
@elasticmachine
Copy link
Contributor

Pinging @elastic/apm-ui (Team:APM)

@watson watson requested a review from trentm July 28, 2023 08:41
@watson watson added the Team:Operations Team label for Operations Team label Jul 28, 2023
@elasticmachine
Copy link
Contributor

Pinging @elastic/kibana-operations (Team:Operations)

It was incompatible with the newest version of the APM agent
@watson watson requested a review from sorenlouv July 28, 2023 11:00
@trentm
Copy link
Member

trentm commented Jul 31, 2023

Update: There were a compatibility issue with the newest version of elastic-apm-node and backport, so I had to slightly walk this one back. I've updated backport as well to meet half way.

Was there some indication of what that compat issue was? I see sorenlouv/backport#465 that locked the elastic-apm-node dep version for backport, but no indication of the issue. I suppose I could try it myself. :)

@trentm
Copy link
Member

trentm commented Jul 31, 2023

I suppose I could try it myself. :)

I've opened sorenlouv/backport#467 to have it support the latest elastic-apm-node version.
@sqren Perhaps you could review, merge, do a release of backport with that; then this PR could update to the new backport version. However, that could be done independently. Up to @watson if you want to wait for that.

@watson
Copy link
Contributor Author

watson commented Aug 3, 2023

@trentm Søren is on PTO, so I'll prefer merging this one now and then just make a follow up PR once he's back and can address your PR.

@elastic/apm-ui Can I please get a review from one of you with the recent changes?

@kibana-ci
Copy link
Collaborator

💚 Build Succeeded

Metrics [docs]

Unknown metric groups

ESLint disabled line counts

id before after diff
@kbn/apm-synthtrace 6 5 -1

Total ESLint disabled count

id before after diff
@kbn/apm-synthtrace 8 7 -1

History

To update your PR or re-run it, just comment with:
@elasticmachine merge upstream

cc @watson

@watson watson mentioned this pull request Aug 3, 2023
Copy link
Contributor

@achyutjhunjhunwala achyutjhunjhunwala left a comment

Choose a reason for hiding this comment

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

APM changes LGTM 👍🏼

@watson watson merged commit 43364f6 into elastic:main Aug 4, 2023
22 checks passed
@watson watson deleted the consolidate-apm-modules branch August 4, 2023 09:30
@kibanamachine
Copy link
Contributor

💔 All backports failed

Status Branch Result
7.17 Backport failed because of merge conflicts
8.9 Backport failed because of merge conflicts

Manual backport

To create the backport manually run:

node scripts/backport --pr 162686

Questions ?

Please refer to the Backport tool documentation

@watson
Copy link
Contributor Author

watson commented Aug 4, 2023

The backports is turning out to be too complicated and multiple PRs needs to be backported as one unit. I'll do them manually instead and remove the label

@watson watson added backport:skip This commit does not require backporting and removed backport:all-open Backport to all branches that could still receive a release labels Aug 4, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport:skip This commit does not require backporting release_note:skip Skip the PR/issue when compiling release notes Team:APM All issues that need APM UI Team support Team:Operations Team label for Operations Team v8.10.0
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants