Skip to content

Commit 90f4911

Browse files
committed
Remove duplicate and unnecessary otlp exporter wrapper
Signed-off-by: Bogdan Drutu <[email protected]>
1 parent 2ba9cdc commit 90f4911

File tree

3 files changed

+269
-382
lines changed

3 files changed

+269
-382
lines changed

exporter/otlpexporter/exporter.go

-263
This file was deleted.

exporter/otlpexporter/factory.go

+46-7
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ import (
2020
"go.opentelemetry.io/collector/component"
2121
"go.opentelemetry.io/collector/config/configgrpc"
2222
"go.opentelemetry.io/collector/config/configmodels"
23+
"go.opentelemetry.io/collector/exporter/exporterhelper"
2324
)
2425

2526
const (
@@ -57,23 +58,61 @@ func (f *Factory) CreateTraceExporter(
5758
params component.ExporterCreateParams,
5859
cfg configmodels.Exporter,
5960
) (component.TraceExporter, error) {
60-
return NewTraceExporter(ctx, params, cfg)
61+
oce, err := newExporter(cfg)
62+
if err != nil {
63+
return nil, err
64+
}
65+
oexp, err := exporterhelper.NewTraceExporter(
66+
cfg,
67+
oce.pushTraceData,
68+
exporterhelper.WithShutdown(oce.shutdown))
69+
if err != nil {
70+
return nil, err
71+
}
72+
73+
return oexp, nil
6174
}
6275

6376
// CreateMetricsExporter creates a metrics exporter based on this config.
6477
func (f *Factory) CreateMetricsExporter(
65-
ctx context.Context,
66-
params component.ExporterCreateParams,
78+
_ context.Context,
79+
_ component.ExporterCreateParams,
6780
cfg configmodels.Exporter,
6881
) (component.MetricsExporter, error) {
69-
return NewMetricsExporter(ctx, params, cfg)
82+
oce, err := newExporter(cfg)
83+
if err != nil {
84+
return nil, err
85+
}
86+
oexp, err := exporterhelper.NewMetricsExporter(
87+
cfg,
88+
oce.pushMetricsData,
89+
exporterhelper.WithShutdown(oce.shutdown),
90+
)
91+
if err != nil {
92+
return nil, err
93+
}
94+
95+
return oexp, nil
7096
}
7197

7298
// CreateLogExporter creates a log exporter based on this config.
7399
func (f *Factory) CreateLogExporter(
74-
ctx context.Context,
75-
params component.ExporterCreateParams,
100+
_ context.Context,
101+
_ component.ExporterCreateParams,
76102
cfg configmodels.Exporter,
77103
) (component.LogExporter, error) {
78-
return NewLogExporter(ctx, params, cfg)
104+
oce, err := newExporter(cfg)
105+
if err != nil {
106+
return nil, err
107+
}
108+
oexp, err := exporterhelper.NewLogsExporter(
109+
cfg,
110+
oce.pushLogData,
111+
exporterhelper.WithShutdown(oce.shutdown),
112+
)
113+
if err != nil {
114+
return nil, err
115+
}
116+
117+
return oexp, nil
79118
}

0 commit comments

Comments
 (0)