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.12] Update apm data (backport #12242) #12250

Merged
merged 3 commits into from
Dec 20, 2023
Merged

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Dec 19, 2023

This is an automatic backport of pull request #12242 done by Mergify.
Cherry-pick of 67ec904 has failed:

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

You are currently cherry-picking commit 67ec9040a.
  (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.txt
	modified:   changelogs/8.12.asciidoc
	modified:   internal/beater/api/intake/handler_test.go
	deleted:    internal/beater/api/intake/test_approved/BodyReader.approved.json
	new file:   internal/beater/api/intake/test_approved/EmptyBody.approved.json
	modified:   internal/beater/api/intake/test_approved/FullQueue.approved.json
	modified:   internal/beater/api/intake/test_approved/FullQueueLegacy.approved.json
	deleted:    internal/beater/api/intake/test_approved/integration/rum/TestRUMHandler_KillSwitchMiddleware/On.approved.json
	deleted:    internal/beater/api/intake/test_approved/integration/rum/TestRUMHandler_NoAuthorizationRequired.approved.json
	modified:   internal/beater/api/mux_intake_rum_test.go
	modified:   systemtest/rum_test.go

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/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

* Update to apm-data version to handle empty rquest bodies gracefully

* Update apm-data to wrap processor errors

* Update apm-data to require one exception.{type,message} for log exceptions

(cherry picked from commit 67ec904)

# Conflicts:
#	go.mod
#	go.sum
@mergify mergify bot requested a review from a team as a code owner December 19, 2023 16:01
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Dec 19, 2023
@mergify mergify bot assigned simitt Dec 19, 2023
@simitt simitt removed the conflicts There is a conflict in the backported pull request label Dec 19, 2023
systemtest/rum_test.go Show resolved Hide resolved
@mergify mergify bot merged commit be356e9 into 8.12 Dec 20, 2023
17 checks passed
@mergify mergify bot deleted the mergify/bp/8.12/pr-12242 branch December 20, 2023 08:39
@simitt simitt added this to the 8.12 milestone Dec 20, 2023
@simitt simitt added the v8.12.0 label Dec 20, 2023
@simitt simitt removed their assignment Dec 20, 2023
@endorama
Copy link
Member

endorama commented Jan 2, 2024

I manually tested this PR for elastic/apm-data#174, one of the included fixes. I can confirm apm-server correctly respond to empty requests without failures.

@carsonip
Copy link
Member

carsonip commented Jan 3, 2024

Tested this PR for elastic/apm-data#181. Although errors are wrapped and returned by apm-data, apm-server tries to unwrap into InvalidInputError (see code), which skips over all the additional context. Therefore, most of the changes in apm-data that affects InvalidInputError have no user-facing changes. As flagged by @kyungeunni , it affects error like:

{
    "accepted": 0,
    "errors": [
        {
            "message": "cannot handle stream: cannot process batch: unauthorized: anonymous access not permitted for agent \"java\""
        }
    ]
}

I agree with @simitt that as there is no additional sensitive info, this is fine.

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

Successfully merging this pull request may close these issues.

5 participants