fix #24

Merged
emmatveev merged 1 commits from master into dev 2025-06-14 04:20:26 +03:00
3 changed files with 31 additions and 0 deletions

View File

@ -6,9 +6,11 @@ services:
image: mathwave/sprint-repo:queues image: mathwave/sprint-repo:queues
networks: networks:
- queues-development - queues-development
- monitoring
environment: environment:
MONGO_HOST: "mongo.develop.sprinthub.ru" MONGO_HOST: "mongo.develop.sprinthub.ru"
MONGO_PASSWORD: $MONGO_PASSWORD_DEV MONGO_PASSWORD: $MONGO_PASSWORD_DEV
STAGE: "development"
deploy: deploy:
mode: replicated mode: replicated
restart_policy: restart_policy:
@ -22,3 +24,5 @@ services:
networks: networks:
queues-development: queues-development:
external: true external: true
monitoring:
external: true

View File

@ -6,9 +6,11 @@ services:
image: mathwave/sprint-repo:queues image: mathwave/sprint-repo:queues
networks: networks:
- queues - queues
- monitoring
environment: environment:
MONGO_HOST: "mongo.sprinthub.ru" MONGO_HOST: "mongo.sprinthub.ru"
MONGO_PASSWORD: $MONGO_PASSWORD_PROD MONGO_PASSWORD: $MONGO_PASSWORD_PROD
STAGE: "production"
deploy: deploy:
mode: replicated mode: replicated
restart_policy: restart_policy:
@ -22,3 +24,5 @@ services:
networks: networks:
queues: queues:
external: true external: true
monitoring:
external: true

23
main.go
View File

@ -1,15 +1,37 @@
package main package main
import ( import (
"bytes"
"encoding/json" "encoding/json"
"fmt"
"log" "log"
"net/http" "net/http"
"os"
"queues-go/app/routers" "queues-go/app/routers"
client "queues-go/app/storage/mongo" client "queues-go/app/storage/mongo"
"strconv"
"sync" "sync"
"time" "time"
) )
func writeMetric(timestamp time.Time, endpoint string, statusCode int, responseTime int, method string) {
s := fmt.Sprintf(
`{"timestamp":"%s","service":"queues","environment":"%s","endpoint":"%s","status_code":%s,"response_time":%s,"method":"%s"}`,
timestamp.Format("2006-01-02T15:04:05Z"),
os.Getenv("STAGE"),
endpoint,
strconv.Itoa(statusCode),
strconv.Itoa(responseTime),
method,
)
data := []byte(s)
r := bytes.NewReader(data)
_, err := http.Post("http://monitoring:1237/api/v1/metrics/endpoint", "application/json", r)
if err != nil {
log.Printf("Error sending metrics %s", err.Error())
}
}
func handlerWrapper(f func(*http.Request) (interface{}, int)) func(http.ResponseWriter, *http.Request) { func handlerWrapper(f func(*http.Request) (interface{}, int)) func(http.ResponseWriter, *http.Request) {
return func(w http.ResponseWriter, r *http.Request) { return func(w http.ResponseWriter, r *http.Request) {
start := time.Now() start := time.Now()
@ -25,6 +47,7 @@ func handlerWrapper(f func(*http.Request) (interface{}, int)) func(http.Response
} else { } else {
w.WriteHeader(status) w.WriteHeader(status)
} }
go writeMetric(start, r.URL.Path, status, int(time.Since(start).Milliseconds()), r.Method)
log.Printf("%s %d %s", r.URL, status, time.Since(start)) log.Printf("%s %d %s", r.URL, status, time.Since(start))
} }
} }