chore: sync main into develop (resolve conflicts) - #463
Merged
Conversation
# [8.1.0](v8.0.0...v8.1.0) (2026-05-13) ### Bug Fixes * ADDON-85914 findings fixes ([#458](#458)) ([175b546](175b546)) * prevent extra_attrs from overriding ATTR_MODINPUT_NAME in record() ([86b7217](86b7217)) * set DELTA aggregation temporality on OTLPMetricExporter ([d71ccfc](d71ccfc)) ### Features * add flush() method to ObservabilityService ([249fb7f](249fb7f)) * add StanzaObservabilityRecorder to solnlib ([02c7d94](02c7d94))
Merges main into develop to resolve version conflicts blocking PR #462. Conflicts were in pyproject.toml and solnlib/__init__.py (version strings: 8.1.0 on main vs 8.1.0-beta.2 on develop). Kept develop's version (8.1.0-beta.2).
wtobis-splunk
requested review from
artemrys,
pdzien-splunk and
rmrowczynski-splunk
August 20, 2026 13:00
rmrowczynski-splunk
approved these changes
Aug 20, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
mainintodevelopto resolve version conflicts blocking PR chore: merge main into develop #462pyproject.tomlandsolnlib/__init__.py(version strings:8.1.0on main vs8.1.0-beta.2on develop)8.1.0-beta.2)Context
PR #462 (
main→develop) is blocked with aCONFLICTINGmerge state becausemainhas thechore(release): 8.1.0commit that isn't indevelop.mainis protected against direct pushes, so the conflict is resolved here instead, on a branch offdevelop. Once this PR merges, PR #462 will be conflict-free (mirrors the pattern used in #455 and #459).🤖 Generated with Claude Code