Skip to content

Trim metadata logging and add logging fields #2725

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
khewonc wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Trim metadata logging and add logging fields #2725

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pkg/controller/utils/datadog/metrics_forwarder.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,8 +147,8 @@ type metricsForwarder struct {
// newMetricsForwarder returns a new Datadog MetricsForwarder instance
func newMetricsForwarder(k8sClient client.Client, decryptor secrets.Decryptor, obj client.Object, platforminfo *kubernetes.PlatformInfo, datadogAgentInternalEnabled bool, credsManager *config.CredentialManager) *metricsForwarder {

logger := log.WithValues("CustomResource.Namespace", obj.GetNamespace(), "CustomResource.Name", obj.GetName())
objKind := getObjKind(obj)
logger := log.WithValues("kind", objKind, "namespace", obj.GetNamespace(), "name", obj.GetName())

return &metricsForwarder{
id: getObjID(obj),
Expand Down
24 changes: 10 additions & 14 deletions pkg/controller/utils/metadata/crd_metadata.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,6 @@ func (cmf *CRDMetadataForwarder) sendMetadata() error {
crdsToSend := cmf.getCRDsToSend(allCRDs)

if len(crdsToSend) == 0 {
cmf.logger.V(1).Info("No changes or heartbeats due")
return nil
}

Expand All @@ -143,10 +142,6 @@ func (cmf *CRDMetadataForwarder) sendCRDMetadata(ctx context.Context, crdInstanc

payload := cmf.buildPayload(clusterUID, crdInstance)

cmf.logger.V(1).Info("Sending metadata HTTP request",
"kind", crdInstance.Kind,
"name", crdInstance.Name)

req, err := cmf.createRequest(payload)
if err != nil {
return fmt.Errorf("error creating request: %w", err)
Expand All @@ -165,8 +160,8 @@ func (cmf *CRDMetadataForwarder) sendCRDMetadata(ctx context.Context, crdInstanc
return fmt.Errorf("failed to read metadata response body: %w", err)
}

cmf.logger.V(1).Info("Read metadata response",
"status code", resp.StatusCode,
cmf.logger.V(2).Info("Sent metadata",
"statusCode", resp.StatusCode,
"body", string(body),
"kind", crdInstance.Kind,
"name", crdInstance.Name)
Expand Down Expand Up @@ -326,7 +321,7 @@ func (cmf *CRDMetadataForwarder) getCRDsToSend(crds []CRDInstance) []CRDInstance
key := buildCacheKey(crd)
newHash, err := hashCRD(crd)
if err != nil {
cmf.logger.V(1).Info("Failed to hash CRD", "error", err, "key", key)
cmf.logger.V(1).Info("Failed to hash CRD", "error", err, "kind", crd.Kind, "namespace", crd.Namespace, "name", crd.Name)
continue
}

Expand All @@ -339,7 +334,7 @@ func (cmf *CRDMetadataForwarder) getCRDsToSend(crds []CRDInstance) []CRDInstance
hash: newHash,
lastSent: now,
}
cmf.logger.V(1).Info("New CRD detected", "key", key)
cmf.logger.V(1).Info("New CRD detected", "kind", crd.Kind, "namespace", crd.Namespace, "name", crd.Name)
continue
}

Expand All @@ -350,7 +345,7 @@ func (cmf *CRDMetadataForwarder) getCRDsToSend(crds []CRDInstance) []CRDInstance
hash: newHash,
lastSent: now,
}
cmf.logger.V(1).Info("CRD change detected", "key", key)
cmf.logger.V(1).Info("CRD change detected", "kind", crd.Kind, "namespace", crd.Namespace, "name", crd.Name)
continue
}

Expand All @@ -359,8 +354,8 @@ func (cmf *CRDMetadataForwarder) getCRDsToSend(crds []CRDInstance) []CRDInstance
if timeSinceLastSend >= crdMetadataHeartbeatTTL {
toSend = append(toSend, crd)
cmf.crdCache[key].lastSent = now
cmf.logger.V(1).Info("CRD heartbeat due", "key", key,
"time_since_last_send", timeSinceLastSend.Round(time.Second))
cmf.logger.V(2).Info("CRD heartbeat due", "kind", crd.Kind, "namespace", crd.Namespace, "name", crd.Name,
"timeSinceLastSend", timeSinceLastSend.Round(time.Second))
continue
}
}
Expand All @@ -379,7 +374,7 @@ func (cmf *CRDMetadataForwarder) cleanupDeletedCRDs(currentCRDs []CRDInstance, s
}

for key := range cmf.crdCache {
cachedKind, _, found := strings.Cut(key, "/")
cachedKind, rest, found := strings.Cut(key, "/")
if !found {
continue
}
Expand All @@ -388,7 +383,8 @@ func (cmf *CRDMetadataForwarder) cleanupDeletedCRDs(currentCRDs []CRDInstance, s
if successfulKinds[cachedKind] {
if !currentKeys[key] {
delete(cmf.crdCache, key)
cmf.logger.V(1).Info("Removed deleted CRD from cache", "key", key)
cachedNS, cachedName, _ := strings.Cut(rest, "/")
cmf.logger.V(1).Info("Removed deleted CRD from cache", "kind", cachedKind, "namespace", cachedNS, "name", cachedName)
}
}
}
Expand Down
12 changes: 5 additions & 7 deletions pkg/controller/utils/metadata/helm_metadata.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,13 +182,13 @@ func (hmf *HelmMetadataForwarder) Start(ctx context.Context) error {
AddFunc: func(obj any) {
if key, keyErr := toolscache.MetaNamespaceKeyFunc(obj); keyErr == nil {
hmf.queue.Add(key)
hmf.logger.V(1).Info("Enqueued ConfigMap for processing", "key", key)
hmf.logger.V(2).Info("Enqueued ConfigMap for processing", "key", key)
}
},
DeleteFunc: func(obj any) {
if key, keyErr := toolscache.DeletionHandlingMetaNamespaceKeyFunc(obj); keyErr == nil {
hmf.queue.Add(deletePrefix + key)
hmf.logger.V(1).Info("Enqueued ConfigMap deletion for processing", "key", key)
hmf.logger.V(2).Info("Enqueued ConfigMap deletion for processing", "key", key)
}
},
},
Expand Down Expand Up @@ -356,7 +356,7 @@ func (hmf *HelmMetadataForwarder) handleHelmResource(ctx context.Context, name,

// Filter for allowed charts (after decoding)
if !allowedCharts[release.Chart.Metadata.Name] {
hmf.logger.V(1).Info("Skipping non-allowed chart",
hmf.logger.V(2).Info("Skipping non-allowed chart",
"chart", release.Chart.Metadata.Name,
"release", releaseName)
return
Expand All @@ -373,7 +373,7 @@ func (hmf *HelmMetadataForwarder) handleHelmResource(ctx context.Context, name,

// Check if we should update (prevent old revisions)
if entry.snapshot != nil && entry.snapshot.Revision >= revision {
hmf.logger.V(1).Info("Skipping old/same revision",
hmf.logger.V(2).Info("Skipping old/same revision",
"key", key,
"existing", entry.snapshot.Revision,
"new", revision)
Expand Down Expand Up @@ -471,8 +471,6 @@ func (hmf *HelmMetadataForwarder) tickerLoop(ctx context.Context) {

// sendAllSnapshots sends all release snapshots
func (hmf *HelmMetadataForwarder) sendAllSnapshots() {
hmf.logger.V(1).Info("Ticker: sending all Helm release snapshots")

count := 0
errors := 0

Expand Down Expand Up @@ -505,7 +503,7 @@ func (hmf *HelmMetadataForwarder) sendAllSnapshots() {
})

if count > 0 {
hmf.logger.V(1).Info("Ticker: sent Helm release snapshots",
hmf.logger.V(2).Info("Ticker: sent Helm release snapshots",
"sent", count,
"errors", errors)
}
Expand Down
18 changes: 9 additions & 9 deletions pkg/controller/utils/metadata/operator_metadata.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ func (omf *OperatorMetadataForwarder) sendMetadata() error {

defer resp.Body.Close()

omf.logger.V(1).Info("Sent metadata", "status code", resp.StatusCode)
omf.logger.V(2).Info("Sent metadata", "statusCode", resp.StatusCode)
return nil
}

Expand Down Expand Up @@ -177,7 +177,7 @@ func (omf *OperatorMetadataForwarder) updateResourceCounts() {
if err := omf.k8sClient.List(ctx, ddaList); err == nil {
omf.OperatorMetadata.ResourceCounts["datadogagent"] = len(ddaList.Items)
} else {
omf.logger.V(1).Info("Failed to list DatadogAgents, keeping old value", "error", err, "old_count", omf.OperatorMetadata.ResourceCounts["datadogagent"])
omf.logger.V(1).Info("Failed to list DatadogAgents, keeping old value", "error", err, "oldCount", omf.OperatorMetadata.ResourceCounts["datadogagent"])
}
}

Expand All @@ -186,7 +186,7 @@ func (omf *OperatorMetadataForwarder) updateResourceCounts() {
if err := omf.k8sClient.List(ctx, ddaiList); err == nil {
omf.OperatorMetadata.ResourceCounts["datadogagentinternal"] = len(ddaiList.Items)
} else {
omf.logger.V(1).Info("Failed to list DatadogAgentInternals, keeping old value", "error", err, "old_count", omf.OperatorMetadata.ResourceCounts["datadogagentinternal"])
omf.logger.V(1).Info("Failed to list DatadogAgentInternals, keeping old value", "error", err, "oldCount", omf.OperatorMetadata.ResourceCounts["datadogagentinternal"])
}
}

Expand All @@ -195,7 +195,7 @@ func (omf *OperatorMetadataForwarder) updateResourceCounts() {
if err := omf.k8sClient.List(ctx, monitorList); err == nil {
omf.OperatorMetadata.ResourceCounts["datadogmonitor"] = len(monitorList.Items)
} else {
omf.logger.V(1).Info("Failed to list DatadogMonitors, keeping old value", "error", err, "old_count", omf.OperatorMetadata.ResourceCounts["datadogmonitor"])
omf.logger.V(1).Info("Failed to list DatadogMonitors, keeping old value", "error", err, "oldCount", omf.OperatorMetadata.ResourceCounts["datadogmonitor"])
}
}

Expand All @@ -204,7 +204,7 @@ func (omf *OperatorMetadataForwarder) updateResourceCounts() {
if err := omf.k8sClient.List(ctx, dashboardList); err == nil {
omf.OperatorMetadata.ResourceCounts["datadogdashboard"] = len(dashboardList.Items)
} else {
omf.logger.V(1).Info("Failed to list DatadogDashboards, keeping old value", "error", err, "old_count", omf.OperatorMetadata.ResourceCounts["datadogdashboard"])
omf.logger.V(1).Info("Failed to list DatadogDashboards, keeping old value", "error", err, "oldCount", omf.OperatorMetadata.ResourceCounts["datadogdashboard"])
}
}

Expand All @@ -213,7 +213,7 @@ func (omf *OperatorMetadataForwarder) updateResourceCounts() {
if err := omf.k8sClient.List(ctx, sloList); err == nil {
omf.OperatorMetadata.ResourceCounts["datadogslo"] = len(sloList.Items)
} else {
omf.logger.V(1).Info("Failed to list DatadogSLOs, keeping old value", "error", err, "old_count", omf.OperatorMetadata.ResourceCounts["datadogslo"])
omf.logger.V(1).Info("Failed to list DatadogSLOs, keeping old value", "error", err, "oldCount", omf.OperatorMetadata.ResourceCounts["datadogslo"])
}
}

Expand All @@ -222,7 +222,7 @@ func (omf *OperatorMetadataForwarder) updateResourceCounts() {
if err := omf.k8sClient.List(ctx, genericList); err == nil {
omf.OperatorMetadata.ResourceCounts["datadoggenericresource"] = len(genericList.Items)
} else {
omf.logger.V(1).Info("Failed to list DatadogGenericResources, keeping old value", "error", err, "old_count", omf.OperatorMetadata.ResourceCounts["datadoggenericresource"])
omf.logger.V(1).Info("Failed to list DatadogGenericResources, keeping old value", "error", err, "oldCount", omf.OperatorMetadata.ResourceCounts["datadoggenericresource"])
}
}

Expand All @@ -231,8 +231,8 @@ func (omf *OperatorMetadataForwarder) updateResourceCounts() {
if err := omf.k8sClient.List(ctx, profileList); err == nil {
omf.OperatorMetadata.ResourceCounts["datadogagentprofile"] = len(profileList.Items)
} else {
omf.logger.V(1).Info("Failed to list DatadogAgentProfiles, keeping old value", "error", err, "old_count", omf.OperatorMetadata.ResourceCounts["datadogagentprofile"])
omf.logger.V(1).Info("Failed to list DatadogAgentProfiles, keeping old value", "error", err, "oldCount", omf.OperatorMetadata.ResourceCounts["datadogagentprofile"])
}
}
omf.logger.V(1).Info("Updated resource counts", "counts", omf.OperatorMetadata.ResourceCounts)
omf.logger.V(2).Info("Updated resource counts", "counts", omf.OperatorMetadata.ResourceCounts)
}
2 changes: 0 additions & 2 deletions pkg/controller/utils/metadata/shared_metadata.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,8 +76,6 @@ func (sm *SharedMetadata) createRequest(payload []byte) (*http.Request, error) {
}
payloadHeader := sm.GetHeaders(*apiKey)

sm.logger.V(1).Info("Sending metadata to URL", "url", *requestURL)

reader := bytes.NewReader(payload)
req, err := http.NewRequestWithContext(context.TODO(), "POST", *requestURL, reader)
if err != nil {
Expand Down
Loading