Skip to content

[8.19](backport #7233) build(deps): bump github.com/oapi-codegen/runtime from 1.4.1 to 1.4.2#7242

Open
mergify[bot] wants to merge 2 commits into
8.19from
mergify/bp/8.19/pr-7233
Open

[8.19](backport #7233) build(deps): bump github.com/oapi-codegen/runtime from 1.4.1 to 1.4.2#7242
mergify[bot] wants to merge 2 commits into
8.19from
mergify/bp/8.19/pr-7233

Conversation

@mergify

@mergify mergify Bot commented Jun 22, 2026

Copy link
Copy Markdown
Contributor

Bumps github.com/oapi-codegen/runtime from 1.4.1 to 1.4.2.

Release notes

Sourced from github.com/oapi-codegen/runtime's releases.

Bug fix for required parameters

This is a bug fix to address a regression introduced in oapi-codegen v2.7.0

🐛 Bug fixes

Sponsors

We would like to thank our sponsors for their support during this release.

Commits


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

…#7233)

* build(deps): bump github.com/oapi-codegen/runtime from 1.4.1 to 1.4.2

Bumps [github.com/oapi-codegen/runtime](https://github.com/oapi-codegen/runtime) from 1.4.1 to 1.4.2.
- [Release notes](https://github.com/oapi-codegen/runtime/releases)
- [Commits](oapi-codegen/runtime@v1.4.1...v1.4.2)

---
updated-dependencies:
- dependency-name: github.com/oapi-codegen/runtime
  dependency-version: 1.4.2
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

* Post dependabot file modifications

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: dependabot[bot] <dependabot[bot]@users.noreply.github.com>
(cherry picked from commit 2f473c0)

# Conflicts:
#	go.mod
#	go.sum
@mergify mergify Bot added the backport label Jun 22, 2026
@mergify

mergify Bot commented Jun 22, 2026

Copy link
Copy Markdown
Contributor Author

Cherry-pick of 2f473c0 has failed:

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

You are currently cherry-picking commit 2f473c0.
  (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:   NOTICE-fips.txt
	modified:   NOTICE.txt

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

@mergify mergify Bot added the conflicts There is a conflict in the backported pull request label Jun 22, 2026
@mergify mergify Bot requested a review from a team as a code owner June 22, 2026 10:52
@mergify mergify Bot requested review from lorienhu and macdewee June 22, 2026 10:52
@github-actions github-actions Bot added automation dependency Team:Elastic-Agent-Control-Plane Label for the Agent Control Plane team labels Jun 22, 2026
@github-actions

This comment has been minimized.

@github-actions

Copy link
Copy Markdown
Contributor

TL;DR

All six Buildkite failures are caused by unresolved merge-conflict markers committed into go.mod/go.sum on the backport branch. Go fails before any CI step can run because go.mod is not parseable.

Remediation

  • Resolve the backport conflict by removing the <<<<<<<, =======, and >>>>>>> sections from go.mod and go.sum.
  • Keep github.com/oapi-codegen/runtime v1.4.2 and the existing github.com/open-telemetry/opamp-go v0.23.0 entries, then run go mod tidy and rerun the failed Buildkite pipeline.
Investigation details

Root Cause

The PR diff contains unresolved conflict markers in dependency files:

  • go.mod around the direct dependency block includes <<<<<<< HEAD, =======, and >>>>>>> 2f473c0... around github.com/oapi-codegen/runtime and github.com/open-telemetry/opamp-go.
  • go.sum contains the same conflict markers around the github.com/oapi-codegen/runtime checksum entries and github.com/open-telemetry/opamp-go checksums.

The intended resolved state appears to be:

	github.com/oapi-codegen/runtime v1.4.2
	github.com/open-telemetry/opamp-go v0.23.0

with matching go.sum entries for github.com/oapi-codegen/runtime v1.4.2 and github.com/open-telemetry/opamp-go v0.23.0.

Evidence

go: errors parsing go.mod:
go.mod:24: malformed module path "<<<<<<<": invalid char '<'
go.mod:26: usage: require module/path v1.2.3
go.mod:29: usage: require module/path v1.2.3

The Buildkite checkout also reports the backport commit had conflicts in go.mod and go.sum before the failed command ran.

Verification

Not run locally against the failing PR state; the CI logs fail during Go module parsing before tests or packaging start. The local workspace shows the resolved form should keep github.com/oapi-codegen/runtime v1.4.2 and github.com/open-telemetry/opamp-go v0.23.0.


What is this? | From workflow: PR Buildkite Detective

Give us feedback! React with 🚀 if perfect, 👍 if helpful, 👎 if not.

@ebeahan

ebeahan commented Jun 22, 2026

Copy link
Copy Markdown
Member

@copilot fix the merge conflicts on this PR

Copilot AI commented Jun 22, 2026

Copy link
Copy Markdown
Contributor

@copilot fix the merge conflicts on this PR

Fixed in commit fix: resolve merge conflicts in go.mod and go.sum. The conflicts in go.mod and go.sum were caused by opamp-go being present in the main branch PR but not in 8.19. The resolution keeps oapi-codegen/runtime v1.4.2 and excludes opamp-go (which doesn't belong in 8.19). go mod verify and go build ./... both pass.

Copilot AI requested a review from ebeahan June 22, 2026 16:05
@ebeahan

ebeahan commented Jun 22, 2026

Copy link
Copy Markdown
Member

/test

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

automation backport conflicts There is a conflict in the backported pull request dependency Team:Elastic-Agent-Control-Plane Label for the Agent Control Plane team

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants