From 02439b9edee91692136770305ca74a9b29c97d13 Mon Sep 17 00:00:00 2001 From: ensiouel <ensiouel@gmail.com> Date: Mon, 25 Dec 2023 12:04:34 +0300 Subject: [PATCH] move pkg/metrics to pkg/telemetry/metrics --- assets/templates/middleware/telemetry | 1 + images/middleware/telemetry_middleware.go | 2 +- pkg/cache/telemetry_middleware.go | 2 +- 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/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/{ => telemetry}/metrics/cache.go | 0 pkg/{ => telemetry}/metrics/request.go | 0 pkg/users/middleware/telemetry_middleware.go | 2 +- 20 files changed, 18 insertions(+), 17 deletions(-) rename pkg/{ => telemetry}/metrics/cache.go (100%) rename pkg/{ => telemetry}/metrics/request.go (100%) diff --git a/assets/templates/middleware/telemetry b/assets/templates/middleware/telemetry index 9d204a22..554dee3f 100644 --- a/assets/templates/middleware/telemetry +++ b/assets/templates/middleware/telemetry @@ -2,6 +2,7 @@ import ( "context" "time" + "git.perx.ru/perxis/perxis-go/pkg/telemetry/metrics" "go.opentelemetry.io/otel" "go.opentelemetry.io/otel/attribute" otelmetric "go.opentelemetry.io/otel/metric" diff --git a/images/middleware/telemetry_middleware.go b/images/middleware/telemetry_middleware.go index 1d4917ae..bb5d217a 100644 --- a/images/middleware/telemetry_middleware.go +++ b/images/middleware/telemetry_middleware.go @@ -12,7 +12,7 @@ import ( "git.perx.ru/perxis/perxis-go/images" "git.perx.ru/perxis/perxis-go/pkg/files" - "git.perx.ru/perxis/perxis-go/pkg/metrics" + "git.perx.ru/perxis/perxis-go/pkg/telemetry/metrics" "go.opentelemetry.io/otel" "go.opentelemetry.io/otel/attribute" otelmetric "go.opentelemetry.io/otel/metric" diff --git a/pkg/cache/telemetry_middleware.go b/pkg/cache/telemetry_middleware.go index 9682470d..5c22fcce 100644 --- a/pkg/cache/telemetry_middleware.go +++ b/pkg/cache/telemetry_middleware.go @@ -3,7 +3,7 @@ package cache import ( "context" - "git.perx.ru/perxis/perxis-go/pkg/metrics" + "git.perx.ru/perxis/perxis-go/pkg/telemetry/metrics" "go.opentelemetry.io/otel/attribute" otelmetric "go.opentelemetry.io/otel/metric" ) diff --git a/pkg/clients/middleware/telemetry_middleware.go b/pkg/clients/middleware/telemetry_middleware.go index 87791c04..35782f7f 100644 --- a/pkg/clients/middleware/telemetry_middleware.go +++ b/pkg/clients/middleware/telemetry_middleware.go @@ -11,7 +11,7 @@ import ( "time" "git.perx.ru/perxis/perxis-go/pkg/clients" - "git.perx.ru/perxis/perxis-go/pkg/metrics" + "git.perx.ru/perxis/perxis-go/pkg/telemetry/metrics" "go.opentelemetry.io/otel" "go.opentelemetry.io/otel/attribute" otelmetric "go.opentelemetry.io/otel/metric" diff --git a/pkg/collaborators/middleware/telemetry_middleware.go b/pkg/collaborators/middleware/telemetry_middleware.go index 17eb6dc0..6ad967e4 100644 --- a/pkg/collaborators/middleware/telemetry_middleware.go +++ b/pkg/collaborators/middleware/telemetry_middleware.go @@ -11,7 +11,7 @@ import ( "time" "git.perx.ru/perxis/perxis-go/pkg/collaborators" - "git.perx.ru/perxis/perxis-go/pkg/metrics" + "git.perx.ru/perxis/perxis-go/pkg/telemetry/metrics" "go.opentelemetry.io/otel" "go.opentelemetry.io/otel/attribute" otelmetric "go.opentelemetry.io/otel/metric" diff --git a/pkg/collections/middleware/telemetry_middleware.go b/pkg/collections/middleware/telemetry_middleware.go index 51cca2af..bd4f4c90 100644 --- a/pkg/collections/middleware/telemetry_middleware.go +++ b/pkg/collections/middleware/telemetry_middleware.go @@ -11,8 +11,8 @@ import ( "time" "git.perx.ru/perxis/perxis-go/pkg/collections" - "git.perx.ru/perxis/perxis-go/pkg/metrics" "git.perx.ru/perxis/perxis-go/pkg/schema" + "git.perx.ru/perxis/perxis-go/pkg/telemetry/metrics" "go.opentelemetry.io/otel" "go.opentelemetry.io/otel/attribute" otelmetric "go.opentelemetry.io/otel/metric" diff --git a/pkg/delivery/middleware/telemetry_middleware.go b/pkg/delivery/middleware/telemetry_middleware.go index aab5d1ac..8252c536 100644 --- a/pkg/delivery/middleware/telemetry_middleware.go +++ b/pkg/delivery/middleware/telemetry_middleware.go @@ -15,7 +15,7 @@ import ( "git.perx.ru/perxis/perxis-go/pkg/environments" "git.perx.ru/perxis/perxis-go/pkg/items" "git.perx.ru/perxis/perxis-go/pkg/locales" - "git.perx.ru/perxis/perxis-go/pkg/metrics" + "git.perx.ru/perxis/perxis-go/pkg/telemetry/metrics" "go.opentelemetry.io/otel" "go.opentelemetry.io/otel/attribute" otelmetric "go.opentelemetry.io/otel/metric" diff --git a/pkg/environments/middleware/telemetry_middleware.go b/pkg/environments/middleware/telemetry_middleware.go index 240b2edb..4a46b9aa 100644 --- a/pkg/environments/middleware/telemetry_middleware.go +++ b/pkg/environments/middleware/telemetry_middleware.go @@ -11,7 +11,7 @@ import ( "time" "git.perx.ru/perxis/perxis-go/pkg/environments" - "git.perx.ru/perxis/perxis-go/pkg/metrics" + "git.perx.ru/perxis/perxis-go/pkg/telemetry/metrics" "go.opentelemetry.io/otel" "go.opentelemetry.io/otel/attribute" otelmetric "go.opentelemetry.io/otel/metric" diff --git a/pkg/files/middleware/telemetry_middleware.go b/pkg/files/middleware/telemetry_middleware.go index 2f1cef2e..d282c065 100644 --- a/pkg/files/middleware/telemetry_middleware.go +++ b/pkg/files/middleware/telemetry_middleware.go @@ -11,7 +11,7 @@ import ( "time" "git.perx.ru/perxis/perxis-go/pkg/files" - "git.perx.ru/perxis/perxis-go/pkg/metrics" + "git.perx.ru/perxis/perxis-go/pkg/telemetry/metrics" "go.opentelemetry.io/otel" "go.opentelemetry.io/otel/attribute" otelmetric "go.opentelemetry.io/otel/metric" diff --git a/pkg/invitations/middleware/telemetry_middleware.go b/pkg/invitations/middleware/telemetry_middleware.go index 25067a29..01f91983 100644 --- a/pkg/invitations/middleware/telemetry_middleware.go +++ b/pkg/invitations/middleware/telemetry_middleware.go @@ -11,8 +11,8 @@ import ( "time" "git.perx.ru/perxis/perxis-go/pkg/invitations" - "git.perx.ru/perxis/perxis-go/pkg/metrics" "git.perx.ru/perxis/perxis-go/pkg/options" + "git.perx.ru/perxis/perxis-go/pkg/telemetry/metrics" "go.opentelemetry.io/otel" "go.opentelemetry.io/otel/attribute" otelmetric "go.opentelemetry.io/otel/metric" diff --git a/pkg/items/middleware/telemetry_middleware.go b/pkg/items/middleware/telemetry_middleware.go index fc61d9f2..71d79354 100644 --- a/pkg/items/middleware/telemetry_middleware.go +++ b/pkg/items/middleware/telemetry_middleware.go @@ -11,8 +11,8 @@ import ( "time" "git.perx.ru/perxis/perxis-go/pkg/items" - "git.perx.ru/perxis/perxis-go/pkg/metrics" "git.perx.ru/perxis/perxis-go/pkg/schema" + "git.perx.ru/perxis/perxis-go/pkg/telemetry/metrics" "go.opentelemetry.io/otel" "go.opentelemetry.io/otel/attribute" otelmetric "go.opentelemetry.io/otel/metric" diff --git a/pkg/locales/middleware/telemetry_middleware.go b/pkg/locales/middleware/telemetry_middleware.go index ead51645..90565366 100644 --- a/pkg/locales/middleware/telemetry_middleware.go +++ b/pkg/locales/middleware/telemetry_middleware.go @@ -11,7 +11,7 @@ import ( "time" "git.perx.ru/perxis/perxis-go/pkg/locales" - "git.perx.ru/perxis/perxis-go/pkg/metrics" + "git.perx.ru/perxis/perxis-go/pkg/telemetry/metrics" "go.opentelemetry.io/otel" "go.opentelemetry.io/otel/attribute" otelmetric "go.opentelemetry.io/otel/metric" diff --git a/pkg/members/middleware/telemetry_middleware.go b/pkg/members/middleware/telemetry_middleware.go index ec097020..493d9fe2 100644 --- a/pkg/members/middleware/telemetry_middleware.go +++ b/pkg/members/middleware/telemetry_middleware.go @@ -11,7 +11,7 @@ import ( "time" "git.perx.ru/perxis/perxis-go/pkg/members" - "git.perx.ru/perxis/perxis-go/pkg/metrics" + "git.perx.ru/perxis/perxis-go/pkg/telemetry/metrics" "go.opentelemetry.io/otel" "go.opentelemetry.io/otel/attribute" otelmetric "go.opentelemetry.io/otel/metric" diff --git a/pkg/organizations/middleware/telemetry_middleware.go b/pkg/organizations/middleware/telemetry_middleware.go index 0344ac11..9b83541a 100644 --- a/pkg/organizations/middleware/telemetry_middleware.go +++ b/pkg/organizations/middleware/telemetry_middleware.go @@ -10,9 +10,9 @@ import ( "context" "time" - "git.perx.ru/perxis/perxis-go/pkg/metrics" "git.perx.ru/perxis/perxis-go/pkg/options" "git.perx.ru/perxis/perxis-go/pkg/organizations" + "git.perx.ru/perxis/perxis-go/pkg/telemetry/metrics" "go.opentelemetry.io/otel" "go.opentelemetry.io/otel/attribute" otelmetric "go.opentelemetry.io/otel/metric" diff --git a/pkg/references/middleware/telemetry_middleware.go b/pkg/references/middleware/telemetry_middleware.go index 5b621eb2..de4533ba 100644 --- a/pkg/references/middleware/telemetry_middleware.go +++ b/pkg/references/middleware/telemetry_middleware.go @@ -11,8 +11,8 @@ import ( "time" "git.perx.ru/perxis/perxis-go/pkg/items" - "git.perx.ru/perxis/perxis-go/pkg/metrics" "git.perx.ru/perxis/perxis-go/pkg/references" + "git.perx.ru/perxis/perxis-go/pkg/telemetry/metrics" "go.opentelemetry.io/otel" "go.opentelemetry.io/otel/attribute" otelmetric "go.opentelemetry.io/otel/metric" diff --git a/pkg/roles/middleware/telemetry_middleware.go b/pkg/roles/middleware/telemetry_middleware.go index 20d6920f..72666a14 100644 --- a/pkg/roles/middleware/telemetry_middleware.go +++ b/pkg/roles/middleware/telemetry_middleware.go @@ -10,8 +10,8 @@ import ( "context" "time" - "git.perx.ru/perxis/perxis-go/pkg/metrics" "git.perx.ru/perxis/perxis-go/pkg/roles" + "git.perx.ru/perxis/perxis-go/pkg/telemetry/metrics" "go.opentelemetry.io/otel" "go.opentelemetry.io/otel/attribute" otelmetric "go.opentelemetry.io/otel/metric" diff --git a/pkg/spaces/middleware/telemetry_middleware.go b/pkg/spaces/middleware/telemetry_middleware.go index 637fb3cd..42caaf89 100644 --- a/pkg/spaces/middleware/telemetry_middleware.go +++ b/pkg/spaces/middleware/telemetry_middleware.go @@ -10,8 +10,8 @@ import ( "context" "time" - "git.perx.ru/perxis/perxis-go/pkg/metrics" "git.perx.ru/perxis/perxis-go/pkg/spaces" + "git.perx.ru/perxis/perxis-go/pkg/telemetry/metrics" "go.opentelemetry.io/otel" "go.opentelemetry.io/otel/attribute" otelmetric "go.opentelemetry.io/otel/metric" diff --git a/pkg/metrics/cache.go b/pkg/telemetry/metrics/cache.go similarity index 100% rename from pkg/metrics/cache.go rename to pkg/telemetry/metrics/cache.go diff --git a/pkg/metrics/request.go b/pkg/telemetry/metrics/request.go similarity index 100% rename from pkg/metrics/request.go rename to pkg/telemetry/metrics/request.go diff --git a/pkg/users/middleware/telemetry_middleware.go b/pkg/users/middleware/telemetry_middleware.go index ee791713..730fab46 100644 --- a/pkg/users/middleware/telemetry_middleware.go +++ b/pkg/users/middleware/telemetry_middleware.go @@ -10,8 +10,8 @@ import ( "context" "time" - "git.perx.ru/perxis/perxis-go/pkg/metrics" "git.perx.ru/perxis/perxis-go/pkg/options" + "git.perx.ru/perxis/perxis-go/pkg/telemetry/metrics" "git.perx.ru/perxis/perxis-go/pkg/users" "go.opentelemetry.io/otel" "go.opentelemetry.io/otel/attribute" -- GitLab