Skip to content

[8.19] (backport #17096) feat: bump apm-data and propagate trace provider #17099

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

Merged
merged 9 commits into from
Jun 5, 2025

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jun 4, 2025

Motivation/summary

apm-data dropped legacy go agent tracing and is fully using otel

propagate the otel provider to apm-data

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

Followup to elastic/apm-data#482


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

* feat: bump apm-data and propagate trace provider

pass otel trace provider to apm-data

* lint: regenerate notice file

(cherry picked from commit 398af2c)

# Conflicts:
#	NOTICE-fips.txt
#	NOTICE.txt
#	go.mod
#	go.sum
#	internal/beater/api/mux.go
#	internal/beater/api/mux_test.go
#	internal/beater/otlp/http_test.go
#	internal/beater/server.go
#	internal/beater/tracing.go
@mergify mergify bot added the backport label Jun 4, 2025
@mergify mergify bot requested a review from a team as a code owner June 4, 2025 21:03
@mergify mergify bot added the conflicts There is a conflict in the backported pull request label Jun 4, 2025
Copy link
Contributor Author

mergify bot commented Jun 4, 2025

Cherry-pick of 398af2c has failed:

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

You are currently cherry-picking commit 398af2c1.
  (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/beater/otlp/grpc.go
	modified:   internal/beater/otlp/grpc_test.go
	modified:   internal/beater/otlp/http.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   NOTICE-fips.txt
	both modified:   NOTICE.txt
	both modified:   go.mod
	both modified:   go.sum
	both modified:   internal/beater/api/mux.go
	both modified:   internal/beater/api/mux_test.go
	both modified:   internal/beater/otlp/http_test.go
	both modified:   internal/beater/server.go
	both modified:   internal/beater/tracing.go

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

github-actions bot commented Jun 4, 2025

🤖 GitHub comments

Expand to view the GitHub comments

Just comment with:

  • run docs-build : Re-trigger the docs validation. (use unformatted text in the comment!)

@kruskall kruskall removed the conflicts There is a conflict in the backported pull request label Jun 4, 2025
@mergify mergify bot merged commit 00b8b0d into 8.19 Jun 5, 2025
15 checks passed
@mergify mergify bot deleted the mergify/bp/8.19/pr-17096 branch June 5, 2025 13:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant