Skip to content

chore(license): scope Apache-2.0 software and CC-BY-4.0 docs - #3487

Merged
Daniel Meppiel (danielmeppiel) merged 7 commits into
mainfrom
danielmeppiel-cncf-sandbox-application
Nov 10, 2026
Merged

Daniel Meppiel (danielmeppiel) merged 7 commits into
mainfrom
danielmeppiel-cncf-sandbox-application

Conversation

@danielmeppiel

@danielmeppiel Daniel Meppiel (danielmeppiel) commented Nov 6, 2026 •

Copy link
Copy Markdown
Collaborator

Description

TL;DR

Propose Apache-2.0 for APM-owned software, executable agent primitives, code/configuration examples and software-facing OpenAPM, with CC-BY-4.0 for general documentation. Publish the exact scope and distribute both licenses with the historical MIT and third-party notices. Correct the confirmed filelock attribution and the misleading claim that setuptools is universally build-only.

Important

Ready for review, not legal clearance or permission to merge. The maintainer approved the scoped amendment on November 9. Rights review remains required; previously published MIT releases and third-party terms are unchanged. This PR does not certify complete dependency-license compliance or CNCF acceptance.

Problem (WHY)

Approach (WHAT)

  • Keep the standard Apache text in LICENSE; add the unmodified official CC-BY-4.0 legal text in LICENSE-DOCS.
  • Make LICENSING.md the explicit scope: documentation prose is CC-BY, while code, configuration examples, agent primitives and software-facing OpenAPM remain Apache.
  • Align contribution terms, documentation entry points and the shared site footer.
  • Ship LICENSE, LICENSE-DOCS, LICENSING.md and NOTICE in source, wheel and standalone distributions.
  • Preserve historical MIT and third-party notices; correct only the verified filelock attribution and misleading coverage statements.

Implementation (HOW)

