Skip to content

Commit

Permalink
[chore] remove references to metric/noop (#33892)
Browse files Browse the repository at this point in the history
use componenttest.NewNopTelemetrySettings() instead.

Signed-off-by: Alex Boten <[email protected]>
  • Loading branch information
codeboten authored Jul 7, 2024
1 parent 6ff2a8a commit f2bef19
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 15 deletions.
9 changes: 1 addition & 8 deletions processor/routingprocessor/factory_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,16 +20,9 @@ import (
"go.opentelemetry.io/collector/pdata/ptrace"
"go.opentelemetry.io/collector/processor/processorhelper"
"go.opentelemetry.io/collector/processor/processortest"
noopmetric "go.opentelemetry.io/otel/metric/noop"
nooptrace "go.opentelemetry.io/otel/trace/noop"
"go.uber.org/zap"
)

var noopTelemetrySettings = component.TelemetrySettings{
TracerProvider: nooptrace.NewTracerProvider(),
MeterProvider: noopmetric.NewMeterProvider(),
Logger: zap.NewNop(),
}
var noopTelemetrySettings = componenttest.NewNopTelemetrySettings()

func TestProcessorGetsCreatedWithValidConfiguration(t *testing.T) {
// prepare
Expand Down
10 changes: 3 additions & 7 deletions receiver/oracledbreceiver/factory_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,9 @@ import (
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"go.opentelemetry.io/collector/component"
"go.opentelemetry.io/collector/component/componenttest"
"go.opentelemetry.io/collector/consumer/consumertest"
"go.opentelemetry.io/collector/receiver"
noopmetric "go.opentelemetry.io/otel/metric/noop"
nooptrace "go.opentelemetry.io/otel/trace/noop"

"github.com/open-telemetry/opentelemetry-collector-contrib/receiver/oracledbreceiver/internal/metadata"
)
Expand All @@ -24,11 +23,8 @@ func TestNewFactory(t *testing.T) {
_, err := factory.CreateMetricsReceiver(
context.Background(),
receiver.Settings{
ID: component.NewID(metadata.Type),
TelemetrySettings: component.TelemetrySettings{
TracerProvider: nooptrace.NewTracerProvider(),
MeterProvider: noopmetric.NewMeterProvider(),
},
ID: component.NewID(metadata.Type),
TelemetrySettings: componenttest.NewNopTelemetrySettings(),
},
factory.CreateDefaultConfig(),
consumertest.NewNop(),
Expand Down

0 comments on commit f2bef19

Please sign in to comment.