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.

Sign up for GitHub

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

Jump to bottom

Update apm data #12242

Merged
merged 6 commits into from
Dec 19, 2023
Merged

Update apm data #12242

merged 6 commits into from
Dec 19, 2023

Conversation

simitt
Copy link
Contributor

@simitt simitt commented Dec 19, 2023 •
edited
Loading

Motivation/summary

Updates APM Server to a newer version of https://github.com/elastic/apm-data. This should be backported to 8.12.0 and therefore contains bugfixes. A seperate PR will be needed to update apm-server to the most recent feature additions in apm-data.

This contains:

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

Related issues

@mergify Mergify
Copy link
Contributor

mergify bot commented Dec 19, 2023

This pull request does not have a backport label. Could you fix it @simitt? 🙏
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.

NOTE: backport-skip has been added to this pull request.

@mergify mergify bot added the backport-skip Skip notification from the automated backport with mergify label Dec 19, 2023
@simitt simitt added backport-8.12 Automated backport with mergify and removed backport-skip Skip notification from the automated backport with mergify labels Dec 19, 2023
@simitt simitt marked this pull request as ready for review December 19, 2023 12:36
@simitt simitt requested a review from a team as a code owner December 19, 2023 12:36
carsonip
carsonip previously approved these changes Dec 19, 2023
View reviewed changes
@simitt simitt enabled auto-merge (squash) December 19, 2023 15:43
@simitt simitt merged commit 67ec904 into elastic:main Dec 19, 2023
10 checks passed
mergify bot pushed a commit that referenced this pull request Dec 19, 2023
@simitt @mergify
Update apm data (#12242)
7af2a00 
* 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 mentioned this pull request Dec 19, 2023
Merged
mergify bot added a commit that referenced this pull request Dec 20, 2023
@mergify @simitt
[8.12] Update apm data (backport #12242) (#12250)
be356e9 
* Update apm data (#12242)

* 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

* fix go dependencies

---------

Co-authored-by: Silvia Mitter <[email protected]>
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
v1v added a commit to v1v/apm-server that referenced this pull request Dec 21, 2023
@v1v
Merge remote-tracking branch 'upstream/main' into feature/automate-re…
db90eb6 
…lease-process

* upstream/main:
  Remove Nassim Kammah from list of maintainers (elastic#12269)
  docs: Add tagged regions to changelog (elastic#12251)
  Update apm data (elastic#12242)
  Revert "Revise wait_for_integration ES implementation (elastic#12150)" (elastic#12240)
v1v added a commit to v1v/apm-server that referenced this pull request Dec 21, 2023
@v1v
Merge remote-tracking branch 'upstream/main' into feature/retry-docke…
31e65ba 
…r-elastic

* upstream/main:
  [updatecli] Bump elastic stack version to 8.13.0-yufkxnwm (elastic#12246)
  Remove Nassim Kammah from list of maintainers (elastic#12269)
  docs: Add tagged regions to changelog (elastic#12251)
  Update apm data (elastic#12242)
  Revert "Revise wait_for_integration ES implementation (elastic#12150)" (elastic#12240)
  ci(release): automate release steps (elastic#12234)
  build(deps): bump the github-actions group with 1 update (elastic#12232)
  [updatecli] Update to elastic/beats@a633696068ed (elastic#12164)
  [updatecli] Bump elastic stack version to 8.13.0-h30gube9 (elastic#12235)
  smoke-test: semver sort latest versions (elastic#12229)
  [updatecli] Bump Golang version to 1.21.5 (elastic#12191)
  fix: always try to remap both span and error stacktraces (elastic#12221)
  [updatecli] Bump elastic stack version to 8.13.0-6av99u5d (elastic#12169)
  docs: Update changelogs for 8.12 release (elastic#12172)
amannocci pushed a commit that referenced this pull request Dec 28, 2023
@simitt @amannocci
Update apm data (#12242)
bf079ca 
* 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
@simitt simitt deleted the update-apm-data branch January 3, 2024 08:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@carsonip carsonip carsonip approved these changes

Assignees
No one assigned
Labels
backport-8.12 Automated backport with mergify
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@simitt @carsonip