Merge pull request #544 from eharris369/CW1520-useAppBaseURLForMetrics

CW Issue #1520: use the appBaseURL for remote metrics
eclipse-archived · Jan 22, 2020 · eda24f8 · eda24f8
2 parents 75a351e + 6d96539
commit eda24f8
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/...org.eclipse.codewind.core/src/org/eclipse/codewind/core/internal/CodewindApplication.java b/...org.eclipse.codewind.core/src/org/eclipse/codewind/core/internal/CodewindApplication.java
@@ -262,7 +262,13 @@ public URL getRootUrl() {
 	public URL getMetricsUrl() {
 		try {
 			if ((!this.injectMetrics) && this.metricsAvailable) {
-				return new URL(getBaseUrl(), projectLanguage.getMetricsRoot());
+				URL appUrl = null;
+				if (appBaseUrl != null && !appBaseUrl.isEmpty()) {
+					appUrl = new URL(appBaseUrl);
+				}
+				URL metricsBaseUrl = appUrl != null ? appUrl : baseUrl;
+				URL metricsUrl = new URL(metricsBaseUrl, projectLanguage.getMetricsRoot());
+				return metricsUrl;
 			} else {
 				return (connection.getBaseURI().resolve(CoreConstants.PERF_METRICS_DASH + "/" + projectLanguage.getId() + "?theme=dark&projectID=" + projectID)).toURL();
 			}
@@ -554,4 +560,3 @@ public String toString() {
 				projectID, name, projectType, fullLocalPath.toOSString());
 	}
 }
-