Skip to content

Commit 4ef33c9

Browse files
committed
repace componenterror to comsumererror
1 parent d92af6b commit 4ef33c9

File tree

3 files changed

+349
-244
lines changed

3 files changed

+349
-244
lines changed

pkg/lambdacomponents/defaults.go

Lines changed: 47 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -13,51 +13,51 @@
1313
* permissions and limitations under the License.
1414
*/
1515

16-
package lambdacomponents
16+
package lambdacomponents
1717

18-
import (
19-
"github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsemfexporter"
20-
"github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsxrayexporter"
21-
"go.opentelemetry.io/collector/component"
22-
"go.opentelemetry.io/collector/component/componenterror"
23-
"go.opentelemetry.io/collector/exporter/loggingexporter"
24-
"go.opentelemetry.io/collector/exporter/otlpexporter"
25-
"go.opentelemetry.io/collector/exporter/otlphttpexporter"
26-
"go.opentelemetry.io/collector/exporter/prometheusexporter"
27-
"go.opentelemetry.io/collector/receiver/otlpreceiver"
28-
)
29-
30-
// LambdaComponents returns a set of stripped components used by the
31-
// OpenTelemetry collector built for Lambda env.
32-
func LambdaComponents() (
33-
component.Factories,
34-
error,
35-
) {
36-
var errs []error
37-
38-
receivers, err := component.MakeReceiverFactoryMap(
39-
otlpreceiver.NewFactory(),
40-
)
41-
if err != nil {
42-
errs = append(errs, err)
43-
}
44-
45-
exporters, err := component.MakeExporterFactoryMap(
46-
awsxrayexporter.NewFactory(),
47-
awsemfexporter.NewFactory(),
48-
prometheusexporter.NewFactory(),
49-
loggingexporter.NewFactory(),
50-
otlpexporter.NewFactory(),
51-
otlphttpexporter.NewFactory(),
52-
)
53-
if err != nil {
54-
errs = append(errs, err)
55-
}
56-
57-
factories := component.Factories{
58-
Receivers: receivers,
59-
Exporters: exporters,
60-
}
61-
62-
return factories, componenterror.CombineErrors(errs)
63-
}
18+
import (
19+
"github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsemfexporter"
20+
"github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsxrayexporter"
21+
"go.opentelemetry.io/collector/component"
22+
"go.opentelemetry.io/collector/consumer/consumererror"
23+
"go.opentelemetry.io/collector/exporter/loggingexporter"
24+
"go.opentelemetry.io/collector/exporter/otlpexporter"
25+
"go.opentelemetry.io/collector/exporter/otlphttpexporter"
26+
"go.opentelemetry.io/collector/exporter/prometheusexporter"
27+
"go.opentelemetry.io/collector/receiver/otlpreceiver"
28+
)
29+
30+
// LambdaComponents returns a set of stripped components used by the
31+
// OpenTelemetry collector built for Lambda env.
32+
func LambdaComponents() (
33+
component.Factories,
34+
error,
35+
) {
36+
var errs []error
37+
38+
receivers, err := component.MakeReceiverFactoryMap(
39+
otlpreceiver.NewFactory(),
40+
)
41+
if err != nil {
42+
errs = append(errs, err)
43+
}
44+
45+
exporters, err := component.MakeExporterFactoryMap(
46+
awsxrayexporter.NewFactory(),
47+
awsemfexporter.NewFactory(),
48+
prometheusexporter.NewFactory(),
49+
loggingexporter.NewFactory(),
50+
otlpexporter.NewFactory(),
51+
otlphttpexporter.NewFactory(),
52+
)
53+
if err != nil {
54+
errs = append(errs, err)
55+
}
56+
57+
factories := component.Factories{
58+
Receivers: receivers,
59+
Exporters: exporters,
60+
}
61+
62+
return factories, consumererror.CombineErrors(errs)
63+
}

pkg/lambdacomponents/go.mod

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,5 @@ require (
1010
)
1111

1212
replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/awsxray => github.com/open-telemetry/opentelemetry-collector-contrib/internal/awsxray v0.23.0
13+
1314
replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws => github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws v0.23.0

0 commit comments

Comments
 (0)