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

package java-attacher alongside apm-server #6593

Merged
merged 13 commits into from
Nov 16, 2021

Conversation

stuartnelson3
Copy link
Contributor

@stuartnelson3 stuartnelson3 commented Nov 11, 2021

Motivation/summary

download and package the java-attacher when executing make release

Checklist

How to test these changes

run some different flavors of mage package, eg.

  • DEV=true SNAPSHOT=true PLATFORMS=linux/amd64 TYPES=docker mage package
  • DEV=true SNAPSHOT=true PLATFORMS=linux/amd64 TYPES=tar.gz mage package
  • DEV=true SNAPSHOT=true PLATFORMS=linux/amd64 TYPES=deb mage package

and verify that java-attacher.jar is stored in the artifact alongside the apm-server binary

Related issues

#4824

@stuartnelson3 stuartnelson3 requested a review from a team November 11, 2021 18:41
@mergify
Copy link
Contributor

mergify bot commented Nov 11, 2021

This pull request does not have a backport label. Could you fix it @stuartnelson3? 🙏
To fixup this pull request, you need to add the backport labels for the needed
branches, such as:

  • backport-7.x is the label to automatically backport to the 7.x branch.
  • backport-7./d is the label to automatically backport to the 7./d branch. /d is the digit

NOTE: backport-skip has been added to this pull request.

@mergify mergify bot added the backport-skip Skip notification from the automated backport with mergify label Nov 11, 2021
@stuartnelson3 stuartnelson3 added backport-8.0 Automated backport with mergify and removed backport-skip Skip notification from the automated backport with mergify labels Nov 11, 2021
@apmmachine
Copy link
Contributor

apmmachine commented Nov 11, 2021

💚 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: 2021-11-16T09:28:40.083+0000

  • Duration: 52 min 25 sec

  • Commit: c62bbec

Test stats 🧪

Test Results
Failed 0
Passed 6022
Skipped 19
Total 6041

🤖 GitHub comments

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

  • /test : Re-trigger the build.

  • /hey-apm : Run the hey-apm benchmark.

  • /package : Generate and publish the docker images.

  • run elasticsearch-ci/docs : Re-trigger the docs validation. (use unformatted text in the comment!)

@stuartnelson3
Copy link
Contributor Author

Note: in the tar.gz and docker container, the attacher is stored alongside the apm-server binary. this is also true in the .deb, where it's stored at ./usr/share/apm-server/bin/. I don't know if this is correct, though.

# dpkg --contents build/distributions/apm-server-8.1.0-SNAPSHOT-amd64.deb
drwxr-xr-x 0/0               0 2021-11-11 19:58 ./
drwxr-xr-x 0/0               0 2021-11-11 19:58 ./etc/
drwxr-xr-x 0/0               0 2021-11-11 19:58 ./etc/apm-server/
-rw-r--r-- 0/0          513253 2021-11-11 19:56 ./etc/apm-server/fields.yml
-rw------- 0/0           49030 2021-11-11 19:56 ./etc/apm-server/apm-server.yml
drwxr-xr-x 0/0               0 2021-11-11 19:58 ./etc/init.d/
-rwxr-xr-x 0/0            5073 2021-11-11 19:58 ./etc/init.d/apm-server
drwxr-xr-x 0/0               0 2021-11-11 19:58 ./lib/
drwxr-xr-x 0/0               0 2021-11-11 19:58 ./lib/systemd/
drwxr-xr-x 0/0               0 2021-11-11 19:58 ./lib/systemd/system/
-rw-r--r-- 0/0             640 2021-11-11 19:58 ./lib/systemd/system/apm-server.service
drwxr-xr-x 0/0               0 2021-11-11 19:58 ./usr/
drwxr-xr-x 0/0               0 2021-11-11 19:58 ./usr/share/
drwxr-xr-x 0/0               0 2021-11-11 19:58 ./usr/share/apm-server/
-rw-r--r-- 0/0         1215906 2021-11-11 09:45 ./usr/share/apm-server/NOTICE.txt
-rw-r--r-- 0/0              41 2021-11-11 19:58 ./usr/share/apm-server/.build_hash.txt
-rw-r--r-- 0/0             675 2021-11-11 19:58 ./usr/share/apm-server/README.md
drwxr-xr-x 0/0               0 2021-11-11 19:58 ./usr/share/apm-server/ingest/
drwxr-xr-x 0/0               0 2021-11-11 19:58 ./usr/share/apm-server/ingest/pipeline/
-rw-r--r-- 0/0            5589 2021-11-11 19:56 ./usr/share/apm-server/ingest/pipeline/definition.json
-rw-r--r-- 0/0            4234 2021-11-11 19:56 ./usr/share/apm-server/ingest/pipeline/definition.yml
drwxr-xr-x 0/0               0 2021-11-11 19:58 ./usr/share/apm-server/bin/
-rwxr-xr-x 0/0       128537776 2021-11-11 19:58 ./usr/share/apm-server/bin/apm-server
-rwxr-xr-x 0/0         1057147 2021-11-11 19:55 ./usr/share/apm-server/bin/apm-server-god
-rwxr-x--- 0/0        16511986 2021-11-11 19:56 ./usr/share/apm-server/bin/java-attacher.jar
-rw-r--r-- 0/0           13675 2021-05-28 15:23 ./usr/share/apm-server/LICENSE.txt
drwxr-xr-x 0/0               0 2021-11-11 19:58 ./usr/share/doc/
drwxr-xr-x 0/0               0 2021-11-11 19:58 ./usr/share/doc/apm-server/
-rw-r--r-- 0/0             138 2021-11-11 19:58 ./usr/share/doc/apm-server/changelog.gz
drwxr-xr-x 0/0               0 2021-11-11 19:58 ./usr/bin/
-rwxr-xr-x 0/0             339 2021-11-11 19:58 ./usr/bin/apm-server
drwxr-xr-x 0/0               0 2021-11-11 19:58 ./var/
drwxr-xr-x 0/0               0 2021-11-11 19:58 ./var/lib/
drwxr-xr-x 0/0               0 2021-11-11 19:55 ./var/lib/apm-server/
drwxr-xr-x 0/0               0 2021-11-11 19:58 ./var/log/
drwxr-xr-x 0/0               0 2021-11-11 19:55 ./var/log/apm-server/

