Skip to content

Telemetry and jdk downloader related changes #426

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.

Sign up for GitHub

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 1 commit into from
May 16, 2025
Merged

Telemetry and jdk downloader related changes #426

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion vscode/src/telemetry/telemetry.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ export namespace Telemetry {

export const getIsTelemetryFeatureAvailable = (): boolean => {
const TELEMETRY_API = TelemetryConfiguration.getInstance()?.getApiConfig();
return TELEMETRY_API?.baseUrl != null && TELEMETRY_API?.baseUrl.trim().length > 0;
return TELEMETRY_API?.baseUrl != null && TELEMETRY_API?.baseUrl.trim().length > 0 && (TELEMETRY_API?.baseUrl.trim().startsWith("https://") || process.env['oracle_oracleJava_allow_httpTelemetryServer'] === "true");
}

export const initializeTelemetry = (contextInfo: ExtensionContextInfo): TelemetryManager => {
Expand Down
2 changes: 1 addition & 1 deletion vscode/src/webviews/jdkDownloader/view.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@ export class JdkDownloaderView {
if (isString(availableVersions)) {
const availableVersionsObj = JSON.parse(availableVersions);
if (availableVersionsObj?.items) {
const jdkVersions = availableVersionsObj?.items?.map((version: any) => version.jdkDetails.jdkVersion);
const jdkVersions = availableVersionsObj?.items?.map((version: any) => String(version.jdkDetails.jdkVersion).replace(/[^a-zA-Z0-9_.+-]/g,""));
LOGGER.log(`Fetched Oracle JDK versions: ${jdkVersions}`);

return jdkVersions;
Expand Down