remove flak test

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

Author: sspaink

v1/plugins/logs/plugin.go

@@ -669,6 +669,19 @@ func (p *Plugin) Config() *Config {
 func (p *Plugin) flushDecisions(ctx context.Context) {
 	p.logger.Info("Flushing decision logs.")
 
+	if *p.config.Reporting.Trigger == plugins.TriggerImmediate && p.config.Reporting.BufferType == sizeBufferType {
+		// make sure there isn't anything left in the immediateResult channel
+		select {
+		case result := <-p.immediateResult:
+			p.mtx.Lock()
+			for _, chunk := range result {
+				p.bufferChunk(p.buffer, chunk)
+			}
+			p.mtx.Unlock()
+		default:
+		}
+	}
+
 	done := make(chan bool)
 
 	go func(ctx context.Context, done chan bool) {

v1/plugins/logs/plugin_test.go

@@ -3727,78 +3727,3 @@ func testStatus() *bundle.Status {
 		LastSuccessfulActivation: tActivate,
 	}
 }
-
-func TestPluginTriggerImmediateErrorHandling(t *testing.T) {
-	t.Parallel()
-
-	tests := []struct {
-		name        string
-		bufferType  string
-		triggerMode plugins.TriggerMode
-	}{
-		{
-			name:        "event buffer upload periodically",
-			bufferType:  eventBufferType,
-			triggerMode: plugins.TriggerImmediate,
-		},
-		{
-			name:        "size buffer upload immediately",
-			bufferType:  sizeBufferType,
-			triggerMode: plugins.TriggerImmediate,
-		},
-	}
-
-	for _, tc := range tests {
-		t.Run(tc.name, func(t *testing.T) {
-			ctx := context.Background()
-
-			testLogger := test.New()
-			testLogger.SetLevel(logging.Error)
-
-			fixture := newTestFixture(t, testFixtureOptions{
-				Logger:                        testLogger,
-				ReportingBufferType:           tc.bufferType,
-				ReportingTrigger:              &tc.triggerMode,
-				ReportingUploadSizeLimitBytes: 300,
-			})
-			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
-
-			fixture.server.expCode = 500
-			err := fixture.plugin.Log(ctx, logServerInfo("abc", input, result))
-			if err != nil {
-				t.Fatal(err)
-			}
-			err = fixture.plugin.Log(ctx, logServerInfo("abc", input, result))
-			if err != nil {
-				t.Fatal(err)
-			}
-
-			fixture.plugin.Stop(ctx)
-
-			// wait until there is an error entry
-			var errReceived string
-			for {
-				entries := testLogger.Entries()
-				if len(entries) > 0 {
-					errReceived = entries[0].Message
-					break
-				}
-				time.Sleep(10 * time.Millisecond)
-			}
-
-			errExpected := "log upload failed, server replied with HTTP 500 Internal Server Error."
-			if errReceived != errExpected {
-				t.Fatalf("Unexpected error received '%s' but expected '%s'", errReceived, errExpected)
-			}
-		})
-	}
-}