Revert "Уменьшил потребеление памяти"

This reverts commit 53609e3.

cmd/agent/main.go

@@ -23,10 +23,10 @@ func main() {
 	ctx := context.Background()
 	ctx, cancel := context.WithCancel(ctx)
 	// создаем буферизованный канал для отправки результатов
-	jobs := make(chan []byte, 20)
-	go Metric.NewСollectMetricGopsutil(ctx, cancel, jobs)
-	go Metric.NewСollect(ctx, cancel, jobs)
+	jobs := make(chan []byte, 2)
 
+	go Metric.NewСollect(ctx, cancel, jobs)
+	go Metric.NewСollectMetricGopsutil(ctx, cancel, jobs)
 	for {
 		select {
 		case <-ctx.Done():
@@ -37,7 +37,7 @@ func main() {
 				g.Go(func() error {
 					var mx sync.Mutex
 					mx.Lock()
-					err := metricscollect.SendMetricsGor(jobs, flag.runAddr, flag.secretKey)
+					err := Metric.SendMetricsGor(jobs, flag.runAddr, flag.secretKey)
 					if err != nil {
 						return err
 					}

cmd/server/main.go

@@ -4,7 +4,6 @@ import (
 	"context"
 	"log"
 	"net/http"
-	_ "net/http/pprof" // подключаем пакет pprof
 
 	"github.com/Zagir2000/alert/internal/server/handlers"
 	"github.com/Zagir2000/alert/internal/server/logger"

internal/agent/metricscollect/metrics.go

@@ -118,7 +118,7 @@ func (m *RuntimeMetrics) AddVaueMetricGopsutil() error {
 }
 
 func (m *RuntimeMetrics) jsonMetricsToBatch() []byte {
-	metrics := make([]models.Metrics, 0, len(m.RuntimeMemstats)+2)
+	var metrics []models.Metrics
 	for k, v := range m.RuntimeMemstats {
 		valueGauge := v
 		jsonGauge := &models.Metrics{
@@ -147,7 +147,7 @@ func (m *RuntimeMetrics) jsonMetricsToBatch() []byte {
 	return out
 }
 
-func SendMetrics(res []byte, hash, hostpath string) error {
+func (m *RuntimeMetrics) SendMetrics(res []byte, hash, hostpath string) error {
 	url := strings.Join([]string{"http:/", hostpath, "updates/"}, "/")
 
 	responseErr := &SendMetricsError{}
@@ -205,7 +205,7 @@ func (m *RuntimeMetrics) NewСollectMetricGopsutil(ctx context.Context, cancel c
 		select {
 		case <-ctx.Done():
 			return
-		case <-time.After(time.Duration(1) * time.Second):
+		default:
 			err := m.AddVaueMetricGopsutil()
 			if err != nil {
 				log.Println("Error in collect metrics 1", err)
@@ -239,11 +239,10 @@ func gzipCompress(data []byte) ([]byte, error) {
 	return buf.Bytes(), err
 }
 
-func SendMetricsGor(jobs <-chan []byte, runAddr, secretKey string) error {
+func (m *RuntimeMetrics) SendMetricsGor(jobs <-chan []byte, runAddr, secretKey string) error {
 	for j := range jobs {
-
 		hash := hash.CrateHash(secretKey, j, sha256.New)
-		err := SendMetrics(j, hash, runAddr)
+		err := m.SendMetrics(j, hash, runAddr)
 		if err != nil {
 			log.Println("Error in send metrics:", err)
 			return err

internal/agent/metricscollect/metrics_test.go

@@ -37,7 +37,7 @@ func TestRuntimeMetrics_SendMetrics(t *testing.T) {
 			if err != nil {
 				fmt.Println(err)
 			}
-			if err := SendMetrics(res, tt.args.hostpath, ""); (err != nil) != tt.wantErr {
+			if err := m.SendMetrics(res, tt.args.hostpath, ""); (err != nil) != tt.wantErr {
 				t.Errorf("RuntimeMetrics.SendMetrics() error = %v, wantErr %v", err, tt.wantErr)
 			}
 		})

internal/server/handlers/router.go

@@ -2,8 +2,6 @@ package handlers
 
 import (
 	"context"
-	"net/http/pprof"
-	_ "net/http/pprof" // подключаем пакет pprof
 
 	"github.com/Zagir2000/alert/internal/server/logger"
 	"github.com/go-chi/chi/v5"
@@ -20,16 +18,5 @@ func Router(ctx context.Context, log *zap.Logger, newHandStruct *MetricHandlerDB
 	r.Get("/", gzipMiddleware(newHandStruct.GetAllMetrics(ctx, log)))
 	r.Get("/value/{metricType}/{metricName}", gzipMiddleware(newHandStruct.GetNowValueMetrics(ctx, log)))
 	r.Get("/ping", gzipMiddleware(newHandStruct.PingDBConnect(ctx, log)))
-
-	r.HandleFunc("/debug/pprof/", pprof.Index)
-	r.HandleFunc("/debug/pprof/cmdline", pprof.Cmdline)
-	r.HandleFunc("/debug/pprof/profile", pprof.Profile)
-	r.HandleFunc("/debug/pprof/symbol", pprof.Symbol)
-	r.HandleFunc("/debug/pprof/trace", pprof.Trace)
-
-	r.Handle("/debug/pprof/block", pprof.Handler("block"))
-	r.Handle("/debug/pprof/goroutine", pprof.Handler("goroutine"))
-	r.Handle("/debug/pprof/heap", pprof.Handler("heap"))
-	r.Handle("/debug/pprof/threadcreate", pprof.Handler("threadcreate"))
 	return r
 }