-
Notifications
You must be signed in to change notification settings - Fork 525
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
upgrade java agent attacher to 1.50.0 #13289
Conversation
This pull request does not have a backport label. Could you fix it @jackshirazi? 🙏
NOTE: |
run docs-build |
packaging.mk
Outdated
@@ -1,228 +1,228 @@ | |||
############################################################################## |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
question: why the large diff ? 😰
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
try viewing with whitespace turned off. Git seems to have got really confused with me editing on the PC (it doesn't normally, and I tried switching to the ubuntu subsystem but it still did this)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This file has Windows (CRLF) line endings now, hence the huge diff. I could push a commit changing it back to Unix (LF) line endings if you like.
I was going to push a commit to fix the line-endings, but was denied :)
% git remote get-url jackshirazi
[email protected]:jackshirazi/apm-server.git
% git push jackshirazi upgrade-attacher-to-1-5-0
ERROR: Permission to jackshirazi/apm-server.git denied to trentm.
...
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
If it helps, here is a single-file, no-deps Python script for querying and change the line-endings of files: https://github.com/trentm/eol/blob/master/lib/eol.py
% eol $(git diff --name-only main...)
eol: info: changelogs/head.asciidoc: Unix (LF)
eol: info: packaging.mk: Windows (CRLF)
eol: info: packaging/apm-agent-java-public-key.asc: Unix (LF)
% eol -c unix packaging.mk
eol: info: converted `packaging.mk' to LF EOLs
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I ran dos2unix, looks like it worked
…irazi/apm-server into upgrade-attacher-to-1-5-0
@jackshirazi sorry for the back and forth, can you sign the commits ? |
closing this for #13326 |
Motivation/summary
The Java attacher version needs to be upgraded to 1.50.0. The PGP sig is taken from the agent attacher source
Checklist
For functional changes, consider:
How to test these changes
Check the deployment uses java agent 1.50.0 artifacts
Related issues