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] Bump up apm-data to v1.8.1 (backport #13614) #13617

Merged
merged 3 commits into from
Jul 6, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jul 5, 2024

Motivation/summary

host.ip resource attribute was not processed for OTel events which led to missing of this crucial field in the UI.

Checklist

How to test these changes

  1. Create a setup with opentelemetry-collector. Use otlphttp exporter to send data to APM-Server. For receiver, you can use hostmetricsreciever to collect host stats.
  2. Notice that docs indexed in Elasticsearch have the field host.ip set (note if the field labels.host_ip is set then we are not handling it correctly as all unhandled fields are added as a label).

Related issues

NA


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

(cherry picked from commit f56767d)

# Conflicts:
#	go.mod
#	go.sum
@mergify mergify bot requested a review from a team as a code owner July 5, 2024 17:49
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Jul 5, 2024
Copy link
Contributor Author

mergify bot commented Jul 5, 2024

Cherry-pick of f56767d has failed:

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

You are currently cherry-picking commit f56767d42.
  (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.15.asciidoc

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

Copy link
Contributor Author

mergify bot commented Jul 5, 2024

This pull request is now in conflicts. Could you fix it @mergify[bot]? 🙏
To fixup this pull request, you can check out it locally. See documentation: https://help.github.com/articles/checking-out-pull-requests-locally/

git fetch upstream
git checkout -b mergify/bp/8.15/pr-13614 upstream/mergify/bp/8.15/pr-13614
git merge upstream/8.15
git push upstream mergify/bp/8.15/pr-13614

@lahsivjar
Copy link
Contributor

@Mergifyio refresh

Copy link
Contributor Author

mergify bot commented Jul 6, 2024

refresh

✅ Pull request refreshed

@lahsivjar lahsivjar enabled auto-merge (squash) July 6, 2024 22:33
@mergify mergify bot merged commit 448bf5e into 8.15 Jul 6, 2024
16 checks passed
@mergify mergify bot deleted the mergify/bp/8.15/pr-13614 branch July 6, 2024 23:12
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.

1 participant