diff --git a/deploy-service/common/src/main/java/com/pinterest/deployservice/buildtags/BuildTagsManagerImpl.java b/deploy-service/common/src/main/java/com/pinterest/deployservice/buildtags/BuildTagsManagerImpl.java index 474510dd46..dfb14c5823 100644 --- a/deploy-service/common/src/main/java/com/pinterest/deployservice/buildtags/BuildTagsManagerImpl.java +++ b/deploy-service/common/src/main/java/com/pinterest/deployservice/buildtags/BuildTagsManagerImpl.java @@ -132,7 +132,7 @@ public int compare(BuildTagBean o1, BuildTagBean o2) { if (tagBuild.getScm_commit().equals(build.getScm_commit())) { // Tag is on the exact commit LOG.debug( - "Found tag on the exact commit {}", + "Found tag {} on the exact commit {}", tags.get(i).getTag().getValue(), tagBuild.getScm_commit()); ret = tags.get(i).getTag(); diff --git a/deploy-service/common/src/main/java/com/pinterest/deployservice/handler/CommonHandler.java b/deploy-service/common/src/main/java/com/pinterest/deployservice/handler/CommonHandler.java index 2f8097e000..671498f91d 100644 --- a/deploy-service/common/src/main/java/com/pinterest/deployservice/handler/CommonHandler.java +++ b/deploy-service/common/src/main/java/com/pinterest/deployservice/handler/CommonHandler.java @@ -428,7 +428,7 @@ void transition(DeployBean deployBean, DeployBean newDeployBean, EnvironBean env if (oldState != DeployState.RUNNING) { LOG.info("Set deploy {} from {} to RUNNING.", deployId, oldState); } else { - LOG.debug("Deploy {} is still RUNNING...", deployId, oldState); + LOG.debug("Deploy {} is still RUNNING...", deployId); } newDeployBean.setState(DeployState.RUNNING); } diff --git a/deploy-service/common/src/main/java/com/pinterest/deployservice/handler/GoalAnalyst.java b/deploy-service/common/src/main/java/com/pinterest/deployservice/handler/GoalAnalyst.java index 795fccfd5a..b11ded28f9 100644 --- a/deploy-service/common/src/main/java/com/pinterest/deployservice/handler/GoalAnalyst.java +++ b/deploy-service/common/src/main/java/com/pinterest/deployservice/handler/GoalAnalyst.java @@ -460,7 +460,7 @@ private void emitMetrics(AgentBean updateBean) { String.valueOf(updateBean.getStatus().equals(AgentStatus.SUCCEEDED))) .increment(); } catch (Exception ex) { - LOG.warn("Failed to emit metrics of {}", updateBean.toString(), ex); + LOG.warn("Failed to emit metrics of {}", updateBean, ex); } } diff --git a/deploy-service/common/src/main/java/com/pinterest/deployservice/handler/PingHandler.java b/deploy-service/common/src/main/java/com/pinterest/deployservice/handler/PingHandler.java index c13ae23f47..7840875581 100644 --- a/deploy-service/common/src/main/java/com/pinterest/deployservice/handler/PingHandler.java +++ b/deploy-service/common/src/main/java/com/pinterest/deployservice/handler/PingHandler.java @@ -528,7 +528,7 @@ boolean canDeployWithConstraint(String hostId, EnvironBean envBean) throws Excep hostId, totalActiveAgentsWithHostTag, maxParallelWithHostTag, - deployConstraintBean.toString()); + deployConstraintBean); return false; } if (deployConstraintBean.getConstraint_type() == DeployConstraintType.GROUP_BY_GROUP) { @@ -601,7 +601,7 @@ boolean canDeploywithSchedule(EnvironBean env) throws Exception { if (schedule.getState() == ScheduleState.COOLING_DOWN) { LOG.debug( - "Env {} is currently cooling down. Host {} will wait until the cooling down period is over.", + "Env {} is currently cooling down. Hosts will wait until the cooling down period is over.", env.getEnv_id()); return false; } else { @@ -707,7 +707,7 @@ Map convertReports(PingRequestBean pingRequest) { PingRequestBean normalizePingRequest(PingRequestBean pingRequest) throws Exception { String hostId = pingRequest.getHostId(); if (StringUtils.isEmpty(hostId)) { - LOG.error("Missing host id in request: ", pingRequest); + LOG.error("Missing host id in request: {}", pingRequest); throw new DeployInternalException("Missing host id in PingReqest"); } diff --git a/deploy-service/common/src/main/java/com/pinterest/deployservice/pingrequests/Ec2InstanceValidator.java b/deploy-service/common/src/main/java/com/pinterest/deployservice/pingrequests/Ec2InstanceValidator.java index 528d994299..65557ec521 100644 --- a/deploy-service/common/src/main/java/com/pinterest/deployservice/pingrequests/Ec2InstanceValidator.java +++ b/deploy-service/common/src/main/java/com/pinterest/deployservice/pingrequests/Ec2InstanceValidator.java @@ -33,7 +33,7 @@ public void validate(PingRequestBean bean, Set accountAllowList) throws if (!StringUtils.startsWith(bean.getHostId(), "i-")) { LOG.warn("Ignore invalid id {} for host {}", bean.getHostId(), bean.getHostName()); throw new DeployInternalException( - String.format("Host id {} is not a valid ec2 instance id"), + String.format("Host id %s is not a valid ec2 instance id", bean.getHostId()), StringUtils.defaultString(bean.getHostId())); } @@ -53,7 +53,9 @@ public void validate(PingRequestBean bean, Set accountAllowList) throws bean.getHostName(), accountId); throw new DeployInternalException( - String.format("Host id {} is from an disallowed AWS account: {}"), + String.format( + "Host id %s is from an disallowed AWS account: %s", + bean.getHostId(), accountId), StringUtils.defaultString(bean.getHostId()), accountId); } diff --git a/deploy-service/common/src/main/java/com/pinterest/deployservice/scm/SourceControlManagerProxy.java b/deploy-service/common/src/main/java/com/pinterest/deployservice/scm/SourceControlManagerProxy.java index a0f773de7e..7a121c424d 100644 --- a/deploy-service/common/src/main/java/com/pinterest/deployservice/scm/SourceControlManagerProxy.java +++ b/deploy-service/common/src/main/java/com/pinterest/deployservice/scm/SourceControlManagerProxy.java @@ -43,7 +43,7 @@ private SourceControlManager getSourceControlManager(String scmType) throws Exce } SourceControlManager manager = this.managers.get(scmType); if (manager == null) { - LOG.error("Unsupported SCM type: " + scmType); + LOG.error("Unsupported SCM type: {}", scmType); throw new Exception("Unsupported SCM type: " + scmType); } return manager; diff --git a/deploy-service/teletraanservice/src/main/java/com/pinterest/teletraan/resource/EnvAlerts.java b/deploy-service/teletraanservice/src/main/java/com/pinterest/teletraan/resource/EnvAlerts.java index f36c18e3bf..0a3eb230b7 100644 --- a/deploy-service/teletraanservice/src/main/java/com/pinterest/teletraan/resource/EnvAlerts.java +++ b/deploy-service/teletraanservice/src/main/java/com/pinterest/teletraan/resource/EnvAlerts.java @@ -130,10 +130,7 @@ public Response alertsTriggered( return Response.status(400).build(); } - LOG.info( - "Get Alert triggered: {} time:{}", - alert.isTriggered(), - alert.getTriggeredDate().toString()); + LOG.info("Get Alert triggered: {} time:{}", alert.isTriggered(), alert.getTriggeredDate()); if (!alert.isTriggered()) { LOG.info("No action for alert off"); diff --git a/deploy-service/teletraanservice/src/main/java/com/pinterest/teletraan/resource/Tags.java b/deploy-service/teletraanservice/src/main/java/com/pinterest/teletraan/resource/Tags.java index fd465281b9..ee42732418 100644 --- a/deploy-service/teletraanservice/src/main/java/com/pinterest/teletraan/resource/Tags.java +++ b/deploy-service/teletraanservice/src/main/java/com/pinterest/teletraan/resource/Tags.java @@ -155,12 +155,10 @@ public Response create( String operator = sc.getUserPrincipal().getName(); TagBean retEntity = new TagBean(); if (handlers.containsKey(tag.getTarget_type())) { - LOG.debug("Found handler for target type {}", tag.getTarget_type().toString()); + LOG.debug("Found handler for target type {}", tag.getTarget_type()); retEntity = handlers.get(tag.getTarget_type()).createTag(tag, operator); } else { - LOG.debug( - "No handler found for target type {}. Use default", - tag.getTarget_type().toString()); + LOG.debug("No handler found for target type {}. Use default", tag.getTarget_type()); // Default logic. Ideally each type should write its own handler. // At current time, ignore the target id object existence test. The // handler should do that. diff --git a/deploy-service/teletraanservice/src/main/java/com/pinterest/teletraan/worker/AutoPromoter.java b/deploy-service/teletraanservice/src/main/java/com/pinterest/teletraan/worker/AutoPromoter.java index 9fab6a3064..9ce07b66c6 100644 --- a/deploy-service/teletraanservice/src/main/java/com/pinterest/teletraan/worker/AutoPromoter.java +++ b/deploy-service/teletraanservice/src/main/java/com/pinterest/teletraan/worker/AutoPromoter.java @@ -150,7 +150,7 @@ public E getScheduledCheckResult( LOG.info( "Auto deploy due time is {} for check time {} for Environment {}", autoDeployDueDate.toString(ISODateTimeFormat.dateTime()), - checkTime.toString(), + checkTime, currEnvBean.getEnv_name()); if (!autoDeployDueDate.isAfterNow()) { @@ -310,10 +310,7 @@ public void promoteBuild( PromoteResult result = computePromoteBuildResult(currEnvBean, currDeployBean, size, promoteBean); - LOG.info( - "Promote result {} for env {}", - result.getResult().toString(), - currEnvBean.getEnv_name()); + LOG.info("Promote result {} for env {}", result.getResult(), currEnvBean.getEnv_name()); if (result.getResult() == PromoteResult.ResultCode.PromoteBuild && StringUtils.isNotEmpty(result.getPromotedBuild())) { safePromote( @@ -407,10 +404,7 @@ DeployBean promoteDeploy( throws Exception { PromoteResult result = computePromoteDeployResult(currEnvBean, currDeployBean, size, promoteBean); - LOG.info( - "Promote result {} for env {}", - result.getResult().toString(), - currEnvBean.getEnv_name()); + LOG.info("Promote result {} for env {}", result.getResult(), currEnvBean.getEnv_name()); if (result.getResult() == PromoteResult.ResultCode.PromoteDeploy && result.getPredDeployInfo() != null) { safePromote( @@ -533,8 +527,8 @@ List getBuildCandidates(EnvironBean envBean, Interval interval, int s availableBuilds.size(), buildName, scmBranch, - interval.getStart().toString(), - interval.getEnd().toString()); + interval.getStart(), + interval.getEnd()); if (!availableBuilds.isEmpty()) { List buildTagBeanList = buildTagsManager.getEffectiveTagsWithBuilds(availableBuilds); diff --git a/deploy-service/teletraanservice/src/main/java/com/pinterest/teletraan/worker/DeployTagWorker.java b/deploy-service/teletraanservice/src/main/java/com/pinterest/teletraan/worker/DeployTagWorker.java index a9c0c4e1bb..17e65d1347 100644 --- a/deploy-service/teletraanservice/src/main/java/com/pinterest/teletraan/worker/DeployTagWorker.java +++ b/deploy-service/teletraanservice/src/main/java/com/pinterest/teletraan/worker/DeployTagWorker.java @@ -179,7 +179,7 @@ private void processBatch() throws Exception { } catch (SQLException e) { LOG.error( "failed to process job due to SQLException: {} Error {} stack {}", - job.toString(), + job, ExceptionUtils.getRootCauseMessage(e), ExceptionUtils.getStackTrace(e)); @@ -187,13 +187,13 @@ private void processBatch() throws Exception { } catch (Exception e) { LOG.error( "failed to process job due to all other exceptions: {} Error {} stack {}", - job.toString(), + job, ExceptionUtils.getRootCauseMessage(e), ExceptionUtils.getStackTrace(e)); job.setState(TagSyncState.ERROR); LOG.error( "job {} deploy constraint transitions to error state due to exceptions", - job.toString()); + job); LOG.info("updated job state to {}", TagSyncState.ERROR); deployConstraintDAO.updateById(job.getConstraint_id(), job); diff --git a/deploy-service/teletraanservice/src/main/java/com/pinterest/teletraan/worker/HostTerminator.java b/deploy-service/teletraanservice/src/main/java/com/pinterest/teletraan/worker/HostTerminator.java index d9d6cc05f9..a6942efbba 100644 --- a/deploy-service/teletraanservice/src/main/java/com/pinterest/teletraan/worker/HostTerminator.java +++ b/deploy-service/teletraanservice/src/main/java/com/pinterest/teletraan/worker/HostTerminator.java @@ -104,7 +104,7 @@ private boolean removeTerminatedHost(HostBean host) throws Exception { Collection terminatedHosts = rodimusManager.getTerminatedHosts(Collections.singletonList(hostId)); if (terminatedHosts.contains(hostId)) { - LOG.info(String.format("Delete records of terminated host {}", hostId)); + LOG.info("Delete records of terminated host {}", hostId); hostHandler.removeHost(hostId); return true; } @@ -127,10 +127,7 @@ private void processBatch() throws Exception { } } catch (Exception e) { LOG.error( - "Failed to process {} host {}", - host.getState().toString(), - host.getHost_id(), - e); + "Failed to process {} host {}", host.getState(), host.getHost_id(), e); } finally { utilDAO.releaseLock(lockName, connection); LOG.info( diff --git a/deploy-service/teletraanservice/src/main/java/com/pinterest/teletraan/worker/SimpleAgentJanitor.java b/deploy-service/teletraanservice/src/main/java/com/pinterest/teletraan/worker/SimpleAgentJanitor.java index 0a5d06fde9..69d86651a5 100644 --- a/deploy-service/teletraanservice/src/main/java/com/pinterest/teletraan/worker/SimpleAgentJanitor.java +++ b/deploy-service/teletraanservice/src/main/java/com/pinterest/teletraan/worker/SimpleAgentJanitor.java @@ -97,7 +97,7 @@ void processAllHosts() throws Exception { } if (!maxStaleHostIds.isEmpty()) { LOG.info( - "Found the following hosts (Explicit capacity) exceeded maxStaleThreshold: ", + "Found the following hosts (Explicit capacity) exceeded maxStaleThreshold: {}", maxStaleHostIds); processStaleHosts(maxStaleHostIds, true); } @@ -113,7 +113,7 @@ void processAllHosts() throws Exception { } if (!minStaleHostIds.isEmpty()) { LOG.info( - "Found following hosts (Explicit capacity) exceeded minStaleThreshold: ", + "Found following hosts (Explicit capacity) exceeded minStaleThreshold: {}", minStaleHostIds); processStaleHosts(minStaleHostIds, false); }