Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[chore] awsproxy extension ReportFatalError -> ReportStatus #30511

Merged
merged 1 commit into from
Feb 7, 2024
Merged

[chore] awsproxy extension ReportFatalError -> ReportStatus #30511

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 12 additions & 10 deletions extension/awsproxy/extension.go
View file
Open in desktop
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
atoulme marked this conversation as resolved.
Show resolved Hide resolved
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
View file
Open in desktop
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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,5 +43,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)
}
Loading