Surface Change and boundary
LICENSE, LICENSE-DOCS, LICENSING.md Full license texts plus scope, example/primitive/spec exclusions, attribution guidance and historical/third-party treatment. Not elective dual licensing.
CONTRIBUTING.md Inbound contributions use the license applicable to their content.
scripts/notice-metadata.yaml, scripts/generate-notice.py, NOTICE Correct filelock 3.29.0 to MIT with upstream attribution; describe direct-dependency-only enumeration and setuptools' runtime role. Generator algorithm unchanged.
pyproject.toml, build/apm.spec Apache software classifier; explicitly package all four legal files. Dependency requirements and versions unchanged.
Root apm.yml, 14 packages/**/apm.yml files, five .agents/skills/*/apm.yml copies Align 20 first-party software-package declarations to Apache-2.0.
apm.lock.yaml, tests/unit/test_triage_advisory.py Earlier commits refresh deployed/local snapshot hashes after relicensing and prove canonical Git snapshots survive frozen installation; no resolver change.
docs/src/content/docs/index.mdx, enterprise/security.md, enterprise/making-the-case.md, specs/openapm-v0.1.md Align software/spec statements and documentation scope; disclose NOTICE limitations. No normative requirement or schema change.
docs/astro.config.mjs, docs/src/components/Footer.astro Keep the standard Starlight footer and expose both license scopes on every documentation page, including OpenAPM.
tests/unit/test_project_licensing.py, CHANGELOG.md Guard declarations, official CC legal text, explicit exclusions, metadata/NOTICE parity and distribution inclusion; record migration guidance.

Diagrams

Dashed nodes are the documentation license and scope map added by this amendment; all four legal files travel with each distribution.

flowchart LR
    S["Software, agent primitives, examples, OpenAPM"] --> A["LICENSE: Apache-2.0"]
    D["General documentation"] --> C["LICENSE-DOCS: CC-BY-4.0"]
    A --> P["Source, wheel and standalone"]
    C --> P
    L["LICENSING.md: scope and exclusions"] --> P
    N["NOTICE: historical MIT and third-party attribution"] --> P
    classDef new stroke-dasharray: 5 5;
    class C,L new;
Loading

Trade-offs

  • Content scope, not extension-based relicensing. Executable Markdown skills and their resources remain software; human-facing prose is documentation. Code/configuration examples and OpenAPM are explicitly excluded from the documentation grant.
  • Preserve rather than erase earlier terms. Historical MIT and third-party notices remain. Technical scope approval does not establish authority for every contribution or patent grant.
  • Bounded notice correction, not a complete audit fix. No dependency graph changes or new CNCF exceptions. Transitive, vendored, native, website and build-tool attribution still require distribution-specific review. filelock's locked 3.29.0 attribution is not a claim about every version admitted by >=3.12.
  • Software behavior unchanged. No CLI behavior, generic generated-project license defaults, root README edits or companion-repository changes. This does not relicense the Homebrew tap's existing v0.35.0 payload.
  • Canonical legal bytes preserved. LICENSE-DOCS retains the upstream final blank line; this is the only git diff --check warning. All other amended files pass the whitespace check.

Benefits

  1. All 20 first-party software manifests agree with the Python Apache classifier.
  2. Source, wheel and a real macOS arm64 standalone build contain matching copies of all four legal files.
  3. All 126 rendered documentation pages expose the scoped license statement without mislabeling OpenAPM.
  4. The filelock attribution regression and the false NOTICE coverage claim now have regression checks.

Issue and approved scope

Issue: #3486

Human scope-approval comments:

This PR supplies the technical licensing proposal and packaging checks. The documentation boundary is now explicitly chosen and implemented; rights/legal review remains before merge. It does not complete the foundation-contribution process or authorize filing, release, signature or transfer.

Type of change

  • Bug fix
  • New feature
  • Documentation
  • Maintenance / refactor

Testing

  • Tested locally
  • All existing tests pass
  • Added tests for new functionality (if applicable)

Validation

Local results for the amendment; the full suite was not rerun and hosted CI is not inferred from these results. Current main is an ancestor of this branch. Python validation used the existing frozen environment (UV_NO_SYNC=1); all 99 installed third-party distribution versions were matched against the committed lockfile. An unrelated local uv.lock rewrite is preserved and excluded from this PR.

ART below denotes the external session artifact directory used for build output, not a tracked project directory.

Command Result
uv run --frozen --extra dev pytest -q -p no:cacheprovider tests/unit/test_project_licensing.py tests/unit/test_build_spec.py Passed: 52 tests.
uv run --frozen python scripts/generate-notice.py --check Passed: exit 0.
uv build --no-build-isolation --python .venv/bin/python --out-dir "$ART/license-split-distributions" Passed: sdist and wheel; all four legal files byte-identical to source, Apache classifier and four License-File metadata entries verified.
uv run --frozen --no-sync --extra dev --extra build pyinstaller --noconfirm --distpath "$ART/license-split-binary" --workpath "$ART/license-split-pyinstaller-work" build/apm.spec Passed on macOS arm64; all four bundled legal files byte-identical to source; built CLI --version succeeded.
npm --prefix docs run build Passed: 126 pages, 1,111 generated relative links. Parsed every non-redirect page to verify the split footer and its link destinations.
uv run --frozen python scripts/check_test_assertions.py Passed: assertion-quality ratchet clean.
uv run --frozen python scripts/check_exact_test_duplicates.py Passed: 1,417 files, zero allowed duplicate groups.
mmdc -i "$ART/license-split-diagram.mmd" -o "$ART/license-split-diagram.svg" --quiet Passed: diagram rendered.
CI-mirror lint commands and actual output

Commands executed with UV_NO_SYNC=1:

uv run --frozen --extra dev ruff check src/ tests/ scripts/lint_architecture_boundaries.py scripts/architecture_linter/ scripts/windows_native_symlink_probe_entry.py
uv run --frozen --extra dev ruff format --check src/ tests/ scripts/lint_architecture_boundaries.py scripts/architecture_linter/ scripts/windows_native_symlink_probe_entry.py
uv run --frozen --extra dev python -m pylint --disable=all --enable=R0801 --min-similarity-lines=10 --fail-on=R0801 src/apm_cli/ scripts/lint_architecture_boundaries.py scripts/architecture_linter/ scripts/windows_native_symlink_probe_entry.py
bash scripts/lint-auth-signals.sh
bash scripts/lint-architecture-boundaries.sh

All exited 0:

All checks passed!
2093 files already formatted
Your code has been rated at 10.00/10 (previous run: 10.00/10, +0.00)
[*] Rule A: get_bearer_provider boundary (any reference)
[*] Rule B: git ls-remote auth-delegated annotation
[+] auth-signal lint clean

The YAML I/O, 2,100-line and portable-relative-path guards also passed using the CI regexes/thresholds in a portable Python check. The architecture-boundary command exited 0 without output.

Scenario Evidence

Scenario (user promise) Principle Evidence Type
Contributors can identify the license for documentation versus executable Markdown and OpenAPM OSS / community-driven test_documentation_scope_excludes_software_and_specification, test_documentation_license_is_discoverable Component
Redistributors receive both licenses, their scope and retained notices OSS / community-driven test_python_distribution_includes_licenses_scope_and_notice, test_standalone_build_includes_license_and_notice, actual archive/binary inspection Component + artifact inspection
The exact historical MIT notice remains available OSS / community-driven test_notice_preserves_historical_mit_license Component
filelock is not mislabeled public-domain, and NOTICE does not imply nested coverage OSS / community-driven test_filelock_notice_matches_reviewed_release, test_notice_discloses_direct_dependency_coverage_limit Component regression
Site readers see the licensing boundary even on the specification page OSS / community-driven test_docs_footer_exposes_both_license_scopes, all-page generated-HTML inspection Component + artifact inspection

How to test

  • Run the targeted pytest and NOTICE commands above; expect 52 passes and no NOTICE drift.
  • Set ART to a disposable output directory and run the Python package and standalone build commands; inspect all four legal files and run the built CLI with --version.
  • Run npm --prefix docs run build; inspect a guide and OpenAPM for the scope-aware footer.
  • Compare LICENSE-DOCS to the official CC-BY-4.0 legalcode.txt, and review the scope exclusions and historical notices.
  • Complete rights review and required repository approvals before merging; do not infer CNCF dependency clearance from this proposal.

Spec conformance (OpenAPM v0.1)

If this PR changes behaviour that an OpenAPM v0.1 req-XXX covers,
confirm the three-step ritual in the
development guide:

  • Spec edit: docs/src/content/docs/specs/openapm-v0.1.md updated
    (new/changed <a id="req-XXX"></a> anchor + prose + Appendix C
    row).
  • Manifest edit: docs/src/content/docs/specs/manifests/openapm-v0.1.requirements.yml
    updated.
  • Test edit: a @pytest.mark.req("req-XXX") test under
    tests/spec_conformance/ added or extended.
  • CONFORMANCE.{md,json} regenerated via
    uv run --extra dev python -m tests.spec_conformance.gen_statement
    and committed.
  • N/A -- this PR does not change OpenAPM-observable behaviour.

The specification change remains limited to its introductory license sentence. No requirement, schema or conformance artifact is changed by this amendment.

Co-authored-by: Copilot 223556219+Copilot@users.noreply.github.com

Relates to #3486. Preserve historical MIT and third-party notices, align first-party metadata and documentation, and include legal files in standalone distributions. Draft proposal pending rights review before merge.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
@danielmeppiel

Copy link
Copy Markdown
Collaborator Author

APM Spec Guardian: editorial-only

Scope: editorial-only; diff = +1/-1 lines across 1 in-scope file at 258b009a9255cb6a1d0f75004f46cb15c8c3ff06.

No substantive normative spec change detected: only the introductory license sentence changes. Panel fan-out was skipped; the mechanical linter ran. This assessment does not establish licensing authority.

Checks 1-5, 7, 9 and 10 passed. Check 8 is not applicable: the specification contains no Mermaid blocks.

Linter notes

  • [6] Existing count mismatch: the specification declares 136 normative statements but has 137 unique requirement anchors. Both counts are identical on the base branch; this PR does not introduce or change the discrepancy.
  • [11] Non-spec Python file added: tests/unit/test_project_licensing.py is outside the spec-only review. Targeted licensing/build tests and the normal lint chain were run separately; this note is not a general code-review result.

This review is advisory. Re-apply the spec-review label to re-run.

Align both hash ledgers with the five first-party Apache-2.0 manifest copies and extend source/hash parity coverage to all affected skills.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
Preserve the public maintainer roster, contributor credit and Apache licensing notices together.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>

Copilot AI 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.

🟡 Changes recommended

Stale local-package content_hash values cause apm install --frozen to reject the changed packages despite updated deployment hashes.

1 open issue
What changed in this PR

This draft implements the Apache-2.0 licensing proposal from #3486 across APM-owned content and distribution metadata. It preserves historical MIT and third-party notices; rights review remains a prerequisite to merge.

Changes:

  • Align first-party manifests, Python metadata, documentation and OpenAPM’s license statement.
  • Retain historical notices and include LICENSE and NOTICE in standalone builds.
  • Add licensing checks and extend installed-skill consistency coverage.
File Description
tests/​unit/​test_triage_advisory.py Extends installed-skill file and hash checks.
tests/​unit/​test_project_licensing.py Adds metadata, notice-retention and bundle checks.
scripts/​notice-metadata.yaml Updates the generated NOTICE preamble.
pyproject.toml Changes the Python license classifier.
packages/​pr-description-skill/​apm.yml Declares Apache-2.0.
packages/​autopilot/​autopilot-pr-triage-worker/​apm.yml Declares Apache-2.0.
packages/​autopilot/​autopilot-pr-triage-scheduler/​apm.yml Declares Apache-2.0.
packages/​autopilot/​autopilot-pr-review-worker/​apm.yml Declares Apache-2.0.
packages/​autopilot/​autopilot-pr-review-scheduler/​apm.yml Declares Apache-2.0.
packages/​autopilot/​autopilot-pr-merge-worker/​apm.yml Declares Apache-2.0.
packages/​autopilot/​autopilot-maintainer-canvas/​apm.yml Declares Apache-2.0.
packages/​autopilot/​autopilot-issue-triage-worker/​apm.yml Declares Apache-2.0.
packages/​autopilot/​autopilot-issue-triage-scheduler/​apm.yml Declares Apache-2.0.
packages/​autopilot/​autopilot-issue-delivery-worker/​apm.yml Declares Apache-2.0.
packages/​autopilot/​autopilot-issue-delivery-scheduler/​apm.yml Declares Apache-2.0.
packages/​autopilot/​autopilot-comment/​apm.yml Declares Apache-2.0.
packages/​apm-guide/​apm.yml Declares Apache-2.0.
packages/​apm-contributor-dashboard/​apm.yml Declares Apache-2.0.
NOTICE Updates first-party terms and retains historical MIT text.
LICENSE Replaces MIT with standard Apache-2.0 text.
docs/​src/​content/​docs/​specs/​openapm-v0.1.md Changes only the specification’s license statement.
docs/​src/​content/​docs/​index.mdx Updates the homepage license claim.
docs/​src/​content/​docs/​enterprise/​security.md Explains licensing scope and notice retention.
docs/​src/​content/​docs/​enterprise/​making-the-case.md Updates the adoption proposal’s license claim.
CONTRIBUTING.md Clarifies contribution licensing and historical terms.
CHANGELOG.md Records the transition and redistribution guidance.
build/​apm.spec Bundles LICENSE and NOTICE.
apm.yml Declares Apache-2.0 for the root package.
apm.lock.yaml Updates deployed manifest hashes.
.agents/​skills/​pr-description-skill/​apm.yml Aligns the installed skill’s license.
.agents/​skills/​autopilot-pr-review-worker/​apm.yml Aligns the installed skill’s license.
.agents/​skills/​autopilot-pr-merge-worker/​apm.yml Aligns the installed skill’s license.
.agents/​skills/​autopilot-issue-triage-worker/​apm.yml Aligns the installed skill’s license.
.agents/​skills/​autopilot-comment/​apm.yml Aligns the installed skill’s license.

Review effort: Balanced

Comment thread apm.lock.yaml
deployed_file_hashes:
.agents/skills/autopilot-pr-merge-worker/SKILL.md: sha256:bff587a94c928a8d3e0104edde83cf4323939a737f5ee17fed4918f00810f981
.agents/skills/autopilot-pr-merge-worker/apm.yml: sha256:efae1514c8d1ca5469e2c38c361e3953c3f38e659c7a3f4f49cf1298c272ab67
.agents/skills/autopilot-pr-merge-worker/apm.yml: sha256:e421410ed6fe9e77256036f998036bdad5b8706e1d185d8a0414d285f9f9cfa9
Refresh all eleven local package hashes through the canonical source snapshot owner and cover them with a frozen-install regression contract. Preserve dependency-license and deployed-file records.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
Materialize package fixtures with LF bytes so raw integrity hashes are checked against the Git payload, not host checkout line endings. Include the regression in the Windows compatibility gate.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
@danielmeppiel

Copy link
Copy Markdown
Collaborator Author

Licensing CI and main integration

Updated head: 615a63fe8965d047eb5961b05272f25c2e5671e8.

  • Merged current main without rewriting history. The merged maintainer roster, contributor credit, governance authority and both changelog entries are preserved alongside the Apache proposal; AUTHORS stays removed.
  • Repaired the deployed manifest hashes and the package-level content_hash values for all 11 local packages. The latter addresses the frozen-install review finding. Dependency-license snapshots and third-party dependency versions remain unchanged.
  • Added a regression using canonical local-source resolution and snapshot hashing. It rejects the original stale hashes and passes with the repaired lock; actual frozen preflight likewise rejects the old snapshots and accepts the new ones. Git materialization forces canonical LF bytes so the test is independent of host checkout line endings, and it runs in the Windows compatibility gate.

All eight current CI lint steps and 119 focused tests passed locally on this exact head. NOTICE generation and deployment-drift checks passed; the unchanged documentation passed its build and 1,111-link check.

Hosted checks are now complete: 24 successful, 2 neutral, 1 skipped; none pending or failing, including the required gate.

GitHub reports MERGEABLE / BLOCKED: source conflicts are cleared, but CODEOWNER/last-push approval and the merge queue remain platform gates. No human approval is claimed. No merge, reviewer request or auto-merge was performed.

This is source/CI readiness, not a CNCF dependency-license clearance or authority to relicense third-party material. The separate dependency audit and the proposal's existing review boundaries still apply.


Generated by autopilot-pr-merge-worker. This comment is AI-generated and may contain errors.

Keep software, agent primitives, examples and OpenAPM under Apache-2.0; scope general documentation to CC-BY-4.0. Distribute both licenses and the scope, correct filelock attribution, and state NOTICE coverage accurately.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
@danielmeppiel Daniel Meppiel (danielmeppiel) changed the title chore(license): propose Apache-2.0 for APM-owned content chore(license): scope Apache-2.0 software and CC-BY-4.0 docs Nov 9, 2026
@danielmeppiel
Daniel Meppiel (danielmeppiel) merged commit c6cdf13 into main Nov 10, 2026
28 checks passed
@danielmeppiel
Daniel Meppiel (danielmeppiel) deleted the danielmeppiel-cncf-sandbox-application branch November 10, 2026 05:16
Daniel Meppiel (danielmeppiel) added a commit to microsoft/homebrew-apm that referenced this pull request Nov 10, 2026
Preserve the complete historical Microsoft MIT notice and document the separate upstream payload license and coordinated future transition. Leave the MIT v0.35.0 formula, template, release automation and README unchanged.

Relates to #54 and microsoft/apm#3487.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
Daniel Meppiel (danielmeppiel) added a commit to microsoft/apm-action that referenced this pull request Nov 10, 2026
* chore(license): propose Apache-2.0 for APM-owned content

Relates to #72 and microsoft/apm#3487. Preserve historical MIT and third-party notices; rights review remains required before merge.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>

* docs(changelog): record Apache-2.0 proposal #73

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>

---------

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
This was referenced Nov 11, 2026
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