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

feat: sync replace directives with beats #15020

Merged
merged 3 commits into from
Dec 23, 2024

Conversation

kruskall
Copy link
Member

Motivation/summary

remove unused replace directives and ensure we are using the same dep version as beats

google/glog is no longer shipped in the apm-server binary so the replace is not needed (ristretto removed the glog dependency)
sync goja and goja_nodejs versions with beats
remove docker replace directives

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

make test
make apm-server && go version -m apm-server | grep google/glog

Related issues

remove unused replace directives and ensure we are using the
same dep version as beats
@kruskall kruskall requested a review from a team as a code owner December 20, 2024 20:23
Copy link
Contributor

mergify bot commented Dec 20, 2024

This pull request does not have a backport label. Could you fix it @kruskall? 🙏
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.
  • backport-8.x is the label to automatically backport to the 8.x branch.

Copy link
Contributor

mergify bot commented Dec 20, 2024

backport-8.x has been added to help with the transition to the new branch 8.x.
If you don't need it please use backport-skip label.

@mergify mergify bot added the backport-8.x Automated backport to the 8.x branch with mergify label Dec 20, 2024
@kruskall kruskall enabled auto-merge (squash) December 23, 2024 22:53
@kruskall kruskall merged commit fb3f3c7 into elastic:main Dec 23, 2024
11 checks passed
@kruskall kruskall deleted the feat/sync-replace branch December 23, 2024 23:02
mergify bot pushed a commit that referenced this pull request Dec 23, 2024
* feat: sync replace directives with beats

remove unused replace directives and ensure we are using the
same dep version as beats

* lint: regenerate notice file

(cherry picked from commit fb3f3c7)

# Conflicts:
#	go.mod
#	go.sum
mergify bot added a commit that referenced this pull request Dec 23, 2024
)

* feat: sync replace directives with beats (#15020)

* feat: sync replace directives with beats

remove unused replace directives and ensure we are using the
same dep version as beats

* lint: regenerate notice file

(cherry picked from commit fb3f3c7)

# Conflicts:
#	go.mod
#	go.sum

* lint: run go mod tidy

---------

Co-authored-by: kruskall <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport-8.x Automated backport to the 8.x branch with mergify
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants