mirror of
https://github.com/mainflux/mainflux.git
synced 2025-04-29 13:49:28 +08:00

* Move Things and Users to Clients Signed-off-by: dusanb94 <dusan.borovcanin@mainflux.com> Signed-off-by: rodneyosodo <blackd0t@protonmail.com> Signed-off-by: dusanb94 <dusan.borovcanin@mainflux.com> * NOISSUE - Update Add and Delete Policies (#1792) * Remove Policy Action Ranks Signed-off-by: rodneyosodo <blackd0t@protonmail.com> * Fix Rebase Issues Signed-off-by: rodneyosodo <blackd0t@protonmail.com> * Fix CI Test Errors Signed-off-by: rodneyosodo <blackd0t@protonmail.com> * Adding Check on Subject For Clients Signed-off-by: rodneyosodo <blackd0t@protonmail.com> * Remove Check Client Exists Signed-off-by: rodneyosodo <blackd0t@protonmail.com> * Check When Sharing Clients Signed-off-by: rodneyosodo <blackd0t@protonmail.com> * Only Add User to Group When Sharing Things Signed-off-by: rodneyosodo <blackd0t@protonmail.com> * Remove clientType Signed-off-by: rodneyosodo <blackd0t@protonmail.com> * Minor Fix on ShareClient and Fix Tests Signed-off-by: rodneyosodo <blackd0t@protonmail.com> * Fix Policies Tests Signed-off-by: rodneyosodo <blackd0t@protonmail.com> * Clean Up Things Authorization Signed-off-by: rodneyosodo <blackd0t@protonmail.com> * Fix Tests on RetrieveAll Signed-off-by: rodneyosodo <blackd0t@protonmail.com> * Test ShareThing Signed-off-by: rodneyosodo <blackd0t@protonmail.com> * Fix Merge Conflicts Signed-off-by: rodneyosodo <blackd0t@protonmail.com> * Remove Adding Policies. Only Use Ownership Signed-off-by: rodneyosodo <blackd0t@protonmail.com> * Check If Subject is same as Object Signed-off-by: rodneyosodo <blackd0t@protonmail.com> * Move Back To Union As Sometimes Policy is Empty and Fails to Evaluate on Ownership Signed-off-by: rodneyosodo <blackd0t@protonmail.com> * Fix Entity Type For Failing Tests Signed-off-by: rodneyosodo <blackd0t@protonmail.com> * Fix BUG in policy evaluation Signed-off-by: rodneyosodo <blackd0t@protonmail.com> * Fix Tests Signed-off-by: rodneyosodo <blackd0t@protonmail.com> * Add Comments Regarding checkAdmin Signed-off-by: rodneyosodo <blackd0t@protonmail.com> * Fix Tests On Rebase Signed-off-by: rodneyosodo <blackd0t@protonmail.com> * Combine Authorize For Things and Users Signed-off-by: rodneyosodo <blackd0t@protonmail.com> * Fix Tests On Rebase Signed-off-by: rodneyosodo <blackd0t@protonmail.com> * Error on Things SVC `unsupported protocol scheme` Signed-off-by: rodneyosodo <blackd0t@protonmail.com> --------- Signed-off-by: rodneyosodo <blackd0t@protonmail.com> Signed-off-by: dusanb94 <dusan.borovcanin@mainflux.com> * Fix Bug on Things Authorization Cache (#1810) Signed-off-by: rodneyosodo <blackd0t@protonmail.com> Signed-off-by: dusanb94 <dusan.borovcanin@mainflux.com> * Use Password instead of username in MQTT handler Signed-off-by: dusanb94 <dusan.borovcanin@mainflux.com> * Simplify MQTT authorization Signed-off-by: dusanb94 <dusan.borovcanin@mainflux.com> * Fix MQTT tests Signed-off-by: dusanb94 <dusan.borovcanin@mainflux.com> * NOISSUE - Add More Functions to SDK (#1811) * Add More Functions to SDK Signed-off-by: rodneyosodo <blackd0t@protonmail.com> * Add Examples to GoDoc Signed-off-by: rodneyosodo <blackd0t@protonmail.com> * Update Unassign Interface Signed-off-by: rodneyosodo <blackd0t@protonmail.com> * Pass Subject as ID and Not Token on List Channels By Thing Signed-off-by: rodneyosodo <blackd0t@protonmail.com> * Fix Bootstrap Errors For Element Check Signed-off-by: rodneyosodo <blackd0t@protonmail.com> * Add empty line Before Return Signed-off-by: rodneyosodo <blackd0t@protonmail.com> * Reorder URLS in things mux Signed-off-by: rodneyosodo <blackd0t@protonmail.com> * Fix Listing Things Policies Signed-off-by: rodneyosodo <blackd0t@protonmail.com> * Fix Share Thing Signed-off-by: rodneyosodo <blackd0t@protonmail.com> * Add Examples to CLI Docs Signed-off-by: rodneyosodo <blackd0t@protonmail.com> * Fix Update Identity To Update Another User Signed-off-by: rodneyosodo <blackd0t@protonmail.com> * Fix Identify an Update Policies on Things Signed-off-by: rodneyosodo <blackd0t@protonmail.com> * Fix Update Things Policies Signed-off-by: rodneyosodo <blackd0t@protonmail.com> * Fix GoDocs on Disconnect Signed-off-by: rodneyosodo <blackd0t@protonmail.com> * Fix Tests Signed-off-by: rodneyosodo <blackd0t@protonmail.com> * Change Authorize To Use AccessRequest Signed-off-by: rodneyosodo <blackd0t@protonmail.com> --------- Signed-off-by: rodneyosodo <blackd0t@protonmail.com> Signed-off-by: dusanb94 <dusan.borovcanin@mainflux.com> * For Evaluate Policy Use AccessRequest (#1814) Signed-off-by: rodneyosodo <blackd0t@protonmail.com> Signed-off-by: dusanb94 <dusan.borovcanin@mainflux.com> * NOISSUE - Add SDK Tests (#1812) * Add Things Tests Signed-off-by: rodneyosodo <blackd0t@protonmail.com> * Add Channel Tests Signed-off-by: rodneyosodo <blackd0t@protonmail.com> * Add Certs Tests Signed-off-by: rodneyosodo <blackd0t@protonmail.com> * Add Consumer Tests Signed-off-by: rodneyosodo <blackd0t@protonmail.com> * Enrich Group Tests Signed-off-by: rodneyosodo <blackd0t@protonmail.com> * Add Tests For Health Signed-off-by: rodneyosodo <blackd0t@protonmail.com> * Add Tests For Tokens Signed-off-by: rodneyosodo <blackd0t@protonmail.com> * Rename SDK for Tests Signed-off-by: rodneyosodo <blackd0t@protonmail.com> * Add Policies Tests Signed-off-by: rodneyosodo <blackd0t@protonmail.com> * Fix Linter Signed-off-by: rodneyosodo <blackd0t@protonmail.com> * Fix Tests Signed-off-by: rodneyosodo <blackd0t@protonmail.com> * Make Variable Defination Inline Signed-off-by: rodneyosodo <blackd0t@protonmail.com> --------- Signed-off-by: rodneyosodo <blackd0t@protonmail.com> Signed-off-by: dusanb94 <dusan.borovcanin@mainflux.com> * NOISSUE - Make Cache Key Duration Configurable (#1815) * Make Cache Key Duration Configurable Signed-off-by: rodneyosodo <blackd0t@protonmail.com> * Rename ENV Var Signed-off-by: rodneyosodo <blackd0t@protonmail.com> --------- Signed-off-by: rodneyosodo <blackd0t@protonmail.com> Signed-off-by: dusanb94 <dusan.borovcanin@mainflux.com> * NOISSUE - Update GoDocs (#1816) * Add GoDocs Signed-off-by: rodneyosodo <blackd0t@protonmail.com> * Add Missing GoDoc Files Signed-off-by: rodneyosodo <blackd0t@protonmail.com> * Enable godot Signed-off-by: rodneyosodo <blackd0t@protonmail.com> * Add License Information Signed-off-by: rodneyosodo <blackd0t@protonmail.com> --------- Signed-off-by: rodneyosodo <blackd0t@protonmail.com> Signed-off-by: dusanb94 <dusan.borovcanin@mainflux.com> * NOISSUE - Add Call Home Client to Mainflux services (#1751) * Move Things and Users to Clients Signed-off-by: dusanb94 <dusan.borovcanin@mainflux.com> Signed-off-by: rodneyosodo <blackd0t@protonmail.com> Signed-off-by: SammyOina <sammyoina@gmail.com> * collect and send data package Signed-off-by: SammyOina <sammyoina@gmail.com> * create telemetry migrations Signed-off-by: SammyOina <sammyoina@gmail.com> * add telemetry endpoints Signed-off-by: SammyOina <sammyoina@gmail.com> * add transport Signed-off-by: SammyOina <sammyoina@gmail.com> * create service Signed-off-by: SammyOina <sammyoina@gmail.com> * remove homing server Signed-off-by: SammyOina <sammyoina@gmail.com> * add call home to adapters Signed-off-by: SammyOina <sammyoina@gmail.com> * add last seen Signed-off-by: SammyOina <sammyoina@gmail.com> * rename logger Signed-off-by: SammyOina <sammyoina@gmail.com> * remove homing client Signed-off-by: SammyOina <sammyoina@gmail.com> * use unmerged repo Signed-off-by: SammyOina <sammyoina@gmail.com> * use renamed module Signed-off-by: SammyOina <sammyoina@gmail.com> * update call home version Signed-off-by: SammyOina <sammyoina@gmail.com> * edit documentation Signed-off-by: SammyOina <sammyoina@gmail.com> * align table Signed-off-by: SammyOina <sammyoina@gmail.com> * use alias for call home client Signed-off-by: SammyOina <sammyoina@gmail.com> * update callhome Signed-off-by: SammyOina <sammyoina@gmail.com> * update call home pkg Signed-off-by: SammyOina <sammyoina@gmail.com> * update call home Signed-off-by: SammyOina <sammyoina@gmail.com> * fix modules Signed-off-by: SammyOina <sammyoina@gmail.com> * use mf build version Signed-off-by: SammyOina <sammyoina@gmail.com> * use mf build version Signed-off-by: SammyOina <sammyoina@gmail.com> * restore default Signed-off-by: SammyOina <sammyoina@gmail.com> * add call home for users and things Signed-off-by: SammyOina <sammyoina@gmail.com> * enable opting on call home Signed-off-by: SammyOina <sammyoina@gmail.com> * remove full stops Signed-off-by: SammyOina <sammyoina@gmail.com> * update callhome client Signed-off-by: SammyOina <sammyoina@gmail.com> * add call home to all services Signed-off-by: SammyOina <sammyoina@gmail.com> * fix build Signed-off-by: SammyOina <sammyoina@gmail.com> * restore sdk tests Signed-off-by: SammyOina <sammyoina@gmail.com> * remove unnecessary changes Signed-off-by: SammyOina <sammyoina@gmail.com> * restore health_test.go Signed-off-by: SammyOina <sammyoina@gmail.com> --------- Signed-off-by: dusanb94 <dusan.borovcanin@mainflux.com> Signed-off-by: rodneyosodo <blackd0t@protonmail.com> Signed-off-by: SammyOina <sammyoina@gmail.com> Co-authored-by: b1ackd0t <blackd0t@protonmail.com> Signed-off-by: dusanb94 <dusan.borovcanin@mainflux.com> --------- Signed-off-by: dusanb94 <dusan.borovcanin@mainflux.com> Signed-off-by: rodneyosodo <blackd0t@protonmail.com> Signed-off-by: SammyOina <sammyoina@gmail.com> Co-authored-by: b1ackd0t <blackd0t@protonmail.com> Co-authored-by: Sammy Kerata Oina <44265300+SammyOina@users.noreply.github.com>
194 lines
8.1 KiB
Go
194 lines
8.1 KiB
Go
// Copyright (c) Mainflux
|
|
// SPDX-License-Identifier: Apache-2.0
|
|
|
|
package api
|
|
|
|
import (
|
|
"context"
|
|
"time"
|
|
|
|
"github.com/go-kit/kit/metrics"
|
|
mfclients "github.com/mainflux/mainflux/pkg/clients"
|
|
"github.com/mainflux/mainflux/users/clients"
|
|
"github.com/mainflux/mainflux/users/jwt"
|
|
)
|
|
|
|
var _ clients.Service = (*metricsMiddleware)(nil)
|
|
|
|
type metricsMiddleware struct {
|
|
counter metrics.Counter
|
|
latency metrics.Histogram
|
|
svc clients.Service
|
|
}
|
|
|
|
// MetricsMiddleware instruments policies service by tracking request count and latency.
|
|
func MetricsMiddleware(svc clients.Service, counter metrics.Counter, latency metrics.Histogram) clients.Service {
|
|
return &metricsMiddleware{
|
|
counter: counter,
|
|
latency: latency,
|
|
svc: svc,
|
|
}
|
|
}
|
|
|
|
// RegisterClient instruments RegisterClient method with metrics.
|
|
func (ms *metricsMiddleware) RegisterClient(ctx context.Context, token string, client mfclients.Client) (mfclients.Client, error) {
|
|
defer func(begin time.Time) {
|
|
ms.counter.With("method", "register_client").Add(1)
|
|
ms.latency.With("method", "register_client").Observe(time.Since(begin).Seconds())
|
|
}(time.Now())
|
|
return ms.svc.RegisterClient(ctx, token, client)
|
|
}
|
|
|
|
// IssueToken instruments IssueToken method with metrics.
|
|
func (ms *metricsMiddleware) IssueToken(ctx context.Context, identity, secret string) (jwt.Token, error) {
|
|
defer func(begin time.Time) {
|
|
ms.counter.With("method", "issue_token").Add(1)
|
|
ms.latency.With("method", "issue_token").Observe(time.Since(begin).Seconds())
|
|
}(time.Now())
|
|
return ms.svc.IssueToken(ctx, identity, secret)
|
|
}
|
|
|
|
// RefreshToken instruments RefreshToken method with metrics.
|
|
func (ms *metricsMiddleware) RefreshToken(ctx context.Context, accessToken string) (token jwt.Token, err error) {
|
|
defer func(begin time.Time) {
|
|
ms.counter.With("method", "refresh_token").Add(1)
|
|
ms.latency.With("method", "refresh_token").Observe(time.Since(begin).Seconds())
|
|
}(time.Now())
|
|
return ms.svc.RefreshToken(ctx, accessToken)
|
|
}
|
|
|
|
// ViewClient instruments ViewClient method with metrics.
|
|
func (ms *metricsMiddleware) ViewClient(ctx context.Context, token, id string) (mfclients.Client, error) {
|
|
defer func(begin time.Time) {
|
|
ms.counter.With("method", "view_client").Add(1)
|
|
ms.latency.With("method", "view_client").Observe(time.Since(begin).Seconds())
|
|
}(time.Now())
|
|
return ms.svc.ViewClient(ctx, token, id)
|
|
}
|
|
|
|
// ViewProfile instruments ViewProfile method with metrics.
|
|
func (ms *metricsMiddleware) ViewProfile(ctx context.Context, token string) (mfclients.Client, error) {
|
|
defer func(begin time.Time) {
|
|
ms.counter.With("method", "view_profile").Add(1)
|
|
ms.latency.With("method", "view_profile").Observe(time.Since(begin).Seconds())
|
|
}(time.Now())
|
|
return ms.svc.ViewProfile(ctx, token)
|
|
}
|
|
|
|
// ListClients instruments ListClients method with metrics.
|
|
func (ms *metricsMiddleware) ListClients(ctx context.Context, token string, pm mfclients.Page) (mfclients.ClientsPage, error) {
|
|
defer func(begin time.Time) {
|
|
ms.counter.With("method", "list_clients").Add(1)
|
|
ms.latency.With("method", "list_clients").Observe(time.Since(begin).Seconds())
|
|
}(time.Now())
|
|
return ms.svc.ListClients(ctx, token, pm)
|
|
}
|
|
|
|
// UpdateClient instruments UpdateClient method with metrics.
|
|
func (ms *metricsMiddleware) UpdateClient(ctx context.Context, token string, client mfclients.Client) (mfclients.Client, error) {
|
|
defer func(begin time.Time) {
|
|
ms.counter.With("method", "update_client_name_and_metadata").Add(1)
|
|
ms.latency.With("method", "update_client_name_and_metadata").Observe(time.Since(begin).Seconds())
|
|
}(time.Now())
|
|
return ms.svc.UpdateClient(ctx, token, client)
|
|
}
|
|
|
|
// UpdateClientTags instruments UpdateClientTags method with metrics.
|
|
func (ms *metricsMiddleware) UpdateClientTags(ctx context.Context, token string, client mfclients.Client) (mfclients.Client, error) {
|
|
defer func(begin time.Time) {
|
|
ms.counter.With("method", "update_client_tags").Add(1)
|
|
ms.latency.With("method", "update_client_tags").Observe(time.Since(begin).Seconds())
|
|
}(time.Now())
|
|
return ms.svc.UpdateClientTags(ctx, token, client)
|
|
}
|
|
|
|
// UpdateClientIdentity instruments UpdateClientIdentity method with metrics.
|
|
func (ms *metricsMiddleware) UpdateClientIdentity(ctx context.Context, token, id, identity string) (mfclients.Client, error) {
|
|
defer func(begin time.Time) {
|
|
ms.counter.With("method", "update_client_identity").Add(1)
|
|
ms.latency.With("method", "update_client_identity").Observe(time.Since(begin).Seconds())
|
|
}(time.Now())
|
|
return ms.svc.UpdateClientIdentity(ctx, token, id, identity)
|
|
}
|
|
|
|
// UpdateClientSecret instruments UpdateClientSecret method with metrics.
|
|
func (ms *metricsMiddleware) UpdateClientSecret(ctx context.Context, token, oldSecret, newSecret string) (mfclients.Client, error) {
|
|
defer func(begin time.Time) {
|
|
ms.counter.With("method", "update_client_secret").Add(1)
|
|
ms.latency.With("method", "update_client_secret").Observe(time.Since(begin).Seconds())
|
|
}(time.Now())
|
|
return ms.svc.UpdateClientSecret(ctx, token, oldSecret, newSecret)
|
|
}
|
|
|
|
// GenerateResetToken instruments GenerateResetToken method with metrics.
|
|
func (ms *metricsMiddleware) GenerateResetToken(ctx context.Context, email, host string) error {
|
|
defer func(begin time.Time) {
|
|
ms.counter.With("method", "generate_reset_token").Add(1)
|
|
ms.latency.With("method", "generate_reset_token").Observe(time.Since(begin).Seconds())
|
|
}(time.Now())
|
|
return ms.svc.GenerateResetToken(ctx, email, host)
|
|
}
|
|
|
|
// ResetSecret instruments ResetSecret method with metrics.
|
|
func (ms *metricsMiddleware) ResetSecret(ctx context.Context, token, secret string) error {
|
|
defer func(begin time.Time) {
|
|
ms.counter.With("method", "reset_secret").Add(1)
|
|
ms.latency.With("method", "reset_secret").Observe(time.Since(begin).Seconds())
|
|
}(time.Now())
|
|
return ms.svc.ResetSecret(ctx, token, secret)
|
|
}
|
|
|
|
// SendPasswordReset instruments SendPasswordReset method with metrics.
|
|
func (ms *metricsMiddleware) SendPasswordReset(ctx context.Context, host, email, user, token string) error {
|
|
defer func(begin time.Time) {
|
|
ms.counter.With("method", "send_password_reset").Add(1)
|
|
ms.latency.With("method", "send_password_reset").Observe(time.Since(begin).Seconds())
|
|
}(time.Now())
|
|
return ms.svc.SendPasswordReset(ctx, host, email, user, token)
|
|
}
|
|
|
|
// UpdateClientOwner instruments UpdateClientOwner method with metrics.
|
|
func (ms *metricsMiddleware) UpdateClientOwner(ctx context.Context, token string, client mfclients.Client) (mfclients.Client, error) {
|
|
defer func(begin time.Time) {
|
|
ms.counter.With("method", "update_client_owner").Add(1)
|
|
ms.latency.With("method", "update_client_owner").Observe(time.Since(begin).Seconds())
|
|
}(time.Now())
|
|
return ms.svc.UpdateClientOwner(ctx, token, client)
|
|
}
|
|
|
|
// EnableClient instruments EnableClient method with metrics.
|
|
func (ms *metricsMiddleware) EnableClient(ctx context.Context, token string, id string) (mfclients.Client, error) {
|
|
defer func(begin time.Time) {
|
|
ms.counter.With("method", "enable_client").Add(1)
|
|
ms.latency.With("method", "enable_client").Observe(time.Since(begin).Seconds())
|
|
}(time.Now())
|
|
return ms.svc.EnableClient(ctx, token, id)
|
|
}
|
|
|
|
// DisableClient instruments DisableClient method with metrics.
|
|
func (ms *metricsMiddleware) DisableClient(ctx context.Context, token string, id string) (mfclients.Client, error) {
|
|
defer func(begin time.Time) {
|
|
ms.counter.With("method", "disable_client").Add(1)
|
|
ms.latency.With("method", "disable_client").Observe(time.Since(begin).Seconds())
|
|
}(time.Now())
|
|
return ms.svc.DisableClient(ctx, token, id)
|
|
}
|
|
|
|
// ListMembers instruments ListMembers method with metrics.
|
|
func (ms *metricsMiddleware) ListMembers(ctx context.Context, token, groupID string, pm mfclients.Page) (mp mfclients.MembersPage, err error) {
|
|
defer func(begin time.Time) {
|
|
ms.counter.With("method", "list_members").Add(1)
|
|
ms.latency.With("method", "list_members").Observe(time.Since(begin).Seconds())
|
|
}(time.Now())
|
|
return ms.svc.ListMembers(ctx, token, groupID, pm)
|
|
}
|
|
|
|
// Identify instruments Identify method with metrics.
|
|
func (ms *metricsMiddleware) Identify(ctx context.Context, token string) (string, error) {
|
|
defer func(begin time.Time) {
|
|
ms.counter.With("method", "identify").Add(1)
|
|
ms.latency.With("method", "identify").Observe(time.Since(begin).Seconds())
|
|
}(time.Now())
|
|
return ms.svc.Identify(ctx, token)
|
|
}
|