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

[8.x] feat: sync replace directives with beats (backport #15020) #15040

Merged
merged 2 commits into from
Dec 23, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Dec 23, 2024

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


This is an automatic backport of pull request #15020 done by [Mergify](https://mergify.com).

* 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 mergify bot added the backport label Dec 23, 2024
@mergify mergify bot requested a review from a team as a code owner December 23, 2024 23:03
@mergify mergify bot added the conflicts There is a conflict in the backported pull request label Dec 23, 2024
Copy link
Contributor Author

mergify bot commented Dec 23, 2024

Cherry-pick of fb3f3c7 has failed:

On branch mergify/bp/8.x/pr-15020
Your branch is up to date with 'origin/8.x'.

You are currently cherry-picking commit fb3f3c71.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   .ci/updatecli/bump-golang.yml
	modified:   NOTICE.txt
	deleted:    internal/glog/glog.go
	deleted:    internal/glog/go.mod
	deleted:    internal/glog/go.sum
	modified:   packaging/docker/Dockerfile
	modified:   packaging/docker/Dockerfile.wolfi

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   go.mod
	both modified:   go.sum

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@kruskall kruskall removed the conflicts There is a conflict in the backported pull request label Dec 23, 2024
@mergify mergify bot merged commit 369ffc3 into 8.x Dec 23, 2024
13 checks passed
@mergify mergify bot deleted the mergify/bp/8.x/pr-15020 branch December 23, 2024 23:32
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.

1 participant