fix lockups in UpdateStrategyDBMode.HandleEvent

internal/dataplane/sendconfig/dbmode.go

@@ -65,7 +65,7 @@ func NewUpdateStrategyDBModeKonnect(
 	concurrency int,
 	diagnostic *diagnostics.ClientDiagnostic,
 	logger logr.Logger,
-) UpdateStrategyDBMode {
+) *UpdateStrategyDBMode {
 	s := NewUpdateStrategyDBMode(client, dumpConfig, version, concurrency, diagnostic, logger)
 	s.isKonnect = true
 	return s
@@ -102,6 +102,7 @@ func (s *UpdateStrategyDBMode) Update(ctx context.Context, targetContent Content
 	cancel()
 	s.resourceErrorLock.Lock()
 	defer s.resourceErrorLock.Unlock()
+	s.logger.Info("Collecting resource errors")
 	resourceFailures := resourceErrorsToResourceFailures(s.resourceErrors, s.logger)
 	if errs != nil {
 		return mo.None[int](), NewUpdateErrorWithoutResponseBody(
@@ -159,12 +160,14 @@ func (s *UpdateStrategyDBMode) HandleEvents(
 				}
 			}
 		case <-ctx.Done():
-			if diagnostic != nil {
+			// Release resource error lock before sending diffs to diagnositic server to prevent blocking of main procedure of updating.
+			s.resourceErrorLock.Unlock()
+			// REVIEW: Is there a better way to judge whether dumping diffs enabled than directly checking the channel?
+			if diagnostic != nil && diagnostic.Diffs != nil {
 				diff.Timestamp = time.Now().Format(time.RFC3339)
 				diagnostic.Diffs <- diff
 				s.logger.V(logging.DebugLevel).Info("recorded database update events and diff", "hash", hash)
 			}
-			s.resourceErrorLock.Unlock()
 			return
 		}
 	}

internal/dataplane/sendconfig/sendconfig.go

@@ -77,7 +77,7 @@ func PerformUpdate(
 	updateStrategy := updateStrategyResolver.ResolveUpdateStrategy(client, diagnostic)
 	logger = logger.WithValues("update_strategy", updateStrategy.Type())
 	timeStart := time.Now()
-	err = updateStrategy.Update(ctx, ContentWithHash{
+	size, err := updateStrategy.Update(ctx, ContentWithHash{
 		Content:        targetContent,
 		CustomEntities: customEntities,
 		Hash:           newSHA,

test/kongintegration/dbmode_update_strategy_test.go

@@ -52,6 +52,7 @@ func TestUpdateStrategyDBMode(t *testing.T) {
 		dump.Config{},
 		semver.MustParse("3.6.0"),
 		10,
+		nil,
 		logger,
 	)