refactor: remove code analytics (#15)

Author: teodora-sandu

observability/analytics.go

@@ -34,7 +34,6 @@ type codeScanner struct {
 	bundleManager bundle.BundleManager
 	instrumentor  observability.Instrumentor
 	errorReporter observability.ErrorReporter
-	analytics     observability.Analytics
 	logger        *zerolog.Logger
 }
 
@@ -45,7 +44,6 @@ type CodeScanner interface {
 		path string,
 		files <-chan string,
 		changedFiles map[string]bool,
-		scanMetrics observability.ScanMetrics,
 	) (*sarif.SarifResponse, bundle.Bundle, error)
 }
 
@@ -54,14 +52,12 @@ func NewCodeScanner(
 	bundleManager bundle.BundleManager,
 	instrumentor observability.Instrumentor,
 	errorReporter observability.ErrorReporter,
-	analytics observability.Analytics,
 	logger *zerolog.Logger,
 ) *codeScanner {
 	return &codeScanner{
 		bundleManager: bundleManager,
 		instrumentor:  instrumentor,
 		errorReporter: errorReporter,
-		analytics:     analytics,
 		logger:        logger,
 	}
 }
@@ -73,7 +69,6 @@ func (c *codeScanner) UploadAndAnalyze(
 	path string,
 	files <-chan string,
 	changedFiles map[string]bool,
-	scanMetrics observability.ScanMetrics,
 ) (*sarif.SarifResponse, bundle.Bundle, error) {
 	if ctx.Err() != nil {
 		c.logger.Info().Msg("Canceling Code scan - Code scanner received cancellation signal")
@@ -94,7 +89,6 @@ func (c *codeScanner) UploadAndAnalyze(
 		if ctx.Err() == nil { // Only report errors that are not intentional cancellations
 			msg := "error creating bundle..."
 			c.errorReporter.CaptureError(errors.Wrap(err, msg), observability.ErrorReporterOptions{ErrorDiagnosticPath: path})
-			c.analytics.TrackScan(err == nil, scanMetrics)
 			return nil, nil, err
 		} else {
 			c.logger.Info().Msg("Canceling Code scan - Code scanner received cancellation signal")
@@ -103,14 +97,12 @@ func (c *codeScanner) UploadAndAnalyze(
 	}
 
 	uploadedFiles := b.GetFiles()
-	scanMetrics.SetLastScanFileCount(len(uploadedFiles))
 
 	b, err = c.bundleManager.Upload(span.Context(), host, b, uploadedFiles)
 	if err != nil {
 		if ctx.Err() != nil { // Only handle errors that are not intentional cancellations
 			msg := "error uploading files..."
 			c.errorReporter.CaptureError(errors.Wrap(err, msg), observability.ErrorReporterOptions{ErrorDiagnosticPath: path})
-			c.analytics.TrackScan(err == nil, scanMetrics)
 			return nil, b, err
 		} else {
 			log.Info().Msg("Canceling Code scan - Code scanner received cancellation signal")
@@ -129,6 +121,5 @@ func (c *codeScanner) UploadAndAnalyze(
 		return nil, nil, nil
 	}
 
-	c.analytics.TrackScan(err == nil, scanMetrics)
-	return response, b, nil
+	return response, b, err
 }

observability/mocks/analytics.go

@@ -17,13 +17,12 @@ package codeclient_test
 
 import (
 	"context"
-	"github.com/rs/zerolog"
 	"os"
 	"path/filepath"
 	"testing"
-	"time"
 
 	"github.com/golang/mock/gomock"
+	"github.com/rs/zerolog"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
@@ -32,7 +31,6 @@ import (
 	mocks2 "github.com/snyk/code-client-go/bundle/mocks"
 	"github.com/snyk/code-client-go/deepcode"
 	mocks3 "github.com/snyk/code-client-go/deepcode/mocks"
-	"github.com/snyk/code-client-go/observability"
 	"github.com/snyk/code-client-go/observability/mocks"
 )
 
@@ -44,8 +42,6 @@ func Test_UploadAndAnalyze(t *testing.T) {
 		firstDocPath: deepcode.BundleFileFrom(secondDocPath, secondDocContent),
 	}
 
-	scanMetrics := observability.NewScanMetrics(time.Now(), 0)
-
 	logger := zerolog.Nop()
 
 	t.Run(
@@ -62,11 +58,10 @@ func Test_UploadAndAnalyze(t *testing.T) {
 			mockBundleManager := mocks2.NewMockBundleManager(ctrl)
 			mockBundleManager.EXPECT().Create(gomock.Any(), "testHost", "testRequestId", baseDir, gomock.Any(), map[string]bool{}).Return(mockBundle, nil)
 			mockBundleManager.EXPECT().Upload(gomock.Any(), "testHost", mockBundle, files).Return(mockBundle, nil)
-			mockAnalytics := mocks.NewMockAnalytics(ctrl)
 
-			codeScanner := codeclient.NewCodeScanner(mockBundleManager, mockInstrumentor, mockErrorReporter, mockAnalytics, &logger)
+			codeScanner := codeclient.NewCodeScanner(mockBundleManager, mockInstrumentor, mockErrorReporter, &logger)
 
-			response, bundle, err := codeScanner.UploadAndAnalyze(context.Background(), "testHost", baseDir, docs, map[string]bool{}, scanMetrics)
+			response, bundle, err := codeScanner.UploadAndAnalyze(context.Background(), "testHost", baseDir, docs, map[string]bool{})
 			require.NoError(t, err)
 			assert.Equal(t, "", bundle.GetBundleHash())
 			assert.Equal(t, files, bundle.GetFiles())
@@ -88,12 +83,10 @@ func Test_UploadAndAnalyze(t *testing.T) {
 			mockBundleManager := mocks2.NewMockBundleManager(ctrl)
 			mockBundleManager.EXPECT().Create(gomock.Any(), "testHost", "testRequestId", baseDir, gomock.Any(), map[string]bool{}).Return(mockBundle, nil)
 			mockBundleManager.EXPECT().Upload(gomock.Any(), "testHost", mockBundle, files).Return(mockBundle, nil)
-			mockAnalytics := mocks.NewMockAnalytics(ctrl)
-			mockAnalytics.EXPECT().TrackScan(true, gomock.AssignableToTypeOf(observability.ScanMetrics{}))
 
-			codeScanner := codeclient.NewCodeScanner(mockBundleManager, mockInstrumentor, mockErrorReporter, mockAnalytics, &logger)
+			codeScanner := codeclient.NewCodeScanner(mockBundleManager, mockInstrumentor, mockErrorReporter, &logger)
 
-			response, bundle, err := codeScanner.UploadAndAnalyze(context.Background(), "testHost", baseDir, docs, map[string]bool{}, scanMetrics)
+			response, bundle, err := codeScanner.UploadAndAnalyze(context.Background(), "testHost", baseDir, docs, map[string]bool{})
 			require.NoError(t, err)
 			assert.Equal(t, "COMPLETE", response.Status)
 			assert.Equal(t, "testBundleHash", bundle.GetBundleHash())