From 0c0f06ccd91524ff60c598162503839fbc696ef7 Mon Sep 17 00:00:00 2001 From: jrichard Date: Thu, 16 Nov 2017 15:52:59 -0500 Subject: [PATCH] Updating phone home --- .../detect/jenkins/common/DetectCommonStep.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/blackducksoftware/integration/detect/jenkins/common/DetectCommonStep.java b/src/main/java/com/blackducksoftware/integration/detect/jenkins/common/DetectCommonStep.java index 800e3b5..aa078d3 100644 --- a/src/main/java/com/blackducksoftware/integration/detect/jenkins/common/DetectCommonStep.java +++ b/src/main/java/com/blackducksoftware/integration/detect/jenkins/common/DetectCommonStep.java @@ -26,6 +26,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Map; +import java.util.concurrent.Future; import org.apache.commons.lang3.StringUtils; import org.apache.tools.ant.types.Commandline; @@ -83,6 +84,8 @@ public void runCommonDetectStep(final String detectProperties) { final CIEnvironmentVariables variables = new CIEnvironmentVariables(); variables.putAll(envVars); logger.setLogLevel(variables); + PhoneHomeDataService phoneHomeDataService = null; + Future phoneHomeTask = null; try { final String pluginVersion = PluginHelper.getPluginVersion(); logger.info("Running Jenkins Detect version : " + pluginVersion); @@ -142,7 +145,7 @@ public void runCommonDetectStep(final String detectProperties) { final HubServerConfig hubServerConfig = hubServerConfigBuilder.build(); final RestConnection restConnection = hubServerConfig.createCredentialsRestConnection(logger); final HubServicesFactory servicesFactory = new HubServicesFactory(restConnection); - final PhoneHomeDataService phoneHomeDataService = servicesFactory.createPhoneHomeDataService(); + phoneHomeDataService = servicesFactory.createPhoneHomeDataService(); final String thirdPartyVersion = Jenkins.getVersion().toString(); @@ -152,7 +155,7 @@ public void runCommonDetectStep(final String detectProperties) { phoneHomeRequestBodyBuilder.setThirdPartyVersion(thirdPartyVersion); phoneHomeRequestBodyBuilder.setPluginVersion(pluginVersion); - phoneHomeDataService.phoneHome(phoneHomeRequestBodyBuilder); + phoneHomeTask = phoneHomeDataService.startPhoneHome(phoneHomeRequestBodyBuilder); } } catch (final Exception e) { logger.debug("Phone Home failed : " + e.getMessage(), e); @@ -167,6 +170,9 @@ public void runCommonDetectStep(final String detectProperties) { logger.error(e.getMessage(), e); run.setResult(Result.UNSTABLE); } + if (phoneHomeDataService != null && phoneHomeTask != null) { + phoneHomeDataService.endPhoneHome(phoneHomeTask); + } } public List getCorrectedParameters(final String commandLineParameters) throws DetectJenkinsException {