Skip to content

chore: merge develop into main#453

Open
wtobis-splunk wants to merge 25 commits intomainfrom
develop
Open

chore: merge develop into main#453
wtobis-splunk wants to merge 25 commits intomainfrom
develop

Conversation

@wtobis-splunk
Copy link
Copy Markdown
Contributor

No description provided.

kkedziak-splunk and others added 21 commits August 6, 2025 15:46
**Issue:**
[ADDON-78610](https://splunk.atlassian.net/browse/ADDON-78610)

Splunk REST Client now retries failed calls.

Status codes that are retried are below.

Default retries specified by urllib3:
- 413
- 429
- 503

Additional codes specified by solnlib:
- 500
- 502
- 504

The default number of retries is 5.
# [7.0.0-beta.2](v7.0.0-beta.1...v7.0.0-beta.2) (2025-08-06)

### Features

* retrying HTTP calls on errors ([#440](#440)) ([413c3a0](413c3a0))
**Issue number**
[ADDON-85636](https://splunk.atlassian.net/browse/ADDON-85636)

**Summary**
This PR introduces a new _solnlib.observability_ module that adds an
ObservabilityService for Splunk modular inputs and a
_LoggerMetricExporter_ for local/debug metric export. The service
initializes standard event count and event byte counters, reads TA
metadata from app.conf, attempts secure OTLP export to the local
Spotlight collector with env/IPC-based port discovery, and degrades
gracefully when observability is unavailable.

It also adds unit tests covering exporter behavior and OTLP
setup/fallback paths, exports the new module through `solnlib.__init__`,
and updates project dependencies and MkDocs references so the new
observability API is documented and packaged correctly, and formally
drops Python 3.7 support from the package configuration.

**Testing**
- [X] Manual testing on MSCS
- [X] Unit tests added
# [7.0.0-beta.3](v7.0.0-beta.2...v7.0.0-beta.3) (2026-03-26)

### Bug Fixes

* add AAA test sections and update docformatter config ([7d959ac](7d959ac))
* address PR comments ([ce3cef9](ce3cef9))
* drop Python 3.7/3.8 support and fix Splunk Python path detection in CI ([8ee9ffc](8ee9ffc))
* fix OTLP exporter happy-path test ([02dd919](02dd919))
* install local solnlib in integration tests instead of PyPI version ([32ba4a7](32ba4a7))
* update copyright year, remove typing_extensions, drop observability from __init__ ([c685f3e](c685f3e))
* update poetry to 2.1.2 ([d12515a](d12515a))
* use regex pattern in .licenserc.yaml to allow any copyright year ([dbb307e](dbb307e))

### Features

* add ObservabilityService ([f7ec4fb](f7ec4fb))
BREAKING CHANGE: Python 3.7 and 3.8 are no longer supported.
Minimum required Python version is now 3.9.
This commit ensures semantic-release bumps the major version.

The breaking change (dropping Python 3.7/3.8 support) was introduced in
a previous commit with a `fix:` prefix, which would not trigger a major
version bump on its own.
# [7.0.0-beta.4](v7.0.0-beta.3...v7.0.0-beta.4) (2026-04-02)

* feat!: drop Python 3.7 and 3.8 support ([85567db](85567db))

### BREAKING CHANGES

* Python 3.7 and 3.8 are no longer supported.
Minimum required Python version is now 3.9.
wtobis-splunk and others added 2 commits April 3, 2026 08:10
Co-authored-by: Hetang Modi <[email protected]>
Co-authored-by: srv-rr-github-token <[email protected]>
Keep develop version (7.0.0-beta.4) when merging main's 7.0.0 release commit.

Co-Authored-By: Claude Opus 4.6 <[email protected]>
wtobis-splunk and others added 2 commits April 3, 2026 21:35
## Summary
- Merges `main` into `develop` to resolve version conflicts blocking PR
#453
- Conflicts were in `pyproject.toml` and `solnlib/__init__.py` (version
strings: `7.0.0` on main vs `7.0.0-beta.4` on develop)
- Kept develop's version (`7.0.0-beta.4`)

## Context
PR #453 (develop → main) is blocked with `CONFLICTING` merge state
because `main` has the `chore(release): 7.0.0` commit that isn't in
`develop`. Once this PR merges, PR #453 will be conflict-free.

🤖 Generated with [Claude Code](https://claude.com/claude-code)
# [8.0.0-beta.1](v7.0.0...v8.0.0-beta.1) (2026-04-03)

* feat!: drop Python 3.7 and 3.8 support ([85567db](85567db))

### Bug Fixes

* add AAA test sections and update docformatter config ([7d959ac](7d959ac))
* address PR comments ([ce3cef9](ce3cef9))
* drop Python 3.7/3.8 support and fix Splunk Python path detection in CI ([8ee9ffc](8ee9ffc))
* fix OTLP exporter happy-path test ([02dd919](02dd919))
* install local solnlib in integration tests instead of PyPI version ([32ba4a7](32ba4a7))
* update copyright year, remove typing_extensions, drop observability from __init__ ([c685f3e](c685f3e))
* update poetry to 2.1.2 ([d12515a](d12515a))
* use regex pattern in .licenserc.yaml to allow any copyright year ([dbb307e](dbb307e))

### Features

* add ObservabilityService ([f7ec4fb](f7ec4fb))
* retrying HTTP calls on errors ([#440](#440)) ([413c3a0](413c3a0))

### BREAKING CHANGES

* Python 3.7 and 3.8 are no longer supported.
Minimum required Python version is now 3.9.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants