refactor(google): switch the caching log messages from INFO to DEBUG.
MODIFY
clouddriver-core/src/main/groovy/com/netflix/spinnaker/clouddriver/cache/LoggingInstrumentation.groovy
clouddriver-core/src/main/groovy/com/netflix/spinnaker/clouddriver/cache/LoggingInstrumentation.groovy
@@ -33,7 +33,7 @@ class LoggingInstrumentation implements ExecutionInstrumentation {
@Override
void executionCompleted(Agent agent, long durationMs) {
- logger.info("${agent.providerName}:${agent.agentType} completed in ${durationMs / 1000}s")
+ logger.debug("${agent.providerName}:${agent.agentType} completed in ${durationMs / 1000}s")
}
@Override

MODIFY
clouddriver-google/src/main/groovy/com/netflix/spinnaker/clouddriver/google/provider/agent/AbstractGoogleLoadBalancerCachingAgent.groovy
clouddriver-google/src/main/groovy/com/netflix/spinnaker/clouddriver/google/provider/agent/AbstractGoogleLoadBalancerCachingAgent.groovy
@@ -141,7 +141,7 @@ abstract class AbstractGoogleLoadBalancerCachingAgent extends AbstractGoogleCach
evictions[LOAD_BALANCERS.ns].addAll(identifiers)
}
- log.info("On demand cache refresh succeeded. Data: ${data}. Added ${loadBalancer ? 1 : 0} items to the cache.")
+ log.debug("On demand cache refresh succeeded. Data: ${data}. Added ${loadBalancer ? 1 : 0} items to the cache.")
return new OnDemandAgent.OnDemandResult(
sourceAgentType: getOnDemandAgentType(),
@@ -214,7 +214,7 @@ abstract class AbstractGoogleLoadBalancerCachingAgent extends AbstractGoogleCach
abstract List<GoogleLoadBalancer> constructLoadBalancers(String onDemandLoadBalancerName = null)
CacheResult buildCacheResult(CacheResultBuilder cacheResultBuilder, List<GoogleLoadBalancer> googleLoadBalancers) {
- log.info "Describing items in ${agentType}"
+ log.debug "Describing items in ${agentType}"
googleLoadBalancers.each { GoogleLoadBalancer loadBalancer ->
// TODO(duftler): Pull out getLoadBalancerKey() like getServerGroupKey()?
@@ -239,10 +239,10 @@ abstract class AbstractGoogleLoadBalancerCachingAgent extends AbstractGoogleCach
}
}
- log.info "Caching ${cacheResultBuilder.namespace(LOAD_BALANCERS.ns).keepSize()} load balancers in ${agentType}"
- log.info "Caching ${cacheResultBuilder.namespace(INSTANCES.ns).keepSize()} instance relationships in ${agentType}"
- log.info "Caching ${cacheResultBuilder.onDemand.toKeep.size()} onDemand entries in ${agentType}"
- log.info "Evicting ${cacheResultBuilder.onDemand.toEvict.size()} onDemand entries in ${agentType}"
+ log.debug "Caching ${cacheResultBuilder.namespace(LOAD_BALANCERS.ns).keepSize()} load balancers in ${agentType}"
+ log.debug "Caching ${cacheResultBuilder.namespace(INSTANCES.ns).keepSize()} instance relationships in ${agentType}"
+ log.debug "Caching ${cacheResultBuilder.onDemand.toKeep.size()} onDemand entries in ${agentType}"
+ log.debug "Evicting ${cacheResultBuilder.onDemand.toEvict.size()} onDemand entries in ${agentType}"
return cacheResultBuilder.build()
}

MODIFY
clouddriver-google/src/main/groovy/com/netflix/spinnaker/clouddriver/google/provider/agent/GoogleBackendServiceCachingAgent.groovy
clouddriver-google/src/main/groovy/com/netflix/spinnaker/clouddriver/google/provider/agent/GoogleBackendServiceCachingAgent.groovy
@@ -109,7 +109,7 @@ class GoogleBackendServiceCachingAgent extends AbstractGoogleCachingAgent {
}
private CacheResult buildCacheResult(ProviderCache _, List<GoogleBackendService> backendServiceList) {
- log.info("Describing items in ${agentType}")
+ log.debug("Describing items in ${agentType}")
def cacheResultBuilder = new CacheResultBuilder()
@@ -129,7 +129,7 @@ class GoogleBackendServiceCachingAgent extends AbstractGoogleCachingAgent {
}
}
- log.info("Caching ${cacheResultBuilder.namespace(BACKEND_SERVICES.ns).keepSize()} items in ${agentType}")
+ log.debug("Caching ${cacheResultBuilder.namespace(BACKEND_SERVICES.ns).keepSize()} items in ${agentType}")
cacheResultBuilder.build()
}

MODIFY
clouddriver-google/src/main/groovy/com/netflix/spinnaker/clouddriver/google/provider/agent/GoogleGlobalAddressCachingAgent.groovy
clouddriver-google/src/main/groovy/com/netflix/spinnaker/clouddriver/google/provider/agent/GoogleGlobalAddressCachingAgent.groovy
@@ -78,7 +78,7 @@ class GoogleGlobalAddressCachingAgent extends AbstractGoogleCachingAgent {
}
private CacheResult buildCacheResult(ProviderCache _, List<Address> addressList) {
- log.info("Describing items in ${agentType}")
+ log.debug("Describing items in ${agentType}")
def cacheResultBuilder = new CacheResultBuilder()
@@ -90,7 +90,7 @@ class GoogleGlobalAddressCachingAgent extends AbstractGoogleCachingAgent {
}
}
- log.info("Caching ${cacheResultBuilder.namespace(ADDRESSES.ns).keepSize()} items in ${agentType}")
+ log.debug("Caching ${cacheResultBuilder.namespace(ADDRESSES.ns).keepSize()} items in ${agentType}")
cacheResultBuilder.build()
}

MODIFY
clouddriver-google/src/main/groovy/com/netflix/spinnaker/clouddriver/google/provider/agent/GoogleHealthCheckCachingAgent.groovy
clouddriver-google/src/main/groovy/com/netflix/spinnaker/clouddriver/google/provider/agent/GoogleHealthCheckCachingAgent.groovy
@@ -194,7 +194,7 @@ class GoogleHealthCheckCachingAgent extends AbstractGoogleCachingAgent {
}
private CacheResult buildCacheResult(ProviderCache _, List<GoogleHealthCheck> healthCheckList) {
- log.info("Describing items in ${agentType}")
+ log.debug("Describing items in ${agentType}")
def cacheResultBuilder = new CacheResultBuilder()
@@ -206,7 +206,7 @@ class GoogleHealthCheckCachingAgent extends AbstractGoogleCachingAgent {
}
}
- log.info("Caching ${cacheResultBuilder.namespace(HEALTH_CHECKS.ns).keepSize()} items in ${agentType}")
+ log.debug("Caching ${cacheResultBuilder.namespace(HEALTH_CHECKS.ns).keepSize()} items in ${agentType}")
cacheResultBuilder.build()
}

MODIFY
clouddriver-google/src/main/groovy/com/netflix/spinnaker/clouddriver/google/provider/agent/GoogleHttpHealthCheckCachingAgent.groovy
clouddriver-google/src/main/groovy/com/netflix/spinnaker/clouddriver/google/provider/agent/GoogleHttpHealthCheckCachingAgent.groovy
@@ -62,7 +62,7 @@ class GoogleHttpHealthCheckCachingAgent extends AbstractGoogleCachingAgent {
}
private CacheResult buildCacheResult(ProviderCache _, List<HttpHealthCheck> httpHealthCheckList) {
- log.info("Describing items in ${agentType}")
+ log.debug("Describing items in ${agentType}")
def cacheResultBuilder = new CacheResultBuilder()
@@ -74,7 +74,7 @@ class GoogleHttpHealthCheckCachingAgent extends AbstractGoogleCachingAgent {
}
}
- log.info("Caching ${cacheResultBuilder.namespace(HTTP_HEALTH_CHECKS.ns).keepSize()} items in ${agentType}")
+ log.debug("Caching ${cacheResultBuilder.namespace(HTTP_HEALTH_CHECKS.ns).keepSize()} items in ${agentType}")
cacheResultBuilder.build()
}

MODIFY
clouddriver-google/src/main/groovy/com/netflix/spinnaker/clouddriver/google/provider/agent/GoogleHttpLoadBalancerCachingAgent.groovy
clouddriver-google/src/main/groovy/com/netflix/spinnaker/clouddriver/google/provider/agent/GoogleHttpLoadBalancerCachingAgent.groovy
@@ -239,7 +239,7 @@ class GoogleHttpLoadBalancerCachingAgent extends AbstractGoogleLoadBalancerCachi
targetProxyRequest.queue(compute.targetHttpsProxies().get(project, targetProxyName), targetHttpsProxyCallback)
break
default:
- log.info("Non-Http target type found for global forwarding rule ${forwardingRule.name}")
+ log.debug("Non-Http target type found for global forwarding rule ${forwardingRule.name}")
break
}
}

MODIFY
clouddriver-google/src/main/groovy/com/netflix/spinnaker/clouddriver/google/provider/agent/GoogleImageCachingAgent.groovy
clouddriver-google/src/main/groovy/com/netflix/spinnaker/clouddriver/google/provider/agent/GoogleImageCachingAgent.groovy
@@ -104,7 +104,7 @@ class GoogleImageCachingAgent extends AbstractGoogleCachingAgent {
}
private CacheResult buildCacheResult(ProviderCache _, List<Image> imageList) {
- log.info("Describing items in ${agentType}")
+ log.debug("Describing items in ${agentType}")
def cacheResultBuilder = new CacheResultBuilder()
@@ -116,7 +116,7 @@ class GoogleImageCachingAgent extends AbstractGoogleCachingAgent {
}
}
- log.info("Caching ${cacheResultBuilder.namespace(IMAGES.ns).keepSize()} items in ${agentType}")
+ log.debug("Caching ${cacheResultBuilder.namespace(IMAGES.ns).keepSize()} items in ${agentType}")
cacheResultBuilder.build()
}

MODIFY
clouddriver-google/src/main/groovy/com/netflix/spinnaker/clouddriver/google/provider/agent/GoogleInstanceCachingAgent.groovy
clouddriver-google/src/main/groovy/com/netflix/spinnaker/clouddriver/google/provider/agent/GoogleInstanceCachingAgent.groovy
@@ -62,7 +62,7 @@ class GoogleInstanceCachingAgent extends AbstractGoogleCachingAgent {
}
}
- log.info("Caching ${cacheResultBuilder.namespace(INSTANCES.ns).keepSize()} instances in ${agentType}")
+ log.debug("Caching ${cacheResultBuilder.namespace(INSTANCES.ns).keepSize()} instances in ${agentType}")
cacheResultBuilder.build()
}

MODIFY
clouddriver-google/src/main/groovy/com/netflix/spinnaker/clouddriver/google/provider/agent/GoogleNetworkCachingAgent.groovy
clouddriver-google/src/main/groovy/com/netflix/spinnaker/clouddriver/google/provider/agent/GoogleNetworkCachingAgent.groovy
@@ -62,7 +62,7 @@ class GoogleNetworkCachingAgent extends AbstractGoogleCachingAgent {
}
private CacheResult buildCacheResult(ProviderCache _, List<Network> networkList) {
- log.info("Describing items in ${agentType}")
+ log.debug("Describing items in ${agentType}")
def cacheResultBuilder = new CacheResultBuilder()
@@ -74,7 +74,7 @@ class GoogleNetworkCachingAgent extends AbstractGoogleCachingAgent {
}
}
- log.info("Caching ${cacheResultBuilder.namespace(NETWORKS.ns).keepSize()} items in ${agentType}")
+ log.debug("Caching ${cacheResultBuilder.namespace(NETWORKS.ns).keepSize()} items in ${agentType}")
cacheResultBuilder.build()
}

MODIFY
clouddriver-google/src/main/groovy/com/netflix/spinnaker/clouddriver/google/provider/agent/GoogleRegionalAddressCachingAgent.groovy
clouddriver-google/src/main/groovy/com/netflix/spinnaker/clouddriver/google/provider/agent/GoogleRegionalAddressCachingAgent.groovy
@@ -67,7 +67,7 @@ class GoogleRegionalAddressCachingAgent extends AbstractGoogleCachingAgent {
}
private CacheResult buildCacheResult(ProviderCache _, List<Address> addressList) {
- log.info("Describing items in ${agentType}")
+ log.debug("Describing items in ${agentType}")
def cacheResultBuilder = new CacheResultBuilder()
@@ -79,7 +79,7 @@ class GoogleRegionalAddressCachingAgent extends AbstractGoogleCachingAgent {
}
}
- log.info("Caching ${cacheResultBuilder.namespace(ADDRESSES.ns).keepSize()} items in ${agentType}")
+ log.debug("Caching ${cacheResultBuilder.namespace(ADDRESSES.ns).keepSize()} items in ${agentType}")
cacheResultBuilder.build()
}

MODIFY
clouddriver-google/src/main/groovy/com/netflix/spinnaker/clouddriver/google/provider/agent/GoogleRegionalServerGroupCachingAgent.groovy
clouddriver-google/src/main/groovy/com/netflix/spinnaker/clouddriver/google/provider/agent/GoogleRegionalServerGroupCachingAgent.groovy
@@ -222,7 +222,7 @@ class GoogleRegionalServerGroupCachingAgent extends AbstractGoogleCachingAgent i
evictions[SERVER_GROUPS.ns].add(serverGroupKey)
}
- log.info("On demand cache refresh succeeded. Data: ${data}. Added ${serverGroup ? 1 : 0} items to the cache. Evicted ${evictions[SERVER_GROUPS.ns]}.")
+ log.debug("On demand cache refresh succeeded. Data: ${data}. Added ${serverGroup ? 1 : 0} items to the cache. Evicted ${evictions[SERVER_GROUPS.ns]}.")
return new OnDemandAgent.OnDemandResult(
sourceAgentType: getOnDemandAgentType(),
@@ -257,7 +257,7 @@ class GoogleRegionalServerGroupCachingAgent extends AbstractGoogleCachingAgent i
}
private CacheResult buildCacheResult(CacheResultBuilder cacheResultBuilder, List<GoogleServerGroup> serverGroups) {
- log.info "Describing items in $agentType"
+ log.debug "Describing items in $agentType"
serverGroups.each { GoogleServerGroup serverGroup ->
Moniker moniker = naming.deriveMoniker(serverGroup)
@@ -307,12 +307,12 @@ class GoogleRegionalServerGroupCachingAgent extends AbstractGoogleCachingAgent i
}
}
- log.info("Caching ${cacheResultBuilder.namespace(APPLICATIONS.ns).keepSize()} applications in ${agentType}")
- log.info("Caching ${cacheResultBuilder.namespace(CLUSTERS.ns).keepSize()} clusters in ${agentType}")
- log.info("Caching ${cacheResultBuilder.namespace(SERVER_GROUPS.ns).keepSize()} server groups in ${agentType}")
- log.info("Caching ${cacheResultBuilder.namespace(LOAD_BALANCERS.ns).keepSize()} load balancer relationships in ${agentType}")
- log.info("Caching ${cacheResultBuilder.onDemand.toKeep.size()} onDemand entries in ${agentType}")
- log.info("Evicting ${cacheResultBuilder.onDemand.toEvict.size()} onDemand entries in ${agentType}")
+ log.debug("Caching ${cacheResultBuilder.namespace(APPLICATIONS.ns).keepSize()} applications in ${agentType}")
+ log.debug("Caching ${cacheResultBuilder.namespace(CLUSTERS.ns).keepSize()} clusters in ${agentType}")
+ log.debug("Caching ${cacheResultBuilder.namespace(SERVER_GROUPS.ns).keepSize()} server groups in ${agentType}")
+ log.debug("Caching ${cacheResultBuilder.namespace(LOAD_BALANCERS.ns).keepSize()} load balancer relationships in ${agentType}")
+ log.debug("Caching ${cacheResultBuilder.onDemand.toKeep.size()} onDemand entries in ${agentType}")
+ log.debug("Evicting ${cacheResultBuilder.onDemand.toEvict.size()} onDemand entries in ${agentType}")
cacheResultBuilder.build()
}

