Skip to content

Commit

Permalink
[chore] remove component.Host implementation from generated tests (op…
Browse files Browse the repository at this point in the history
…en-telemetry#30903)

**Description:**
The `assertNoErrorHost` struct was used in tests to check that no error
was thrown. However, it uses a deprecated function `ReportFatalError` we
are trying to remove from our code.

**Link to tracking Issue:** 
Fixes
open-telemetry#30579
  • Loading branch information
atoulme authored and cparkins committed Feb 1, 2024
1 parent 5062da2 commit 5b58659
Show file tree
Hide file tree
Showing 133 changed files with 231 additions and 1,924 deletions.
34 changes: 10 additions & 24 deletions cmd/mdatagen/templates/component_test.go.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ import (
"context"
"testing"

"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"go.opentelemetry.io/collector/component"
"go.opentelemetry.io/collector/component/componenttest"
Expand Down Expand Up @@ -50,19 +49,6 @@ type assertNoErrorHost struct {

var _ component.Host = (*assertNoErrorHost)(nil)

// newAssertNoErrorHost returns a new instance of assertNoErrorHost.
func newAssertNoErrorHost(t *testing.T) component.Host {
return &assertNoErrorHost{
componenttest.NewNopHost(),
t,
}
}

func (aneh *assertNoErrorHost) ReportFatalError(err error) {
assert.NoError(aneh, err)
}


{{ if isExporter }}
func TestComponentLifecycle(t *testing.T) {
factory := NewFactory()
Expand Down Expand Up @@ -119,10 +105,10 @@ func TestComponentLifecycle(t *testing.T) {
{{ end }}
c, err := test.createFn(context.Background(), exportertest.NewNopCreateSettings(), cfg)
require.NoError(t, err)
host := newAssertNoErrorHost(t)
host := componenttest.NewNopHost()
err = c.Start(context.Background(), host)
require.NoError(t, err)
assert.NotPanics(t, func() {
require.NotPanics(t, func() {
switch e := c.(type) {
case exporter.Logs:
logs := testdata.GenerateLogsManyLogRecordsSameResource(2)
Expand All @@ -145,7 +131,7 @@ func TestComponentLifecycle(t *testing.T) {
}
})
{{ if not expectConsumerError }}
assert.NoError(t, err)
require.NoError(t, err)
{{ end }}
err = c.Shutdown(context.Background())
require.NoError(t, err)
Expand Down Expand Up @@ -210,10 +196,10 @@ func TestComponentLifecycle(t *testing.T) {
{{ end }}
c, err := test.createFn(context.Background(), processortest.NewNopCreateSettings(), cfg)
require.NoError(t, err)
host := newAssertNoErrorHost(t)
host := componenttest.NewNopHost()
err = c.Start(context.Background(), host)
require.NoError(t, err)
assert.NotPanics(t, func() {
require.NotPanics(t, func() {
switch e := c.(type) {
case processor.Logs:
logs := testdata.GenerateLogsManyLogRecordsSameResource(2)
Expand All @@ -235,7 +221,7 @@ func TestComponentLifecycle(t *testing.T) {
err = e.ConsumeTraces(context.Background(), traces)
}
})
assert.NoError(t, err)
require.NoError(t, err)
err = c.Shutdown(context.Background())
require.NoError(t, err)
})
Expand Down Expand Up @@ -299,7 +285,7 @@ func TestComponentLifecycle(t *testing.T) {
{{ end }}
firstRcvr, err := test.createFn(context.Background(), receivertest.NewNopCreateSettings(), cfg)
require.NoError(t, err)
host := newAssertNoErrorHost(t)
host := componenttest.NewNopHost()
require.NoError(t, err)
require.NoError(t, firstRcvr.Start(context.Background(), host))
require.NoError(t, firstRcvr.Shutdown(context.Background()))
Expand Down Expand Up @@ -337,12 +323,12 @@ func TestComponentLifecycle(t *testing.T) {
{{ end }}
firstExt, err := factory.CreateExtension(context.Background(), extensiontest.NewNopCreateSettings(), cfg)
require.NoError(t, err)
require.NoError(t, firstExt.Start(context.Background(), newAssertNoErrorHost(t)))
require.NoError(t, firstExt.Start(context.Background(), componenttest.NewNopHost()))
require.NoError(t, firstExt.Shutdown(context.Background()))

secondExt, err := factory.CreateExtension(context.Background(), extensiontest.NewNopCreateSettings(), cfg)
require.NoError(t, err)
require.NoError(t, secondExt.Start(context.Background(), newAssertNoErrorHost(t)))
require.NoError(t, secondExt.Start(context.Background(), componenttest.NewNopHost()))
require.NoError(t, secondExt.Shutdown(context.Background()))
})
}
Expand Down Expand Up @@ -452,7 +438,7 @@ func TestComponentLifecycle(t *testing.T) {
{{ end }}
firstConnector, err := test.createFn(context.Background(), connectortest.NewNopCreateSettings(), cfg)
require.NoError(t, err)
host := newAssertNoErrorHost(t)
host := componenttest.NewNopHost()
require.NoError(t, err)
require.NoError(t, firstConnector.Start(context.Background(), host))
require.NoError(t, firstConnector.Shutdown(context.Background()))
Expand Down
15 changes: 1 addition & 14 deletions connector/countconnector/generated_component_test.go

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

15 changes: 1 addition & 14 deletions connector/exceptionsconnector/generated_component_test.go

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

15 changes: 1 addition & 14 deletions connector/servicegraphconnector/generated_component_test.go

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

15 changes: 1 addition & 14 deletions connector/spanmetricsconnector/generated_component_test.go

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

17 changes: 2 additions & 15 deletions exporter/alertmanagerexporter/generated_component_test.go

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

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

17 changes: 2 additions & 15 deletions exporter/awscloudwatchlogsexporter/generated_component_test.go

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

Loading

0 comments on commit 5b58659

Please sign in to comment.