Skip to content

Backport fix to ensure the bug does not affect splunk-otel-collector v0.127.0 #6314

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 5 commits into from
Jun 17, 2025

Conversation

jvoravong
Copy link
Contributor

Backported open-telemetry/opentelemetry-collector#13117 fix from https://github.com/open-telemetry/opentelemetry-collector/releases/tag/v0.128.0 to ensure the bug does not affect splunk-otel-collector v0.127.0.

Copy link

codecov bot commented Jun 13, 2025

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 43.72%. Comparing base (3f360f7) to head (a1e78a2).
Report is 1 commits behind head on main.

Additional details and impacted files
@@            Coverage Diff             @@
##             main    #6314      +/-   ##
==========================================
- Coverage   43.73%   43.72%   -0.02%     
==========================================
  Files         390      390              
  Lines       26995    26995              
==========================================
- Hits        11806    11803       -3     
- Misses      14340    14341       +1     
- Partials      849      851       +2     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
  • 📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

@jvoravong jvoravong marked this pull request as ready for review June 13, 2025 15:01
@jvoravong jvoravong requested review from a team as code owners June 13, 2025 15:01
@jvoravong
Copy link
Contributor Author

Two Integration Test check failures exist and are expected due to test coverage failures, they are unrelated to this PR.

->
	go.opentelemetry.io/collector/confmap v1.34.0
	go.opentelemetry.io/collector/confmap/provider/envprovider v1.34.0
	go.opentelemetry.io/collector/confmap/provider/fileprovider v1.34.0
	go.opentelemetry.io/collector/confmap/provider/yamlprovider v1.34.0
	go.opentelemetry.io/collector/confmap/xconfmap v0.128.0
@jvoravong jvoravong force-pushed the backport-13117 branch 2 times, most recently from 475627c to bfd95b9 Compare June 16, 2025 21:35
@crobert-1
Copy link
Contributor

Tests are failing because of open-telemetry/opentelemetry-collector#12981, tests need to be updated to properly account for upstream change.

@jvoravong jvoravong force-pushed the backport-13117 branch 4 times, most recently from 2854fe3 to d847f73 Compare June 17, 2025 15:41
Copy link
Contributor

Choose a reason for hiding this comment

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

It's no longer valid to pass an empty config and expect a non-nil response from confmap. The test case should be updated to contain valid "default" information for the component that is not empty. 👍

@jvoravong jvoravong force-pushed the backport-13117 branch 4 times, most recently from 9b42bda to 93faf22 Compare June 17, 2025 17:43
@jvoravong
Copy link
Contributor Author

The two failing check for the integration tests will be fixed in a separate PR.

@jvoravong jvoravong merged commit c3bf242 into main Jun 17, 2025
233 of 235 checks passed
@jvoravong jvoravong deleted the backport-13117 branch June 17, 2025 18:37
@github-actions github-actions bot locked and limited conversation to collaborators Jun 17, 2025
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants