Skip to content

Conversation

owenrumney
Copy link
Contributor

Description

Adding the next tranche of flags with non-sensitive values to the
telemetry information.

These flags are all boolean or int values which leak no sensitive
information

Related issues

Remove this section if you don't have related PRs.

Checklist

  • I've read the guidelines for contributing to this repository.
  • I've followed the conventions in the PR title.
  • I've added tests that prove my fix is effective or that my feature works.
  • I've updated the documentation with the relevant information (if needed).

@owenrumney owenrumney self-assigned this Jul 1, 2025
@owenrumney owenrumney marked this pull request as ready for review July 1, 2025 11:02
@owenrumney owenrumney requested a review from knqyf263 as a code owner July 1, 2025 11:02
@knqyf263
Copy link
Collaborator

knqyf263 commented Jul 1, 2025

I remember there was an issue where IsSet always returned true because of SetDefault. Could you check if the flag values currently being sent only include those that were actually set?

viper.SetDefault(f.ConfigName, f.Default)

@owenrumney
Copy link
Contributor Author

owenrumney commented Jul 1, 2025

I remember there was an issue where IsSet always returned true because of SetDefault. Could you check if the flag values currently being sent only include those that were actually set?

viper.SetDefault(f.ConfigName, f.Default)

The tests support that it is only flags that have been passed that get included in the telemetry send. I will explicitly check that this isn't an issue we're going to be affected by.

I looked at things like pkg-types, which has a default in the tests and it only gets included when explicitly used

Update: I've checked this and there are a number of license related flags that go through the viper.SetDefault process using their ConfigName and we filter them out. Only flags that are set through the env or directly as flags on the CLI are included in the telemetry

@owenrumney owenrumney requested a review from knqyf263 July 1, 2025 15:41
@owenrumney owenrumney force-pushed the chore/add-more-telemetry-values branch from d577933 to 3bfaf4b Compare July 2, 2025 08:12
@owenrumney owenrumney requested a review from DmitriyLewen as a code owner July 2, 2025 08:12
@owenrumney owenrumney force-pushed the chore/add-more-telemetry-values branch from 3bfaf4b to 7f0a0e6 Compare July 2, 2025 08:13
@owenrumney owenrumney changed the title chore(cli): Add more non-sensitive flags to telemetry fix(cli): Add more non-sensitive flags to telemetry Jul 2, 2025
Adding the next tranche of flags with non-sensitive values to the
telemetry information.

These flags are all boolean or int values which leak no sensitive
information
@owenrumney owenrumney force-pushed the chore/add-more-telemetry-values branch from 7f0a0e6 to 6c6df83 Compare July 2, 2025 09:31
@DmitriyLewen
Copy link
Contributor

I've checked this and there are a number of license related flags that go through the viper.SetDefault process using their ConfigName and we filter them out. Only flags that are set through the env or directly as flags on the CLI are included in the telemetry

We need this (in another PR). Because we are losing this information.
for example, IIUC trivy-operator has switched from using envs to using a config file (or is planning to) @simar7 correct me if I'm wrong.

@owenrumney owenrumney closed this Jul 2, 2025
@owenrumney owenrumney reopened this Jul 2, 2025
@owenrumney
Copy link
Contributor Author

I've checked this and there are a number of license related flags that go through the viper.SetDefault process using their ConfigName and we filter them out. Only flags that are set through the env or directly as flags on the CLI are included in the telemetry

We need this (in another PR). Because we are losing this information. for example, IIUC trivy-operator has switched from using envs to using a config file (or is planning to) @simar7 correct me if I'm wrong.

Yes, created as #9121

Copy link
Contributor

@DmitriyLewen DmitriyLewen left a comment

Choose a reason for hiding this comment

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

LGTM

@owenrumney owenrumney added this pull request to the merge queue Jul 2, 2025
@owenrumney
Copy link
Contributor Author

@aqua-bot backport release/v0.64

Merged via the queue into aquasecurity:main with commit 7041a39 Jul 2, 2025
32 checks passed
@owenrumney owenrumney deleted the chore/add-more-telemetry-values branch July 2, 2025 10:52
@aqua-bot aqua-bot mentioned this pull request Jul 2, 2025
@owenrumney
Copy link
Contributor Author

