Skip to content
Merged
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
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,19 @@ class FileManager {
private static final String OVERWATCH_DIR_ENV_VAR = "MAVEN_PROJECTBASEDIR";
private static final String BLAZAR_DIR_ENV_VAR = "VIEWABLE_BUILD_ARTIFACTS_DIR";

private final Optional<String> vbaDirectory;
private final Optional<String> buildDirectory;


public static synchronized FileManager instance(Context context) {
FileManager instance = context.get(FileManager.class);

if (instance == null) {
instance = new FileManager(HubSpotUtils.getPhase(context));
instance = new FileManager(
HubSpotUtils.getPhase(context),
HubSpotUtils.getVbaDirectory(context),
HubSpotUtils.getBuildDirectory(context)
);
context.put(FileManager.class, instance);
}

Expand All @@ -47,31 +55,35 @@ public static synchronized FileManager instance(Context context) {

private final String phase;

FileManager(String phase) {
FileManager(String phase, Optional<String> vbaDirectory, Optional<String> buildDirectory) {
this.phase = phase;
this.vbaDirectory = vbaDirectory
.or(() -> Optional.ofNullable(System.getenv(BLAZAR_DIR_ENV_VAR)));
this.buildDirectory = buildDirectory
.or(() -> Optional.ofNullable(System.getenv(OVERWATCH_DIR_ENV_VAR)));;
}

public String getPhase() {
return phase;
}

Optional<Path> getErrorOutputPath() {
return getDataDir(BLAZAR_DIR_ENV_VAR, "error-prone")
return getVbaPath("error-prone")
.map(o -> o.resolve("error-prone-exceptions.json"));
}

Optional<Path> getTimingsOutputPath() {
return getDataDir(BLAZAR_DIR_ENV_VAR, "error-prone")
return getVbaPath("error-prone")
.map(o -> o.resolve("error-prone-timings.json"));
}

Optional<Path> getLifeCycleCanaryPath(String id) {
return getDataDir(OVERWATCH_DIR_ENV_VAR, "target/overwatch-metadata")
return getMavenBuildPath( "target/overwatch-metadata")
.map(o -> o.resolve(String.format("lifecycle-canary-%s.json", id)));
}

Optional<Path> getUncaughtExceptionPath() {
return getDataDir(BLAZAR_DIR_ENV_VAR, "error-prone")
return getVbaPath("error-prone")
.map(o -> o.resolve("error-prone-exception.log"));
}

Expand All @@ -85,8 +97,15 @@ void write(Object data, Path path) {
}
}

private Optional<Path> getDataDir(String envVar, String pathToAppend) {
String dir = System.getenv(envVar);
private Optional<Path> getMavenBuildPath(String pathToAppend) {
return getDataDir(buildDirectory.orElse(""), pathToAppend);
}

private Optional<Path> getVbaPath(String pathToAppend) {
return getDataDir(vbaDirectory.orElse(""), pathToAppend);
}

private Optional<Path> getDataDir(String dir, String pathToAppend) {
if (Strings.isNullOrEmpty(dir)) {
return Optional.empty();
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,11 @@

package com.google.errorprone.hubspot;

import java.nio.charset.StandardCharsets;
import java.nio.file.FileSystems;
import java.nio.file.PathMatcher;
import java.nio.file.Paths;
import java.util.Base64;
import java.util.Iterator;
import java.util.List;
import java.util.Optional;
Expand Down Expand Up @@ -158,6 +160,26 @@ public static String getPhase(Context context) {
}
}

public static Optional<String> getVbaDirectory(Context context) {
return Optional
.ofNullable(context.get(ErrorProneFlags.class))
.flatMap(flags -> flags.get("hubspot:vba-directory"))
.map(encoded -> new String(
Base64.getUrlDecoder().decode(encoded),
StandardCharsets.UTF_8
));
}

public static Optional<String> getBuildDirectory(Context context) {
return Optional
.ofNullable(context.get(ErrorProneFlags.class))
.flatMap(flags -> flags.get("hubspot:build-directory"))
.map(encoded -> new String(
Base64.getUrlDecoder().decode(encoded),
StandardCharsets.UTF_8
));
}

private HubSpotUtils() {
throw new AssertionError();
}
Expand Down