From 3d4f3efa0004ee2c6cd06e95ffbc3e23250dd4c6 Mon Sep 17 00:00:00 2001
From: ensiouel <ensiouel@gmail.com>
Date: Fri, 22 Dec 2023 21:34:10 +0300
Subject: [PATCH] refactor
---
assets/templates/middleware/telemetry | 2 +-
images/middleware/telemetry_middleware.go | 2 +-
pkg/cache/metrics_middleware.go | 4 ++--
pkg/clients/middleware/telemetry_middleware.go | 2 +-
pkg/collaborators/middleware/telemetry_middleware.go | 2 +-
pkg/collections/middleware/telemetry_middleware.go | 2 +-
pkg/delivery/middleware/telemetry_middleware.go | 2 +-
pkg/environments/middleware/telemetry_middleware.go | 2 +-
pkg/files/middleware/telemetry_middleware.go | 2 +-
pkg/invitations/middleware/telemetry_middleware.go | 2 +-
pkg/items/middleware/telemetry_middleware.go | 2 +-
pkg/locales/middleware/telemetry_middleware.go | 2 +-
pkg/members/middleware/telemetry_middleware.go | 2 +-
pkg/metrics/cache.go | 4 ++--
pkg/metrics/request.go | 6 +++---
pkg/organizations/middleware/telemetry_middleware.go | 2 +-
pkg/references/middleware/telemetry_middleware.go | 2 +-
pkg/roles/middleware/telemetry_middleware.go | 2 +-
pkg/spaces/middleware/telemetry_middleware.go | 2 +-
pkg/users/middleware/telemetry_middleware.go | 2 +-
20 files changed, 24 insertions(+), 24 deletions(-)
diff --git a/assets/templates/middleware/telemetry b/assets/templates/middleware/telemetry
index 32462a68..9d204a22 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 f608c8fe..1d4917ae 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 2f3f6fe5..9682470d 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 ee4a2e27..87791c04 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 13f08977..17eb6dc0 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 8ba14244..51cca2af 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 c4f11f37..aab5d1ac 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 c5952405..240b2edb 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 021759c6..2f1cef2e 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 98a2e514..25067a29 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 1f931cba..fc61d9f2 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 79a77096..ead51645 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 b7d6f32b..ec097020 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 3c5ba67d..bf3eb7df 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 5a8093b4..03c19743 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 4f9c2115..0344ac11 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 bc4f3ebc..5b621eb2 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 703e3b93..20d6920f 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 c52facae..637fb3cd 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 e680ae43..ee791713 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)
}
--
GitLab