diff --git a/java/ql/integration-tests/java/buildless-erroneous/diagnostics.expected b/java/ql/integration-tests/java/buildless-erroneous/diagnostics.expected index 90aa56bf3f6d..ee1b8835665b 100644 --- a/java/ql/integration-tests/java/buildless-erroneous/diagnostics.expected +++ b/java/ql/integration-tests/java/buildless-erroneous/diagnostics.expected @@ -1,3 +1,18 @@ +{ + "attributes": {}, + "markdownMessage": "Internal telemetry for the Java extractor.\n\nNo action needed.", + "severity": "note", + "source": { + "extractorName": "java", + "id": "java/extractor/summary", + "name": "Java extractor telemetry" + }, + "visibility": { + "cliSummaryTable": false, + "statusPage": false, + "telemetry": true + } +} { "markdownMessage": "Because no usable build tool (Gradle, Maven, etc) was found, build scripts could not be queried for guidance about the appropriate JDK version for the code being extracted, or precise dependency information. The default JDK will be used, and external dependencies will be inferred from the Java package names used.", "severity": "unknown", diff --git a/java/ql/integration-tests/java/buildless-gradle-boms/diagnostics.expected b/java/ql/integration-tests/java/buildless-gradle-boms/diagnostics.expected index 976e0eb08fce..d78b3ca081ae 100644 --- a/java/ql/integration-tests/java/buildless-gradle-boms/diagnostics.expected +++ b/java/ql/integration-tests/java/buildless-gradle-boms/diagnostics.expected @@ -1,3 +1,18 @@ +{ + "attributes": {}, + "markdownMessage": "Internal telemetry for the Java extractor.\n\nNo action needed.", + "severity": "note", + "source": { + "extractorName": "java", + "id": "java/extractor/summary", + "name": "Java extractor telemetry" + }, + "visibility": { + "cliSummaryTable": false, + "statusPage": false, + "telemetry": true + } +} { "markdownMessage": "Java analysis used build tool Gradle to pick a JDK version and/or to recommend external dependencies.", "severity": "unknown", diff --git a/java/ql/integration-tests/java/buildless-gradle-classifiers/diagnostics.expected b/java/ql/integration-tests/java/buildless-gradle-classifiers/diagnostics.expected index 7312fdf95ec4..906a8f129900 100644 --- a/java/ql/integration-tests/java/buildless-gradle-classifiers/diagnostics.expected +++ b/java/ql/integration-tests/java/buildless-gradle-classifiers/diagnostics.expected @@ -1,3 +1,18 @@ +{ + "attributes": {}, + "markdownMessage": "Internal telemetry for the Java extractor.\n\nNo action needed.", + "severity": "note", + "source": { + "extractorName": "java", + "id": "java/extractor/summary", + "name": "Java extractor telemetry" + }, + "visibility": { + "cliSummaryTable": false, + "statusPage": false, + "telemetry": true + } +} { "markdownMessage": "Java analysis used build tool Gradle to pick a JDK version and/or to recommend external dependencies.", "severity": "unknown", diff --git a/java/ql/integration-tests/java/buildless-gradle-timeout/diagnostics.expected b/java/ql/integration-tests/java/buildless-gradle-timeout/diagnostics.expected index 779ffa91e715..56072f5b90cc 100644 --- a/java/ql/integration-tests/java/buildless-gradle-timeout/diagnostics.expected +++ b/java/ql/integration-tests/java/buildless-gradle-timeout/diagnostics.expected @@ -1,3 +1,18 @@ +{ + "attributes": {}, + "markdownMessage": "Internal telemetry for the Java extractor.\n\nNo action needed.", + "severity": "note", + "source": { + "extractorName": "java", + "id": "java/extractor/summary", + "name": "Java extractor telemetry" + }, + "visibility": { + "cliSummaryTable": false, + "statusPage": false, + "telemetry": true + } +} { "markdownMessage": "A Gradle process was aborted because it didn't write to the console for 5 seconds. Consider either lengthening the timeout if appropriate by setting CODEQL_EXTRACTOR_JAVA_BUILDLESS_CHILD_PROCESS_IDLE_TIMEOUT to a higher value or zero for no timeout, or else investigate why Gradle timed out. Java analysis will continue, but the analysis may be of reduced quality.", "severity": "note", diff --git a/java/ql/integration-tests/java/buildless-gradle/diagnostics.expected b/java/ql/integration-tests/java/buildless-gradle/diagnostics.expected index 337fa9338081..abe6bfaa24c5 100644 --- a/java/ql/integration-tests/java/buildless-gradle/diagnostics.expected +++ b/java/ql/integration-tests/java/buildless-gradle/diagnostics.expected @@ -1,3 +1,18 @@ +{ + "attributes": {}, + "markdownMessage": "Internal telemetry for the Java extractor.\n\nNo action needed.", + "severity": "note", + "source": { + "extractorName": "java", + "id": "java/extractor/summary", + "name": "Java extractor telemetry" + }, + "visibility": { + "cliSummaryTable": false, + "statusPage": false, + "telemetry": true + } +} { "markdownMessage": "Java analysis used build tool Gradle to pick a JDK version and/or to recommend external dependencies.", "severity": "unknown", diff --git a/java/ql/integration-tests/java/buildless-inherit-trust-store/diagnostics.expected b/java/ql/integration-tests/java/buildless-inherit-trust-store/diagnostics.expected index 766db40aa62e..9faa13e8d8b7 100644 --- a/java/ql/integration-tests/java/buildless-inherit-trust-store/diagnostics.expected +++ b/java/ql/integration-tests/java/buildless-inherit-trust-store/diagnostics.expected @@ -1,3 +1,18 @@ +{ + "attributes": {}, + "markdownMessage": "Internal telemetry for the Java extractor.\n\nNo action needed.", + "severity": "note", + "source": { + "extractorName": "java", + "id": "java/extractor/summary", + "name": "Java extractor telemetry" + }, + "visibility": { + "cliSummaryTable": false, + "statusPage": false, + "telemetry": true + } +} { "markdownMessage": "Java analysis used build tool Maven to pick a JDK version and/or to recommend external dependencies.", "severity": "unknown", diff --git a/java/ql/integration-tests/java/buildless-maven-executable-war/diagnostics.expected b/java/ql/integration-tests/java/buildless-maven-executable-war/diagnostics.expected index 1058e1528f99..cc4731ad9c24 100644 --- a/java/ql/integration-tests/java/buildless-maven-executable-war/diagnostics.expected +++ b/java/ql/integration-tests/java/buildless-maven-executable-war/diagnostics.expected @@ -1,3 +1,18 @@ +{ + "attributes": {}, + "markdownMessage": "Internal telemetry for the Java extractor.\n\nNo action needed.", + "severity": "note", + "source": { + "extractorName": "java", + "id": "java/extractor/summary", + "name": "Java extractor telemetry" + }, + "visibility": { + "cliSummaryTable": false, + "statusPage": false, + "telemetry": true + } +} { "markdownMessage": "Java analysis used build tool Maven to pick a JDK version and/or to recommend external dependencies.", "severity": "unknown", diff --git a/java/ql/integration-tests/java/buildless-maven-existing-settings-xml/diagnostics.expected b/java/ql/integration-tests/java/buildless-maven-existing-settings-xml/diagnostics.expected index f3c89bb842a0..fdef7e871f54 100644 --- a/java/ql/integration-tests/java/buildless-maven-existing-settings-xml/diagnostics.expected +++ b/java/ql/integration-tests/java/buildless-maven-existing-settings-xml/diagnostics.expected @@ -1,3 +1,18 @@ +{ + "attributes": {}, + "markdownMessage": "Internal telemetry for the Java extractor.\n\nNo action needed.", + "severity": "note", + "source": { + "extractorName": "java", + "id": "java/extractor/summary", + "name": "Java extractor telemetry" + }, + "visibility": { + "cliSummaryTable": false, + "statusPage": false, + "telemetry": true + } +} { "markdownMessage": "Java analysis used build tool Maven to pick a JDK version and/or to recommend external dependencies.", "severity": "unknown", diff --git a/java/ql/integration-tests/java/buildless-maven-mirrorof/diagnostics.expected b/java/ql/integration-tests/java/buildless-maven-mirrorof/diagnostics.expected index f3c89bb842a0..fdef7e871f54 100644 --- a/java/ql/integration-tests/java/buildless-maven-mirrorof/diagnostics.expected +++ b/java/ql/integration-tests/java/buildless-maven-mirrorof/diagnostics.expected @@ -1,3 +1,18 @@ +{ + "attributes": {}, + "markdownMessage": "Internal telemetry for the Java extractor.\n\nNo action needed.", + "severity": "note", + "source": { + "extractorName": "java", + "id": "java/extractor/summary", + "name": "Java extractor telemetry" + }, + "visibility": { + "cliSummaryTable": false, + "statusPage": false, + "telemetry": true + } +} { "markdownMessage": "Java analysis used build tool Maven to pick a JDK version and/or to recommend external dependencies.", "severity": "unknown", diff --git a/java/ql/integration-tests/java/buildless-maven-multimodule/diagnostics.expected b/java/ql/integration-tests/java/buildless-maven-multimodule/diagnostics.expected index 1058e1528f99..cc4731ad9c24 100644 --- a/java/ql/integration-tests/java/buildless-maven-multimodule/diagnostics.expected +++ b/java/ql/integration-tests/java/buildless-maven-multimodule/diagnostics.expected @@ -1,3 +1,18 @@ +{ + "attributes": {}, + "markdownMessage": "Internal telemetry for the Java extractor.\n\nNo action needed.", + "severity": "note", + "source": { + "extractorName": "java", + "id": "java/extractor/summary", + "name": "Java extractor telemetry" + }, + "visibility": { + "cliSummaryTable": false, + "statusPage": false, + "telemetry": true + } +} { "markdownMessage": "Java analysis used build tool Maven to pick a JDK version and/or to recommend external dependencies.", "severity": "unknown", diff --git a/java/ql/integration-tests/java/buildless-maven-timeout/diagnostics.expected b/java/ql/integration-tests/java/buildless-maven-timeout/diagnostics.expected index 5a30189b5e30..04c4fd2c7e5f 100644 --- a/java/ql/integration-tests/java/buildless-maven-timeout/diagnostics.expected +++ b/java/ql/integration-tests/java/buildless-maven-timeout/diagnostics.expected @@ -1,3 +1,18 @@ +{ + "attributes": {}, + "markdownMessage": "Internal telemetry for the Java extractor.\n\nNo action needed.", + "severity": "note", + "source": { + "extractorName": "java", + "id": "java/extractor/summary", + "name": "Java extractor telemetry" + }, + "visibility": { + "cliSummaryTable": false, + "statusPage": false, + "telemetry": true + } +} { "markdownMessage": "A Maven process was aborted because it didn't write to the console for 5 seconds. Consider either lenghtening the timeout if appropriate by setting CODEQL_EXTRACTOR_JAVA_BUILDLESS_CHILD_PROCESS_IDLE_TIMEOUT to a higher value or zero for no timeout, or else investigate why Maven timed out. Java analysis will continue, but the analysis may be of reduced quality.", "severity": "note", diff --git a/java/ql/integration-tests/java/buildless-maven-tolerate-unavailable-dependency/diagnostics.expected b/java/ql/integration-tests/java/buildless-maven-tolerate-unavailable-dependency/diagnostics.expected index 0ef924eb7c11..49e812dc1e94 100644 --- a/java/ql/integration-tests/java/buildless-maven-tolerate-unavailable-dependency/diagnostics.expected +++ b/java/ql/integration-tests/java/buildless-maven-tolerate-unavailable-dependency/diagnostics.expected @@ -1,3 +1,18 @@ +{ + "attributes": {}, + "markdownMessage": "Internal telemetry for the Java extractor.\n\nNo action needed.", + "severity": "note", + "source": { + "extractorName": "java", + "id": "java/extractor/summary", + "name": "Java extractor telemetry" + }, + "visibility": { + "cliSummaryTable": false, + "statusPage": false, + "telemetry": true + } +} { "markdownMessage": "At least one dependency JAR suggested by the build system could not be downloaded. This means the analysis will try to satisfy the dependency with its default choice for the required external package name, which may be the wrong version or the wrong package entirely. This may lead to partial analysis of code using this dependency. See the extraction log for full details. If the cause appears to be a temporary outage, consider retrying the analysis.", "severity": "note", diff --git a/java/ql/integration-tests/java/buildless-maven-tolerate-unavailable-dependency/test.py b/java/ql/integration-tests/java/buildless-maven-tolerate-unavailable-dependency/test.py index f7673ce3ad1c..3a08acad55f5 100644 --- a/java/ql/integration-tests/java/buildless-maven-tolerate-unavailable-dependency/test.py +++ b/java/ql/integration-tests/java/buildless-maven-tolerate-unavailable-dependency/test.py @@ -1,4 +1,4 @@ -def test(codeql, java): +def test(codeql, java, check_diagnostics_java): codeql.database.create( build_mode="none", ) diff --git a/java/ql/integration-tests/java/buildless-maven/diagnostics.expected b/java/ql/integration-tests/java/buildless-maven/diagnostics.expected index f3c89bb842a0..fdef7e871f54 100644 --- a/java/ql/integration-tests/java/buildless-maven/diagnostics.expected +++ b/java/ql/integration-tests/java/buildless-maven/diagnostics.expected @@ -1,3 +1,18 @@ +{ + "attributes": {}, + "markdownMessage": "Internal telemetry for the Java extractor.\n\nNo action needed.", + "severity": "note", + "source": { + "extractorName": "java", + "id": "java/extractor/summary", + "name": "Java extractor telemetry" + }, + "visibility": { + "cliSummaryTable": false, + "statusPage": false, + "telemetry": true + } +} { "markdownMessage": "Java analysis used build tool Maven to pick a JDK version and/or to recommend external dependencies.", "severity": "unknown", diff --git a/java/ql/integration-tests/java/buildless-proxy-gradle/diagnostics.expected b/java/ql/integration-tests/java/buildless-proxy-gradle/diagnostics.expected index 337fa9338081..abe6bfaa24c5 100644 --- a/java/ql/integration-tests/java/buildless-proxy-gradle/diagnostics.expected +++ b/java/ql/integration-tests/java/buildless-proxy-gradle/diagnostics.expected @@ -1,3 +1,18 @@ +{ + "attributes": {}, + "markdownMessage": "Internal telemetry for the Java extractor.\n\nNo action needed.", + "severity": "note", + "source": { + "extractorName": "java", + "id": "java/extractor/summary", + "name": "Java extractor telemetry" + }, + "visibility": { + "cliSummaryTable": false, + "statusPage": false, + "telemetry": true + } +} { "markdownMessage": "Java analysis used build tool Gradle to pick a JDK version and/or to recommend external dependencies.", "severity": "unknown", diff --git a/java/ql/integration-tests/java/buildless-proxy-maven/diagnostics.expected b/java/ql/integration-tests/java/buildless-proxy-maven/diagnostics.expected index f3c89bb842a0..fdef7e871f54 100644 --- a/java/ql/integration-tests/java/buildless-proxy-maven/diagnostics.expected +++ b/java/ql/integration-tests/java/buildless-proxy-maven/diagnostics.expected @@ -1,3 +1,18 @@ +{ + "attributes": {}, + "markdownMessage": "Internal telemetry for the Java extractor.\n\nNo action needed.", + "severity": "note", + "source": { + "extractorName": "java", + "id": "java/extractor/summary", + "name": "Java extractor telemetry" + }, + "visibility": { + "cliSummaryTable": false, + "statusPage": false, + "telemetry": true + } +} { "markdownMessage": "Java analysis used build tool Maven to pick a JDK version and/or to recommend external dependencies.", "severity": "unknown", diff --git a/java/ql/integration-tests/java/buildless-sibling-projects/diagnostics.expected b/java/ql/integration-tests/java/buildless-sibling-projects/diagnostics.expected index b3df8a700c31..b821d41e6003 100644 --- a/java/ql/integration-tests/java/buildless-sibling-projects/diagnostics.expected +++ b/java/ql/integration-tests/java/buildless-sibling-projects/diagnostics.expected @@ -1,3 +1,18 @@ +{ + "attributes": {}, + "markdownMessage": "Internal telemetry for the Java extractor.\n\nNo action needed.", + "severity": "note", + "source": { + "extractorName": "java", + "id": "java/extractor/summary", + "name": "Java extractor telemetry" + }, + "visibility": { + "cliSummaryTable": false, + "statusPage": false, + "telemetry": true + } +} { "markdownMessage": "Java analysis dropped the following dependencies because a sibling project depends on a higher version:\n\n* `junit/junit-4.11`", "severity": "unknown", diff --git a/java/ql/integration-tests/java/buildless/diagnostics.expected b/java/ql/integration-tests/java/buildless/diagnostics.expected index 90aa56bf3f6d..ee1b8835665b 100644 --- a/java/ql/integration-tests/java/buildless/diagnostics.expected +++ b/java/ql/integration-tests/java/buildless/diagnostics.expected @@ -1,3 +1,18 @@ +{ + "attributes": {}, + "markdownMessage": "Internal telemetry for the Java extractor.\n\nNo action needed.", + "severity": "note", + "source": { + "extractorName": "java", + "id": "java/extractor/summary", + "name": "Java extractor telemetry" + }, + "visibility": { + "cliSummaryTable": false, + "statusPage": false, + "telemetry": true + } +} { "markdownMessage": "Because no usable build tool (Gradle, Maven, etc) was found, build scripts could not be queried for guidance about the appropriate JDK version for the code being extracted, or precise dependency information. The default JDK will be used, and external dependencies will be inferred from the Java package names used.", "severity": "unknown", diff --git a/java/ql/integration-tests/java/gradle-sample-without-wrapper-or-gradle-buildless/diagnostics.expected b/java/ql/integration-tests/java/gradle-sample-without-wrapper-or-gradle-buildless/diagnostics.expected index f40920e10d63..b23aa85f2548 100644 --- a/java/ql/integration-tests/java/gradle-sample-without-wrapper-or-gradle-buildless/diagnostics.expected +++ b/java/ql/integration-tests/java/gradle-sample-without-wrapper-or-gradle-buildless/diagnostics.expected @@ -1,3 +1,21 @@ +{ + "attributes": { + "java_vendor": "__REDACTED__", + "java_version": "11.0.31" + }, + "markdownMessage": "Internal telemetry for the Java extractor.\n\nNo action needed.", + "severity": "note", + "source": { + "extractorName": "java", + "id": "java/extractor/summary", + "name": "Java extractor telemetry" + }, + "visibility": { + "cliSummaryTable": false, + "statusPage": false, + "telemetry": true + } +} { "markdownMessage": "Analyzed a Gradle project without the [Gradle wrapper](https://docs.gradle.org/current/userguide/gradle_wrapper.html). This may use an incompatible version of Gradle.", "severity": "warning", diff --git a/java/ql/integration-tests/java/gradle-sample-without-wrapper-or-gradle-buildless/test.py b/java/ql/integration-tests/java/gradle-sample-without-wrapper-or-gradle-buildless/test.py index e59277f3ea36..92aedd825efa 100644 --- a/java/ql/integration-tests/java/gradle-sample-without-wrapper-or-gradle-buildless/test.py +++ b/java/ql/integration-tests/java/gradle-sample-without-wrapper-or-gradle-buildless/test.py @@ -4,7 +4,8 @@ # The version of gradle used doesn't work on java 17 -def test(codeql, use_java_11, java, environment): +def test(codeql, use_java_11, java, environment, check_diagnostics): + check_diagnostics.redact += ["attributes.java_vendor"] gradle_override_dir = pathlib.Path(tempfile.mkdtemp()) if runs_on.windows: (gradle_override_dir / "gradle.bat").write_text("@echo off\nexit /b 2\n") diff --git a/java/ql/integration-tests/java/maven-download-failure/diagnostics.expected b/java/ql/integration-tests/java/maven-download-failure/diagnostics.expected index daabe47a9e9f..c3e812b36162 100644 --- a/java/ql/integration-tests/java/maven-download-failure/diagnostics.expected +++ b/java/ql/integration-tests/java/maven-download-failure/diagnostics.expected @@ -1,3 +1,18 @@ +{ + "attributes": {}, + "markdownMessage": "Internal telemetry for the Java extractor.\n\nNo action needed.", + "severity": "note", + "source": { + "extractorName": "java", + "id": "java/extractor/summary", + "name": "Java extractor telemetry" + }, + "visibility": { + "cliSummaryTable": false, + "statusPage": false, + "telemetry": true + } +} { "markdownMessage": "Java analysis used build tool Maven to pick a JDK version and/or to recommend external dependencies.", "severity": "unknown", diff --git a/java/ql/integration-tests/java/maven-download-failure/test.py b/java/ql/integration-tests/java/maven-download-failure/test.py index a86d970e3fe0..ad9c4bb78409 100644 --- a/java/ql/integration-tests/java/maven-download-failure/test.py +++ b/java/ql/integration-tests/java/maven-download-failure/test.py @@ -2,7 +2,7 @@ import os.path import shutil -def test(codeql, java, check_diagnostics): +def test(codeql, java, check_diagnostics_java): # Avoid shutil resolving mvn to the wrapper script in the test dir: os.environ["NoDefaultCurrentDirectoryInExePath"] = "0"