Skip to content

Merge telemetry into main with conflicts resolved #417

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

Merged
merged 36 commits into from
May 2, 2025

Conversation

Achal1607
Copy link
Member

Merged main into telemetry to resolve all the merge conflicts.

Achal1607 and others added 30 commits November 7, 2024 12:02
Upgraded dev dependencies and removed unused dependencies
Merging main into telemetry
some bug fixes and added debug logger

Added flag to disable telemetry feature

Updated LspServerTelemetryManager with slight refinements

1. The workspaceInfo values, especially the javaVersion field.
2. Also reverted the sendTelemetry() methods to the state
    similar to earlier definitions with synchronized blocks;
    with minor refactoring improvements.
3. Added the missed changes in NbCodeClientCapabilities for the
    addition of the wantsTelemetryEnabled field.

Signed-off-by: Siddharth Srinivasan <[email protected]>

Updated telemetry l10n with only english

1. Added the same english key value for telemetry setting and message in
    all language bundles. This is to ensure that tests pass.
2. Removed the unused dependency "axios" pruned further dependencies of
    it.
3. Updated minimum runtime JDK version to 23 instead of 22 in l10n messages.

Signed-off-by: Siddharth Srinivasan <[email protected]>
Initial structure of telemetry feature in the extension
2) Added build time config for telemetry
3) Fixed status code around bug
4) added important headers in the post request of telemetry events
Merge 'main' into 'telemetry'
Improvements in telemetry client
…trigger

ensure workspaceChangeEvent interval is triggered only once
Updated telemetry event triggers
1. Amended LspServerTelemetryManager to expose isPreviewEnabled() method
   and associated enums and methods to populate JdkFeatureEvent.
2. Amended NbCodeClientCapabilites.wantsTelemetryEnabled() to avoid an
   NPE in case of null Boolean -> boolean conversion.
3. Fixed handlers.ts to receive jdkFeature event from LSP and send it to
   the telemetry reporter.
4. Fixed jdkFeatures.ts to properly coalesce multiple events.

Signed-off-by: Siddharth Srinivasan <[email protected]>
…ure-event

Fixes and edits to telemetry code to support JdkFeatureEvent
workspace root are recognized

1. Amended LspServerTelemetryManager.sendWorkspaceInfo to use a NavigableMap
   to find sub-paths of the workspaceFolder that correspond to Projects,
   when it is not itself a Project.
2. Also, caught exceptions from ProjectProblems.isBroken() since it
   maybe a sign of a broken project.

Signed-off-by: Siddharth Srinivasan <[email protected]>
features from the NetBeans LSP Server.

1. Added nbcode.java.lsp.server.telemetry module to provide the
   implementation.
2. Added jdk.compiler module access to NBLS in launchOptions.ts

Co-authored-by: Jan Lahoda @lahodaj
Co-authored-by: Siddharth Srinivasan @sid-srini
Signed-off-by: Siddharth Srinivasan <[email protected]>
…projects-workspace-info

Fixes to TelemetryServerManager to ensure multi-module projects under a workspace root are recognized
Adding initial structure of telemetry jdkFeatures event generation
Brings changes up-to-date from 23.1.0 GA.
Merge main branch into feature branch
Fixed label and id issue in JDK downloader
Fixed ids coming up as label issue in JDK Downloader
Merging the latest changes from 'main', corresponding to v. 24.0.0
with merge conflicts resolved.
Added 429 error code retryable support
union across the source root instead of only those in the active editor.

Signed-off-by: Siddharth Srinivasan <[email protected]>
Achal1607 and others added 6 commits April 24, 2025 21:08
Enhancement in telemetry preferences flow and some telemetry maintenance changes
…che-update

Updated telemetry jdk-features cache expiry time and maintenance as a
1. Added a detailed data usage policy document as vscode/TELEMETRY.md
2. Updated telemetry consent settings and pop-up messages to refer to
   this document.

Signed-off-by: Siddharth Srinivasan <[email protected]>
…-messages

Updating telemetry consent messages
@Achal1607 Achal1607 requested a review from sid-srini April 30, 2025 08:03
@oracle-contributor-agreement oracle-contributor-agreement bot added the OCA Verified All contributors have signed the Oracle Contributor Agreement. label Apr 30, 2025
@Achal1607 Achal1607 changed the base branch from telemetry to main April 30, 2025 08:29
Copy link
Member

@sid-srini sid-srini left a comment

Choose a reason for hiding this comment

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

Thanks. LGTM 👍

@sid-srini sid-srini changed the title Resolved merge conflicts in telemetry branch Merge telemetry into main with conflicts resolved Apr 30, 2025
@Achal1607 Achal1607 added this to the JVSC 24.1.0 milestone Apr 30, 2025
@sid-srini sid-srini merged commit 6541ab3 into oracle:main May 2, 2025
3 checks passed
@sid-srini sid-srini removed the request for review from arvindaprameya May 2, 2025 06:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
OCA Verified All contributors have signed the Oracle Contributor Agreement.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants