Skip to content

Commit 18600de

Browse files
wlsaud619wlsaud619
committed
v1.0.0
1 parent 86e7090 commit 18600de

File tree

26 files changed

+104
-366
lines changed

26 files changed

+104
-366
lines changed

‎chains/cosmos/exporter/exporter.go

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,17 +28,17 @@ func Start(log *zap.Logger) {
2828

2929
// nomal guages
3030
for i := 0; i < len(gaugesNamespaceList); i++ {
31-
gauges[i] = metric.NewGauge("exporter", gaugesNamespaceList[i], "")
31+
gauges[i] = utils.NewGauge("exporter", gaugesNamespaceList[i], "")
3232
prometheus.MustRegister(gauges[i])
3333
}
3434

3535

3636
// denom gagues
3737
count := 0
3838
for i := 0; i < len(metric.DenomList)*3; i += 3 {
39-
gaugesDenom[i] = metric.NewGauge("exporter_balances", metric.DenomList[count], "")
40-
gaugesDenom[i+1] = metric.NewGauge("exporter_commission", metric.DenomList[count], "")
41-
gaugesDenom[i+2] = metric.NewGauge("exporter_rewards", metric.DenomList[count], "")
39+
gaugesDenom[i] = utils.NewGauge("exporter_balances", metric.DenomList[count], "")
40+
gaugesDenom[i+1] = utils.NewGauge("exporter_commission", metric.DenomList[count], "")
41+
gaugesDenom[i+2] = utils.NewGauge("exporter_rewards", metric.DenomList[count], "")
4242
prometheus.MustRegister(gaugesDenom[i])
4343
prometheus.MustRegister(gaugesDenom[i+1])
4444
prometheus.MustRegister(gaugesDenom[i+2])
@@ -49,7 +49,7 @@ func Start(log *zap.Logger) {
4949

5050
// labels
5151
labels := []string{"chainId", "moniker", "operatorAddress", "accountAddress", "consHexAddress"}
52-
gaugesForLabel := metric.NewCounterVec("exporter", "labels", "", labels)
52+
gaugesForLabel := utils.NewCounterVec("exporter", "labels", "", labels)
5353

5454
prometheus.MustRegister(gaugesForLabel)
5555

@@ -71,6 +71,7 @@ func Start(log *zap.Logger) {
7171

7272
if previousBlockHeight != currentBlockHeight {
7373

74+
fmt.Println("")
7475
log.Info("RPC-Server", zap.Bool("Success", true), zap.String("err", "nil"), zap.String("Get Data", "Block Height: " +fmt.Sprint(currentBlockHeight)))
7576

7677

‎chains/cosmos/exporter/metric/types.go

Lines changed: 0 additions & 34 deletions
This file was deleted.

‎chains/emoney/exporter/exporter.go

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,17 +28,17 @@ func Start(log *zap.Logger) {
2828

2929
// nomal guages
3030
for i := 0; i < len(gaugesNamespaceList); i++ {
31-
gauges[i] = metric.NewGauge("exporter", gaugesNamespaceList[i], "")
31+
gauges[i] = utils.NewGauge("exporter", gaugesNamespaceList[i], "")
3232
prometheus.MustRegister(gauges[i])
3333
}
3434

3535

3636
// denom gagues
3737
count := 0
3838
for i := 0; i < len(metric.DenomList)*3; i += 3 {
39-
gaugesDenom[i] = metric.NewGauge("exporter_balances", metric.DenomList[count], "")
40-
gaugesDenom[i+1] = metric.NewGauge("exporter_commission", metric.DenomList[count], "")
41-
gaugesDenom[i+2] = metric.NewGauge("exporter_rewards", metric.DenomList[count], "")
39+
gaugesDenom[i] = utils.NewGauge("exporter_balances", metric.DenomList[count], "")
40+
gaugesDenom[i+1] = utils.NewGauge("exporter_commission", metric.DenomList[count], "")
41+
gaugesDenom[i+2] = utils.NewGauge("exporter_rewards", metric.DenomList[count], "")
4242
prometheus.MustRegister(gaugesDenom[i])
4343
prometheus.MustRegister(gaugesDenom[i+1])
4444
prometheus.MustRegister(gaugesDenom[i+2])
@@ -49,7 +49,7 @@ func Start(log *zap.Logger) {
4949

5050
// labels
5151
labels := []string{"chainId", "moniker", "operatorAddress", "accountAddress", "consHexAddress"}
52-
gaugesForLabel := metric.NewCounterVec("exporter", "labels", "", labels)
52+
gaugesForLabel := utils.NewCounterVec("exporter", "labels", "", labels)
5353

5454
prometheus.MustRegister(gaugesForLabel)
5555

@@ -71,6 +71,7 @@ func Start(log *zap.Logger) {
7171

7272
if previousBlockHeight != currentBlockHeight {
7373

74+
fmt.Println("")
7475
log.Info("RPC-Server", zap.Bool("Success", true), zap.String("err", "nil"), zap.String("Get Data", "Block Height: " +fmt.Sprint(currentBlockHeight)))
7576

7677

‎chains/emoney/exporter/metric/types.go

Lines changed: 0 additions & 35 deletions
This file was deleted.

‎chains/iov/exporter/exporter.go

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import (
77

88
rpc "github.com/node-a-team/Cosmos-IE/chains/iov/getData/rpc"
99
metric "github.com/node-a-team/Cosmos-IE/chains/iov/exporter/metric"
10+
utils "github.com/node-a-team/Cosmos-IE/utils"
1011

1112
"github.com/prometheus/client_golang/prometheus"
1213
)
@@ -25,13 +26,13 @@ func Start(log *zap.Logger) {
2526

2627
// nomal guages
2728
for i := 0; i < len(gaugesNamespaceList); i++ {
28-
gauges[i] = metric.NewGauge("exporter", gaugesNamespaceList[i], "")
29+
gauges[i] = utils.NewGauge("exporter", gaugesNamespaceList[i], "")
2930
prometheus.MustRegister(gauges[i])
3031
}
3132

3233
// labels
3334
labels := []string{"chainId"}
34-
gaugesForLabel := metric.NewCounterVec("exporter", "labels", "", labels)
35+
gaugesForLabel := utils.NewCounterVec("exporter", "labels", "", labels)
3536

3637
prometheus.MustRegister(gaugesForLabel)
3738

@@ -53,6 +54,7 @@ func Start(log *zap.Logger) {
5354

5455
if previousBlockHeight != currentBlockHeight {
5556

57+
fmt.Println("")
5658
log.Info("RPC-Server", zap.Bool("Success", true), zap.String("err", "nil"), zap.String("Get Data", "Block Height: " +fmt.Sprint(currentBlockHeight)))
5759

5860

‎chains/iov/exporter/metric/types.go

Lines changed: 0 additions & 34 deletions
This file was deleted.

‎chains/iov/getData/rpc/rpc.go

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,8 @@ func GetData(blockHeight int64, consHexAddr string, log *zap.Logger) *RPCData {
4343
log.Info("RPC-Server", zap.Bool("Success", true), zap.String("err", "nil"), zap.String("Get Data", "Commit Data"),)
4444
}
4545

46-
fmt.Println("consHexAddr: ", consHexAddr)
4746
rd.Commit = getCommit(commitData, consHexAddr)
4847

49-
5048
return rd
5149
}
5250

‎chains/iov/main.go

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,6 @@ func Main(port string) {
1616
log,_ := zap.NewDevelopment()
1717
defer log.Sync()
1818

19-
// cfg.ConfigPath = os.Args[1]
20-
21-
// port := cfg.Init()
2219
rpc.OpenSocket(log)
2320

2421
http.Handle("/metrics", promhttp.Handler())

‎chains/iris/exporter/exporter.go

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ import (
55
"go.uber.org/zap"
66
"time"
77

8-
metric "github.com/node-a-team/cosmos_metric/chains/iris/exporter/metric"
9-
rest "github.com/node-a-team/cosmos_metric/chains/iris/getData/rest"
10-
rpc "github.com/node-a-team/cosmos_metric/chains/iris/getData/rpc"
11-
utils "github.com/node-a-team/cosmos_metric/utils"
8+
metric "github.com/node-a-team/Cosmos-IE/chains/iris/exporter/metric"
9+
rest "github.com/node-a-team/Cosmos-IE/chains/iris/getData/rest"
10+
rpc "github.com/node-a-team/Cosmos-IE/chains/iris/getData/rpc"
11+
utils "github.com/node-a-team/Cosmos-IE/utils"
1212

1313
"github.com/prometheus/client_golang/prometheus"
1414
)
@@ -26,16 +26,16 @@ func Start(log *zap.Logger) {
2626

2727
// nomal guages
2828
for i := 0; i < len(gaugesNamespaceList); i++ {
29-
gauges[i] = metric.NewGauge("exporter", gaugesNamespaceList[i], "")
29+
gauges[i] = utils.NewGauge("exporter", gaugesNamespaceList[i], "")
3030
prometheus.MustRegister(gauges[i])
3131
}
3232

3333
// denom gagues
3434
count := 0
3535
for i := 0; i < len(metric.DenomList)*3; i += 3 {
36-
gaugesDenom[i] = metric.NewGauge("exporter_balances", metric.DenomList[count], "")
37-
gaugesDenom[i+1] = metric.NewGauge("exporter_commission", metric.DenomList[count], "")
38-
gaugesDenom[i+2] = metric.NewGauge("exporter_rewards", metric.DenomList[count], "")
36+
gaugesDenom[i] = utils.NewGauge("exporter_balances", metric.DenomList[count], "")
37+
gaugesDenom[i+1] = utils.NewGauge("exporter_commission", metric.DenomList[count], "")
38+
gaugesDenom[i+2] = utils.NewGauge("exporter_rewards", metric.DenomList[count], "")
3939
prometheus.MustRegister(gaugesDenom[i])
4040
prometheus.MustRegister(gaugesDenom[i+1])
4141
prometheus.MustRegister(gaugesDenom[i+2])
@@ -45,7 +45,7 @@ func Start(log *zap.Logger) {
4545

4646
// labels
4747
labels := []string{"chainId", "moniker", "operatorAddress", "accountAddress", "consHexAddress"}
48-
gaugesForLabel := metric.NewCounterVec("exporter", "labels", "", labels)
48+
gaugesForLabel := utils.NewCounterVec("exporter", "labels", "", labels)
4949

5050
prometheus.MustRegister(gaugesForLabel)
5151

@@ -65,6 +65,7 @@ func Start(log *zap.Logger) {
6565

6666
if previousBlockHeight != currentBlockHeight {
6767

68+
fmt.Println("")
6869
log.Info("RPC-Server", zap.Bool("Success", true), zap.String("err", "nil"), zap.String("Get Data", "Block Height: "+fmt.Sprint(currentBlockHeight)))
6970

7071
restData, consHexAddr := rest.GetData(currentBlockHeight, log)

‎chains/iris/exporter/metric/metric.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ package metric
33
import (
44
"go.uber.org/zap"
55

6-
rest "github.com/node-a-team/cosmos_metric/chains/iris/getData/rest"
7-
rpc "github.com/node-a-team/cosmos_metric/chains/iris/getData/rpc"
8-
utils "github.com/node-a-team/cosmos_metric/utils"
6+
rest "github.com/node-a-team/Cosmos-IE/chains/iris/getData/rest"
7+
rpc "github.com/node-a-team/Cosmos-IE/chains/iris/getData/rpc"
8+
utils "github.com/node-a-team/Cosmos-IE/utils"
99
)
1010

1111
var (

‎chains/iris/exporter/metric/types.go

Lines changed: 0 additions & 31 deletions
This file was deleted.

‎chains/iris/getData/rest/delegations.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55
"go.uber.org/zap"
66
"strings"
77

8-
utils "github.com/node-a-team/cosmos_metric/utils"
8+
utils "github.com/node-a-team/Cosmos-IE/utils"
99
)
1010

1111
/*

‎chains/iris/getData/rest/inflation.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55
"go.uber.org/zap"
66
"strings"
77

8-
utils "github.com/node-a-team/cosmos_metric/utils"
8+
utils "github.com/node-a-team/Cosmos-IE/utils"
99
)
1010

1111
type param struct {

‎chains/iris/getData/rest/rest.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"go.uber.org/zap"
55
"os/exec"
66

7-
utils "github.com/node-a-team/cosmos_metric/utils"
7+
utils "github.com/node-a-team/Cosmos-IE/utils"
88
)
99

1010
var (

‎chains/iris/main.go

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,18 +7,15 @@ import (
77

88
"github.com/prometheus/client_golang/prometheus/promhttp"
99

10-
"github.com/node-a-team/cosmos_metric/chains/iris/exporter"
11-
rpc "github.com/node-a-team/cosmos_metric/chains/iris/getData/rpc"
10+
"github.com/node-a-team/Cosmos-IE/chains/iris/exporter"
11+
rpc "github.com/node-a-team/Cosmos-IE/chains/iris/getData/rpc"
1212
)
1313

1414
func Main(port string) {
1515

1616
log, _ := zap.NewDevelopment()
1717
defer log.Sync()
1818

19-
// cfg.ConfigPath = os.Args[1]
20-
21-
// port := cfg.Init()
2219
rpc.OpenSocket(log)
2320

2421
http.Handle("/metrics", promhttp.Handler())

0 commit comments

Comments
 (0)