Skip to content

fix(telemetry): report release version in operator-intake and export manifest - #4383

Merged
vybe merged 1 commit into
Abilityai:devfrom
pcbeingused333:fix/trinity-version-4381
Nov 11, 2026
Merged

vybe merged 1 commit into
Abilityai:devfrom
pcbeingused333:fix/trinity-version-4381

Conversation

@pcbeingused333

Copy link
Copy Markdown
Contributor

Fixes #4381

Description

trinity_version in the operator-intake notice (operator_intake_service.py) and in the agent-data export manifest (routers/agent_data.py) was read from GIT_COMMIT_SHORT, an environment variable nothing in the repo sets, so it was always "unknown". Both call sites now use utils.app_version.resolve_release_version() (the VERSION env var, then the VERSION file). Nothing reads GIT_COMMIT_SHORT any more (its only remaining mentions are the two regression-test comments that explain the bug), and the now-unused import os in the intake service is removed.

The ent#466 spec mentioned in the issue lives outside this repo and is not touched here.

Related Issue

Fixes #4381

Journey Impact

Journey Impact: none: telemetry/export metadata value only; no journey promise changes

Type of Change

  • Bug fix (non-breaking change that fixes an issue)
  • New feature (non-breaking change that adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to change)
  • Documentation update

Testing

  • I have tested this locally
  • New tests added (if applicable)
  • All existing tests pass
  • Every new test executes the changed path

New: two cases added to tests/unit/test_ent437_telemetry_consent.py after the existing resolve_release_version test (which already covers the env var with the +g<sha> suffix stripped): "unknown" only when neither env nor file exists, and the VERSION file used when env is unset. The two call sites are exercised end to end: test_operator_intake.py::test_payload_trinity_version_is_release_version (payload recorded by the existing RecordingClient) and test_agent_data_endpoints.py::test_export_manifest_trinity_version_is_release_version (manifest.json read from the format=base64 export tar), both with VERSION set via monkeypatch. No change to tests/registry.json.

Mutation: with the source change reverted, the two call-site tests fail (trinity_version is "unknown"); with it, they pass. Ran test_ent437_telemetry_consent.py, test_1810_1814_version_truth.py, test_operator_intake.py, test_agent_data_endpoints.py: 111 passed. The local venv does not carry the mcp==1.30.0 pin (pin conflict), and the full suite was not run.

Checklist

  • My code follows the project's style guidelines
  • I have updated the documentation (if applicable)
  • I have not committed any sensitive data (API keys, credentials, etc.)
  • I have added appropriate logging for new functionality

This PR was prepared with AI assistance (Claude Code).

…manifest

trinity_version read GIT_COMMIT_SHORT, which nothing sets, so it was always
"unknown". Use utils.app_version.resolve_release_version() instead.

@vybe vybe left a comment

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.

merge-train: batch validated on train/20261111-0613 (#4463)

@vybe
vybe merged commit 6f64afd into Abilityai:dev Nov 11, 2026
23 of 24 checks passed
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.

2 participants