Skip to content

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Jun 6, 2025

What does this PR do?

Adds cumulativetodeltaprocessor to the EDOT collector

elastic-agent version of elastic/opentelemetry-collector-components#601

/cc @codefromthecrypt

Why is it important?

Elastic stack only supports delta metrics. The processor can be used to still ingest certain cumulative metrics such as those scraped from Prometheus endpoints.

Checklist

  • I have read and understood the pull request guidelines of this project.
  • My code follows the style guidelines of this project
  • I have commented my code, particularly in hard-to-understand areas
  • I have made corresponding changes to the documentation
  • I have made corresponding change to the default configuration files
  • I have added tests that prove my fix is effective or that my feature works
  • I have added an entry in ./changelog/fragments using the changelog tool
  • I have added an integration test or an E2E test

Disruptive User Impact

How to test this PR locally

Can start a server exposing Prometheus metrics such as envoy and configure collector with prometheus receiver and cumulativetodelta processor to elastic apm.


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

---------

Co-authored-by: Andrzej Stencel <andrzej.stencel@elastic.co>
(cherry picked from commit 5111970)

# Conflicts:
#	NOTICE-fips.txt
#	go.mod
#	go.sum
#	internal/pkg/otel/README.md
#	internal/pkg/otel/testdata/all-components-fips.yml
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Jun 6, 2025
@mergify
Copy link
Contributor Author

mergify bot commented Jun 6, 2025

Cherry-pick of 5111970 has failed:

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

You are currently cherry-picking commit 511197098.
  (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
	new file:   changelog/fragments/1749176965-add-cumulativetodeltaprocessor.yaml
	modified:   internal/pkg/otel/components.go
	modified:   internal/pkg/otel/testdata/all-components.yml

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   NOTICE-fips.txt
	both modified:   go.mod
	both modified:   go.sum
	both modified:   internal/pkg/otel/README.md
	deleted by us:   internal/pkg/otel/testdata/all-components-fips.yml

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 requested a review from a team as a code owner June 6, 2025 23:09
@mergify mergify bot added the conflicts There is a conflict in the backported pull request label Jun 6, 2025
@mergify mergify bot requested review from kaanyalti and michel-laterman and removed request for a team June 6, 2025 23:09
@mergify mergify bot added the backport label Jun 6, 2025
@github-actions github-actions bot added enhancement New feature or request Team:Elastic-Agent-Control-Plane Label for the Agent Control Plane team labels Jun 6, 2025
@elasticmachine
Copy link
Contributor

Pinging @elastic/elastic-agent-control-plane (Team:Elastic-Agent-Control-Plane)

@mergify
Copy link
Contributor Author

mergify bot commented Jun 9, 2025

This pull request has not been merged yet. Could you please review and merge it @anuraaga? 🙏

@andrzej-stencel andrzej-stencel enabled auto-merge (squash) June 9, 2025 13:19
@elastic-sonarqube
Copy link

@andrzej-stencel andrzej-stencel merged commit e2eea75 into 9.0 Jun 10, 2025
11 checks passed
@andrzej-stencel andrzej-stencel deleted the mergify/bp/9.0/pr-8372 branch June 10, 2025 07:58
@elasticmachine
Copy link
Contributor

💛 Build succeeded, but was flaky

Failed CI Steps

History

cc @anuraaga

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 enhancement New feature or request 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.

4 participants