Removal of debugging probes of analysis of #232

promregator · Sep 25, 2023 · d1cc306 · d1cc306
1 parent 12e0555
commit d1cc306
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 49 deletions.
diff --git a/src/main/java/org/cloudfoundry/promregator/cfaccessor/ReactiveCFAccessorImpl.java b/src/main/java/org/cloudfoundry/promregator/cfaccessor/ReactiveCFAccessorImpl.java
@@ -3,10 +3,8 @@
 import java.net.InetAddress;
 import java.net.UnknownHostException;
 import java.time.Duration;
-import java.util.List;
 import java.util.Set;
 import java.util.regex.Pattern;
-import java.util.stream.Collectors;
 
 import javax.annotation.PostConstruct;
 
@@ -18,7 +16,6 @@
 import org.cloudfoundry.client.v3.organizations.ListOrganizationDomainsResponse;
 import org.cloudfoundry.client.v3.processes.ListProcessesRequest;
 import org.cloudfoundry.client.v3.processes.ListProcessesResponse;
-import org.cloudfoundry.client.v3.processes.ProcessResource;
 import org.cloudfoundry.client.v3.routes.ListRoutesRequest;
 import org.cloudfoundry.client.v3.routes.ListRoutesResponse;
 import org.cloudfoundry.promregator.cfaccessor.client.InfoV3;
@@ -372,31 +369,14 @@ public Mono<ListProcessesResponse> retrieveWebProcessesForAppId(String applicati
 				.perPage(resultsPerPage)
 				.build();
 
-		PaginatedResponseGeneratorFunctionV3<org.cloudfoundry.client.v3.processes.ProcessResource, ListProcessesResponse> responseGenerator = (list, numberOfPages) -> {
-			if (log.isDebugEnabled()) {
-				log.debug("Received process page in responseGenerator with {} items - total number of pages: {}", list.size(), numberOfPages);
-				final boolean duplicateEntryDetected = list.stream().distinct().collect(Collectors.toList()).size() != list.size();
-				log.debug("Duplicate entries detected in responseGenerator: {}", Boolean.valueOf(duplicateEntryDetected).toString());
-			}
-			return ListProcessesResponse.builder()
+		PaginatedResponseGeneratorFunctionV3<org.cloudfoundry.client.v3.processes.ProcessResource, ListProcessesResponse> responseGenerator = (list, numberOfPages) -> 
+			ListProcessesResponse.builder()
 			.addAllResources(list)
 			.pagination(Pagination.builder().totalPages(numberOfPages).totalResults(list.size()).build())
 			.build();
-		};
 
 		return this.paginatedRequestFetcher.performGenericPagedRetrievalV3(RequestType.PROCESSES, applicationId, requestGenerator, 
-				r -> { 
-					Mono<ListProcessesResponse> monoResponse = this.cloudFoundryClient.processes().list(r);
-					if (log.isDebugEnabled()) {
-						monoResponse = monoResponse.doOnNext(e -> {
-							final List<ProcessResource> list = e.getResources();
-							log.debug("Received process page in requestFunction with {} items", list.size());
-							final boolean duplicateEntryDetected = list.stream().distinct().collect(Collectors.toList()).size() != list.size();
-							log.debug("Duplicate entries detected in requestFunction: {}", Boolean.valueOf(duplicateEntryDetected).toString());
-						});
-					}
-					return monoResponse;
-				}, this.requestTimeoutProcess,
+				r -> this.cloudFoundryClient.processes().list(r), this.requestTimeoutProcess, 
 				responseGenerator);
 
 	}
@@ -411,33 +391,14 @@ public Mono<ListProcessesResponse> retrieveWebProcessesForAppIds(Set<String> app
 			.perPage(resultsPerPage)
 			.build();
 
-		PaginatedResponseGeneratorFunctionV3<org.cloudfoundry.client.v3.processes.ProcessResource, ListProcessesResponse> responseGenerator = (list, numberOfPages) -> {
-			if (log.isDebugEnabled()) {
-				log.debug("Received process page in responseGenerator with {} items - total number of pages: {}", list.size(), numberOfPages);
-				final boolean duplicateEntryDetected = list.stream().distinct().collect(Collectors.toList()).size() != list.size();
-				log.debug("Duplicate entries detected in responseGenerator: {}", Boolean.valueOf(duplicateEntryDetected).toString());
-			}
-
-			return ListProcessesResponse.builder()
+		PaginatedResponseGeneratorFunctionV3<org.cloudfoundry.client.v3.processes.ProcessResource, ListProcessesResponse> responseGenerator = (list, numberOfPages) -> 
+			ListProcessesResponse.builder()
 			.addAllResources(list)
 			.pagination(Pagination.builder().totalPages(numberOfPages).totalResults(list.size()).build())
 			.build();
-		};
 
 		return this.paginatedRequestFetcher.performGenericPagedRetrievalV3(RequestType.PROCESSES, applicationIds, requestGenerator, 
-				r -> {
-					Mono<ListProcessesResponse> monoResponse = this.cloudFoundryClient.processes().list(r);
-					if (log.isDebugEnabled()) {
-						monoResponse = monoResponse.doOnNext(e -> {
-							final List<ProcessResource> list = e.getResources();
-							log.debug("Received process page in requestFunction with {} items", list.size());
-							final boolean duplicateEntryDetected = list.stream().distinct().collect(Collectors.toList()).size() != list.size();
-							log.debug("Duplicate entries detected in requestFunction: {}", Boolean.valueOf(duplicateEntryDetected).toString());
-						});
-					}
-					return monoResponse;
-				},
-				this.requestTimeoutProcess, 
+				r -> this.cloudFoundryClient.processes().list(r), this.requestTimeoutProcess, 
 				responseGenerator);
 	}
 

diff --git a/src/main/java/org/cloudfoundry/promregator/scanner/ReactiveAppInstanceScanner.java b/src/main/java/org/cloudfoundry/promregator/scanner/ReactiveAppInstanceScanner.java
@@ -230,10 +230,6 @@ public List<Instance> determineInstancesFromTargets(List<ResolvedTarget> targets
 			final List<ProcessResource> list = lapr.getResources();
 			if (list.size() > 1) {
 				log.error("Application Id {} with application name {} in org {} and space {} returned multiple web processes via CF API V3 Processes; Promregator does not know how to handle this. Provide your use case to the developers to understand how this shall be handled properly.", rt.getApplicationId(), rt.getApplicationName(), rt.getOrgName(), rt.getSpaceName());
-				StringBuffer sb = new StringBuffer();
-				sb.append(String.format("The following non-unique instances (count: %d) were detected:\n", list.size()));
-				list.forEach(pr -> sb.append(pr.toString()+ "\n"));
-				log.info(sb.toString());
 				return Mono.empty();
 			}