From 70066f014ca2f1cf58a989d602a9888b91d5204d Mon Sep 17 00:00:00 2001 From: basimSynopsys Date: Tue, 27 Feb 2024 19:38:42 +0600 Subject: [PATCH 1/4] update the phone home helper class to use the new API credentials for GA4 --- .../phonehome/BlackDuckPhoneHomeHelper.java | 22 ++++++------------- 1 file changed, 7 insertions(+), 15 deletions(-) diff --git a/src/main/java/com/synopsys/integration/blackduck/phonehome/BlackDuckPhoneHomeHelper.java b/src/main/java/com/synopsys/integration/blackduck/phonehome/BlackDuckPhoneHomeHelper.java index 4fd4936b7..b728149ee 100644 --- a/src/main/java/com/synopsys/integration/blackduck/phonehome/BlackDuckPhoneHomeHelper.java +++ b/src/main/java/com/synopsys/integration/blackduck/phonehome/BlackDuckPhoneHomeHelper.java @@ -23,7 +23,6 @@ import com.synopsys.integration.phonehome.PhoneHomeClient; import com.synopsys.integration.phonehome.PhoneHomeResponse; import com.synopsys.integration.phonehome.PhoneHomeService; -import com.synopsys.integration.phonehome.google.analytics.GoogleAnalyticsConstants; import com.synopsys.integration.phonehome.request.PhoneHomeRequestBody; import com.synopsys.integration.phonehome.request.PhoneHomeRequestBodyBuilder; import com.synopsys.integration.util.IntEnvironmentVariables; @@ -35,15 +34,11 @@ public class BlackDuckPhoneHomeHelper { private final BlackDuckRegistrationService blackDuckRegistrationService; private final IntEnvironmentVariables intEnvironmentVariables; - public static BlackDuckPhoneHomeHelper createPhoneHomeHelper(BlackDuckServicesFactory blackDuckServicesFactory) { - return BlackDuckPhoneHomeHelper.createAsynchronousPhoneHomeHelper(blackDuckServicesFactory, new NoThreadExecutorService()); + public static BlackDuckPhoneHomeHelper createPhoneHomeHelper(BlackDuckServicesFactory blackDuckServicesFactory, String apiSecret, String measurementId) { + return BlackDuckPhoneHomeHelper.createAsynchronousPhoneHomeHelper(blackDuckServicesFactory, apiSecret, measurementId, new NoThreadExecutorService()); } - public static BlackDuckPhoneHomeHelper createAsynchronousPhoneHomeHelper(BlackDuckServicesFactory blackDuckServicesFactory, ExecutorService executorService) { - return createAsynchronousPhoneHomeHelper(blackDuckServicesFactory, executorService, GoogleAnalyticsConstants.PRODUCTION_INTEGRATIONS_TRACKING_ID); - } - - public static BlackDuckPhoneHomeHelper createAsynchronousPhoneHomeHelper(BlackDuckServicesFactory blackDuckServicesFactory, ExecutorService executorService, String trackingId) { + public static BlackDuckPhoneHomeHelper createAsynchronousPhoneHomeHelper(BlackDuckServicesFactory blackDuckServicesFactory, String apiSecret, String measurementId, ExecutorService executorService) { BlackDuckRegistrationService blackDuckRegistrationService = blackDuckServicesFactory.createBlackDuckRegistrationService(); IntLogger intLogger = blackDuckServicesFactory.getLogger(); @@ -51,19 +46,16 @@ public static BlackDuckPhoneHomeHelper createAsynchronousPhoneHomeHelper(BlackDu BlackDuckHttpClient blackDuckHttpClient = blackDuckServicesFactory.getBlackDuckHttpClient(); HttpClientBuilder httpClientBuilder = blackDuckHttpClient.getHttpClientBuilder(); Gson gson = blackDuckServicesFactory.getGson(); - PhoneHomeClient phoneHomeClient = BlackDuckPhoneHomeHelper.createPhoneHomeClient(intLogger, httpClientBuilder, gson, trackingId); + PhoneHomeClient phoneHomeClient = BlackDuckPhoneHomeHelper.createPhoneHomeClient(intLogger, httpClientBuilder, gson, apiSecret, measurementId); PhoneHomeService phoneHomeService = PhoneHomeService.createAsynchronousPhoneHomeService(intLogger, phoneHomeClient, executorService); return new BlackDuckPhoneHomeHelper(intLogger, phoneHomeService, blackDuckRegistrationService, intEnvironmentVariables); } - public static PhoneHomeClient createPhoneHomeClient(IntLogger intLogger, HttpClientBuilder httpClientBuilder, Gson gson) { - return createPhoneHomeClient(intLogger, httpClientBuilder, gson, GoogleAnalyticsConstants.PRODUCTION_INTEGRATIONS_TRACKING_ID); - } - - public static PhoneHomeClient createPhoneHomeClient(IntLogger intLogger, HttpClientBuilder httpClientBuilder, Gson gson, String trackingId) { - return new PhoneHomeClient(intLogger, httpClientBuilder, gson, trackingId); + public static PhoneHomeClient createPhoneHomeClient(IntLogger intLogger, HttpClientBuilder httpClientBuilder, Gson gson, String apiSecret, String measurementId) { + //return new PhoneHomeClient(intLogger, httpClientBuilder, gson, apiSecret, measurementId); + return new PhoneHomeClient(intLogger, httpClientBuilder, gson, measurementId); } public BlackDuckPhoneHomeHelper(IntLogger logger, PhoneHomeService phoneHomeService, BlackDuckRegistrationService blackDuckRegistrationService, From 18445fc18e59031714e0ccf9a4413c5dfb7b9807 Mon Sep 17 00:00:00 2001 From: basimSynopsys Date: Tue, 27 Feb 2024 19:40:31 +0600 Subject: [PATCH 2/4] the phone home helper changes are not backward compatible so changing major version --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index dcb2b84c4..c217587b0 100644 --- a/build.gradle +++ b/build.gradle @@ -7,7 +7,7 @@ project.ext.moduleName = 'com.synopsys.integration.blackduck-common' project.ext.javaUseAutoModuleName = 'true' project.ext.junitShowStandardStreams = 'true' -version = '66.2.14-SNAPSHOT' +version = '67.0.0-SNAPSHOT' description = 'A library for using various capabilities of Black Duck, notably the REST API and signature scanning.' From d9705dba1f58c8364ec53fd84915345c860a74a1 Mon Sep 17 00:00:00 2001 From: basimSynopsys Date: Wed, 10 Jul 2024 22:36:48 +0600 Subject: [PATCH 3/4] using the updated phoneHomeClient constructor --- .../blackduck/phonehome/BlackDuckPhoneHomeHelper.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/main/java/com/synopsys/integration/blackduck/phonehome/BlackDuckPhoneHomeHelper.java b/src/main/java/com/synopsys/integration/blackduck/phonehome/BlackDuckPhoneHomeHelper.java index b728149ee..3baa73d67 100644 --- a/src/main/java/com/synopsys/integration/blackduck/phonehome/BlackDuckPhoneHomeHelper.java +++ b/src/main/java/com/synopsys/integration/blackduck/phonehome/BlackDuckPhoneHomeHelper.java @@ -54,8 +54,7 @@ public static BlackDuckPhoneHomeHelper createAsynchronousPhoneHomeHelper(BlackDu } public static PhoneHomeClient createPhoneHomeClient(IntLogger intLogger, HttpClientBuilder httpClientBuilder, Gson gson, String apiSecret, String measurementId) { - //return new PhoneHomeClient(intLogger, httpClientBuilder, gson, apiSecret, measurementId); - return new PhoneHomeClient(intLogger, httpClientBuilder, gson, measurementId); + return new PhoneHomeClient(intLogger, httpClientBuilder, gson, apiSecret, measurementId); } public BlackDuckPhoneHomeHelper(IntLogger logger, PhoneHomeService phoneHomeService, BlackDuckRegistrationService blackDuckRegistrationService, From 4f9b7173dd2e0ca02b4d9c0c962eb0d52b32155a Mon Sep 17 00:00:00 2001 From: basimSynopsys Date: Sun, 28 Jul 2024 18:28:44 +0600 Subject: [PATCH 4/4] use the updated phone-home-client library version 6 --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index c217587b0..13edfe5e8 100644 --- a/build.gradle +++ b/build.gradle @@ -24,7 +24,7 @@ repositories { dependencies { api 'com.synopsys.integration:blackduck-common-api:2023.4.2.2' - api 'com.synopsys.integration:phone-home-client:5.1.10' + api 'com.synopsys.integration:phone-home-client:6.0.0' api 'com.synopsys.integration:integration-bdio:26.0.9' api 'com.blackducksoftware.bdio:bdio2:3.2.5'