Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
C
canifa_note
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Vũ Hoàng Anh
canifa_note
Commits
b0f52ade
Commit
b0f52ade
authored
Feb 24, 2024
by
Steven
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
chore: remove metric service
parent
222d04fb
Changes
13
Hide whitespace changes
Inline
Side-by-side
Showing
13 changed files
with
1 addition
and
96 deletions
+1
-96
memo.go
api/v1/memo.go
+0
-4
resource.go
api/v1/resource.go
+0
-3
user.go
api/v1/user.go
+0
-2
auth_service.go
api/v2/auth_service.go
+0
-3
memo_service.go
api/v2/memo_service.go
+0
-4
resource_service.go
api/v2/resource_service.go
+0
-2
main.go
bin/memos/main.go
+1
-15
go.mod
go.mod
+0
-1
go.sum
go.sum
+0
-3
telegram.go
server/integration/telegram.go
+0
-2
profile.go
server/profile/profile.go
+0
-2
server.go
server/server.go
+0
-3
metric.go
server/service/metric/metric.go
+0
-52
No files found.
api/v1/memo.go
View file @
b0f52ade
...
@@ -17,7 +17,6 @@ import (
...
@@ -17,7 +17,6 @@ import (
"github.com/usememos/memos/internal/util"
"github.com/usememos/memos/internal/util"
"github.com/usememos/memos/plugin/webhook"
"github.com/usememos/memos/plugin/webhook"
storepb
"github.com/usememos/memos/proto/gen/store"
storepb
"github.com/usememos/memos/proto/gen/store"
"github.com/usememos/memos/server/service/metric"
"github.com/usememos/memos/store"
"github.com/usememos/memos/store"
)
)
...
@@ -351,7 +350,6 @@ func (s *APIV1Service) CreateMemo(c echo.Context) error {
...
@@ -351,7 +350,6 @@ func (s *APIV1Service) CreateMemo(c echo.Context) error {
if
err
!=
nil
{
if
err
!=
nil
{
return
echo
.
NewHTTPError
(
http
.
StatusInternalServerError
,
"Failed to create activity"
)
.
SetInternal
(
err
)
return
echo
.
NewHTTPError
(
http
.
StatusInternalServerError
,
"Failed to create activity"
)
.
SetInternal
(
err
)
}
}
metric
.
Enqueue
(
"memo comment create"
)
if
_
,
err
:=
s
.
Store
.
CreateInbox
(
ctx
,
&
store
.
Inbox
{
if
_
,
err
:=
s
.
Store
.
CreateInbox
(
ctx
,
&
store
.
Inbox
{
SenderID
:
memo
.
CreatorID
,
SenderID
:
memo
.
CreatorID
,
ReceiverID
:
relatedMemo
.
CreatorID
,
ReceiverID
:
relatedMemo
.
CreatorID
,
...
@@ -410,7 +408,6 @@ func (s *APIV1Service) CreateMemo(c echo.Context) error {
...
@@ -410,7 +408,6 @@ func (s *APIV1Service) CreateMemo(c echo.Context) error {
log
.
Warn
(
"Failed to dispatch memo created webhook"
,
zap
.
Error
(
err
))
log
.
Warn
(
"Failed to dispatch memo created webhook"
,
zap
.
Error
(
err
))
}
}
metric
.
Enqueue
(
"memo create"
)
return
c
.
JSON
(
http
.
StatusOK
,
memoResponse
)
return
c
.
JSON
(
http
.
StatusOK
,
memoResponse
)
}
}
...
@@ -1011,7 +1008,6 @@ func (s *APIV1Service) dispatchMemoRelatedWebhook(ctx context.Context, memo *Mem
...
@@ -1011,7 +1008,6 @@ func (s *APIV1Service) dispatchMemoRelatedWebhook(ctx context.Context, memo *Mem
if
err
!=
nil
{
if
err
!=
nil
{
return
err
return
err
}
}
metric
.
Enqueue
(
"webhook dispatch"
)
for
_
,
hook
:=
range
webhooks
{
for
_
,
hook
:=
range
webhooks
{
payload
:=
convertMemoToWebhookPayload
(
memo
)
payload
:=
convertMemoToWebhookPayload
(
memo
)
payload
.
ActivityType
=
activityType
payload
.
ActivityType
=
activityType
...
...
api/v1/resource.go
View file @
b0f52ade
...
@@ -22,7 +22,6 @@ import (
...
@@ -22,7 +22,6 @@ import (
"github.com/usememos/memos/internal/log"
"github.com/usememos/memos/internal/log"
"github.com/usememos/memos/internal/util"
"github.com/usememos/memos/internal/util"
"github.com/usememos/memos/plugin/storage/s3"
"github.com/usememos/memos/plugin/storage/s3"
"github.com/usememos/memos/server/service/metric"
"github.com/usememos/memos/store"
"github.com/usememos/memos/store"
)
)
...
@@ -162,7 +161,6 @@ func (s *APIV1Service) CreateResource(c echo.Context) error {
...
@@ -162,7 +161,6 @@ func (s *APIV1Service) CreateResource(c echo.Context) error {
if
err
!=
nil
{
if
err
!=
nil
{
return
echo
.
NewHTTPError
(
http
.
StatusInternalServerError
,
"Failed to create resource"
)
.
SetInternal
(
err
)
return
echo
.
NewHTTPError
(
http
.
StatusInternalServerError
,
"Failed to create resource"
)
.
SetInternal
(
err
)
}
}
metric
.
Enqueue
(
"resource create"
)
return
c
.
JSON
(
http
.
StatusOK
,
convertResourceFromStore
(
resource
))
return
c
.
JSON
(
http
.
StatusOK
,
convertResourceFromStore
(
resource
))
}
}
...
@@ -240,7 +238,6 @@ func (s *APIV1Service) UploadResource(c echo.Context) error {
...
@@ -240,7 +238,6 @@ func (s *APIV1Service) UploadResource(c echo.Context) error {
if
err
!=
nil
{
if
err
!=
nil
{
return
echo
.
NewHTTPError
(
http
.
StatusInternalServerError
,
"Failed to create resource"
)
.
SetInternal
(
err
)
return
echo
.
NewHTTPError
(
http
.
StatusInternalServerError
,
"Failed to create resource"
)
.
SetInternal
(
err
)
}
}
metric
.
Enqueue
(
"resource create"
)
return
c
.
JSON
(
http
.
StatusOK
,
convertResourceFromStore
(
resource
))
return
c
.
JSON
(
http
.
StatusOK
,
convertResourceFromStore
(
resource
))
}
}
...
...
api/v1/user.go
View file @
b0f52ade
...
@@ -12,7 +12,6 @@ import (
...
@@ -12,7 +12,6 @@ import (
"golang.org/x/crypto/bcrypt"
"golang.org/x/crypto/bcrypt"
"github.com/usememos/memos/internal/util"
"github.com/usememos/memos/internal/util"
"github.com/usememos/memos/server/service/metric"
"github.com/usememos/memos/store"
"github.com/usememos/memos/store"
)
)
...
@@ -183,7 +182,6 @@ func (s *APIV1Service) CreateUser(c echo.Context) error {
...
@@ -183,7 +182,6 @@ func (s *APIV1Service) CreateUser(c echo.Context) error {
}
}
userMessage
:=
convertUserFromStore
(
user
)
userMessage
:=
convertUserFromStore
(
user
)
metric
.
Enqueue
(
"user create"
)
return
c
.
JSON
(
http
.
StatusOK
,
userMessage
)
return
c
.
JSON
(
http
.
StatusOK
,
userMessage
)
}
}
...
...
api/v2/auth_service.go
View file @
b0f52ade
...
@@ -19,7 +19,6 @@ import (
...
@@ -19,7 +19,6 @@ import (
"github.com/usememos/memos/plugin/idp"
"github.com/usememos/memos/plugin/idp"
"github.com/usememos/memos/plugin/idp/oauth2"
"github.com/usememos/memos/plugin/idp/oauth2"
apiv2pb
"github.com/usememos/memos/proto/gen/api/v2"
apiv2pb
"github.com/usememos/memos/proto/gen/api/v2"
"github.com/usememos/memos/server/service/metric"
"github.com/usememos/memos/store"
"github.com/usememos/memos/store"
)
)
...
@@ -168,7 +167,6 @@ func (s *APIV2Service) doSignIn(ctx context.Context, user *store.User, expireTim
...
@@ -168,7 +167,6 @@ func (s *APIV2Service) doSignIn(ctx context.Context, user *store.User, expireTim
return
status
.
Errorf
(
codes
.
Internal
,
"failed to set grpc header, error: %v"
,
err
)
return
status
.
Errorf
(
codes
.
Internal
,
"failed to set grpc header, error: %v"
,
err
)
}
}
metric
.
Enqueue
(
"user sign in"
)
return
nil
return
nil
}
}
...
@@ -214,7 +212,6 @@ func (s *APIV2Service) SignUp(ctx context.Context, request *apiv2pb.SignUpReques
...
@@ -214,7 +212,6 @@ func (s *APIV2Service) SignUp(ctx context.Context, request *apiv2pb.SignUpReques
if
err
:=
s
.
doSignIn
(
ctx
,
user
,
time
.
Now
()
.
Add
(
auth
.
AccessTokenDuration
));
err
!=
nil
{
if
err
:=
s
.
doSignIn
(
ctx
,
user
,
time
.
Now
()
.
Add
(
auth
.
AccessTokenDuration
));
err
!=
nil
{
return
nil
,
status
.
Errorf
(
codes
.
Internal
,
fmt
.
Sprintf
(
"failed to sign in, err: %s"
,
err
))
return
nil
,
status
.
Errorf
(
codes
.
Internal
,
fmt
.
Sprintf
(
"failed to sign in, err: %s"
,
err
))
}
}
metric
.
Enqueue
(
"user sign up"
)
return
&
apiv2pb
.
SignUpResponse
{
return
&
apiv2pb
.
SignUpResponse
{
User
:
convertUserFromStore
(
user
),
User
:
convertUserFromStore
(
user
),
},
nil
},
nil
...
...
api/v2/memo_service.go
View file @
b0f52ade
...
@@ -23,7 +23,6 @@ import (
...
@@ -23,7 +23,6 @@ import (
"github.com/usememos/memos/plugin/webhook"
"github.com/usememos/memos/plugin/webhook"
apiv2pb
"github.com/usememos/memos/proto/gen/api/v2"
apiv2pb
"github.com/usememos/memos/proto/gen/api/v2"
storepb
"github.com/usememos/memos/proto/gen/store"
storepb
"github.com/usememos/memos/proto/gen/store"
"github.com/usememos/memos/server/service/metric"
"github.com/usememos/memos/store"
"github.com/usememos/memos/store"
)
)
...
@@ -64,7 +63,6 @@ func (s *APIV2Service) CreateMemo(ctx context.Context, request *apiv2pb.CreateMe
...
@@ -64,7 +63,6 @@ func (s *APIV2Service) CreateMemo(ctx context.Context, request *apiv2pb.CreateMe
if
err
!=
nil
{
if
err
!=
nil
{
return
nil
,
err
return
nil
,
err
}
}
metric
.
Enqueue
(
"memo create"
)
memoMessage
,
err
:=
s
.
convertMemoFromStore
(
ctx
,
memo
)
memoMessage
,
err
:=
s
.
convertMemoFromStore
(
ctx
,
memo
)
if
err
!=
nil
{
if
err
!=
nil
{
...
@@ -371,7 +369,6 @@ func (s *APIV2Service) CreateMemoComment(ctx context.Context, request *apiv2pb.C
...
@@ -371,7 +369,6 @@ func (s *APIV2Service) CreateMemoComment(ctx context.Context, request *apiv2pb.C
return
nil
,
status
.
Errorf
(
codes
.
Internal
,
"failed to create inbox"
)
return
nil
,
status
.
Errorf
(
codes
.
Internal
,
"failed to create inbox"
)
}
}
}
}
metric
.
Enqueue
(
"memo comment create"
)
response
:=
&
apiv2pb
.
CreateMemoCommentResponse
{
response
:=
&
apiv2pb
.
CreateMemoCommentResponse
{
Memo
:
memo
,
Memo
:
memo
,
...
@@ -806,7 +803,6 @@ func (s *APIV2Service) dispatchMemoRelatedWebhook(ctx context.Context, memo *api
...
@@ -806,7 +803,6 @@ func (s *APIV2Service) dispatchMemoRelatedWebhook(ctx context.Context, memo *api
if
err
!=
nil
{
if
err
!=
nil
{
return
err
return
err
}
}
metric
.
Enqueue
(
"webhook dispatch"
)
for
_
,
hook
:=
range
webhooks
{
for
_
,
hook
:=
range
webhooks
{
payload
:=
convertMemoToWebhookPayload
(
memo
)
payload
:=
convertMemoToWebhookPayload
(
memo
)
payload
.
ActivityType
=
activityType
payload
.
ActivityType
=
activityType
...
...
api/v2/resource_service.go
View file @
b0f52ade
...
@@ -11,7 +11,6 @@ import (
...
@@ -11,7 +11,6 @@ import (
"google.golang.org/protobuf/types/known/timestamppb"
"google.golang.org/protobuf/types/known/timestamppb"
apiv2pb
"github.com/usememos/memos/proto/gen/api/v2"
apiv2pb
"github.com/usememos/memos/proto/gen/api/v2"
"github.com/usememos/memos/server/service/metric"
"github.com/usememos/memos/store"
"github.com/usememos/memos/store"
)
)
...
@@ -46,7 +45,6 @@ func (s *APIV2Service) CreateResource(ctx context.Context, request *apiv2pb.Crea
...
@@ -46,7 +45,6 @@ func (s *APIV2Service) CreateResource(ctx context.Context, request *apiv2pb.Crea
return
nil
,
status
.
Errorf
(
codes
.
Internal
,
"failed to create resource: %v"
,
err
)
return
nil
,
status
.
Errorf
(
codes
.
Internal
,
"failed to create resource: %v"
,
err
)
}
}
metric
.
Enqueue
(
"resource create"
)
return
&
apiv2pb
.
CreateResourceResponse
{
return
&
apiv2pb
.
CreateResourceResponse
{
Resource
:
s
.
convertResourceFromStore
(
ctx
,
resource
),
Resource
:
s
.
convertResourceFromStore
(
ctx
,
resource
),
},
nil
},
nil
...
...
bin/memos/main.go
View file @
b0f52ade
...
@@ -16,7 +16,6 @@ import (
...
@@ -16,7 +16,6 @@ import (
"github.com/usememos/memos/internal/log"
"github.com/usememos/memos/internal/log"
"github.com/usememos/memos/server"
"github.com/usememos/memos/server"
_profile
"github.com/usememos/memos/server/profile"
_profile
"github.com/usememos/memos/server/profile"
"github.com/usememos/memos/server/service/metric"
"github.com/usememos/memos/store"
"github.com/usememos/memos/store"
"github.com/usememos/memos/store/db"
"github.com/usememos/memos/store/db"
)
)
...
@@ -41,7 +40,6 @@ var (
...
@@ -41,7 +40,6 @@ var (
driver
string
driver
string
dsn
string
dsn
string
serveFrontend
bool
serveFrontend
bool
enableMetric
bool
rootCmd
=
&
cobra
.
Command
{
rootCmd
=
&
cobra
.
Command
{
Use
:
"memos"
,
Use
:
"memos"
,
...
@@ -74,11 +72,6 @@ var (
...
@@ -74,11 +72,6 @@ var (
return
return
}
}
if
profile
.
Metric
{
// nolint
metric
.
NewMetricClient
(
s
.
ID
,
*
profile
)
}
c
:=
make
(
chan
os
.
Signal
,
1
)
c
:=
make
(
chan
os
.
Signal
,
1
)
// Trigger graceful shutdown on SIGINT or SIGTERM.
// Trigger graceful shutdown on SIGINT or SIGTERM.
// The default signal sent by the `kill` command is SIGTERM,
// The default signal sent by the `kill` command is SIGTERM,
...
@@ -124,7 +117,6 @@ func init() {
...
@@ -124,7 +117,6 @@ func init() {
rootCmd
.
PersistentFlags
()
.
StringVarP
(
&
driver
,
"driver"
,
""
,
""
,
"database driver"
)
rootCmd
.
PersistentFlags
()
.
StringVarP
(
&
driver
,
"driver"
,
""
,
""
,
"database driver"
)
rootCmd
.
PersistentFlags
()
.
StringVarP
(
&
dsn
,
"dsn"
,
""
,
""
,
"database source name(aka. DSN)"
)
rootCmd
.
PersistentFlags
()
.
StringVarP
(
&
dsn
,
"dsn"
,
""
,
""
,
"database source name(aka. DSN)"
)
rootCmd
.
PersistentFlags
()
.
BoolVarP
(
&
serveFrontend
,
"frontend"
,
""
,
true
,
"serve frontend files"
)
rootCmd
.
PersistentFlags
()
.
BoolVarP
(
&
serveFrontend
,
"frontend"
,
""
,
true
,
"serve frontend files"
)
rootCmd
.
PersistentFlags
()
.
BoolVarP
(
&
enableMetric
,
"metric"
,
""
,
true
,
"allow metric collection"
)
err
:=
viper
.
BindPFlag
(
"mode"
,
rootCmd
.
PersistentFlags
()
.
Lookup
(
"mode"
))
err
:=
viper
.
BindPFlag
(
"mode"
,
rootCmd
.
PersistentFlags
()
.
Lookup
(
"mode"
))
if
err
!=
nil
{
if
err
!=
nil
{
...
@@ -154,17 +146,12 @@ func init() {
...
@@ -154,17 +146,12 @@ func init() {
if
err
!=
nil
{
if
err
!=
nil
{
panic
(
err
)
panic
(
err
)
}
}
err
=
viper
.
BindPFlag
(
"metric"
,
rootCmd
.
PersistentFlags
()
.
Lookup
(
"metric"
))
if
err
!=
nil
{
panic
(
err
)
}
viper
.
SetDefault
(
"mode"
,
"demo"
)
viper
.
SetDefault
(
"mode"
,
"demo"
)
viper
.
SetDefault
(
"driver"
,
"sqlite"
)
viper
.
SetDefault
(
"driver"
,
"sqlite"
)
viper
.
SetDefault
(
"addr"
,
""
)
viper
.
SetDefault
(
"addr"
,
""
)
viper
.
SetDefault
(
"port"
,
8081
)
viper
.
SetDefault
(
"port"
,
8081
)
viper
.
SetDefault
(
"frontend"
,
true
)
viper
.
SetDefault
(
"frontend"
,
true
)
viper
.
SetDefault
(
"metric"
,
true
)
viper
.
SetEnvPrefix
(
"memos"
)
viper
.
SetEnvPrefix
(
"memos"
)
}
}
...
@@ -187,9 +174,8 @@ port: %d
...
@@ -187,9 +174,8 @@ port: %d
mode: %s
mode: %s
driver: %s
driver: %s
frontend: %t
frontend: %t
metric: %t
---
---
`
,
profile
.
Version
,
profile
.
Data
,
profile
.
DSN
,
profile
.
Addr
,
profile
.
Port
,
profile
.
Mode
,
profile
.
Driver
,
profile
.
Frontend
,
profile
.
Metric
)
`
,
profile
.
Version
,
profile
.
Data
,
profile
.
DSN
,
profile
.
Addr
,
profile
.
Port
,
profile
.
Mode
,
profile
.
Driver
,
profile
.
Frontend
)
}
}
func
printGreetings
()
{
func
printGreetings
()
{
...
...
go.mod
View file @
b0f52ade
...
@@ -102,7 +102,6 @@ require (
...
@@ -102,7 +102,6 @@ require (
github.com/mitchellh/mapstructure v1.5.0 // indirect
github.com/mitchellh/mapstructure v1.5.0 // indirect
github.com/pelletier/go-toml/v2 v2.1.1 // indirect
github.com/pelletier/go-toml/v2 v2.1.1 // indirect
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
github.com/posthog/posthog-go v0.0.0-20240208111551-abe6962c309e
github.com/spf13/afero v1.11.0 // indirect
github.com/spf13/afero v1.11.0 // indirect
github.com/spf13/cast v1.6.0 // indirect
github.com/spf13/cast v1.6.0 // indirect
github.com/spf13/pflag v1.0.5 // indirect
github.com/spf13/pflag v1.0.5 // indirect
...
...
go.sum
View file @
b0f52ade
...
@@ -367,8 +367,6 @@ github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZN
...
@@ -367,8 +367,6 @@ github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZN
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U=
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U=
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI=
github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI=
github.com/posthog/posthog-go v0.0.0-20240208111551-abe6962c309e h1:Cks+ATHSvyId+c4XOTdvVomE2Srb6WFlkXljYZddOEw=
github.com/posthog/posthog-go v0.0.0-20240208111551-abe6962c309e/go.mod h1:migYMxlAqcnQy+3eN8mcL0b2tpKy6R+8Zc0lxwk4dKM=
github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=
github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=
github.com/prometheus/client_golang v0.9.3-0.20190127221311-3c4408c8b829/go.mod h1:p2iRAGwDERtqlqzRXnrOVns+ignqQo//hLXqYxZYVNs=
github.com/prometheus/client_golang v0.9.3-0.20190127221311-3c4408c8b829/go.mod h1:p2iRAGwDERtqlqzRXnrOVns+ignqQo//hLXqYxZYVNs=
github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo=
github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo=
...
@@ -460,7 +458,6 @@ github.com/ugorji/go v1.1.7/go.mod h1:kZn38zHttfInRq0xu/PH0az30d+z6vm202qpg1oXVM
...
@@ -460,7 +458,6 @@ github.com/ugorji/go v1.1.7/go.mod h1:kZn38zHttfInRq0xu/PH0az30d+z6vm202qpg1oXVM
github.com/ugorji/go/codec v1.1.7/go.mod h1:Ax+UKWsSmolVDwsd+7N3ZtXu+yMGCf907BLYF3GoBXY=
github.com/ugorji/go/codec v1.1.7/go.mod h1:Ax+UKWsSmolVDwsd+7N3ZtXu+yMGCf907BLYF3GoBXY=
github.com/urfave/cli v1.20.0/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijbERA=
github.com/urfave/cli v1.20.0/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijbERA=
github.com/urfave/cli v1.22.1/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0=
github.com/urfave/cli v1.22.1/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0=
github.com/urfave/cli v1.22.5/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0=
github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw=
github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw=
github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc=
github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc=
github.com/valyala/fasttemplate v1.2.2 h1:lxLXG0uE3Qnshl9QyaK6XJxMXlQZELvChBOCmQD0Loo=
github.com/valyala/fasttemplate v1.2.2 h1:lxLXG0uE3Qnshl9QyaK6XJxMXlQZELvChBOCmQD0Loo=
...
...
server/integration/telegram.go
View file @
b0f52ade
...
@@ -16,7 +16,6 @@ import (
...
@@ -16,7 +16,6 @@ import (
"github.com/usememos/memos/plugin/telegram"
"github.com/usememos/memos/plugin/telegram"
"github.com/usememos/memos/plugin/webhook"
"github.com/usememos/memos/plugin/webhook"
storepb
"github.com/usememos/memos/proto/gen/store"
storepb
"github.com/usememos/memos/proto/gen/store"
"github.com/usememos/memos/server/service/metric"
"github.com/usememos/memos/store"
"github.com/usememos/memos/store"
)
)
...
@@ -231,7 +230,6 @@ func (t *TelegramHandler) dispatchMemoRelatedWebhook(ctx context.Context, memo s
...
@@ -231,7 +230,6 @@ func (t *TelegramHandler) dispatchMemoRelatedWebhook(ctx context.Context, memo s
if
err
!=
nil
{
if
err
!=
nil
{
return
err
return
err
}
}
metric
.
Enqueue
(
"webhook dispatch"
)
for
_
,
hook
:=
range
webhooks
{
for
_
,
hook
:=
range
webhooks
{
payload
:=
t
.
convertMemoToWebhookPayload
(
ctx
,
memo
)
payload
:=
t
.
convertMemoToWebhookPayload
(
ctx
,
memo
)
payload
.
ActivityType
=
activityType
payload
.
ActivityType
=
activityType
...
...
server/profile/profile.go
View file @
b0f52ade
...
@@ -32,8 +32,6 @@ type Profile struct {
...
@@ -32,8 +32,6 @@ type Profile struct {
Version
string
`json:"version"`
Version
string
`json:"version"`
// Frontend indicate the frontend is enabled or not
// Frontend indicate the frontend is enabled or not
Frontend
bool
`json:"-"`
Frontend
bool
`json:"-"`
// Metric indicate the metric collection is enabled or not
Metric
bool
`json:"-"`
}
}
func
(
p
*
Profile
)
IsDev
()
bool
{
func
(
p
*
Profile
)
IsDev
()
bool
{
...
...
server/server.go
View file @
b0f52ade
...
@@ -18,7 +18,6 @@ import (
...
@@ -18,7 +18,6 @@ import (
"github.com/usememos/memos/server/frontend"
"github.com/usememos/memos/server/frontend"
"github.com/usememos/memos/server/integration"
"github.com/usememos/memos/server/integration"
"github.com/usememos/memos/server/profile"
"github.com/usememos/memos/server/profile"
"github.com/usememos/memos/server/service/metric"
versionchecker
"github.com/usememos/memos/server/service/version_checker"
versionchecker
"github.com/usememos/memos/server/service/version_checker"
"github.com/usememos/memos/store"
"github.com/usememos/memos/store"
)
)
...
@@ -106,8 +105,6 @@ func NewServer(ctx context.Context, profile *profile.Profile, store *store.Store
...
@@ -106,8 +105,6 @@ func NewServer(ctx context.Context, profile *profile.Profile, store *store.Store
func
(
s
*
Server
)
Start
(
ctx
context
.
Context
)
error
{
func
(
s
*
Server
)
Start
(
ctx
context
.
Context
)
error
{
go
versionchecker
.
NewVersionChecker
(
s
.
Store
,
s
.
Profile
)
.
Start
(
ctx
)
go
versionchecker
.
NewVersionChecker
(
s
.
Store
,
s
.
Profile
)
.
Start
(
ctx
)
go
s
.
telegramBot
.
Start
(
ctx
)
go
s
.
telegramBot
.
Start
(
ctx
)
metric
.
Enqueue
(
"server start"
)
return
s
.
e
.
Start
(
fmt
.
Sprintf
(
"%s:%d"
,
s
.
Profile
.
Addr
,
s
.
Profile
.
Port
))
return
s
.
e
.
Start
(
fmt
.
Sprintf
(
"%s:%d"
,
s
.
Profile
.
Addr
,
s
.
Profile
.
Port
))
}
}
...
...
server/service/metric/metric.go
deleted
100644 → 0
View file @
222d04fb
package
metric
import
(
"github.com/posthog/posthog-go"
"github.com/usememos/memos/server/profile"
)
const
(
PostHogAPIKey
=
"phc_YFEi1aqUBW9sX2KDzdvMtK43DNu0mkeoKMKc0EQum2t"
)
var
(
client
*
MetricClient
)
// nolint
type
MetricClient
struct
{
workspaceID
string
profile
*
profile
.
Profile
phClient
*
posthog
.
Client
}
func
NewMetricClient
(
workspaceID
string
,
profile
profile
.
Profile
)
(
*
MetricClient
,
error
)
{
phClient
,
err
:=
posthog
.
NewWithConfig
(
PostHogAPIKey
,
posthog
.
Config
{
Endpoint
:
"https://app.posthog.com"
,
})
if
err
!=
nil
{
return
nil
,
err
}
client
=
&
MetricClient
{
workspaceID
:
workspaceID
,
profile
:
&
profile
,
phClient
:
&
phClient
,
}
return
client
,
nil
}
func
Enqueue
(
event
string
)
{
if
client
==
nil
{
return
}
if
client
.
profile
.
Mode
!=
"prod"
{
return
}
// nolint
(
*
client
.
phClient
)
.
Enqueue
(
posthog
.
Capture
{
DistinctId
:
`memos-`
+
client
.
workspaceID
,
Event
:
event
,
})
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment