Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[chore] move pulsar exporter to generated lifecycle tests #30542

Merged
merged 2 commits into from
Jan 31, 2024
Merged

[chore] move pulsar exporter to generated lifecycle tests #30542

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7190826
[chore] move pulsar exporter to generated lifecycle tests
Frapschen Jan 13, 2024
918760a
fix tests
atoulme Jan 31, 2024
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
Prev Previous commit
fix tests
  • Loading branch information
@atoulme
atoulme committed Jan 31, 2024
commit 918760a6e1898b2d5c0d482eb8bc7cf377a352de
3 changes: 3 additions & 0 deletions exporter/pulsarexporter/factory.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,7 @@ func (f *pulsarExporterFactory) createTracesExporter(
exporterhelper.WithTimeout(exporterhelper.TimeoutSettings{Timeout: 0}),
exporterhelper.WithRetry(oCfg.BackOffConfig),
exporterhelper.WithQueue(oCfg.QueueSettings),
exporterhelper.WithStart(exp.start),
exporterhelper.WithShutdown(exp.Close))
}

Expand Down Expand Up @@ -136,6 +137,7 @@ func (f *pulsarExporterFactory) createMetricsExporter(
exporterhelper.WithTimeout(exporterhelper.TimeoutSettings{Timeout: 0}),
exporterhelper.WithRetry(oCfg.BackOffConfig),
exporterhelper.WithQueue(oCfg.QueueSettings),
exporterhelper.WithStart(exp.start),
exporterhelper.WithShutdown(exp.Close))
}

