Skip to content

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Mar 18, 2025

What does this PR do?

The PR replaces lsminterval processor and signaltometrics connector with the newly introduced elasticapm connector which wraps both the processor and the connector with the required APM configurations.

In addition, the PR also removes aggregation for metrics pipeline as required by elastic/opentelemetry-collector-components#390

The PR is same as #6937 but for 9.0 branch since the upgrade of otel components to version 0.120.0 has been merged to 9.0 already however, the main PR is still pending.

Why is it important?

To centralize all APM components and configurations a new connector component called elasticapmconnector was recently introduced. The component encapsulates the signaltometrics connector and the lsminterval connector along with the required configurations for APM.

To handle metrics-only services correctly for the UI.

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

Related issues

Questions to ask yourself

  • How are we going to support this in production?
  • How are we going to measure its adoption?
  • How are we going to debug this?
  • What are the metrics I should take care of?
  • ...

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

@mergify mergify bot requested a review from a team as a code owner March 18, 2025 14:50
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Mar 18, 2025
@mergify mergify bot requested review from kaanyalti and pkoutsovasilis and removed request for a team March 18, 2025 14:50
@mergify
Copy link
Contributor Author

mergify bot commented Mar 18, 2025

Cherry-pick of efeb73b has failed:

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

You are currently cherry-picking commit efeb73bf2.
  (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:   deploy/helm/edot-collector/kube-stack/README.md
	modified:   deploy/helm/edot-collector/kube-stack/values.yaml
	modified:   internal/pkg/agent/cmd/testdata/otel/components-output.yml
	modified:   internal/pkg/otel/components.go
	modified:   internal/pkg/otel/samples/darwin/logs_metrics_traces.yml
	modified:   internal/pkg/otel/samples/linux/logs_metrics_traces.yml
	modified:   internal/pkg/otel/testdata/all-components.yml

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   NOTICE.txt
	both modified:   go.mod
	both modified:   go.sum
	both modified:   internal/pkg/otel/README.md

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

@swiatekm swiatekm changed the title [8.18](backport #7172) [9.0] Use elastic apm connector to replace other apm components [8.18](backport #7172) Use elastic apm connector to replace other apm components Mar 18, 2025
@github-actions github-actions bot added Team:Elastic-Agent-Control-Plane Label for the Agent Control Plane team skip-changelog labels Mar 18, 2025
@elasticmachine
Copy link
Contributor

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

(cherry picked from commit efeb73b)

# Conflicts:
#	NOTICE.txt
#	go.mod
#	go.sum
#	internal/pkg/otel/README.md
@swiatekm swiatekm force-pushed the mergify/bp/8.18/pr-7172 branch from 1f3a1fe to 0fcf60d Compare March 18, 2025 14:54
@swiatekm swiatekm removed the conflicts There is a conflict in the backported pull request label Mar 18, 2025
Copy link
Contributor

@lahsivjar lahsivjar left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM!

@elastic-sonarqube
Copy link

@swiatekm swiatekm self-assigned this Mar 18, 2025
@elasticmachine
Copy link
Contributor

💚 Build Succeeded

History

cc @lahsivjar @swiatekm

@swiatekm swiatekm merged commit bcd3fcc into 8.18 Mar 18, 2025
12 checks passed
@swiatekm swiatekm deleted the mergify/bp/8.18/pr-7172 branch March 18, 2025 17:30
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.

3 participants