Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 23 additions & 3 deletions functional_java_interop_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -44,22 +44,42 @@ func produceWithJava(t *testing.T, topic string, codec CompressionCodec, message
stdin, err := cmd.StdinPipe()
require.NoError(t, err)

stderr, err := cmd.StderrPipe()
require.NoError(t, err)

var stderrOutput strings.Builder
var wg sync.WaitGroup
wg.Add(1)
go func() {
defer wg.Done()
Comment on lines +51 to +54
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For single goroutine synchronization, I would usually recommend just using a simple channel:

collectionDone := make(chan struct{})
go func() {
	defer close(collectionDone)
	…
}()
…
<-collectionDone

Not like using a WaitGroup is wrong.

s := bufio.NewScanner(stderr)
for s.Scan() {
stderrOutput.WriteString(s.Text() + "\n")
}
}()

require.NoError(t, cmd.Start())

for _, msg := range messages {
_, err := fmt.Fprintln(stdin, msg)
if err != nil {
stdin.Close()
waitErr := cmd.Wait()
wg.Wait()
if waitErr != nil {
err = fmt.Errorf("failed to write message: %w; Java producer failed: %w", err, waitErr)
err = fmt.Errorf("failed to write message: %w; Java producer failed: %w; stderr: %s", err, waitErr, stderrOutput.String())
}
}
require.NoError(t, err)
}
stdin.Close()

require.NoError(t, cmd.Wait(), "Java producer failed")
err = cmd.Wait()
wg.Wait()
if err != nil {
t.Logf("Java producer stderr: %s", stderrOutput.String())
require.NoError(t, err, "Java producer failed")
}
}

func consumeWithSarama(t *testing.T, topic string, startOffset int64, count int) []string {
Expand Down Expand Up @@ -253,7 +273,7 @@ func kafkaVersionAtLeast(requiredVersion string) bool {

func javaProducerArgs(topic string, codec CompressionCodec) []string {
args := make([]string, 0, 8)
if kafkaVersionAtLeast("2.0.0") {
if kafkaVersionAtLeast("2.5.0") {
args = append(args, "--bootstrap-server", brokerAddr)
} else {
args = append(args, "--broker-list", brokerAddr)
Expand Down
Loading