Skip to content

Commit

Permalink
Merge branch 'main' into packaging-tests-debug
Browse files Browse the repository at this point in the history
  • Loading branch information
jinja2 authored Nov 15, 2024
2 parents 3af0909 + 7d52e44 commit 4745444
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 2 deletions.
2 changes: 1 addition & 1 deletion docker/kafka/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM bitnami/kafka:3.8.0
FROM bitnami/kafka:3.9.0

ENV JMX_PORT=7099
EXPOSE 7099
Expand Down
2 changes: 1 addition & 1 deletion packaging/fpm/Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ GEM
insist
mustache (= 0.99.8)
stud
rexml (3.3.8)
rexml (3.3.9)
stud (0.0.23)

PLATFORMS
Expand Down
2 changes: 2 additions & 0 deletions tests/receivers/scriptedinputs/script_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
package scriptedinputs

import (
"fmt"
"regexp"
"testing"
"time"
Expand Down Expand Up @@ -64,6 +65,7 @@ func TestScriptReceiverDf(t *testing.T) {
tc.OTLPReceiverSink.Reset()

lr := receivedOTLPLogs[0].ResourceLogs().At(0).ScopeLogs().At(0).LogRecords().At(0)
fmt.Printf("Received log entry - \n%s", lr.Body().Str())
assert.Regexp(tt, regexp.MustCompile("Filesystem\\s+Type\\s+Size\\s+Used\\s+Avail\\s+Use%\\s+Inodes\\s+IUsed\\s+IFree\\s+IUse%\\s+MountedOn"), lr.Body().Str())
}, 10*time.Second, 10*time.Millisecond, "Failed to receive expected logs")
}
Expand Down

0 comments on commit 4745444

Please sign in to comment.