diff --git a/assets/templates/middleware/telemetry b/assets/templates/middleware/telemetry index 32462a68c0746c15d615b651b0eff6744cfbd4af..9d204a228cedb42a8853b914728b9dd690a16688 100644 --- a/assets/templates/middleware/telemetry +++ b/assets/templates/middleware/telemetry @@ -21,7 +21,7 @@ type {{$decorator}} struct { // {{$funcName}} returns {{$decorator}} func {{$funcName}} (base {{.Interface.Type}}, instance string, spanDecorator ...func(span trace.Span, params, results map[string]interface{})) {{$decorator}} { - requestMetrics, err := metrics.NewRequestMetrics(instance) + requestMetrics, err := metrics.GetRequestMetrics() if err != nil { panic(err) } diff --git a/images/middleware/telemetry_middleware.go b/images/middleware/telemetry_middleware.go index f608c8fe5f1ad24f6417acbccf9fdda16e6271f1..1d4917aed7194087a863d0e07103d3828899def8 100644 --- a/images/middleware/telemetry_middleware.go +++ b/images/middleware/telemetry_middleware.go @@ -29,7 +29,7 @@ type telemetryMiddleware struct { // TelemetryMiddleware returns telemetryMiddleware func TelemetryMiddleware(base images.Images, instance string, spanDecorator ...func(span trace.Span, params, results map[string]interface{})) telemetryMiddleware { - requestMetrics, err := metrics.NewRequestMetrics(instance) + requestMetrics, err := metrics.GetRequestMetrics() if err != nil { panic(err) } diff --git a/pkg/cache/metrics_middleware.go b/pkg/cache/metrics_middleware.go index 2f3f6fe57836bf1b7430cfe7fef800344666a49e..9682470dc4b0289e59b4d865bfbb8019ed01d1c0 100644 --- a/pkg/cache/metrics_middleware.go +++ b/pkg/cache/metrics_middleware.go @@ -15,8 +15,8 @@ type telemetryMiddleware struct { } // TelemetryMiddleware возвращает обертку над кэшем, которая используется для отслеживания количества хитов и промахов в кэше. -func TelemetryMiddleware(next Cache, scope string, keyValues ...attribute.KeyValue) Cache { - cacheMetrics, err := metrics.NewCacheMetrics(scope) +func TelemetryMiddleware(next Cache, keyValues ...attribute.KeyValue) Cache { + cacheMetrics, err := metrics.GetCacheMetrics() if err != nil { panic(err) } diff --git a/pkg/clients/middleware/telemetry_middleware.go b/pkg/clients/middleware/telemetry_middleware.go index ee4a2e27bc02ec2bc8385ac0cbb50323e926d3d8..87791c04ad8500cbce38d93cd3c44fc12c9f67ef 100644 --- a/pkg/clients/middleware/telemetry_middleware.go +++ b/pkg/clients/middleware/telemetry_middleware.go @@ -28,7 +28,7 @@ type telemetryMiddleware struct { // TelemetryMiddleware returns telemetryMiddleware func TelemetryMiddleware(base clients.Clients, instance string, spanDecorator ...func(span trace.Span, params, results map[string]interface{})) telemetryMiddleware { - requestMetrics, err := metrics.NewRequestMetrics(instance) + requestMetrics, err := metrics.GetRequestMetrics() if err != nil { panic(err) } diff --git a/pkg/collaborators/middleware/telemetry_middleware.go b/pkg/collaborators/middleware/telemetry_middleware.go index 13f089773e58513276fd01dd2e782b9ced83a24a..17eb6dc0ba89d6c92650af451205109ce5789d84 100644 --- a/pkg/collaborators/middleware/telemetry_middleware.go +++ b/pkg/collaborators/middleware/telemetry_middleware.go @@ -28,7 +28,7 @@ type telemetryMiddleware struct { // TelemetryMiddleware returns telemetryMiddleware func TelemetryMiddleware(base collaborators.Collaborators, instance string, spanDecorator ...func(span trace.Span, params, results map[string]interface{})) telemetryMiddleware { - requestMetrics, err := metrics.NewRequestMetrics(instance) + requestMetrics, err := metrics.GetRequestMetrics() if err != nil { panic(err) } diff --git a/pkg/collections/middleware/telemetry_middleware.go b/pkg/collections/middleware/telemetry_middleware.go index 8ba14244d576e531468f34ae1943b7b7f227e1aa..51cca2af9c0e00d7b9ddff5753a94987d9e4257e 100644 --- a/pkg/collections/middleware/telemetry_middleware.go +++ b/pkg/collections/middleware/telemetry_middleware.go @@ -29,7 +29,7 @@ type telemetryMiddleware struct { // TelemetryMiddleware returns telemetryMiddleware func TelemetryMiddleware(base collections.Collections, instance string, spanDecorator ...func(span trace.Span, params, results map[string]interface{})) telemetryMiddleware { - requestMetrics, err := metrics.NewRequestMetrics(instance) + requestMetrics, err := metrics.GetRequestMetrics() if err != nil { panic(err) } diff --git a/pkg/delivery/middleware/telemetry_middleware.go b/pkg/delivery/middleware/telemetry_middleware.go index c4f11f370f7d0b9c4f8e878a6a79d73b8fc90a42..aab5d1ac64380d6c53f34a73f97c50b50e1186d9 100644 --- a/pkg/delivery/middleware/telemetry_middleware.go +++ b/pkg/delivery/middleware/telemetry_middleware.go @@ -32,7 +32,7 @@ type telemetryMiddleware struct { // TelemetryMiddleware returns telemetryMiddleware func TelemetryMiddleware(base delivery.Delivery, instance string, spanDecorator ...func(span trace.Span, params, results map[string]interface{})) telemetryMiddleware { - requestMetrics, err := metrics.NewRequestMetrics(instance) + requestMetrics, err := metrics.GetRequestMetrics() if err != nil { panic(err) } diff --git a/pkg/environments/middleware/telemetry_middleware.go b/pkg/environments/middleware/telemetry_middleware.go index c5952405c19f84810bca120bab05124a53e13f50..240b2edb323727561eb859f4fa9522060c7ed95a 100644 --- a/pkg/environments/middleware/telemetry_middleware.go +++ b/pkg/environments/middleware/telemetry_middleware.go @@ -28,7 +28,7 @@ type telemetryMiddleware struct { // TelemetryMiddleware returns telemetryMiddleware func TelemetryMiddleware(base environments.Environments, instance string, spanDecorator ...func(span trace.Span, params, results map[string]interface{})) telemetryMiddleware { - requestMetrics, err := metrics.NewRequestMetrics(instance) + requestMetrics, err := metrics.GetRequestMetrics() if err != nil { panic(err) } diff --git a/pkg/files/middleware/telemetry_middleware.go b/pkg/files/middleware/telemetry_middleware.go index 021759c6a32d6f8da1cd711d0d26b84d07b6a145..2f1cef2ec98f92a8d81cc21d7c63f7c137aa7c6a 100644 --- a/pkg/files/middleware/telemetry_middleware.go +++ b/pkg/files/middleware/telemetry_middleware.go @@ -28,7 +28,7 @@ type telemetryMiddleware struct { // TelemetryMiddleware returns telemetryMiddleware func TelemetryMiddleware(base files.Files, instance string, spanDecorator ...func(span trace.Span, params, results map[string]interface{})) telemetryMiddleware { - requestMetrics, err := metrics.NewRequestMetrics(instance) + requestMetrics, err := metrics.GetRequestMetrics() if err != nil { panic(err) } diff --git a/pkg/invitations/middleware/telemetry_middleware.go b/pkg/invitations/middleware/telemetry_middleware.go index 98a2e514fcd92aa186bc012d64a0a161e3108144..25067a296f45cf069f1d6e41d93250234a296113 100644 --- a/pkg/invitations/middleware/telemetry_middleware.go +++ b/pkg/invitations/middleware/telemetry_middleware.go @@ -29,7 +29,7 @@ type telemetryMiddleware struct { // TelemetryMiddleware returns telemetryMiddleware func TelemetryMiddleware(base invitations.Invitations, instance string, spanDecorator ...func(span trace.Span, params, results map[string]interface{})) telemetryMiddleware { - requestMetrics, err := metrics.NewRequestMetrics(instance) + requestMetrics, err := metrics.GetRequestMetrics() if err != nil { panic(err) } diff --git a/pkg/items/middleware/telemetry_middleware.go b/pkg/items/middleware/telemetry_middleware.go index 1f931cbabc6532d7b848279c3633f76cc96bc47f..fc61d9f26fa6b55c513198bc5f631856961725a8 100644 --- a/pkg/items/middleware/telemetry_middleware.go +++ b/pkg/items/middleware/telemetry_middleware.go @@ -29,7 +29,7 @@ type telemetryMiddleware struct { // TelemetryMiddleware returns telemetryMiddleware func TelemetryMiddleware(base items.Items, instance string, spanDecorator ...func(span trace.Span, params, results map[string]interface{})) telemetryMiddleware { - requestMetrics, err := metrics.NewRequestMetrics(instance) + requestMetrics, err := metrics.GetRequestMetrics() if err != nil { panic(err) } diff --git a/pkg/locales/middleware/telemetry_middleware.go b/pkg/locales/middleware/telemetry_middleware.go index 79a770964d06cee0893bc702de312d5365ef671a..ead51645676b55c1691cfff918dbe5cf7f0bc442 100644 --- a/pkg/locales/middleware/telemetry_middleware.go +++ b/pkg/locales/middleware/telemetry_middleware.go @@ -28,7 +28,7 @@ type telemetryMiddleware struct { // TelemetryMiddleware returns telemetryMiddleware func TelemetryMiddleware(base locales.Locales, instance string, spanDecorator ...func(span trace.Span, params, results map[string]interface{})) telemetryMiddleware { - requestMetrics, err := metrics.NewRequestMetrics(instance) + requestMetrics, err := metrics.GetRequestMetrics() if err != nil { panic(err) } diff --git a/pkg/members/middleware/telemetry_middleware.go b/pkg/members/middleware/telemetry_middleware.go index b7d6f32b23bf47b38014c761008a9d441d86c4c5..ec097020b8e9418987ee542e0f93d93a49c8af0e 100644 --- a/pkg/members/middleware/telemetry_middleware.go +++ b/pkg/members/middleware/telemetry_middleware.go @@ -28,7 +28,7 @@ type telemetryMiddleware struct { // TelemetryMiddleware returns telemetryMiddleware func TelemetryMiddleware(base members.Members, instance string, spanDecorator ...func(span trace.Span, params, results map[string]interface{})) telemetryMiddleware { - requestMetrics, err := metrics.NewRequestMetrics(instance) + requestMetrics, err := metrics.GetRequestMetrics() if err != nil { panic(err) } diff --git a/pkg/metrics/cache.go b/pkg/metrics/cache.go index 3c5ba67de07c5394eb5a16f4f5993d6c92cefda4..bf3eb7df6b14a2dad2d301271c75021a95286536 100644 --- a/pkg/metrics/cache.go +++ b/pkg/metrics/cache.go @@ -11,9 +11,9 @@ type CacheMetrics struct { InvalidatesTotal otelmetric.Int64Counter } -func NewCacheMetrics(scope string) (*CacheMetrics, error) { +func GetCacheMetrics() (*CacheMetrics, error) { var ( - meter = otel.Meter(scope) + meter = otel.Meter("git.perx.ru/perxis/perxis-go/pkg/metrics") cacheMetrics = new(CacheMetrics) err error ) diff --git a/pkg/metrics/request.go b/pkg/metrics/request.go index 5a8093b409c0d8e87fac204c234989d54d988ed1..03c19743d4bb779e295f0833d17816fea8f69b60 100644 --- a/pkg/metrics/request.go +++ b/pkg/metrics/request.go @@ -11,12 +11,12 @@ type RequestMetrics struct { DurationMilliseconds otelmetric.Int64Histogram } -// NewRequestMetrics возвращает метрики для подсчета количества удачных/неудачных запросов, а так же длительности ответов. +// GetRequestMetrics возвращает метрики для подсчета количества удачных/неудачных запросов, а так же длительности ответов. // // Для RequestMetrics.DurationMilliseconds значения buckets по умолчанию равно []float64{0, 5, 10, 25, 50, 75, 100, 250, 500, 750, 1000, 2500, 5000, 7500, 10000} -func NewRequestMetrics(scope string) (*RequestMetrics, error) { +func GetRequestMetrics() (*RequestMetrics, error) { var ( - meter = otel.Meter(scope) + meter = otel.Meter("git.perx.ru/perxis/perxis-go/pkg/metrics") requestMetrics = new(RequestMetrics) err error ) diff --git a/pkg/organizations/middleware/telemetry_middleware.go b/pkg/organizations/middleware/telemetry_middleware.go index 4f9c21153bc419449eefb13daadeeb71cd7aad06..0344ac11f1392a5c1616e97fc39d56cb9c9636fc 100644 --- a/pkg/organizations/middleware/telemetry_middleware.go +++ b/pkg/organizations/middleware/telemetry_middleware.go @@ -29,7 +29,7 @@ type telemetryMiddleware struct { // TelemetryMiddleware returns telemetryMiddleware func TelemetryMiddleware(base organizations.Organizations, instance string, spanDecorator ...func(span trace.Span, params, results map[string]interface{})) telemetryMiddleware { - requestMetrics, err := metrics.NewRequestMetrics(instance) + requestMetrics, err := metrics.GetRequestMetrics() if err != nil { panic(err) } diff --git a/pkg/references/middleware/telemetry_middleware.go b/pkg/references/middleware/telemetry_middleware.go index bc4f3ebc3945db814c469fdf91c92779a73f51cf..5b621eb25bf91b7cca936423cd88b9b65ce7b3f4 100644 --- a/pkg/references/middleware/telemetry_middleware.go +++ b/pkg/references/middleware/telemetry_middleware.go @@ -29,7 +29,7 @@ type telemetryMiddleware struct { // TelemetryMiddleware returns telemetryMiddleware func TelemetryMiddleware(base references.References, instance string, spanDecorator ...func(span trace.Span, params, results map[string]interface{})) telemetryMiddleware { - requestMetrics, err := metrics.NewRequestMetrics(instance) + requestMetrics, err := metrics.GetRequestMetrics() if err != nil { panic(err) } diff --git a/pkg/roles/middleware/telemetry_middleware.go b/pkg/roles/middleware/telemetry_middleware.go index 703e3b93584316ecb1dcddb69497a32235f2dc00..20d6920fc55df6d0e2eafbbfc8bb539c8d6552a9 100644 --- a/pkg/roles/middleware/telemetry_middleware.go +++ b/pkg/roles/middleware/telemetry_middleware.go @@ -28,7 +28,7 @@ type telemetryMiddleware struct { // TelemetryMiddleware returns telemetryMiddleware func TelemetryMiddleware(base roles.Roles, instance string, spanDecorator ...func(span trace.Span, params, results map[string]interface{})) telemetryMiddleware { - requestMetrics, err := metrics.NewRequestMetrics(instance) + requestMetrics, err := metrics.GetRequestMetrics() if err != nil { panic(err) } diff --git a/pkg/spaces/middleware/telemetry_middleware.go b/pkg/spaces/middleware/telemetry_middleware.go index c52facae57f25e0f91e784ff57f9cfe2e1b159f8..637fb3cda561769ea9fc9841334a9dfe3650e120 100644 --- a/pkg/spaces/middleware/telemetry_middleware.go +++ b/pkg/spaces/middleware/telemetry_middleware.go @@ -28,7 +28,7 @@ type telemetryMiddleware struct { // TelemetryMiddleware returns telemetryMiddleware func TelemetryMiddleware(base spaces.Spaces, instance string, spanDecorator ...func(span trace.Span, params, results map[string]interface{})) telemetryMiddleware { - requestMetrics, err := metrics.NewRequestMetrics(instance) + requestMetrics, err := metrics.GetRequestMetrics() if err != nil { panic(err) } diff --git a/pkg/users/middleware/telemetry_middleware.go b/pkg/users/middleware/telemetry_middleware.go index e680ae4308b4528fd4534f460ba858c59bf047cf..ee7917131cbc60b58e0c28046c875c985429966b 100644 --- a/pkg/users/middleware/telemetry_middleware.go +++ b/pkg/users/middleware/telemetry_middleware.go @@ -29,7 +29,7 @@ type telemetryMiddleware struct { // TelemetryMiddleware returns telemetryMiddleware func TelemetryMiddleware(base users.Users, instance string, spanDecorator ...func(span trace.Span, params, results map[string]interface{})) telemetryMiddleware { - requestMetrics, err := metrics.NewRequestMetrics(instance) + requestMetrics, err := metrics.GetRequestMetrics() if err != nil { panic(err) }