remove chatty spans

Signed-off-by: Matthias Bertschy <matthias.bertschy@gmail.com>
kubescape · Mar 24, 2023 · 910328f · 910328f
1 parent ca23485
commit 910328f
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 12 deletions.
diff --git a/adapters/v1/grype.go b/adapters/v1/grype.go
@@ -56,9 +56,6 @@ func NewGrypeAdapter() *GrypeAdapter {
 
 // DBVersion returns the vulnerabilities DB checksum which is used to tag CVE manifests
 func (g *GrypeAdapter) DBVersion(ctx context.Context) string {
-	_, span := otel.Tracer("").Start(ctx, "GrypeAdapter.DBVersion")
-	defer span.End()
-
 	g.mu.RLock()
 	defer g.mu.RUnlock()
 
@@ -67,9 +64,6 @@ func (g *GrypeAdapter) DBVersion(ctx context.Context) string {
 
 // Ready returns the status of the vulnerabilities DB
 func (g *GrypeAdapter) Ready(ctx context.Context) bool {
-	ctx, span := otel.Tracer("").Start(ctx, "GrypeAdapter.Ready")
-	defer span.End()
-
 	// DB update is in progress
 	if !g.mu.TryRLock() {
 		return false
@@ -80,6 +74,8 @@ func (g *GrypeAdapter) Ready(ctx context.Context) bool {
 	if g.dbStatus == nil || now.Sub(g.lastDbUpdate) > 24*time.Hour {
 		g.mu.Lock()
 		defer g.mu.Unlock()
+		ctx, span := otel.Tracer("").Start(ctx, "GrypeAdapter.UpdateDB")
+		defer span.End()
 		logger.L().Info("updating grype DB")
 		var err error
 		g.store, g.dbStatus, g.dbCloser, err = grype.LoadVulnerabilityDB(g.dbConfig, true)
@@ -176,7 +172,5 @@ func getMatchers() []matcher.Matcher {
 
 // Version returns Grype's version which is used to tag CVE manifests
 func (g *GrypeAdapter) Version(ctx context.Context) string {
-	_, span := otel.Tracer("").Start(ctx, "GrypeAdapter.Ready")
-	defer span.End()
 	return tools.PackageVersion("github.com/anchore/grype")
 }
diff --git a/adapters/v1/syft.go b/adapters/v1/syft.go
@@ -120,7 +120,5 @@ func (s *SyftAdapter) CreateSBOM(ctx context.Context, imageID string, options do
 
 // Version returns Syft's version which is used to tag SBOMs
 func (s *SyftAdapter) Version(ctx context.Context) string {
-	_, span := otel.Tracer("").Start(ctx, "SyftAdapter.Version")
-	defer span.End()
 	return tools.PackageVersion("github.com/anchore/syft")
 }
diff --git a/core/services/scan.go b/core/services/scan.go
@@ -83,8 +83,6 @@ func (s *ScanService) GenerateSBOM(ctx context.Context) error {
 
 // Ready proxies the cveScanner's readiness
 func (s *ScanService) Ready(ctx context.Context) bool {
-	ctx, span := otel.Tracer("").Start(ctx, "ScanService.Ready")
-	defer span.End()
 	return s.cveScanner.Ready(ctx)
 }