diff --git a/pkg/config/uploads.go b/pkg/config/uploads.go index 257c70e3..01fbc4ca 100644 --- a/pkg/config/uploads.go +++ b/pkg/config/uploads.go @@ -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 { diff --git a/pkg/service/process.go b/pkg/service/process.go index 5ad941a3..cace017b 100644 --- a/pkg/service/process.go +++ b/pkg/service/process.go @@ -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) diff --git a/pkg/service/service.go b/pkg/service/service.go index 799d938c..95d999e0 100644 --- a/pkg/service/service.go +++ b/pkg/service/service.go @@ -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)