Skip to content

Commit cfa60ac

Browse files
Fix tests
1 parent b7fd080 commit cfa60ac

File tree

2 files changed

+5
-9
lines changed

2 files changed

+5
-9
lines changed

bridges/otellogr/logsink.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@ import (
6969
"time"
7070

7171
"github.com/go-logr/logr"
72+
7273
"go.opentelemetry.io/otel/log"
7374
"go.opentelemetry.io/otel/log/global"
7475
"go.opentelemetry.io/otel/sdk/instrumentation"

bridges/otellogr/logsink_test.go

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ import (
1313
"github.com/go-logr/logr"
1414
"github.com/stretchr/testify/assert"
1515
"github.com/stretchr/testify/require"
16+
1617
"go.opentelemetry.io/otel/log"
1718
"go.opentelemetry.io/otel/log/global"
1819
"go.opentelemetry.io/otel/log/logtest"
@@ -35,11 +36,6 @@ func TestNewLogSinkConfiguration(t *testing.T) {
3536
var ls *LogSink
3637
assert.NotPanics(t, func() { ls = NewLogSink() })
3738
assert.NotNil(t, ls)
38-
require.IsType(t, &logtest.Recorder{}, ls.logger)
39-
40-
l := ls.logger.(*logtest.Recorder)
41-
assert.Equal(t, version, l.Result()[0].Version)
42-
assert.Equal(t, bridgeName, l.Result()[0].Name)
4339
})
4440

4541
t.Run("with_options", func(t *testing.T) {
@@ -56,7 +52,6 @@ func TestNewLogSinkConfiguration(t *testing.T) {
5652
)
5753
})
5854
assert.NotNil(t, ls)
59-
require.IsType(t, &logtest.Recorder{}, ls.logger)
6055
assert.NotNil(t, ls.levelSeverity)
6156
assert.Equal(t, log.SeverityFatal, ls.levelSeverity(0))
6257
})
@@ -229,10 +224,10 @@ func TestLogSink(t *testing.T) {
229224
l := logr.New(ls)
230225
tt.f(&l)
231226

232-
require.Len(t, rec.Result(), tt.expectedLoggerCount+1)
227+
require.Len(t, rec.Result(), tt.expectedLoggerCount)
233228

234-
assert.Len(t, rec.Result()[tt.expectedLoggerCount].Records, len(tt.expectedRecords))
235-
for i, record := range rec.Result()[tt.expectedLoggerCount].Records {
229+
assert.Len(t, rec.Result()[tt.expectedLoggerCount-1].Records, len(tt.expectedRecords))
230+
for i, record := range rec.Result()[tt.expectedLoggerCount-1].Records {
236231
assert.Equal(t, tt.expectedRecords[i].Body, record.Body())
237232
assert.Equal(t, tt.expectedRecords[i].Severity, record.Severity())
238233

0 commit comments

Comments
 (0)