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.15](backport #4939) feat: upgrade go agent to v2 #5250

Merged
merged 2 commits into from
Aug 5, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Aug 2, 2024

What does this PR do?

Update the dependency to v2.

Why is it important?

go.elastic.co/apm v1 has been deprecated for a while.

Checklist

  • My code follows the style guidelines of this project
  • I have commented my code, particularly in hard-to-understand areas
  • I have made corresponding changes to the documentation
  • I have made corresponding change to the default configuration files
  • I have added tests that prove my fix is effective or that my feature works
  • I have added an entry in ./changelog/fragments using the changelog tool
  • I have added an integration test or an E2E test

Disruptive User Impact

How to test this PR locally

Related issues

Can be dropped from the dependency graph completely once elastic/e2e-testing#3845 is merged

Questions to ask yourself

  • How are we going to support this in production?
  • How are we going to measure its adoption?
  • How are we going to debug this?
  • What are the metrics I should take care of?
  • ...

Closes #3404


This is an automatic backport of pull request #4939 done by Mergify.

* feat: upgrade go agent to v2

go.elastic.co/apm v1 has been deprecated for a while. Update the dependency
to v2.

* lint: reorder imports to fix linter issues

* build: run go mod tidy

* lint: remove duplicate go.mod lines

* lint: keep go.elastic.co/apm version unchanged

(cherry picked from commit d19603b)

# Conflicts:
#	NOTICE.txt
#	go.mod
#	go.sum
@mergify mergify bot requested a review from a team as a code owner August 2, 2024 11:07
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Aug 2, 2024
@mergify mergify bot requested review from michalpristas and michel-laterman and removed request for a team August 2, 2024 11:07
Copy link
Contributor Author

mergify bot commented Aug 2, 2024

Cherry-pick of d19603b has failed:

On branch mergify/bp/8.15/pr-4939
Your branch is up to date with 'origin/8.15'.

You are currently cherry-picking commit d19603bbcc.
  (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:   internal/pkg/agent/application/application.go
	modified:   internal/pkg/agent/application/coordinator/coordinator.go
	modified:   internal/pkg/agent/application/coordinator/coordinator_test.go
	modified:   internal/pkg/agent/application/dispatcher/dispatcher.go
	modified:   internal/pkg/agent/application/monitoring/server.go
	modified:   internal/pkg/agent/application/upgrade/artifact/download/composed/downloader.go
	modified:   internal/pkg/agent/application/upgrade/artifact/download/fs/downloader.go
	modified:   internal/pkg/agent/application/upgrade/step_download.go
	modified:   internal/pkg/agent/application/upgrade/upgrade.go
	modified:   internal/pkg/agent/cmd/enroll_cmd.go
	modified:   internal/pkg/agent/cmd/run.go
	modified:   internal/pkg/basecmd/version/cmd_test.go
	modified:   internal/pkg/fleetapi/ack_cmd.go
	modified:   internal/pkg/fleetapi/acker/fleet/fleet_acker.go
	modified:   internal/pkg/fleetapi/acker/lazy/lazy_acker.go
	modified:   pkg/component/fake/component/comp/apm.go
	modified:   pkg/component/runtime/manager.go
	modified:   pkg/component/runtime/manager_fake_input_test.go
	modified:   pkg/component/runtime/manager_test.go
	modified:   pkg/control/v1/server/server.go
	modified:   pkg/control/v2/control_test.go
	modified:   pkg/control/v2/server/server.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   NOTICE.txt
	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

Copy link

Quality Gate failed Quality Gate failed

Failed conditions
0.0% Coverage on New Code (required ≥ 40%)

See analysis details on SonarQube

Copy link
Contributor Author

mergify bot commented Aug 5, 2024

This pull request has not been merged yet. Could you please review and merge it @kruskall? 🙏

@pierrehilbert pierrehilbert merged commit 25075f6 into 8.15 Aug 5, 2024
12 of 13 checks passed
@pierrehilbert pierrehilbert deleted the mergify/bp/8.15/pr-4939 branch August 5, 2024 09:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport conflicts There is a conflict in the backported pull request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants