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.

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

remove spammy logs, s3 retry defaults #544

Merged
merged 1 commit into from
Nov 27, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 4 additions & 1 deletion pkg/config/uploads.go
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,10 @@ type EgressS3Upload struct {
func (p *PipelineConfig) getUploadConfig(req uploadRequest) UploadConfig {
if s3 := req.GetS3(); s3 != nil {
s3Conf := &EgressS3Upload{
S3Upload: s3,
S3Upload: s3,
MaxRetries: 3,
MaxRetryDelay: time.Second * 5,
MinRetryDelay: time.Millisecond * 100,
}
// merge in options from config (proxy, retry limit, delay and aws logging) if specified
if p.S3 != nil {
Expand Down
1 change: 0 additions & 1 deletion pkg/service/process.go
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,6 @@ func getSocketAddress(handlerTmpDir string) string {
// Gather implements the prometheus.Gatherer interface on server-side to allow aggregation of handler metrics
func (p *Process) Gather() ([]*dto.MetricFamily, error) {
// Get the metrics from the handler via IPC
logger.Debugw("gathering metrics from handler process", "egress_id", p.req.EgressId)
metricsResponse, err := p.grpcClient.GetMetrics(context.Background(), &ipc.MetricsRequest{})
if err != nil {
logger.Warnw("Error obtaining metrics from handler, skipping", err, "egress_id", p.req.EgressId)
Expand Down
2 changes: 0 additions & 2 deletions pkg/service/service.go
Original file line number Diff line number Diff line change
Expand Up @@ -235,8 +235,6 @@ func (s *Service) CreateGatherer() prometheus.Gatherer {
s.mu.RLock()
defer s.mu.RUnlock()

logger.Debugw("gathering metrics", "numHandlers", len(s.activeHandlers))

gatherers := prometheus.Gatherers{}
// Include the default repo
gatherers = append(gatherers, prometheus.DefaultGatherer)
Expand Down