tracing sampling return value update (#351)

* tracing sampling return value update * set limit only if defined
openclarity · Mar 30, 2023 · 0e63a42 · 0e63a42
1 parent f624b07
commit 0e63a42
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/backend/pkg/database/apievent.go b/backend/pkg/database/apievent.go
@@ -271,8 +271,11 @@ func (a *APIEventsTableHandler) GetAPIEventsWithAnnotations(ctx context.Context,
 		sortDir = "ASC"
 	}
 
+	if query.Limit != 0 {
+		tx = tx.Limit(query.Limit)
+	}
+
 	if err := tx.Offset(query.Offset).
-		Limit(query.Limit).
 		Order(fmt.Sprintf("%s %s", query.Order, sortDir)).
 		WithContext(ctx).
 		Find(&events).Error; err != nil {

diff --git a/backend/pkg/modules/internal/core/modules.go b/backend/pkg/modules/internal/core/modules.go
@@ -17,7 +17,6 @@ package core
 
 import (
 	"context"
-	"errors"
 	"fmt"
 	"net/http"
 
@@ -241,7 +240,7 @@ func (b *accessor) Notify(ctx context.Context, modName string, apiID uint, n not
 
 func (b *accessor) EnableTraces(ctx context.Context, modName string, apiID uint) error {
 	if !b.traceSamplingEnabled {
-		return errors.New("trace sampling is not enabled")
+		return nil
 	}
 	if err := b.samplingManager.AddHostToTrace(modName, uint32(apiID)); err != nil {
 		return fmt.Errorf("failed to add API %v to trace: %v", apiID, err)