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

upgrade java agent attacher to 1.50.0 #13289

Closed

Conversation

jackshirazi
Copy link
Contributor

@jackshirazi jackshirazi commented Jun 3, 2024

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:

  • Is it observable through the addition of either logging or metrics?
  • Is its use being published in telemetry to enable product improvement?
  • Have system tests been added to avoid regression?

How to test these changes

Check the deployment uses java agent 1.50.0 artifacts

Related issues

Copy link
Contributor

mergify bot commented Jun 3, 2024

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

  • backport-7.17 is the label to automatically backport to the 7.17 branch.
  • backport-8./d is the label to automatically backport to the 8./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 Jun 3, 2024
@jackshirazi jackshirazi marked this pull request as ready for review June 3, 2024 15:03
@jackshirazi jackshirazi requested a review from a team as a code owner June 3, 2024 15:03
@jackshirazi jackshirazi marked this pull request as draft June 3, 2024 15:14
@jackshirazi jackshirazi marked this pull request as ready for review June 4, 2024 13:16
@jackshirazi
Copy link
Contributor Author

run docs-build

packaging.mk Outdated
@@ -1,228 +1,228 @@
##############################################################################
Copy link
Member

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 ? 😰

Copy link
Contributor Author

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)

Copy link
Member

@trentm trentm Jun 4, 2024

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.
...

Copy link
Member

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

Copy link
Contributor Author

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

@kruskall kruskall enabled auto-merge (squash) June 4, 2024 22:11
@kruskall kruskall disabled auto-merge June 4, 2024 22:11
@kruskall
Copy link
Member

kruskall commented Jun 4, 2024

@jackshirazi sorry for the back and forth, can you sign the commits ?

@jackshirazi
Copy link
Contributor Author

closing this for #13326

@jackshirazi jackshirazi closed this Jun 5, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport-skip Skip notification from the automated backport with mergify
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants