Skip to content

Commit

Permalink
[chore] awsproxy extension ReportFatalError -> ReportStatus (open-tel…
Browse files Browse the repository at this point in the history
…emetry#30511)

Remove use of deprecated host.ReportFatalError

Linked to
open-telemetry#30501
  • Loading branch information
atoulme authored and anthoai97 committed Feb 12, 2024
1 parent 85f74a6 commit e0fc526
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 13 deletions.
22 changes: 12 additions & 10 deletions extension/awsproxy/extension.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,17 +16,18 @@ import (
)

type xrayProxy struct {
logger *zap.Logger
config *Config
server proxy.Server
logger *zap.Logger
config *Config
server proxy.Server
settings component.TelemetrySettings
}

var _ extension.Extension = (*xrayProxy)(nil)

func (x xrayProxy) Start(_ context.Context, host component.Host) error {
func (x xrayProxy) Start(_ context.Context, _ component.Host) error {
go func() {
if err := x.server.ListenAndServe(); !errors.Is(err, http.ErrServerClosed) && err != nil {
host.ReportFatalError(err)
x.settings.ReportStatus(component.NewFatalErrorEvent(err))
}
}()
x.logger.Info("X-Ray proxy server started on " + x.config.ProxyConfig.Endpoint)
Expand All @@ -37,17 +38,18 @@ func (x xrayProxy) Shutdown(ctx context.Context) error {
return x.server.Shutdown(ctx)
}

func newXrayProxy(config *Config, logger *zap.Logger) (extension.Extension, error) {
srv, err := proxy.NewServer(&config.ProxyConfig, logger)
func newXrayProxy(config *Config, telemetrySettings component.TelemetrySettings) (extension.Extension, error) {
srv, err := proxy.NewServer(&config.ProxyConfig, telemetrySettings.Logger)

if err != nil {
return nil, err
}

p := &xrayProxy{
config: config,
logger: logger,
server: srv,
config: config,
logger: telemetrySettings.Logger,
server: srv,
settings: telemetrySettings,
}

return p, nil
Expand Down
4 changes: 2 additions & 2 deletions extension/awsproxy/extension_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import (
"testing"

"github.com/stretchr/testify/assert"
"go.opentelemetry.io/collector/component/componenttest"
"go.opentelemetry.io/collector/config/confignet"
"go.uber.org/zap"

"github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/proxy"
)
Expand All @@ -22,7 +22,7 @@ func TestInvalidEndpoint(t *testing.T) {
},
},
},
zap.NewNop(),
componenttest.NewNopTelemetrySettings(),
)
assert.Error(t, err)
}
2 changes: 1 addition & 1 deletion extension/awsproxy/factory.go
Original file line number Diff line number Diff line change
Expand Up @@ -44,5 +44,5 @@ func createDefaultConfig() component.Config {
}

func createExtension(_ context.Context, params extension.CreateSettings, cfg component.Config) (extension.Extension, error) {
return newXrayProxy(cfg.(*Config), params.Logger)
return newXrayProxy(cfg.(*Config), params.TelemetrySettings)
}

0 comments on commit e0fc526

Please sign in to comment.