Expand Down Expand Up @@ -166,5 +168,6 @@ func (f *pulsarExporterFactory) createLogsExporter(
exporterhelper.WithTimeout(exporterhelper.TimeoutSettings{Timeout: 0}),
exporterhelper.WithRetry(oCfg.BackOffConfig),
exporterhelper.WithQueue(oCfg.QueueSettings),
exporterhelper.WithStart(exp.start),
exporterhelper.WithShutdown(exp.Close))
}
17 changes: 11 additions & 6 deletions exporter/pulsarexporter/factory_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import (

"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"go.opentelemetry.io/collector/component/componenttest"
"go.opentelemetry.io/collector/config/configretry"
"go.opentelemetry.io/collector/exporter/exporterhelper"
"go.opentelemetry.io/collector/exporter/exportertest"
Expand Down Expand Up @@ -39,9 +40,10 @@ func TestWithTracesMarshalers_err(t *testing.T) {
tracesMarshaler := &customTraceMarshaler{encoding: "unknown"}
f := NewFactory(withTracesMarshalers(tracesMarshaler))
r, err := f.CreateTracesExporter(context.Background(), exportertest.NewNopCreateSettings(), cfg)
require.NoError(t, err)
err = r.Start(context.Background(), componenttest.NewNopHost())
// no available broker
require.Error(t, err)
assert.Nil(t, r)
}

func TestCreateTracesExporter_err(t *testing.T) {
Expand All @@ -50,27 +52,30 @@ func TestCreateTracesExporter_err(t *testing.T) {

f := pulsarExporterFactory{tracesMarshalers: tracesMarshalers()}
r, err := f.createTracesExporter(context.Background(), exportertest.NewNopCreateSettings(), cfg)
require.NoError(t, err)
err = r.Start(context.Background(), componenttest.NewNopHost())
// no available broker
require.Error(t, err)
assert.Nil(t, r)
}

func TestCreateMetricsExporter_err(t *testing.T) {
cfg := createDefaultConfig().(*Config)
cfg.Endpoint = ""

mf := pulsarExporterFactory{metricsMarshalers: metricsMarshalers()}
mr, err := mf.createMetricsExporter(context.Background(), exportertest.NewNopCreateSettings(), cfg)
r, err := mf.createMetricsExporter(context.Background(), exportertest.NewNopCreateSettings(), cfg)
require.NoError(t, err)
err = r.Start(context.Background(), componenttest.NewNopHost())
require.Error(t, err)
assert.Nil(t, mr)
}

func TestCreateLogsExporter_err(t *testing.T) {
cfg := createDefaultConfig().(*Config)
cfg.Endpoint = ""

mf := pulsarExporterFactory{logsMarshalers: logsMarshalers()}
mr, err := mf.createLogsExporter(context.Background(), exportertest.NewNopCreateSettings(), cfg)
r, err := mf.createLogsExporter(context.Background(), exportertest.NewNopCreateSettings(), cfg)
require.NoError(t, err)
err = r.Start(context.Background(), componenttest.NewNopHost())
require.Error(t, err)
assert.Nil(t, mr)
}
19 changes: 3 additions & 16 deletions exporter/pulsarexporter/generated_component_test.go
View file
Open in desktop

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

64 changes: 46 additions & 18 deletions exporter/pulsarexporter/pulsar_exporter.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import (
"fmt"

"github.com/apache/pulsar-client-go/pulsar"
"go.opentelemetry.io/collector/component"
"go.opentelemetry.io/collector/consumer/consumererror"
"go.opentelemetry.io/collector/exporter"
"go.opentelemetry.io/collector/pdata/plog"
Expand All @@ -20,6 +21,7 @@ import (
var errUnrecognizedEncoding = fmt.Errorf("unrecognized encoding")

type PulsarTracesProducer struct {
cfg Config
client pulsar.Client
producer pulsar.Producer
topic string
Expand Down Expand Up @@ -48,12 +50,26 @@ func (e *PulsarTracesProducer) tracesPusher(ctx context.Context, td ptrace.Trace
}

func (e *PulsarTracesProducer) Close(context.Context) error {
if e.producer == nil {
return nil
}
e.producer.Close()
e.client.Close()
return nil
}

func (e *PulsarTracesProducer) start(_ context.Context, _ component.Host) error {
client, producer, err := newPulsarProducer(e.cfg)
if err != nil {
return err
}
e.client = client
e.producer = producer
return nil
}

type PulsarMetricsProducer struct {
cfg Config
client pulsar.Client
producer pulsar.Producer
topic string
Expand Down Expand Up @@ -82,12 +98,26 @@ func (e *PulsarMetricsProducer) metricsDataPusher(ctx context.Context, md pmetri
}

func (e *PulsarMetricsProducer) Close(context.Context) error {
if e.producer == nil {
return nil
}
e.producer.Close()
e.client.Close()
return nil
}

func (e *PulsarMetricsProducer) start(_ context.Context, _ component.Host) error {
client, producer, err := newPulsarProducer(e.cfg)
if err != nil {
return err
}
e.client = client
e.producer = producer
return nil
}

type PulsarLogsProducer struct {
cfg Config
client pulsar.Client
producer pulsar.Producer
topic string
Expand Down Expand Up @@ -116,11 +146,24 @@ func (e *PulsarLogsProducer) logsDataPusher(ctx context.Context, ld plog.Logs) e
}

func (e *PulsarLogsProducer) Close(context.Context) error {
if e.producer == nil {
return nil
}
e.producer.Close()
e.client.Close()
return nil
}

func (e *PulsarLogsProducer) start(_ context.Context, _ component.Host) error {
client, producer, err := newPulsarProducer(e.cfg)
if err != nil {
return err
}
e.client = client
e.producer = producer
return nil
}

func newPulsarProducer(config Config) (pulsar.Client, pulsar.Producer, error) {
options := config.clientOptions()

Expand All @@ -146,14 +189,9 @@ func newMetricsExporter(config Config, set exporter.CreateSettings, marshalers m
if marshaler == nil {
return nil, errUnrecognizedEncoding
}
client, producer, err := newPulsarProducer(config)
if err != nil {
return nil, err
}

return &PulsarMetricsProducer{
client: client,
producer: producer,
cfg: config,
topic: config.Topic,
marshaler: marshaler,
logger: set.Logger,
Expand All @@ -166,13 +204,8 @@ func newTracesExporter(config Config, set exporter.CreateSettings, marshalers ma
if marshaler == nil {
return nil, errUnrecognizedEncoding
}
client, producer, err := newPulsarProducer(config)
if err != nil {
return nil, err
}
return &PulsarTracesProducer{
client: client,
producer: producer,
cfg: config,
topic: config.Topic,
marshaler: marshaler,
logger: set.Logger,
Expand All @@ -184,14 +217,9 @@ func newLogsExporter(config Config, set exporter.CreateSettings, marshalers map[
if marshaler == nil {
return nil, errUnrecognizedEncoding
}
client, producer, err := newPulsarProducer(config)
if err != nil {
return nil, err
}

return &PulsarLogsProducer{
client: client,
producer: producer,
cfg: config,
topic: config.Topic,
marshaler: marshaler,
logger: set.Logger,
Expand Down
Loading