Skip to content

chore: merge develop into main - #472

Merged
Sudesh0119 merged 8 commits into
mainfrom
develop
Nov 3, 2026
Merged

Sudesh0119 merged 8 commits into
mainfrom
develop

Conversation

@Sudesh0119

Copy link
Copy Markdown
Contributor

No description provided.

Sudesh0119 and others added 6 commits October 27, 2026 14:37
…d-on

The unscoped app.conf lookup merged every installed app, so telemetry
could be labelled with another add-on's name and version. Detect the
bundling app from solnlib's install path and scope the lookup to it.
No public API or method signature changes.

Co-Authored-By: Claude Code <noreply@anthropic.com>
solnlib's own __file__ is already symlink-resolved (sys.path[0] is
realpath'd), and SPLUNK_ETC may be relocated. Detect the app from the
main script first, fall back to solnlib's path, and accept SPLUNK_ETC.

Co-Authored-By: Claude Code <noreply@anthropic.com>
Prefer the outermost etc/apps match, compare paths case-insensitively on
Windows, tolerate a missing sys.argv or path errors, and keep detection
failures inside _read_ta_info so the solnlib-path fallback still applies.

Co-Authored-By: Claude Code <noreply@anthropic.com>
…d-on (#470)

## Summary
Telemetry could report the wrong add-on name and version (ADDON-91029).
`ObservabilityService._read_ta_info()` read `app.conf` without scoping
it to an app, so on a host with several add-ons it could pick up another
add-on's `[id]` stanza. For example, the GCP add-on reported itself as
`Splunk_TA_cyberark 1.2.0`.

The fix:
- solnlib now works out which add-on it belongs to from where it is
installed (`etc/apps/<app>/...`).
- It reads only that add-on's `app.conf`.
- If `[id] name` is missing, it uses the app folder name instead.
- If the add-on can't be found, telemetry is skipped and an INFO line is
logged, so no wrong identity is reported.

## Compatibility
- No public API or method signature changes. The only addition is a
private helper, `splunkenv._get_app_name_from_path`.
- Add-ons that pass `ta_name` / `ta_version`, or that override
`StanzaObservabilityRecorder._get_or_create_service` (Salesforce, GCP PR
#1027), behave the same as on 8.2.0.

## Test plan
- [x] Unit tests: the lookup is scoped to the owning add-on, the right
add-on wins when several are installed, the folder-name fallback works,
and an undetectable add-on gives no telemetry and no error
- [x] Side-by-side check of 8.2.0 and this branch with several add-ons
installed (`lib/`, `aob_py3`, and `lib/3rdparty` install folders):
identity is now correct, and explicit identity and subclass overrides
behave the same
- [ ] Check on a Splunk instance with several add-ons installed

🤖 Generated with [Claude Code](https://claude.com/claude-code)
## [8.2.1-beta.1](v8.2.0...v8.2.1-beta.1) (2026-11-02)

### Bug Fixes

* ADDON-91029 scope observability app.conf lookup to the owning add-on ([0d589ed](0d589ed))
* ADDON-91029 scope observability app.conf lookup to the owning add-on ([#470](#470)) ([5d73194](5d73194)), closes [#1027](https://github.com/splunk/addonfactory-solutions-library-python/issues/1027)
* detect the running add-on from the main script path ([09f02cd](09f02cd))
* harden running add-on detection ([06e9254](06e9254))
@Sudesh0119
Sudesh0119 requested a review from a team as a code owner November 3, 2026 10:47
@Sudesh0119
Sudesh0119 enabled auto-merge November 3, 2026 10:47
@Sudesh0119 Sudesh0119 self-assigned this Nov 3, 2026
Comment thread solnlib/__init__.py
]

__version__ = "8.2.0"
__version__ = "8.2.1-beta.1"

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

version is not right

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

@vosmolovskiy-splunk It's autogenerated and same in every PR merged before and will be corrected- https://github.com/splunk/addonfactory-solutions-library-python/pull/468/changes

Comment thread pyproject.toml
[tool.poetry]
name = "solnlib"
version = "8.2.0"
version = "8.2.1-beta.1"

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

version again

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

@vosmolovskiy-splunk It's autogenerated and same in every PR merged before and will be corrected- https://github.com/splunk/addonfactory-solutions-library-python/pull/468/changes

@Sudesh0119
Sudesh0119 merged commit ed99715 into main Nov 3, 2026
26 of 27 checks passed
@github-actions github-actions Bot locked and limited conversation to collaborators Nov 3, 2026
@github-actions github-actions Bot locked and limited conversation to collaborators Nov 3, 2026
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