@aqua-bot backport release/v0.64

@aqua-bot
Copy link
Contributor

aqua-bot commented Jul 2, 2025

Backport PR created: #9124

alexlebens pushed a commit to alexlebens/infrastructure that referenced this pull request Jul 31, 2025
This PR contains the following updates:

| Package | Update | Change |
|---|---|---|
| [mirror.gcr.io/aquasec/trivy](https://www.aquasec.com/products/trivy/) ([source](https://github.com/aquasecurity/trivy)) | minor | `0.64.1` -> `0.65.0` |

---

### Release Notes

<details>
<summary>aquasecurity/trivy (mirror.gcr.io/aquasec/trivy)</summary>

### [`v0.65.0`](https://github.com/aquasecurity/trivy/blob/HEAD/CHANGELOG.md#0650-2025-07-30)

[Compare Source](aquasecurity/trivy@v0.64.1...v0.65.0)

##### Features

- add graceful shutdown with signal handling ([#&#8203;9242](aquasecurity/trivy#9242)) ([2c05882](aquasecurity/trivy@2c05882))
- add HTTP request/response tracing support ([#&#8203;9125](aquasecurity/trivy#9125)) ([aa5b32a](aquasecurity/trivy@aa5b32a))
- **alma:** add AlmaLinux 10 support ([#&#8203;9207](aquasecurity/trivy#9207)) ([861d51e](aquasecurity/trivy@861d51e))
- **flag:** add schema validation for `--server` flag ([#&#8203;9270](aquasecurity/trivy#9270)) ([ed4640e](aquasecurity/trivy@ed4640e))
- **image:** add Docker context resolution ([#&#8203;9166](aquasecurity/trivy#9166)) ([99cd4e7](aquasecurity/trivy@99cd4e7))
- **license:** observe pkg types option in license scanner ([#&#8203;9091](aquasecurity/trivy#9091)) ([d44af8c](aquasecurity/trivy@d44af8c))
- **misconf:** add private ip google access attribute to subnetwork ([#&#8203;9199](aquasecurity/trivy#9199)) ([263845c](aquasecurity/trivy@263845c))
- **misconf:** added logging and versioning to the gcp storage bucket ([#&#8203;9226](aquasecurity/trivy#9226)) ([110f80e](aquasecurity/trivy@110f80e))
- **repo:** add git repository metadata to reports ([#&#8203;9252](aquasecurity/trivy#9252)) ([f4b2cf1](aquasecurity/trivy@f4b2cf1))
- **report:** add CVSS vectors in sarif report ([#&#8203;9157](aquasecurity/trivy#9157)) ([60723e6](aquasecurity/trivy@60723e6))
- **sbom:** add SHA-512 hash support for CycloneDX SBOM ([#&#8203;9126](aquasecurity/trivy#9126)) ([12d6706](aquasecurity/trivy@12d6706))

##### Bug Fixes

- **alma:** parse epochs from rpmqa file ([#&#8203;9101](aquasecurity/trivy#9101)) ([82db2fc](aquasecurity/trivy@82db2fc))
- also check `filepath` when removing duplicate packages ([#&#8203;9142](aquasecurity/trivy#9142)) ([4d10a81](aquasecurity/trivy@4d10a81))
- **aws:** update amazon linux 2 EOL date ([#&#8203;9176](aquasecurity/trivy#9176)) ([0ecfed6](aquasecurity/trivy@0ecfed6))
- **cli:** Add more non-sensitive flags to telemetry ([#&#8203;9110](aquasecurity/trivy#9110)) ([7041a39](aquasecurity/trivy@7041a39))
- **cli:** ensure correct command is picked by telemetry ([#&#8203;9260](aquasecurity/trivy#9260)) ([b4ad00f](aquasecurity/trivy@b4ad00f))
- **cli:** panic: attempt to get os.Args\[1] when len(os.Args) < 2 ([#&#8203;9206](aquasecurity/trivy#9206)) ([adfa879](aquasecurity/trivy@adfa879))
- **license:** add missed `GFDL-NIV-1.1` and `GFDL-NIV-1.2` into Trivy mapping ([#&#8203;9116](aquasecurity/trivy#9116)) ([a692f29](aquasecurity/trivy@a692f29))
- **license:** handle WITH operator for `LaxSplitLicenses` ([#&#8203;9232](aquasecurity/trivy#9232)) ([b4193d0](aquasecurity/trivy@b4193d0))
- migrate from `*.list` to `*.md5sums` files for `dpkg` ([#&#8203;9131](aquasecurity/trivy#9131)) ([f224de3](aquasecurity/trivy@f224de3))
- **misconf:** correctly adapt azure storage account ([#&#8203;9138](aquasecurity/trivy#9138)) ([51aa022](aquasecurity/trivy@51aa022))
- **misconf:** correctly parse empty port ranges in google\_compute\_firewall ([#&#8203;9237](aquasecurity/trivy#9237)) ([77bab7b](aquasecurity/trivy@77bab7b))
- **misconf:** fix log bucket in schema ([#&#8203;9235](aquasecurity/trivy#9235)) ([7ebc129](aquasecurity/trivy@7ebc129))
- **misconf:** skip rewriting expr if attr is nil ([#&#8203;9113](aquasecurity/trivy#9113)) ([42ccd3d](aquasecurity/trivy@42ccd3d))
- **nodejs:** don't use prerelease logic for compare npm constraints  ([#&#8203;9208](aquasecurity/trivy#9208)) ([fe96436](aquasecurity/trivy@fe96436))
- prevent graceful shutdown message on normal exit ([#&#8203;9244](aquasecurity/trivy#9244)) ([6095984](aquasecurity/trivy@6095984))
- **rootio:** check full version to detect `root.io` packages ([#&#8203;9117](aquasecurity/trivy#9117)) ([c2ddd44](aquasecurity/trivy@c2ddd44))
- **rootio:** fix severity selection ([#&#8203;9181](aquasecurity/trivy#9181)) ([6fafbeb](aquasecurity/trivy@6fafbeb))
- **sbom:** merge in-graph and out-of-graph OS packages in scan results ([#&#8203;9194](aquasecurity/trivy#9194)) ([aa944cc](aquasecurity/trivy@aa944cc))
- **sbom:** use correct field for licenses in CycloneDX reports ([#&#8203;9057](aquasecurity/trivy#9057)) ([143da88](aquasecurity/trivy@143da88))
- **secret:** add UTF-8 validation in secret scanner to prevent protobuf marshalling errors ([#&#8203;9253](aquasecurity/trivy#9253)) ([54832a7](aquasecurity/trivy@54832a7))
- **secret:** fix line numbers for multiple-line secrets ([#&#8203;9104](aquasecurity/trivy#9104)) ([e579746](aquasecurity/trivy@e579746))
- **server:** add HTTP transport setup to server mode ([#&#8203;9217](aquasecurity/trivy#9217)) ([1163b04](aquasecurity/trivy@1163b04))
- supporting .egg-info/METADATA in python.Packaging analyzer ([#&#8203;9151](aquasecurity/trivy#9151)) ([e306e2d](aquasecurity/trivy@e306e2d))
- **terraform:** `for_each` on a map returns a resource for every key ([#&#8203;9156](aquasecurity/trivy#9156)) ([153318f](aquasecurity/trivy@153318f))

</details>

---

### Configuration

📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined).

🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied.

♻ **Rebasing**: Whenever PR is behind base branch, or you tick the rebase/retry checkbox.

🔕 **Ignore**: Close this PR and you won't be reminded about this update again.

---

 - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box

---

This PR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate).
<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiI0MS4xLjMiLCJ1cGRhdGVkSW5WZXIiOiI0MS4xLjMiLCJ0YXJnZXRCcmFuY2giOiJtYWluIiwibGFiZWxzIjpbImltYWdlIl19-->

Reviewed-on: https://gitea.alexlebens.dev/alexlebens/infrastructure/pulls/1073
Co-authored-by: Renovate Bot <renovate-bot@alexlebens.net>
Co-committed-by: Renovate Bot <renovate-bot@alexlebens.net>
yutatokoi pushed a commit to yutatokoi/trivy that referenced this pull request Aug 12, 2025
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.

fix(cli): Add more non-sensitive flags to the telemetry
4 participants