Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: Sending instrumentation data from VS and IntelliJ #5287

Merged
merged 4 commits into from
Jun 5, 2024

Conversation

PeterSchafer
Copy link
Collaborator

@PeterSchafer PeterSchafer commented Jun 4, 2024

Pull Request Submission

Please check the boxes once done.

The pull request must:

  • Reviewer Documentation
    • follow CONTRIBUTING rules
    • be accompanied by a detailed description of the changes
    • contain a risk assessment of the change (Low | Medium | High) with regards to breaking existing functionality. A change e.g. of an underlying language plugin can completely break the functionality for that language, but appearing as only a version change in the dependencies.
    • highlight breaking API if applicable
    • contain a link to the automatic tests that cover the updated functionality.
    • contain testing instructions in case that the reviewer wants to manual verify as well, to add to the manual testing done by the author.
    • link to the link to the PR for the User-facing documentation
  • User facing Documentation
    • update any relevant documentation in gitbook by submitting a gitbook PR, and including the PR link here
    • ensure that the message of the final single commit is descriptive and prefixed with either feat: or fix: , others might be used in rare occasions as well, if there is no need to document the changes in the release notes. The changes or fixes should be described in detail in the commit message for the changelog & release notes.
  • Testing
    • Changes, removals and additions to functionality must be covered by acceptance / integration tests or smoke tests - either already existing ones, or new ones, created by the author of the PR.

Pull Request Review

All pull requests must undergo a thorough review process before being merged.
The review process of the code PR should include code review, testing, and any necessary feedback or revisions.
Pull request reviews of functionality developed in other teams only review the given documentation and test reports.

Manual testing will not be performed by the reviewing team, and is the responsibility of the author of the PR.

For Node projects: It’s important to make sure changes in package.json are also affecting package-lock.json correctly.

If a dependency is not necessary, don’t add it.

When adding a new package as a dependency, make sure that the change is absolutely necessary. We would like to refrain from adding new dependencies when possible.
Documentation PRs in gitbook are reviewed by Snyk's content team. They will also advise on the best phrasing and structuring if needed.

Pull Request Approval

Once a pull request has been reviewed and all necessary revisions have been made, it is approved for merging into
the main codebase. The merging of the code PR is performed by the code owners, the merging of the documentation PR
by our content writers.

What does this PR do?

Adapt how we convert and send v1 instrumentation data from IntelliJ and Visual Studio IDEs. While we change the a bit responsibilities here, we were able to clean this up a bit as well.

The main behavioural change is that the analytics report command now always sends the data itself and directly, for v1 and v2 data. This is why we don't want to send additional instrumentation data for it. It remains the same that we don't send instrumentation data when the CLI is executed in an IDE.

Where should the reviewer start?

Main changes are here snyk/go-application-framework#204

How should this be manually tested?

  1. Case: Run code test "inside" an IDE
SNYK_INTEGRATION_NAME=VS_CODE snyk code test -d
...
2024-06-04T20:04:33Z main - This CLI call is not instrumented!
  1. Case: Run code test normally
snyk code test -d
...
2024-06-04T20:07:48Z analytics.report:3 - [0] Schema Version: 2
2024-06-04T20:07:48Z analytics.report:3 - [0] Data: {"data":{"attributes":{"interaction":{"categories":["code","test"],"errors":[],"extension":{"exitcode":1},"id":"urn:snyk:interaction:2f8dc39e-d829-4054-b5aa-13155...
  1. Case: Inject v1 instrumentation data (OSS)
SNYK_INTEGRATION_NAME=VS_CODE snyk analytics report --experimental -d -i -inputData '{"data": {"type": "analytics","attributes": {"path":"<PATH_TO_TEST>", "device_id": "unique-uuid","application": "snyk-cli","application_version": "1.1233.0","os": "macOS","arch": "ARM64","integration_name": "IntelliJ","integration_version": "2.5.5","integration_environment": "Pycharm","integration_environment_version": "2023.1","event_type": "Scan done","status": "Succeeded","scan_type": "Snyk Open Source","unique_issue_count": {"critical": 15,"high": 10,"medium": 1,"low": 2},"duration_ms": "1000","timestamp_finished": "2023-09-01T12:00:00Z"}}}'
...
2024-06-04T20:07:48Z analytics.report:1 - [0] Schema Version: 2
2024-06-04T20:07:48Z analytics.report:1 - [0] Data: {"data":{"attributes":{"interaction":{"categories":["oss","test"],"errors":[],"extension":{"device_id":"unique-uuid"},"id":"urn:snyk:interaction:2f8dc39e-d829-4054-b5aa-13155...

When <PATH_TO_TEST> is specified, the Data should contain a target id, while it won't if path is not specified.

Any background context you want to provide?

What are the relevant tickets?

Screenshots

Additional questions

@PeterSchafer PeterSchafer requested a review from a team as a code owner June 4, 2024 20:11
@PeterSchafer PeterSchafer force-pushed the fix/CLI-351_v2_data branch from c6bdc81 to 274a372 Compare June 4, 2024 20:12
@PeterSchafer PeterSchafer force-pushed the fix/CLI-351_v2_data branch from eb4a0e8 to 5679e16 Compare June 5, 2024 10:25
@PeterSchafer PeterSchafer enabled auto-merge (squash) June 5, 2024 10:25
@PeterSchafer PeterSchafer force-pushed the fix/CLI-351_v2_data branch from 5679e16 to 41ce967 Compare June 5, 2024 10:42
@PeterSchafer PeterSchafer merged commit 58d4fc9 into main Jun 5, 2024
15 checks passed
@PeterSchafer PeterSchafer deleted the fix/CLI-351_v2_data branch June 5, 2024 12:03
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