Skip to content

Commit 1bf5b56

Browse files
committed
revert: remove test refactoring based on review feedback
1 parent 9319b20 commit 1bf5b56

File tree

2 files changed

+1
-22
lines changed

2 files changed

+1
-22
lines changed

service/service.go

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -372,9 +372,7 @@ func Validate(ctx context.Context, set Settings, cfg Config) error {
372372
// Historically, attempting to register process metrics on unsupported platforms
373373
// (e.g. AIX) caused the Collector to fail at startup.
374374
// See https://github.com/open-telemetry/opentelemetry-collector/issues/12098
375-
//
376-
// It is defined as a variable to allow overriding in tests.
377-
var registerProcessMetrics = func(
375+
func registerProcessMetrics(
378376
srv *Service,
379377
goos string,
380378
register func(component.TelemetrySettings, ...proctelemetry.RegisterOption) error,

service/service_test.go

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -882,22 +882,3 @@ func TestRegisterProcessMetrics_SupportedOS_RegisterFails_ReturnsError(t *testin
882882
require.ErrorIs(t, err, wantErr)
883883
require.Contains(t, err.Error(), "failed to register process metrics")
884884
}
885-
886-
func TestNew_ProcessMetricsRegistrationFailure(t *testing.T) {
887-
originalRegisterFunc := registerProcessMetrics
888-
defer func() {
889-
registerProcessMetrics = originalRegisterFunc
890-
}()
891-
892-
registerProcessMetrics = func(srv *Service, goos string, register func(component.TelemetrySettings, ...proctelemetry.RegisterOption) error) error {
893-
return errors.New("forced process metrics registration error")
894-
}
895-
896-
set := newNopSettings()
897-
cfg := newNopConfig()
898-
899-
_, err := New(context.Background(), set, cfg)
900-
901-
require.Error(t, err)
902-
require.Contains(t, err.Error(), "forced process metrics registration error")
903-
}

0 commit comments

Comments
 (0)