Skip to content

Conversation

@lahsivjar
Copy link
Member

Description

Exposes the MergeCtx function introduced in https://github.com/open-telemetry/opentelemetry-collector/pull/13460/files to exporterhelper#QueueBatchSettings. This will allow configuring the merge context function using exporterhelper#WithQueueBatch.

Link to tracking issue

Related to #13320

Testing

N/A

Documentation

N/A

@codecov
Copy link

codecov bot commented Sep 1, 2025

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 91.67%. Comparing base (6ccdc89) to head (bab6491).
⚠️ Report is 61 commits behind head on main.

Additional details and impacted files
@@           Coverage Diff           @@
##             main   #13742   +/-   ##
=======================================
  Coverage   91.67%   91.67%           
=======================================
  Files         652      652           
  Lines       42506    42506           
=======================================
+ Hits        38968    38969    +1     
+ Misses       2731     2730    -1     
  Partials      807      807           

☔ 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.

@bogdan-st
Copy link

Hi @lahsivjar, could you please add a changelog entry? There are instructions in the contribution guide.

@lahsivjar
Copy link
Member Author

@bogdan-st Added changelog, thanks for the ping!

@lahsivjar
Copy link
Member Author

I don't think the test failures are related to the PR.

@bogdandrutu
Copy link
Member

Please rebase, I added a change to simplify number of times we add a setting.

@songy23 songy23 added the ready-to-merge Code review completed; ready to merge by maintainers label Sep 15, 2025
@lahsivjar
Copy link
Member Author

@bogdandrutu Friendly nudge for pushing the PR forward. Is there anything blocking the PR to get this merged?

@lahsivjar
Copy link
Member Author

@jmacd Friendly ping to get this merged, it already has the ready-to-merge label and it would be great to get this in for the next release.

Copy link
Member

@dmitryax dmitryax left a comment

Choose a reason for hiding this comment

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

LGTM. @lahsivjar please ping me on a PR where you use it

@dmitryax dmitryax added this pull request to the merge queue Oct 10, 2025
Merged via the queue into open-telemetry:main with commit 1d8da94 Oct 10, 2025
60 checks passed
@github-actions github-actions bot added this to the next release milestone Oct 10, 2025
github-merge-queue bot pushed a commit that referenced this pull request Oct 11, 2025
<!--Ex. Fixing a bug - Describe the bug and how this fixes the issue.
Ex. Adding a feature - Explain what this achieves.-->
#### Description

Update a changelog entry with the proper component for fixing the tests.

Example:
https://github.com/open-telemetry/opentelemetry-collector/actions/runs/18419570659/job/52490942165?pr=13782

Relates to
#13742

Signed-off-by: Paulo Dias <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

ready-to-merge Code review completed; ready to merge by maintainers

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants