Merge branch 'main' into dependabot/go_modules/tools/github.com/vektr…

…a/mockery/v2-2.34.1
percona · Sep 26, 2023 · f504a1f · f504a1f
2 parents 5981f1d + a407ad5
commit f504a1f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/managed/services/telemetry/telemetry.go b/managed/services/telemetry/telemetry.go
@@ -188,8 +188,8 @@ func (s *Service) processSendCh(ctx context.Context) {
 				reportsBuf = []*pmmv1.ServerMetric{}
 				reportsBufSync.Unlock()
 
-				go func() {
-					err := s.send(sendCtx, &reporter.ReportRequest{
+				go func(ctx context.Context) {
+					err := s.send(ctx, &reporter.ReportRequest{
 						Metrics: reportsToSend,
 					})
 					if err != nil {
@@ -201,7 +201,7 @@ func (s *Service) processSendCh(ctx context.Context) {
 					}
 
 					s.l.Debug("Telemetry info sent.")
-				}()
+				}(sendCtx)
 			}
 		case <-ctx.Done():
 			if cancel != nil {

diff --git a/managed/services/telemetry/telemetry_test.go b/managed/services/telemetry/telemetry_test.go
@@ -19,7 +19,6 @@ import (
 	"context"
 	"io/fs"
 	"os"
-	"reflect"
 	"testing"
 	"time"
 
@@ -264,7 +263,7 @@ func initMockTelemetrySender(t *testing.T, expectedReport *reporter.ReportReques
 		var mockTelemetrySender mockSender
 		mockTelemetrySender.Test(t)
 		mockTelemetrySender.On("SendTelemetry",
-			mock.AnythingOfType(reflect.TypeOf(context.TODO()).Name()),
+			mock.Anything,
 			mock.MatchedBy(func(report *reporter.ReportRequest) bool {
 				return matchExpectedReport(report, expectedReport)
 			}),