Skip to content

Commit

Permalink
[exporter/kafka] Modified tests to confirm correct marshaler used
Browse files Browse the repository at this point in the history
  • Loading branch information
wizardofchaosland committed Nov 29, 2022
1 parent 761ede5 commit 40da4eb
Show file tree
Hide file tree
Showing 4 changed files with 38 additions and 3 deletions.
36 changes: 33 additions & 3 deletions exporter/kafkaexporter/factory_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,9 @@ import (
"go.opentelemetry.io/collector/pdata/plog"
"go.opentelemetry.io/collector/pdata/pmetric"
"go.opentelemetry.io/collector/pdata/ptrace"
"go.uber.org/zap"
"go.uber.org/zap/zapcore"
"go.uber.org/zap/zaptest/observer"
)

// data is a simple means of allowing
Expand Down Expand Up @@ -129,10 +132,14 @@ func TestCreateMetricExporter(t *testing.T) {
t.Run(tc.name, func(t *testing.T) {
t.Parallel()

core, observed := observer.New(zapcore.DebugLevel)
exporterSettings := componenttest.NewNopExporterCreateSettings()
exporterSettings.Logger = zap.New(core)

f := NewFactory(WithMetricsMarshalers(tc.marshalers...))
exporter, err := f.CreateMetricsExporter(
context.Background(),
componenttest.NewNopExporterCreateSettings(),
exporterSettings,
tc.conf,
)
if tc.err != nil {
Expand All @@ -142,6 +149,11 @@ func TestCreateMetricExporter(t *testing.T) {
}
assert.NoError(t, err, "Must not error")
assert.NotNil(t, exporter, "Must return valid exporter when no error is returned")

// confirm marshaler selected matches the encoding we asked for
logEntries := observed.FilterField(zap.String("encoding", tc.conf.Encoding))
assert.NotNil(t, logEntries)
assert.Equal(t, 1, logEntries.Len())
})
}
}
Expand Down Expand Up @@ -205,10 +217,14 @@ func TestCreateLogExporter(t *testing.T) {
t.Run(tc.name, func(t *testing.T) {
t.Parallel()

core, observed := observer.New(zapcore.DebugLevel)
exporterSettings := componenttest.NewNopExporterCreateSettings()
exporterSettings.Logger = zap.New(core)

f := NewFactory(WithLogsMarshalers(tc.marshalers...))
exporter, err := f.CreateLogsExporter(
context.Background(),
componenttest.NewNopExporterCreateSettings(),
exporterSettings,
tc.conf,
)
if tc.err != nil {
Expand All @@ -218,6 +234,11 @@ func TestCreateLogExporter(t *testing.T) {
}
assert.NoError(t, err, "Must not error")
assert.NotNil(t, exporter, "Must return valid exporter when no error is returned")

// confirm marshaler selected matches the encoding we asked for
logEntries := observed.FilterField(zap.String("encoding", tc.conf.Encoding))
assert.NotNil(t, logEntries)
assert.Equal(t, 1, logEntries.Len())
})
}
}
Expand Down Expand Up @@ -279,10 +300,14 @@ func TestCreateTraceExporter(t *testing.T) {
t.Run(tc.name, func(t *testing.T) {
t.Parallel()

core, observed := observer.New(zapcore.DebugLevel)
exporterSettings := componenttest.NewNopExporterCreateSettings()
exporterSettings.Logger = zap.New(core)

f := NewFactory(WithTracesMarshalers(tc.marshalers...))
exporter, err := f.CreateTracesExporter(
context.Background(),
componenttest.NewNopExporterCreateSettings(),
exporterSettings,
tc.conf,
)
if tc.err != nil {
Expand All @@ -292,6 +317,11 @@ func TestCreateTraceExporter(t *testing.T) {
}
assert.NoError(t, err, "Must not error")
assert.NotNil(t, exporter, "Must return valid exporter when no error is returned")

// confirm marshaler selected matches the encoding we asked for
logEntries := observed.FilterField(zap.String("encoding", tc.conf.Encoding))
assert.NotNil(t, logEntries)
assert.Equal(t, 1, logEntries.Len())
})
}
}
1 change: 1 addition & 0 deletions exporter/kafkaexporter/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ require (

require (
github.com/apache/thrift v0.17.0 // indirect
github.com/benbjohnson/clock v1.3.0 // indirect
github.com/cenkalti/backoff/v4 v4.2.0 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/eapache/go-resiliency v1.3.0 // indirect
Expand Down
1 change: 1 addition & 0 deletions exporter/kafkaexporter/go.sum

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions exporter/kafkaexporter/kafka_exporter.go
Original file line number Diff line number Diff line change
Expand Up @@ -173,6 +173,7 @@ func newMetricsExporter(config Config, set component.ExporterCreateSettings, mar
if marshaler == nil {
return nil, errUnrecognizedEncoding
}
set.Logger.Debug("Configured marshaller", zap.String("encoding", marshaler.Encoding()))
producer, err := newSaramaProducer(config)
if err != nil {
return nil, err
Expand All @@ -193,6 +194,7 @@ func newTracesExporter(config Config, set component.ExporterCreateSettings, mars
if marshaler == nil {
return nil, errUnrecognizedEncoding
}
set.Logger.Debug("Configured marshaller", zap.String("encoding", marshaler.Encoding()))
producer, err := newSaramaProducer(config)
if err != nil {
return nil, err
Expand All @@ -210,6 +212,7 @@ func newLogsExporter(config Config, set component.ExporterCreateSettings, marsha
if marshaler == nil {
return nil, errUnrecognizedEncoding
}
set.Logger.Debug("Configured marshaller", zap.String("encoding", marshaler.Encoding()))
producer, err := newSaramaProducer(config)
if err != nil {
return nil, err
Expand Down

0 comments on commit 40da4eb

Please sign in to comment.