Makefile Show resolved Hide resolved
@mergify
Copy link
Contributor

mergify bot commented Nov 15, 2021

This pull request is now in conflicts. Could you fix it @stuartnelson3? 🙏
To fixup this pull request, you can check out it locally. See documentation: https://help.github.com/articles/checking-out-pull-requests-locally/

git fetch upstream
git checkout -b package-java-attacher upstream/package-java-attacher
git merge upstream/master
git push upstream package-java-attacher

@mergify
Copy link
Contributor

mergify bot commented Nov 15, 2021

This pull request is now in conflicts. Could you fix it @stuartnelson3? 🙏
To fixup this pull request, you can check out it locally. See documentation: https://help.github.com/articles/checking-out-pull-requests-locally/

git fetch upstream
git checkout -b package-java-attacher upstream/package-java-attacher
git merge upstream/master
git push upstream package-java-attacher

@stuartnelson3
Copy link
Contributor Author

@axw @felixbarny let me know if the gpg stuff aligns with what you want/expect, or if I should be storing the pubkey somewhere else.

Copy link
Member

@felixbarny felixbarny left a comment

Choose a reason for hiding this comment

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

LGTM

Copy link
Member

@axw axw left a comment

Choose a reason for hiding this comment

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

looks great, thank you :)

changelogs/head.asciidoc Outdated Show resolved Hide resolved
Copy link
Member

@felixbarny felixbarny left a comment

Choose a reason for hiding this comment

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

Please wait until 1.27.0 is out before merging. Otherwise, just some minor suggestions.

Makefile Outdated Show resolved Hide resolved
Makefile Outdated Show resolved Hide resolved
Makefile Outdated Show resolved Hide resolved
@stuartnelson3 stuartnelson3 marked this pull request as ready for review November 15, 2021 12:00
Copy link
Member

@felixbarny felixbarny left a comment

Choose a reason for hiding this comment

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

I took the liberty to update the attacher version to the just released version 1.27.0

@stuartnelson3 stuartnelson3 enabled auto-merge (squash) November 16, 2021 08:30
@stuartnelson3
Copy link
Contributor Author

/test

@stuartnelson3 stuartnelson3 merged commit 5a8e0d2 into elastic:master Nov 16, 2021
mergify bot pushed a commit that referenced this pull request Nov 16, 2021
@stuartnelson3 stuartnelson3 deleted the package-java-attacher branch November 16, 2021 11:26
stuartnelson3 added a commit that referenced this pull request Nov 16, 2021
(cherry picked from commit 5a8e0d2)

Co-authored-by: stuart nelson <[email protected]>
@marclop
Copy link
Contributor

marclop commented Jan 4, 2022

Verified by downloading the apm-server from the latest 8.0 snapshot: https://snapshots.elastic.co/8.0.0-b0d1c470/summary-8.0.0-SNAPSHOT.html#apm-server

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants