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.

Sign up for GitHub

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

Jump to bottom

Use otel version 0.97.0 #4638

Merged
merged 6 commits into from
May 2, 2024
Merged

Use otel version 0.97.0 #4638

merged 6 commits into from
May 2, 2024

Conversation

michalpristas
Copy link
Contributor

Otel versions >0.97.0 have a bug where they expose metrics on :8888 even for validate subcommands causing our tests to fail.

related to this issue here: open-telemetry/opentelemetry-collector#10031
cause by pull open-telemetry/opentelemetry-collector#9257

Closes: #4617

@michalpristas michalpristas requested a review from a team as a code owner April 30, 2024 09:23
@michalpristas michalpristas requested review from nchaulet, kaanyalti, ycombinator and pierrehilbert and removed request for nchaulet and kaanyalti April 30, 2024 09:23
@mergify Mergify
Copy link
Contributor

mergify bot commented Apr 30, 2024

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

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

NOTE: backport-skip has been added to this pull request.

@michalpristas michalpristas added Team:Elastic-Agent-Control-Plane Label for the Agent Control Plane team Team:Elastic-Agent Label for the Agent team labels Apr 30, 2024
@elasticmachine
Copy link
Contributor

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

@elasticmachine
Copy link
Contributor

Pinging @elastic/elastic-agent (Team:Elastic-Agent)

ycombinator
ycombinator previously approved these changes Apr 30, 2024
View reviewed changes
@michalpristas michalpristas mentioned this pull request Apr 30, 2024
Closed
7 tasks
@michalpristas
Copy link
Contributor Author

Pavel and Olga are working on addressing macos failures

ycombinator
ycombinator reviewed Apr 30, 2024
View reviewed changes
go.mod
@@ -41,11 +41,11 @@ require (
github.com/mitchellh/hashstructure v1.1.0
github.com/mitchellh/mapstructure v1.5.1-0.20231216201459-8508981c8b6c
github.com/oklog/ulid v1.3.1
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/fileexporter v0.98.0
Copy link
Contributor

Choose a reason for hiding this comment

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

Could we add a couple of newlines around this block of OTel dependencies or add a separate require block for them to indicate that they are all related?

This would then give us an opportunity to add a comment here explaining why we're pinning to 0.97.0 for now and what is the criteria for undoing that pinning. That way, when dependabot tries to automatically bump the version, whoever reviews those PRs would immediately know whether to approve them or not.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

i think we could separate

@ycombinator ycombinator dismissed their stale review April 30, 2024 13:06

Added new comment

@ycombinator ycombinator mentioned this pull request Apr 30, 2024
Closed
ycombinator
ycombinator reviewed Apr 30, 2024
View reviewed changes
go.mod Outdated Show resolved Hide resolved
michalpristas and others added 2 commits May 2, 2024 09:59
@michalpristas
Merge branch 'main' into otel-0970
402d0f2
@michalpristas @ycombinator
Update go.mod
c010548 
Co-authored-by: Shaunak Kashyap <ycombinator@gmail.com>
@elastic-sonarqube Elastic SonarQube
Copy link

Quality Gate passed Quality Gate passed

Issues
0 New issues
0 Fixed issues
0 Accepted issues

Measures
0 Security Hotspots
0.0% Coverage on New Code
0.0% Duplication on New Code

See analysis details on SonarQube

@michalpristas michalpristas merged commit a3900f0 into elastic:main May 2, 2024
9 checks passed
@ycombinator ycombinator added backport-v8.14.0 Automated backport with mergify and removed backport-skip labels May 8, 2024
@ycombinator
Copy link
Contributor

Backporting to 8.14 as it's needed for #4711.

mergify bot pushed a commit that referenced this pull request May 8, 2024
@michalpristas @mergify
Use otel version 0.97.0 (#4638)
d3befd9 
* Use version 0.97.0

---------

Co-authored-by: Shaunak Kashyap <ycombinator@gmail.com>
(cherry picked from commit a3900f0)

# Conflicts:
#	NOTICE.txt
#	go.mod
#	go.sum
#	internal/pkg/otel/README.md
#	internal/pkg/otel/run.go
@mergify mergify bot mentioned this pull request May 8, 2024
Merged
ycombinator added a commit that referenced this pull request May 8, 2024
@mergify @michalpristas @ycombinator
[8.14](backport #4638) Use otel version 0.97.0 (#4714)
d003d2a 
* Use otel version 0.97.0 (#4638)

* Use version 0.97.0

---------

Co-authored-by: Shaunak Kashyap <ycombinator@gmail.com>
(cherry picked from commit a3900f0)

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

* Fix conflicts

---------

Co-authored-by: Michal Pristas <michal.pristas@gmail.com>
Co-authored-by: Shaunak Kashyap <ycombinator@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ycombinator ycombinator ycombinator left review comments

@pierrehilbert pierrehilbert pierrehilbert approved these changes

@rdner rdner rdner approved these changes

Assignees

@michalpristas michalpristas

Labels
backport-v8.14.0 Automated backport with mergify skip-changelog Team:Elastic-Agent Label for the Agent team Team:Elastic-Agent-Control-Plane Label for the Agent Control Plane team
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

[Flaky Test]: TestOtelFileProcessing – there should be exported logs by now
5 participants
@michalpristas @elasticmachine @ycombinator @pierrehilbert @rdner