Skip to content

Commit

Permalink
Use in-memory provider instead of custom provider (open-telemetry#4089)
Browse files Browse the repository at this point in the history
Signed-off-by: Bogdan Drutu <bogdandrutu@gmail.com>
  • Loading branch information
bogdandrutu authored Sep 23, 2021
1 parent a25152f commit 5541459
Showing 1 changed file with 22 additions and 35 deletions.
57 changes: 22 additions & 35 deletions service/collector_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,26 @@ import (
"go.opentelemetry.io/collector/service/parserprovider"
)

const configStr = `
receivers:
otlp:
protocols:
grpc:
exporters:
otlp:
endpoint: "localhost:4317"
processors:
batch:
extensions:
service:
extensions:
pipelines:
traces:
receivers: [otlp]
processors: [batch]
exporters: [otlp]
`

func TestCollector_Start(t *testing.T) {
factories, err := defaultcomponents.Components()
require.NoError(t, err)
Expand Down Expand Up @@ -147,7 +167,7 @@ func TestCollector_StartAsGoRoutine(t *testing.T) {
set := CollectorSettings{
BuildInfo: component.DefaultBuildInfo(),
Factories: factories,
ParserProvider: new(minimalParserLoader),
ParserProvider: parserprovider.NewInMemory(strings.NewReader(configStr)),
}
col, err := New(set)
require.NoError(t, err)
Expand Down Expand Up @@ -233,39 +253,6 @@ func assertZPages(t *testing.T) {
}
}

type minimalParserLoader struct{}

func (*minimalParserLoader) Get(context.Context) (*configparser.ConfigMap, error) {
configStr := `
receivers:
otlp:
protocols:
grpc:
exporters:
otlp:
endpoint: "localhost:4317"
processors:
batch:
extensions:
service:
extensions:
pipelines:
traces:
receivers: [otlp]
processors: [batch]
exporters: [otlp]
`
return configparser.NewConfigMapFromBuffer(strings.NewReader(configStr))
}

func (*minimalParserLoader) Close(context.Context) error {
return nil
}

type errParserLoader struct {
err error
}
Expand Down Expand Up @@ -306,7 +293,7 @@ func TestCollector_reloadService(t *testing.T) {
},
{
name: "retire_service_ok_load_ok",
parserProvider: new(minimalParserLoader),
parserProvider: parserprovider.NewInMemory(strings.NewReader(configStr)),
service: &service{
logger: zap.NewNop(),
builtExporters: builder.Exporters{},
Expand Down

0 comments on commit 5541459

Please sign in to comment.