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

Add components for supporting APM functions #5713

Merged
merged 9 commits into from
Oct 11, 2024

Conversation

lahsivjar
Copy link
Contributor

@lahsivjar lahsivjar commented Oct 7, 2024

What does this PR do?

Adds the following component to support https://github.com/elastic/opentelemetry-dev/issues/372:

* [spanmetricsconnectorv2](https://github.com/elastic/opentelemetry-collector-components/tree/main/connector/spanmetricsconnectorv2) - this component will be removed in favor of a new component soon * [countconnector](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/main/connector/countconnector)

Why is it important?

Required for https://github.com/elastic/opentelemetry-dev/issues/372

Related issues

Closes https://github.com/elastic/opentelemetry-dev/issues/390

Copy link
Contributor

mergify bot commented Oct 7, 2024

This pull request does not have a backport label. Could you fix it @lahsivjar? 🙏
To fixup this pull request, you need to add the backport labels for the needed
branches, such as:

  • backport-./d./d is the label to automatically backport to the 8./d branch. /d is the digit

Copy link
Contributor

mergify bot commented Oct 7, 2024

backport-v8.x has been added to help with the transition to the new branch 8.x.
If you don't need it please use backport-skip label and remove the backport-8.x label.

@mergify mergify bot added the backport-8.x Automated backport to the 8.x branch with mergify label Oct 7, 2024
@lahsivjar
Copy link
Contributor Author

This is blocked by dependency upgrade PRs, there are some dependency issues with EA - some dependencies are on v0.109.0 whereas others at v0.110.0. Even the latest update PR doesn’t upgrade all of them.

Copy link
Contributor

mergify bot commented Oct 8, 2024

This pull request is now in conflicts. Could you fix it? 🙏
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 add-new-components upstream/add-new-components
git merge upstream/main
git push upstream add-new-components

@lahsivjar lahsivjar marked this pull request as ready for review October 9, 2024 15:00
@lahsivjar lahsivjar requested a review from a team as a code owner October 9, 2024 15:00
@pierrehilbert pierrehilbert added the Team:Elastic-Agent-Control-Plane Label for the Agent Control Plane team label Oct 9, 2024
@elasticmachine
Copy link
Contributor

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

@pierrehilbert pierrehilbert requested a review from pchila October 9, 2024 15:06
Copy link
Contributor

@rogercoll rogercoll left a comment

Choose a reason for hiding this comment

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

LGTM, this will unblock 8.16 Auto-instrumentation testing.

@lahsivjar
Copy link
Contributor Author

I am at a loss here on what is failing in the pipeline and the logs are not very helpful. Can someone point me in the correct direction or give me a clue?

@lahsivjar
Copy link
Contributor Author

lahsivjar commented Oct 9, 2024

(windows-amd64-2022-fleet-privileged) Test output (sudo) (stdout): === Failed
  | >>> (windows-amd64-2022-fleet-privileged) Test output (sudo) (stdout): === FAIL: testing/integration TestFleetManagedUpgradePrivileged (246.47s)
 

Looks like this is the culprit... not sure if it is related to my changes. I have triggered a retry 🤞

@rogercoll
Copy link
Contributor

@lahsivjar Seems the CI succeed after the retry, is there any other blocker?

@lahsivjar
Copy link
Contributor Author

@rogercoll No blockers but require reviews from the codeowners (merging is currently blocked).

@lahsivjar lahsivjar enabled auto-merge (squash) October 10, 2024 11:21
go.mod Outdated Show resolved Hide resolved
Copy link
Member

@pchila pchila left a comment

Choose a reason for hiding this comment

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

There's just a small inconsistency for one indirect otel-collector dependency, looks good otherwise

@lahsivjar
Copy link
Contributor Author

There's just a small inconsistency for one indirect otel-collector dependency, looks good otherwise

Good catch! It looks like collector-components has some pending PRs for component updates. Let me merge those and bump the version.

@swiatekm swiatekm removed their request for review October 10, 2024 18:08
@lahsivjar lahsivjar disabled auto-merge October 11, 2024 10:54
@lahsivjar
Copy link
Contributor Author

lahsivjar commented Oct 11, 2024

We already have the replacement for spanmetricsconnectorv2 merged and ready to be released. Pausing this PR for a bit to add that component.

UPDATE: Done!

@lahsivjar lahsivjar requested a review from pchila October 11, 2024 11:44
Copy link

@lahsivjar lahsivjar enabled auto-merge (squash) October 11, 2024 12:52
@lahsivjar lahsivjar merged commit f560826 into elastic:main Oct 11, 2024
14 checks passed
@lahsivjar lahsivjar deleted the add-new-components branch October 11, 2024 16:06
mergify bot pushed a commit that referenced this pull request Oct 11, 2024
(cherry picked from commit f560826)

# Conflicts:
#	NOTICE.txt
#	go.mod
#	go.sum
#	internal/pkg/otel/README.md
lahsivjar added a commit that referenced this pull request Oct 14, 2024
)

* Add components for supporting APM functions (#5713)

(cherry picked from commit f560826)

# Conflicts:
#	NOTICE.txt
#	go.mod
#	go.sum
#	internal/pkg/otel/README.md

* Fix merge conflicts

---------

Co-authored-by: Vishal Raj <vishal.raj@elastic.co>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport-8.x Automated backport to the 8.x branch with mergify skip-changelog 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.

6 participants