Skip to content

Add detecting and tagging VSCode builds #384

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

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,5 @@ out/
build/
target/
*.DS_Store
.vscode/
bin/
12 changes: 12 additions & 0 deletions src/main/java/com/gradle/CustomBuildScanEnhancements.java
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ final class CustomBuildScanEnhancements {
private static final String PROJECT_PROP_ANDROID_STUDIO_VERSION = "android.studio.version";
private static final String SYSTEM_PROP_ECLIPSE_BUILD_ID = "eclipse.buildId";
private static final String SYSTEM_PROP_IDEA_SYNC_ACTIVE = "idea.sync.active";
private static final String ENV_VAR_VSCODE_PID = "VSCODE_PID";

private final DevelocityAdapter develocity;
private final BuildScanAdapter buildScan;
Expand Down Expand Up @@ -98,6 +99,7 @@ private void captureIde() {
ideProperties.put(PROJECT_PROP_ANDROID_STUDIO_VERSION, firstOrElseSecond(providers, gradlePropertyProvider(PROJECT_PROP_ANDROID_STUDIO_VERSION, gradle, providers), gradlePropertyProvider(PROJECT_PROP_ANDROID_STUDIO_VERSION_LEGACY, gradle, providers)));
ideProperties.put(SYSTEM_PROP_ECLIPSE_BUILD_ID, systemPropertyProvider(SYSTEM_PROP_ECLIPSE_BUILD_ID, providers));
ideProperties.put(SYSTEM_PROP_IDEA_SYNC_ACTIVE, systemPropertyProvider(SYSTEM_PROP_IDEA_SYNC_ACTIVE, providers));
ideProperties.put(ENV_VAR_VSCODE_PID, environmentPropertyProvider(ENV_VAR_VSCODE_PID, providers));

// Process data at execution time to ensure property initialization
buildScan.buildFinished(new CaptureIdeMetadataAction(buildScan, ideProperties));
Expand Down Expand Up @@ -132,6 +134,8 @@ public void execute(BuildResultAdapter buildResult) {
tagIde("IntelliJ IDEA", props.get(SYSTEM_PROP_IDEA_VERSION).get());
} else if (props.get(SYSTEM_PROP_ECLIPSE_BUILD_ID).isPresent()) {
tagIde("Eclipse", props.get(SYSTEM_PROP_ECLIPSE_BUILD_ID).get());
} else if (props.get(ENV_VAR_VSCODE_PID).isPresent()) {
tagIde("VS Code", "");
} else {
buildScan.tag("Cmd Line");
}
Expand Down Expand Up @@ -565,4 +569,12 @@ private static <T> Provider<T> firstOrElseSecond(ProviderFactory providers, Prov
}
}

private static Provider<String> environmentPropertyProvider(String name, ProviderFactory providers) {
if (isGradle61OrNewer()) {
return providers.environmentVariable(name);
} else {
return providers.provider(() -> System.getenv(name));
}
}

}