MODIFY
clouddriver-google/src/main/groovy/com/netflix/spinnaker/clouddriver/google/provider/agent/GoogleSecurityGroupCachingAgent.groovy
clouddriver-google/src/main/groovy/com/netflix/spinnaker/clouddriver/google/provider/agent/GoogleSecurityGroupCachingAgent.groovy
@@ -135,7 +135,7 @@ class GoogleSecurityGroupCachingAgent extends AbstractGoogleCachingAgent impleme
evictions[SECURITY_GROUPS.ns].addAll(identifiers)
}
- log.info("On demand cache refresh succeeded. Data: ${data}. Added ${firewall ? 1 : 0} items to the cache.")
+ log.debug("On demand cache refresh succeeded. Data: ${data}. Added ${firewall ? 1 : 0} items to the cache.")
return new OnDemandAgent.OnDemandResult(
sourceAgentType: getOnDemandAgentType(),
@@ -223,7 +223,7 @@ class GoogleSecurityGroupCachingAgent extends AbstractGoogleCachingAgent impleme
}
private CacheResult buildCacheResult(CacheResultBuilder cacheResultBuilder, List<Firewall> firewalls) {
- log.info("Describing items in ${agentType}")
+ log.debug("Describing items in ${agentType}")
firewalls.each { Firewall firewall ->
def securityGroupKey = Keys.getSecurityGroupKey(firewall.getName(),
@@ -240,9 +240,9 @@ class GoogleSecurityGroupCachingAgent extends AbstractGoogleCachingAgent impleme
}
}
- log.info("Caching ${cacheResultBuilder.namespace(SECURITY_GROUPS.ns).keepSize()} security groups in ${agentType}")
- log.info "Caching ${cacheResultBuilder.onDemand.toKeep.size()} onDemand entries in ${agentType}"
- log.info "Evicting ${cacheResultBuilder.onDemand.toEvict.size()} onDemand entries in ${agentType}"
+ log.debug("Caching ${cacheResultBuilder.namespace(SECURITY_GROUPS.ns).keepSize()} security groups in ${agentType}")
+ log.debug "Caching ${cacheResultBuilder.onDemand.toKeep.size()} onDemand entries in ${agentType}"
+ log.debug "Evicting ${cacheResultBuilder.onDemand.toEvict.size()} onDemand entries in ${agentType}"
return cacheResultBuilder.build()
}

MODIFY
clouddriver-google/src/main/groovy/com/netflix/spinnaker/clouddriver/google/provider/agent/GoogleSslCertificateCachingAgent.groovy
clouddriver-google/src/main/groovy/com/netflix/spinnaker/clouddriver/google/provider/agent/GoogleSslCertificateCachingAgent.groovy
@@ -62,7 +62,7 @@ class GoogleSslCertificateCachingAgent extends AbstractGoogleCachingAgent {
}
private CacheResult buildCacheResult(ProviderCache _, List<SslCertificate> sslCertificateList) {
- log.info("Describing items in ${agentType}")
+ log.debug("Describing items in ${agentType}")
def cacheResultBuilder = new CacheResultBuilder()
@@ -74,7 +74,7 @@ class GoogleSslCertificateCachingAgent extends AbstractGoogleCachingAgent {
}
}
- log.info("Caching ${cacheResultBuilder.namespace(SSL_CERTIFICATES.ns).keepSize()} items in ${agentType}")
+ log.debug("Caching ${cacheResultBuilder.namespace(SSL_CERTIFICATES.ns).keepSize()} items in ${agentType}")
cacheResultBuilder.build()
}

