Skip to content

Commit

Permalink
feat: add metrics
Browse files Browse the repository at this point in the history
  • Loading branch information
hulucc committed Jan 24, 2022
1 parent ce73168 commit 7e402df
Show file tree
Hide file tree
Showing 8 changed files with 200 additions and 34 deletions.
6 changes: 6 additions & 0 deletions cmd/spiracle/proxy.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,17 @@ import (
"github.com/LilithGames/spiracle/services/roomproxy"
"github.com/LilithGames/spiracle/repos"
"github.com/LilithGames/spiracle/config"
"github.com/LilithGames/spiracle/infra/telemetry"
)

func spiracle(ctx context.Context, conf *config.Config, wg *sync.WaitGroup, mgr manager.Manager) {
defer wg.Done()
telemetry.InitMeter(ctx)
if conf.RoomProxy.MetricsAddr != "" {
go telemetry.RunMetricServer(ctx, conf.RoomProxy.MetricsAddr)
}
s := &proxy.Statd{}
s.Init()
var th proxy.TickHandler
if conf.RoomProxy.Debug {
th = proxy.StdoutTickHandler
Expand Down
1 change: 1 addition & 0 deletions config/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ type Config struct {
Expire int `default:"30"`
}
Servers []Server
MetricsAddr string `default:":2222"`
}
Controller struct {
Reconciler struct {
Expand Down
1 change: 0 additions & 1 deletion deploy/config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,3 @@ controller:
leaderelection:
enable: true
id: eed665e4.projectdavinci.com

32 changes: 19 additions & 13 deletions deploy/spiracle.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -64,19 +64,25 @@ spec:
configMap:
name: spiracle-config

# ---
# apiVersion: v1
# kind: Service
# metadata:
# name: spiracle-metrics-service
# namespace: default
# spec:
# selector:
# app: spiracle
# ports:
# - name: https
# port: 8443
# targetPort: https
---
apiVersion: v1
kind: Service
metadata:
name: spiracle-metric
namespace: default
spec:
selector:
app: spiracle
type: LoadBalancer
ports:
- name: spiracle
port: 2222
targetPort: 2222
protocol: TCP
- name: controller
port: 8080
targetPort: 8080
protocol: TCP

---
apiVersion: v1
Expand Down
30 changes: 20 additions & 10 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,16 @@ go 1.17
require (
github.com/buraksezer/olric v0.4.0-beta.2.0.20210502130407-be0cf149f919
github.com/buraksezer/olric-cloud-plugin v0.3.0-beta.4.0.20201003183038-f78c20f7619d
github.com/go-logr/logr v0.3.0
github.com/go-logr/logr v1.2.1
github.com/jinzhu/configor v1.2.1
github.com/libp2p/go-reuseport v0.0.2
github.com/nursik/go-expire-map v1.1.0
github.com/stretchr/testify v1.7.0
go.opentelemetry.io/otel/exporters/prometheus v0.25.0
go.opentelemetry.io/otel/metric v0.25.0
go.opentelemetry.io/otel/sdk v1.2.0
go.opentelemetry.io/otel/sdk/export/metric v0.25.0
go.opentelemetry.io/otel/sdk/metric v0.25.0
golang.org/x/net v0.0.0-20210510120150-4163338589ed
k8s.io/apimachinery v0.20.2
k8s.io/client-go v0.20.2
Expand Down Expand Up @@ -49,7 +55,7 @@ require (
github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e // indirect
github.com/golang/protobuf v1.4.3 // indirect
github.com/google/btree v1.0.0 // indirect
github.com/google/go-cmp v0.5.2 // indirect
github.com/google/go-cmp v0.5.6 // indirect
github.com/google/go-querystring v1.0.0 // indirect
github.com/google/gofuzz v1.1.0 // indirect
github.com/google/uuid v1.1.2 // indirect
Expand All @@ -72,7 +78,7 @@ require (
github.com/imdario/mergo v0.3.10 // indirect
github.com/jmespath/go-jmespath v0.4.0 // indirect
github.com/joyent/triton-go v1.8.5 // indirect
github.com/json-iterator/go v1.1.10 // indirect
github.com/json-iterator/go v1.1.11 // indirect
github.com/linode/linodego v0.21.1 // indirect
github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
github.com/miekg/dns v1.1.31 // indirect
Expand All @@ -81,15 +87,14 @@ require (
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.1 // indirect
github.com/nicolai86/scaleway-sdk v1.10.2-0.20180628010248-798f60e20bb2 // indirect
github.com/nursik/go-expire-map v1.1.0 // indirect
github.com/nursik/go-ordered-set v0.0.0-20190626022851-0e8872c36517 // indirect
github.com/packethost/packngo v0.3.0 // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/prometheus/client_golang v1.7.1 // indirect
github.com/prometheus/client_golang v1.11.0 // indirect
github.com/prometheus/client_model v0.2.0 // indirect
github.com/prometheus/common v0.10.0 // indirect
github.com/prometheus/procfs v0.2.0 // indirect
github.com/prometheus/common v0.26.0 // indirect
github.com/prometheus/procfs v0.6.0 // indirect
github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529 // indirect
github.com/sirupsen/logrus v1.7.0 // indirect
github.com/softlayer/softlayer-go v1.0.1 // indirect
Expand All @@ -99,21 +104,24 @@ require (
github.com/vmihailenco/msgpack v4.0.4+incompatible // indirect
github.com/vmware/govmomi v0.23.1 // indirect
go.opencensus.io v0.22.4 // indirect
go.opentelemetry.io/otel v1.2.0 // indirect
go.opentelemetry.io/otel/internal/metric v0.25.0 // indirect
go.opentelemetry.io/otel/trace v1.2.0 // indirect
go.uber.org/atomic v1.6.0 // indirect
go.uber.org/multierr v1.5.0 // indirect
go.uber.org/zap v1.15.0 // indirect
golang.org/x/crypto v0.0.0-20201002170205-7f63de1d35b0 // indirect
golang.org/x/oauth2 v0.0.0-20200902213428-5d25da1a8d43 // indirect
golang.org/x/sync v0.0.0-20200930132711-30421366ff76 // indirect
golang.org/x/sys v0.0.0-20210423082822-04245dca01da // indirect
golang.org/x/sync v0.0.0-20201207232520-09787c993a3a // indirect
golang.org/x/sys v0.0.0-20210603081109-ebe580a85c40 // indirect
golang.org/x/text v0.3.6 // indirect
golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e // indirect
gomodules.xyz/jsonpatch/v2 v2.1.0 // indirect
google.golang.org/api v0.32.0 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/genproto v0.0.0-20201110150050-8816d57aaa9a // indirect
google.golang.org/grpc v1.32.0 // indirect
google.golang.org/protobuf v1.25.0 // indirect
google.golang.org/protobuf v1.26.0-rc.1 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/yaml.v2 v2.3.0 // indirect
gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776 // indirect
Expand All @@ -126,3 +134,5 @@ require (
sigs.k8s.io/structured-merge-diff/v4 v4.0.2 // indirect
sigs.k8s.io/yaml v1.2.0 // indirect
)

replace github.com/go-logr/logr => github.com/go-logr/logr v0.3.0
Loading

0 comments on commit 7e402df

Please sign in to comment.