remove flaky test and make result chan earlier

Signed-off-by: sspaink <[email protected]>

Author: sspaink

Diff for: v1/plugins/logs/plugin.go

@@ -588,6 +588,10 @@ func New(parsedConfig *Config, manager *plugins.Manager) *Plugin {
 		preparedMask: *newPrepareOnce(),
 	}
 
+	if *parsedConfig.Reporting.Trigger == plugins.TriggerImmediate {
+		plugin.immediateResult = make(chan [][]byte)
+	}
+
 	switch parsedConfig.Reporting.BufferType {
 	case eventBufferType:
 		plugin.eventBuffer = newEventBuffer(
@@ -832,8 +836,6 @@ func (p *Plugin) compilerUpdated(storage.Transaction) {
 func (p *Plugin) loop() {
 	ctx, cancel := context.WithCancel(context.Background())
 
-	var retry int
-
 	var errCh chan error
 	var stop chan chan struct{}
 	if *p.config.Reporting.Trigger == plugins.TriggerImmediate && p.config.Service != "" {
@@ -842,7 +844,6 @@ func (p *Plugin) loop() {
 
 		switch p.config.Reporting.BufferType {
 		case sizeBufferType:
-			p.immediateResult = make(chan [][]byte)
 			go immediateUpload[[][]byte](ctx,
 				errCh,
 				stop,
@@ -859,6 +860,8 @@ func (p *Plugin) loop() {
 		}
 	}
 
+	var retry int
+
 	for {
 		var waitC chan struct{}
 

Diff for: v1/plugins/logs/plugin_test.go

@@ -3800,79 +3800,3 @@ func TestPluginTriggerImmediateErrorHandling(t *testing.T) {
 		})
 	}
 }
-
-func TestPluginImmediateMaxDelayFlush(t *testing.T) {
-	t.Parallel()
-
-	tests := []struct {
-		name        string
-		bufferType  string
-		uploadLimit int64
-	}{
-		{
-			name:       "event buffer upload immediately",
-			bufferType: eventBufferType,
-		},
-		{
-			name:        "size buffer upload immediately",
-			bufferType:  sizeBufferType,
-			uploadLimit: 215,
-		},
-	}
-
-	for _, tc := range tests {
-		t.Run(tc.name, func(t *testing.T) {
-			ctx := context.Background()
-
-			maxDelay := int64(1)
-
-			triggerMode := plugins.TriggerImmediate
-			fixture := newTestFixture(t, testFixtureOptions{
-				ReportingBufferType:           tc.bufferType,
-				ReportingTrigger:              &triggerMode,
-				ReportingUploadSizeLimitBytes: tc.uploadLimit,
-				ReportingMaxDelay:             maxDelay,
-			})
-			defer fixture.server.stop()
-
-			fixture.server.ch = make(chan []EventV1, 8)
-
-			if err := fixture.plugin.Start(ctx); err != nil {
-				t.Fatal(err)
-			}
-
-			var input any = make(map[string]interface{})
-			var result any = false
-
-			input = generateInputMap(1)
-			id := "abc"
-			err := fixture.plugin.Log(ctx, logServerInfo(id, input, result))
-			if err != nil {
-				t.Fatal(err)
-			}
-			err = fixture.plugin.Log(ctx, logServerInfo(id, input, result))
-			if err != nil {
-				t.Fatal(err)
-			}
-
-			// wait for the immediate loop to flush the single event
-			time.Sleep(time.Duration(maxDelay) * time.Second * 2)
-
-			close(fixture.server.ch)
-
-			for events := range fixture.server.ch {
-				if len(events) < 1 {
-					t.Fatal("no events received")
-				}
-
-				if events[0].DecisionID != id {
-					t.Fatalf("Unexpected decision ID received '%s' but expected '%s'", events[0].DecisionID, id)
-				}
-
-				return
-			}
-
-			t.Fatalf("no events received")
-		})
-	}
-}