Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Access] Fixed REST API metrics #375

Merged
merged 9 commits into from
Jun 1, 2023
Merged

[Access] Fixed REST API metrics #375

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
0d2bca2
Added changes due to changes in rest server creation.
Guitarheroua May 15, 2023
ac74ef3
linted
Guitarheroua May 15, 2023
f4ac429
Changed to NoopCollector
Guitarheroua May 15, 2023
990f57a
linted
Guitarheroua May 15, 2023
ef675bf
Removed replace. Update flow-go version.
Guitarheroua May 17, 2023
e1150e1
Merge remote-tracking branch 'origin/master' into guitarheroua/3971-f…
Guitarheroua May 29, 2023
4ec7d0a
Fixed merge issue
Guitarheroua May 30, 2023
fe89267
fixed build issues
Guitarheroua May 30, 2023
d5118ca
Fixed typo
Guitarheroua Jun 1, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,6 @@ require (
go.uber.org/multierr v1.9.0 // indirect
go.uber.org/zap v1.24.0 // indirect
golang.org/x/crypto v0.4.0 // indirect
golang.org/x/mod v0.8.0 // indirect
golang.org/x/net v0.8.0 // indirect
golang.org/x/sync v0.1.0 // indirect
golang.org/x/sys v0.6.0 // indirect
Expand All @@ -162,3 +161,5 @@ require (
modernc.org/sqlite v1.21.1 // indirect
nhooyr.io/websocket v1.8.6 // indirect
)

replace github.com/onflow/flow-go v0.30.1-0.20230501182206-6a911be58b92 => github.com/Guitarheroua/flow-go v0.0.0-20230515134220-bf45732c221f
Guitarheroua marked this conversation as resolved.
Show resolved Hide resolved
5 changes: 2 additions & 3 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,8 @@ github.com/Azure/go-autorest/logger v0.1.0/go.mod h1:oExouG+K6PryycPJfVSxi/koC6L
github.com/Azure/go-autorest/tracing v0.5.0/go.mod h1:r/s2XiOKccPW3HrqB+W0TQzfbtp2fGCgRFtBroKn4Dk=
github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
github.com/Guitarheroua/flow-go v0.0.0-20230515134220-bf45732c221f h1:XVBQ9BxIKEIWHsmkc1pusJoUq5pbod3YJAEl5eerm7Y=
github.com/Guitarheroua/flow-go v0.0.0-20230515134220-bf45732c221f/go.mod h1:uEwS/eX5sMMkDy7cGxzF5IAeALmWSo/b40g14n9XRLQ=
github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible/go.mod h1:r7JcOSlj0wfOMncg0iLm8Leh48TZaKVeNIfJntJ2wa0=
github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU=
github.com/OneOfOne/xxhash v1.2.5 h1:zl/OfRA6nftbBK9qTohYBJ5xvw6C/oNKizR7cZGl3cI=
Expand Down Expand Up @@ -661,8 +663,6 @@ github.com/onflow/flow-core-contracts/lib/go/templates v1.2.3 h1:X25A1dNajNUtE+K
github.com/onflow/flow-core-contracts/lib/go/templates v1.2.3/go.mod h1:dqAUVWwg+NlOhsuBHex7bEWmsUjsiExzhe/+t4xNH6A=
github.com/onflow/flow-ft/lib/go/contracts v0.7.0 h1:XEKE6qJUw3luhsYmIOteXP53gtxNxrwTohgxJXCYqBE=
github.com/onflow/flow-ft/lib/go/contracts v0.7.0/go.mod h1:kTMFIySzEJJeupk+7EmXs0EJ6CBWY/MV9fv9iYQk+RU=
github.com/onflow/flow-go v0.30.1-0.20230501182206-6a911be58b92 h1:69Vr02Tym7gTiJJFwP7jYtTw4RZgaARx7adVpXtYUzk=
github.com/onflow/flow-go v0.30.1-0.20230501182206-6a911be58b92/go.mod h1:L4+8DBmimZfkvd1etcXX4i1QWgMDRxsIckP+RmOGKdM=
github.com/onflow/flow-go-sdk v0.24.0/go.mod h1:IoptMLPyFXWvyd9yYA6/4EmSeeozl6nJoIv4FaEMg74=
github.com/onflow/flow-go-sdk v0.40.0 h1:s8uwoyTquN8tjdXpqGmNkXTjf79yUII8JExc5QEl4Xw=
github.com/onflow/flow-go-sdk v0.40.0/go.mod h1:34dxXk9Hp/bQw6Zy6+H44Xo0kQU+aJyQoqdDxq00rJM=
Expand Down Expand Up @@ -1012,7 +1012,6 @@ golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
golang.org/x/mod v0.8.0 h1:LUYupSeNrTNCGzR/hVBk2NHZO4hXcVaW1k4Qx7rjPx8=
golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
Expand Down
6 changes: 4 additions & 2 deletions server/rest.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ import (
"github.com/onflow/flow-emulator/server/backend"
"github.com/onflow/flow-go/engine/access/rest"
"github.com/onflow/flow-go/model/flow"
"github.com/onflow/flow-go/module/metrics"
"github.com/rs/zerolog"
)

Expand Down Expand Up @@ -71,13 +72,14 @@ func (r *RestServer) Stop() {
}

func NewRestServer(logger *zerolog.Logger, be *backend.Backend, chain flow.Chain, host string, port int, debug bool) (*RestServer, error) {

debugLogger := zerolog.Logger{}
if debug {
debugLogger = zerolog.New(os.Stdout)
}

srv, err := rest.NewServer(backend.NewAdapter(be), fmt.Sprintf("%s:3333", host), debugLogger, chain)
restCollector := metrics.NewNoopCollector()
Copy link
Contributor

@peterargue peterargue May 17, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

sounds like @bluesign would these turned on by default

Suggested change
restCollector := metrics.NewNoopCollector()
restCollector := metrics.NewRestCollector(metricsProm.Config{Prefix: "access_rest_api"})

also needs to import metricsProm

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

not necessarily by default, but support an option to enable it

Copy link
Contributor

@peterargue peterargue May 17, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

that's fair, but fwiw it is enabled by default for grpc

flow-emulator/server/grpc.go

Line 74 in 3c8ca15

grpcprometheus.Register(grpcServer)

sounds like we need a followup issue to make metrics configurable for both

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We can separate this in another PR yeah.


srv, err := rest.NewServer(backend.NewAdapter(be), fmt.Sprintf("%s:3333", host), debugLogger, chain, restCollector)
if err != nil {
return nil, err
}
Expand Down