Skip to content

Commit

Permalink
Cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
ryanrolds committed Feb 5, 2025
1 parent 458437f commit 05e632c
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 23 deletions.
6 changes: 0 additions & 6 deletions pkg/utils/statsutils/metrics/metrics.go
Original file line number Diff line number Diff line change
Expand Up @@ -127,8 +127,6 @@ func resourceToGVK(resource resources.Resource) (schema.GroupVersionKind, error)
}

func (m *ConfigStatusMetrics) SetResourceStatus(ctx context.Context, resource resources.Resource, status *core.Status) {
fmt.Printf("SetResourceStatus: %s\n, %s\n", resource.GetMetadata().Ref(), status.GetState())

if status.GetState() == core.Status_Warning || status.GetState() == core.Status_Rejected {
m.SetResourceInvalid(ctx, resource)
return
Expand All @@ -153,8 +151,6 @@ func (m *ConfigStatusMetrics) SetResourceValid(ctx context.Context, resource res
log.Errorf("Error setting labels on %s: %s", Names[gvk], err.Error())
}
statsutils.MeasureZero(ctx, m.metrics[gvk].gauge, mutators...)
} else {
log.Warnf("Skipping setting valid metric for resource %s, no metric configured", resource.GetMetadata().Ref())
}
}

Expand All @@ -172,8 +168,6 @@ func (m *ConfigStatusMetrics) SetResourceInvalid(ctx context.Context, resource r
log.Errorf("Error setting labels on %s: %s", Names[gvk], err.Error())
}
statsutils.MeasureOne(ctx, m.metrics[gvk].gauge, mutators...)
} else {
log.Warnf("Skipping setting invalid metric for resource %s, no metric configured", resource.GetMetadata().Ref())
}
}

Expand Down
5 changes: 5 additions & 0 deletions test/kubernetes/e2e/features/metrics/edge.go
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,11 @@ func (s *prometheusMetricsTestingSuite) fetchMetrics() (map[string]*dto.MetricFa
res, err := http.Get(fmt.Sprintf("http://localhost:%d/metrics", s.portForwarder.LocalPort()))
s.Require().NoError(err, "can get metrics")

defer func() {
err := res.Body.Close()
s.Require().NoError(err, "can close response body")
}()

// make sure the response is successful
s.Require().Equal(http.StatusOK, res.StatusCode, "response status code is 200")

Expand Down
17 changes: 0 additions & 17 deletions test/kubernetes/e2e/tests/manifests/status-metrics.yaml

This file was deleted.

0 comments on commit 05e632c

Please sign in to comment.