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 afe545fc5c..5ceacad141 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 @@ -47,8 +47,6 @@ import com.fasterxml.jackson.databind.ObjectMapper; -import io.micrometer.core.instrument.Metrics; - public class GoalAnalyst { private static final Logger LOG = LoggerFactory.getLogger(GoalAnalyst.class); // Define lower value for hotfix and rollback priority to make sure they deploy first @@ -566,14 +564,12 @@ void process(String envId, EnvironBean env, PingReportBean report, AgentBean age hostTagBean.setEnv_id(envId); hostTagBean.setCreate_date(System.currentTimeMillis()); hostTagDAO.insertOrUpdate(hostTagBean); - Metrics.counter("ec2TagsByDeployd", "create", "yes", "tagName", tagName, "tagValue", tagValue, "envName", env.getEnv_name(), "stageName", env.getStage_name(), "hostName", host).increment(); - LOG.debug("insert host_tags with env id {}, host id {}, tag name {}, tag value {}", envId, host_id, tagName, tagValue); + LOG.debug("Create host tags from Deployd: insert host_tags with env id {}, host id {}, tag name {}, tag value {}", envId, host_id, tagName, tagValue); } else if (tagValue.equals(hostTagBean.getTag_value()) == false) { hostTagBean.setTag_value(tagValue); hostTagBean.setCreate_date(System.currentTimeMillis()); hostTagDAO.insertOrUpdate(hostTagBean); - Metrics.counter("ec2TagsByDeployd", "create", "no", "tagName", tagName, "tagValue", tagValue, "envName", env.getEnv_name(), "stageName", env.getStage_name(), "hostName", host).increment(); - LOG.debug("update host_tags with env id {}, host id {}, tag name {}, tag value {}", envId, host_id, tagName, tagValue); + LOG.debug("Update host tags from Deployd: update host_tags with env id {}, host id {}, tag name {}, tag value {}", envId, host_id, tagName, tagValue); } } } 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 74f289b4e2..509339cbc2 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 @@ -20,7 +20,6 @@ import java.util.concurrent.TimeUnit; import io.micrometer.core.instrument.Counter; -import io.micrometer.core.instrument.Metrics; public class DeployTagWorker implements Runnable { private static final Logger LOG = LoggerFactory.getLogger(DeployTagWorker.class); @@ -118,7 +117,7 @@ private void processEachEnvironConstraint(DeployConstraintBean bean) throws Exce hostTagBean.setEnv_id(envId); hostTagBean.setCreate_date(System.currentTimeMillis()); statements.add(hostTagDAO.genInsertOrUpdate(hostTagBean)); - Metrics.counter("ec2TagsByWorker", "tagName", tagName, "tagValue", tagValue, "envName", environBean.getEnv_name(), "stageName", environBean.getStage_name(), "hostId", hostId).increment(); + LOG.debug("Create host tags from CMDB: insert host_tags with env id {}, host id {}, tag name {}, tag value {}", envId, host_id, tagName, tagValue); } } }