MODIFY
clouddriver-google/src/main/groovy/com/netflix/spinnaker/clouddriver/google/provider/agent/GoogleSubnetCachingAgent.groovy
clouddriver-google/src/main/groovy/com/netflix/spinnaker/clouddriver/google/provider/agent/GoogleSubnetCachingAgent.groovy
@@ -78,7 +78,7 @@ class GoogleSubnetCachingAgent extends AbstractGoogleCachingAgent {
}
private CacheResult buildCacheResult(ProviderCache _, List<Subnetwork> subnetList) {
- log.info("Describing items in ${agentType}")
+ log.debug("Describing items in ${agentType}")
def cacheResultBuilder = new CacheResultBuilder()
@@ -90,7 +90,7 @@ class GoogleSubnetCachingAgent extends AbstractGoogleCachingAgent {
}
}
- log.info("Caching ${cacheResultBuilder.namespace(SUBNETS.ns).keepSize()} items in ${agentType}")
+ log.debug("Caching ${cacheResultBuilder.namespace(SUBNETS.ns).keepSize()} items in ${agentType}")
cacheResultBuilder.build()
}

MODIFY
clouddriver-google/src/main/groovy/com/netflix/spinnaker/clouddriver/google/provider/agent/GoogleZonalServerGroupCachingAgent.groovy
clouddriver-google/src/main/groovy/com/netflix/spinnaker/clouddriver/google/provider/agent/GoogleZonalServerGroupCachingAgent.groovy
@@ -260,7 +260,7 @@ class GoogleZonalServerGroupCachingAgent extends AbstractGoogleCachingAgent impl
evictions[SERVER_GROUPS.ns].addAll(identifiers)
}
- log.info("On demand cache refresh succeeded. Data: ${data}. Added ${serverGroup ? 1 : 0} items to the cache. Evicted ${evictions[SERVER_GROUPS.ns]}.")
+ log.debug("On demand cache refresh succeeded. Data: ${data}. Added ${serverGroup ? 1 : 0} items to the cache. Evicted ${evictions[SERVER_GROUPS.ns]}.")
return new OnDemandResult(
sourceAgentType: getOnDemandAgentType(),
@@ -295,7 +295,7 @@ class GoogleZonalServerGroupCachingAgent extends AbstractGoogleCachingAgent impl
}
private CacheResult buildCacheResult(CacheResultBuilder cacheResultBuilder, List<GoogleServerGroup> serverGroups) {
- log.info "Describing items in $agentType"
+ log.debug "Describing items in $agentType"
serverGroups.each { GoogleServerGroup serverGroup ->
Moniker moniker = naming.deriveMoniker(serverGroup)
@@ -345,12 +345,12 @@ class GoogleZonalServerGroupCachingAgent extends AbstractGoogleCachingAgent impl
}
}
- log.info("Caching ${cacheResultBuilder.namespace(APPLICATIONS.ns).keepSize()} applications in ${agentType}")
- log.info("Caching ${cacheResultBuilder.namespace(CLUSTERS.ns).keepSize()} clusters in ${agentType}")
- log.info("Caching ${cacheResultBuilder.namespace(SERVER_GROUPS.ns).keepSize()} server groups in ${agentType}")
- log.info("Caching ${cacheResultBuilder.namespace(LOAD_BALANCERS.ns).keepSize()} load balancer relationships in ${agentType}")
- log.info("Caching ${cacheResultBuilder.onDemand.toKeep.size()} onDemand entries in ${agentType}")
- log.info("Evicting ${cacheResultBuilder.onDemand.toEvict.size()} onDemand entries in ${agentType}")
+ log.debug("Caching ${cacheResultBuilder.namespace(APPLICATIONS.ns).keepSize()} applications in ${agentType}")
+ log.debug("Caching ${cacheResultBuilder.namespace(CLUSTERS.ns).keepSize()} clusters in ${agentType}")
+ log.debug("Caching ${cacheResultBuilder.namespace(SERVER_GROUPS.ns).keepSize()} server groups in ${agentType}")
+ log.debug("Caching ${cacheResultBuilder.namespace(LOAD_BALANCERS.ns).keepSize()} load balancer relationships in ${agentType}")
+ log.debug("Caching ${cacheResultBuilder.onDemand.toKeep.size()} onDemand entries in ${agentType}")
+ log.debug("Evicting ${cacheResultBuilder.onDemand.toEvict.size()} onDemand entries in ${agentType}")
cacheResultBuilder.build()
}

refactor(google): switch the caching log messages from INFO to DEBUG. (#3579)