2019-10-07 08:14:47 -06:00
|
|
|
// Copyright (c) Mainflux
|
2018-08-26 13:15:48 +02:00
|
|
|
// SPDX-License-Identifier: Apache-2.0
|
|
|
|
|
2018-04-19 13:40:22 +02:00
|
|
|
// +build !test
|
|
|
|
|
2017-09-23 01:03:27 +02:00
|
|
|
package api
|
|
|
|
|
|
|
|
import (
|
2019-07-18 15:01:09 +02:00
|
|
|
"context"
|
2017-09-23 01:03:27 +02:00
|
|
|
"time"
|
|
|
|
|
|
|
|
"github.com/go-kit/kit/metrics"
|
2020-11-23 11:34:29 +01:00
|
|
|
"github.com/mainflux/mainflux/internal/groups"
|
2018-05-15 17:13:09 +02:00
|
|
|
"github.com/mainflux/mainflux/things"
|
2017-09-23 01:03:27 +02:00
|
|
|
)
|
|
|
|
|
2018-05-15 17:13:09 +02:00
|
|
|
var _ things.Service = (*metricsMiddleware)(nil)
|
2017-09-23 01:03:27 +02:00
|
|
|
|
2018-03-11 18:06:01 +01:00
|
|
|
type metricsMiddleware struct {
|
2017-09-23 01:03:27 +02:00
|
|
|
counter metrics.Counter
|
|
|
|
latency metrics.Histogram
|
2018-05-15 17:13:09 +02:00
|
|
|
svc things.Service
|
2017-09-23 01:03:27 +02:00
|
|
|
}
|
|
|
|
|
2018-03-11 18:06:01 +01:00
|
|
|
// MetricsMiddleware instruments core service by tracking request count and
|
2017-09-23 01:03:27 +02:00
|
|
|
// latency.
|
2018-05-15 17:13:09 +02:00
|
|
|
func MetricsMiddleware(svc things.Service, counter metrics.Counter, latency metrics.Histogram) things.Service {
|
2018-03-11 18:06:01 +01:00
|
|
|
return &metricsMiddleware{
|
2017-09-23 01:03:27 +02:00
|
|
|
counter: counter,
|
|
|
|
latency: latency,
|
2018-03-11 18:06:01 +01:00
|
|
|
svc: svc,
|
2017-09-23 01:03:27 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2019-11-04 13:14:17 -07:00
|
|
|
func (ms *metricsMiddleware) CreateThings(ctx context.Context, token string, ths ...things.Thing) (saved []things.Thing, err error) {
|
2019-10-29 05:59:54 -06:00
|
|
|
defer func(begin time.Time) {
|
|
|
|
ms.counter.With("method", "create_things").Add(1)
|
|
|
|
ms.latency.With("method", "create_things").Observe(time.Since(begin).Seconds())
|
|
|
|
}(time.Now())
|
|
|
|
|
2019-11-04 13:14:17 -07:00
|
|
|
return ms.svc.CreateThings(ctx, token, ths...)
|
2019-10-29 05:59:54 -06:00
|
|
|
}
|
|
|
|
|
2019-07-18 15:01:09 +02:00
|
|
|
func (ms *metricsMiddleware) UpdateThing(ctx context.Context, token string, thing things.Thing) error {
|
2017-09-23 01:03:27 +02:00
|
|
|
defer func(begin time.Time) {
|
2018-05-15 17:13:09 +02:00
|
|
|
ms.counter.With("method", "update_thing").Add(1)
|
|
|
|
ms.latency.With("method", "update_thing").Observe(time.Since(begin).Seconds())
|
2017-09-23 01:03:27 +02:00
|
|
|
}(time.Now())
|
|
|
|
|
2019-07-18 15:01:09 +02:00
|
|
|
return ms.svc.UpdateThing(ctx, token, thing)
|
2017-09-23 01:03:27 +02:00
|
|
|
}
|
|
|
|
|
2019-07-18 15:01:09 +02:00
|
|
|
func (ms *metricsMiddleware) UpdateKey(ctx context.Context, token, id, key string) error {
|
2019-04-25 14:37:51 +02:00
|
|
|
defer func(begin time.Time) {
|
|
|
|
ms.counter.With("method", "update_key").Add(1)
|
|
|
|
ms.latency.With("method", "update_key").Observe(time.Since(begin).Seconds())
|
|
|
|
}(time.Now())
|
|
|
|
|
2019-07-18 15:01:09 +02:00
|
|
|
return ms.svc.UpdateKey(ctx, token, id, key)
|
2019-04-25 14:37:51 +02:00
|
|
|
}
|
|
|
|
|
2019-07-18 15:01:09 +02:00
|
|
|
func (ms *metricsMiddleware) ViewThing(ctx context.Context, token, id string) (things.Thing, error) {
|
2017-09-23 01:03:27 +02:00
|
|
|
defer func(begin time.Time) {
|
2018-05-15 17:13:09 +02:00
|
|
|
ms.counter.With("method", "view_thing").Add(1)
|
|
|
|
ms.latency.With("method", "view_thing").Observe(time.Since(begin).Seconds())
|
2017-09-23 01:03:27 +02:00
|
|
|
}(time.Now())
|
|
|
|
|
2019-07-18 15:01:09 +02:00
|
|
|
return ms.svc.ViewThing(ctx, token, id)
|
2017-09-23 01:03:27 +02:00
|
|
|
}
|
|
|
|
|
2020-04-15 15:15:30 +02:00
|
|
|
func (ms *metricsMiddleware) ListThings(ctx context.Context, token string, offset, limit uint64, name string, metadata things.Metadata) (things.Page, error) {
|
2017-09-23 01:03:27 +02:00
|
|
|
defer func(begin time.Time) {
|
2018-05-15 17:13:09 +02:00
|
|
|
ms.counter.With("method", "list_things").Add(1)
|
|
|
|
ms.latency.With("method", "list_things").Observe(time.Since(begin).Seconds())
|
2017-09-23 01:03:27 +02:00
|
|
|
}(time.Now())
|
|
|
|
|
2019-09-17 13:46:24 +00:00
|
|
|
return ms.svc.ListThings(ctx, token, offset, limit, name, metadata)
|
2017-09-23 01:03:27 +02:00
|
|
|
}
|
|
|
|
|
2020-07-26 22:47:15 +02:00
|
|
|
func (ms *metricsMiddleware) ListThingsByChannel(ctx context.Context, token, id string, offset, limit uint64, connected bool) (things.Page, error) {
|
2019-01-08 11:53:24 +01:00
|
|
|
defer func(begin time.Time) {
|
|
|
|
ms.counter.With("method", "list_things_by_channel").Add(1)
|
|
|
|
ms.latency.With("method", "list_things_by_channel").Observe(time.Since(begin).Seconds())
|
|
|
|
}(time.Now())
|
|
|
|
|
2020-07-26 22:47:15 +02:00
|
|
|
return ms.svc.ListThingsByChannel(ctx, token, id, offset, limit, connected)
|
2019-01-08 11:53:24 +01:00
|
|
|
}
|
|
|
|
|
2019-07-18 15:01:09 +02:00
|
|
|
func (ms *metricsMiddleware) RemoveThing(ctx context.Context, token, id string) error {
|
2017-09-23 01:03:27 +02:00
|
|
|
defer func(begin time.Time) {
|
2018-05-15 17:13:09 +02:00
|
|
|
ms.counter.With("method", "remove_thing").Add(1)
|
|
|
|
ms.latency.With("method", "remove_thing").Observe(time.Since(begin).Seconds())
|
2017-09-23 01:03:27 +02:00
|
|
|
}(time.Now())
|
|
|
|
|
2019-07-18 15:01:09 +02:00
|
|
|
return ms.svc.RemoveThing(ctx, token, id)
|
2017-09-23 01:03:27 +02:00
|
|
|
}
|
|
|
|
|
2019-11-04 13:14:17 -07:00
|
|
|
func (ms *metricsMiddleware) CreateChannels(ctx context.Context, token string, channels ...things.Channel) (saved []things.Channel, err error) {
|
2019-10-29 05:59:54 -06:00
|
|
|
defer func(begin time.Time) {
|
|
|
|
ms.counter.With("method", "create_channels").Add(1)
|
|
|
|
ms.latency.With("method", "create_channels").Observe(time.Since(begin).Seconds())
|
|
|
|
}(time.Now())
|
|
|
|
|
2019-11-04 13:14:17 -07:00
|
|
|
return ms.svc.CreateChannels(ctx, token, channels...)
|
2019-10-29 05:59:54 -06:00
|
|
|
}
|
|
|
|
|
2019-07-18 15:01:09 +02:00
|
|
|
func (ms *metricsMiddleware) UpdateChannel(ctx context.Context, token string, channel things.Channel) error {
|
2017-09-23 01:03:27 +02:00
|
|
|
defer func(begin time.Time) {
|
|
|
|
ms.counter.With("method", "update_channel").Add(1)
|
|
|
|
ms.latency.With("method", "update_channel").Observe(time.Since(begin).Seconds())
|
|
|
|
}(time.Now())
|
|
|
|
|
2019-07-18 15:01:09 +02:00
|
|
|
return ms.svc.UpdateChannel(ctx, token, channel)
|
2017-09-23 01:03:27 +02:00
|
|
|
}
|
|
|
|
|
2019-07-18 15:01:09 +02:00
|
|
|
func (ms *metricsMiddleware) ViewChannel(ctx context.Context, token, id string) (things.Channel, error) {
|
2017-09-23 01:03:27 +02:00
|
|
|
defer func(begin time.Time) {
|
|
|
|
ms.counter.With("method", "view_channel").Add(1)
|
|
|
|
ms.latency.With("method", "view_channel").Observe(time.Since(begin).Seconds())
|
|
|
|
}(time.Now())
|
|
|
|
|
2019-07-18 15:01:09 +02:00
|
|
|
return ms.svc.ViewChannel(ctx, token, id)
|
2017-09-23 01:03:27 +02:00
|
|
|
}
|
|
|
|
|
2019-10-01 14:12:52 +02:00
|
|
|
func (ms *metricsMiddleware) ListChannels(ctx context.Context, token string, offset, limit uint64, name string, metadata things.Metadata) (things.ChannelsPage, error) {
|
2017-09-23 01:03:27 +02:00
|
|
|
defer func(begin time.Time) {
|
|
|
|
ms.counter.With("method", "list_channels").Add(1)
|
|
|
|
ms.latency.With("method", "list_channels").Observe(time.Since(begin).Seconds())
|
|
|
|
}(time.Now())
|
|
|
|
|
2019-10-01 14:12:52 +02:00
|
|
|
return ms.svc.ListChannels(ctx, token, offset, limit, name, metadata)
|
2017-09-23 01:03:27 +02:00
|
|
|
}
|
|
|
|
|
2020-07-26 22:47:15 +02:00
|
|
|
func (ms *metricsMiddleware) ListChannelsByThing(ctx context.Context, token, id string, offset, limit uint64, connected bool) (things.ChannelsPage, error) {
|
2019-01-08 11:53:24 +01:00
|
|
|
defer func(begin time.Time) {
|
|
|
|
ms.counter.With("method", "list_channels_by_thing").Add(1)
|
|
|
|
ms.latency.With("method", "list_channels_by_thing").Observe(time.Since(begin).Seconds())
|
|
|
|
}(time.Now())
|
|
|
|
|
2020-07-26 22:47:15 +02:00
|
|
|
return ms.svc.ListChannelsByThing(ctx, token, id, offset, limit, connected)
|
2019-01-08 11:53:24 +01:00
|
|
|
}
|
|
|
|
|
2019-07-18 15:01:09 +02:00
|
|
|
func (ms *metricsMiddleware) RemoveChannel(ctx context.Context, token, id string) error {
|
2017-09-23 01:03:27 +02:00
|
|
|
defer func(begin time.Time) {
|
|
|
|
ms.counter.With("method", "remove_channel").Add(1)
|
|
|
|
ms.latency.With("method", "remove_channel").Observe(time.Since(begin).Seconds())
|
|
|
|
}(time.Now())
|
|
|
|
|
2019-07-18 15:01:09 +02:00
|
|
|
return ms.svc.RemoveChannel(ctx, token, id)
|
2017-09-23 01:03:27 +02:00
|
|
|
}
|
|
|
|
|
2019-11-15 10:44:31 -07:00
|
|
|
func (ms *metricsMiddleware) Connect(ctx context.Context, token string, chIDs, thIDs []string) error {
|
2018-03-11 18:06:01 +01:00
|
|
|
defer func(begin time.Time) {
|
|
|
|
ms.counter.With("method", "connect").Add(1)
|
|
|
|
ms.latency.With("method", "connect").Observe(time.Since(begin).Seconds())
|
|
|
|
}(time.Now())
|
|
|
|
|
2019-11-15 10:44:31 -07:00
|
|
|
return ms.svc.Connect(ctx, token, chIDs, thIDs)
|
2018-03-11 18:06:01 +01:00
|
|
|
}
|
|
|
|
|
2019-07-18 15:01:09 +02:00
|
|
|
func (ms *metricsMiddleware) Disconnect(ctx context.Context, token, chanID, thingID string) error {
|
2018-03-11 18:06:01 +01:00
|
|
|
defer func(begin time.Time) {
|
|
|
|
ms.counter.With("method", "disconnect").Add(1)
|
|
|
|
ms.latency.With("method", "disconnect").Observe(time.Since(begin).Seconds())
|
|
|
|
}(time.Now())
|
|
|
|
|
2019-07-18 15:01:09 +02:00
|
|
|
return ms.svc.Disconnect(ctx, token, chanID, thingID)
|
2017-12-29 10:47:43 +01:00
|
|
|
}
|
|
|
|
|
2019-10-21 15:24:45 -06:00
|
|
|
func (ms *metricsMiddleware) CanAccessByKey(ctx context.Context, id, key string) (string, error) {
|
2017-09-23 01:03:27 +02:00
|
|
|
defer func(begin time.Time) {
|
2019-10-21 15:24:45 -06:00
|
|
|
ms.counter.With("method", "can_access_by_key").Add(1)
|
|
|
|
ms.latency.With("method", "can_access_by_key").Observe(time.Since(begin).Seconds())
|
2017-09-23 01:03:27 +02:00
|
|
|
}(time.Now())
|
|
|
|
|
2019-10-21 15:24:45 -06:00
|
|
|
return ms.svc.CanAccessByKey(ctx, id, key)
|
2017-09-23 01:03:27 +02:00
|
|
|
}
|
2018-05-17 20:17:02 +02:00
|
|
|
|
2019-07-18 15:01:09 +02:00
|
|
|
func (ms *metricsMiddleware) CanAccessByID(ctx context.Context, chanID, thingID string) error {
|
2019-07-15 18:28:15 +02:00
|
|
|
defer func(begin time.Time) {
|
|
|
|
ms.counter.With("method", "can_access_by_id").Add(1)
|
|
|
|
ms.latency.With("method", "can_access_by_id").Observe(time.Since(begin).Seconds())
|
|
|
|
}(time.Now())
|
|
|
|
|
2019-07-18 15:01:09 +02:00
|
|
|
return ms.svc.CanAccessByID(ctx, chanID, thingID)
|
2019-07-15 18:28:15 +02:00
|
|
|
}
|
|
|
|
|
2019-07-18 15:01:09 +02:00
|
|
|
func (ms *metricsMiddleware) Identify(ctx context.Context, key string) (string, error) {
|
2018-05-17 20:17:02 +02:00
|
|
|
defer func(begin time.Time) {
|
|
|
|
ms.counter.With("method", "identify").Add(1)
|
|
|
|
ms.latency.With("method", "identify").Observe(time.Since(begin).Seconds())
|
|
|
|
}(time.Now())
|
|
|
|
|
2019-07-18 15:01:09 +02:00
|
|
|
return ms.svc.Identify(ctx, key)
|
2018-05-17 20:17:02 +02:00
|
|
|
}
|
2020-11-23 11:34:29 +01:00
|
|
|
|
|
|
|
func (ms *metricsMiddleware) CreateGroup(ctx context.Context, token string, g groups.Group) (id string, err error) {
|
|
|
|
defer func(begin time.Time) {
|
|
|
|
ms.counter.With("method", "create_group").Add(1)
|
|
|
|
ms.latency.With("method", "create_group").Observe(time.Since(begin).Seconds())
|
|
|
|
}(time.Now())
|
|
|
|
return ms.svc.CreateGroup(ctx, token, g)
|
|
|
|
}
|
|
|
|
|
|
|
|
func (ms *metricsMiddleware) UpdateGroup(ctx context.Context, token string, g groups.Group) (gr groups.Group, err error) {
|
|
|
|
defer func(begin time.Time) {
|
|
|
|
ms.counter.With("method", "update_group").Add(1)
|
|
|
|
ms.latency.With("method", "update_group").Observe(time.Since(begin).Seconds())
|
|
|
|
}(time.Now())
|
|
|
|
return ms.svc.UpdateGroup(ctx, token, g)
|
|
|
|
}
|
|
|
|
|
|
|
|
func (ms *metricsMiddleware) RemoveGroup(ctx context.Context, token string, id string) (err error) {
|
|
|
|
defer func(begin time.Time) {
|
|
|
|
ms.counter.With("method", "remove_group").Add(1)
|
|
|
|
ms.latency.With("method", "remove_group").Observe(time.Since(begin).Seconds())
|
|
|
|
}(time.Now())
|
|
|
|
return ms.svc.RemoveGroup(ctx, token, id)
|
|
|
|
}
|
|
|
|
|
|
|
|
func (ms *metricsMiddleware) ViewGroup(ctx context.Context, token, id string) (g groups.Group, err error) {
|
|
|
|
defer func(begin time.Time) {
|
|
|
|
ms.counter.With("method", "view_group").Add(1)
|
|
|
|
ms.latency.With("method", "view_group").Observe(time.Since(begin).Seconds())
|
|
|
|
}(time.Now())
|
|
|
|
|
|
|
|
return ms.svc.ViewGroup(ctx, token, id)
|
|
|
|
}
|
|
|
|
|
|
|
|
func (ms *metricsMiddleware) ListGroups(ctx context.Context, token string, level uint64, gm groups.Metadata) (gp groups.GroupPage, err error) {
|
|
|
|
defer func(begin time.Time) {
|
|
|
|
ms.counter.With("method", "list_groups").Add(1)
|
|
|
|
ms.latency.With("method", "list_groups").Observe(time.Since(begin).Seconds())
|
|
|
|
}(time.Now())
|
|
|
|
|
|
|
|
return ms.svc.ListGroups(ctx, token, level, gm)
|
|
|
|
}
|
|
|
|
|
|
|
|
func (ms *metricsMiddleware) ListParents(ctx context.Context, token, childID string, level uint64, gm groups.Metadata) (gp groups.GroupPage, err error) {
|
|
|
|
defer func(begin time.Time) {
|
|
|
|
ms.counter.With("method", "parents").Add(1)
|
|
|
|
ms.latency.With("method", "parents").Observe(time.Since(begin).Seconds())
|
|
|
|
}(time.Now())
|
|
|
|
|
|
|
|
return ms.svc.ListParents(ctx, token, childID, level, gm)
|
|
|
|
}
|
|
|
|
|
|
|
|
func (ms *metricsMiddleware) ListChildren(ctx context.Context, token, parentID string, level uint64, gm groups.Metadata) (gp groups.GroupPage, err error) {
|
|
|
|
defer func(begin time.Time) {
|
|
|
|
ms.counter.With("method", "list_children").Add(1)
|
|
|
|
ms.latency.With("method", "list_children").Observe(time.Since(begin).Seconds())
|
|
|
|
}(time.Now())
|
|
|
|
|
|
|
|
return ms.svc.ListChildren(ctx, token, parentID, level, gm)
|
|
|
|
}
|
|
|
|
|
|
|
|
func (ms *metricsMiddleware) ListMembers(ctx context.Context, token, groupID string, offset, limit uint64, gm groups.Metadata) (gp groups.MemberPage, 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, offset, limit, gm)
|
|
|
|
}
|
|
|
|
|
|
|
|
func (ms *metricsMiddleware) ListMemberships(ctx context.Context, token, groupID string, offset, limit uint64, gm groups.Metadata) (gp groups.GroupPage, err error) {
|
|
|
|
defer func(begin time.Time) {
|
|
|
|
ms.counter.With("method", "list_memberships").Add(1)
|
|
|
|
ms.latency.With("method", "list_memberships").Observe(time.Since(begin).Seconds())
|
|
|
|
}(time.Now())
|
|
|
|
|
|
|
|
return ms.svc.ListMemberships(ctx, token, groupID, offset, limit, gm)
|
|
|
|
}
|
|
|
|
|
|
|
|
func (ms *metricsMiddleware) Assign(ctx context.Context, token, memberID, groupID string) (err error) {
|
|
|
|
defer func(begin time.Time) {
|
|
|
|
ms.counter.With("method", "assign").Add(1)
|
|
|
|
ms.latency.With("method", "assign").Observe(time.Since(begin).Seconds())
|
|
|
|
}(time.Now())
|
|
|
|
|
|
|
|
return ms.svc.Assign(ctx, token, memberID, groupID)
|
|
|
|
}
|
|
|
|
|
|
|
|
func (ms *metricsMiddleware) Unassign(ctx context.Context, token, memberID, groupID string) (err error) {
|
|
|
|
defer func(begin time.Time) {
|
|
|
|
ms.counter.With("method", "unassign").Add(1)
|
|
|
|
ms.latency.With("method", "unassign").Observe(time.Since(begin).Seconds())
|
|
|
|
}(time.Now())
|
|
|
|
|
|
|
|
return ms.svc.Unassign(ctx, token, memberID, groupID)
|
|
|
|
}
|