Skip to content
Permalink
Browse files

rename vgo to tracing

  • Loading branch information...
sunface committed Mar 13, 2019
1 parent 7304f32 commit cd611cca8368594aaab6193ddf3843d7fca41fc5
Showing with 135 additions and 135 deletions.
  1. +1 −1 .gitignore
  2. +1 −1 README.md
  3. +3 −3 agent/agent.conf
  4. +2 −2 agent/bin/agent.conf
  5. +3 −3 agent/cmd/root.go
  6. +1 −1 agent/main.go
  7. +1 −1 agent/misc/config.go
  8. +1 −1 agent/plugins/collector/all/all.go
  9. +3 −3 agent/plugins/collector/system/cpu.go
  10. +3 −3 agent/plugins/collector/system/ifstat.go
  11. +3 −3 agent/plugins/collector/system/mem.go
  12. +3 −3 agent/plugins/collector/system/system.go
  13. +8 −8 agent/service/agent.go
  14. +1 −1 agent/service/collector.go
  15. +6 −6 agent/service/handle_agent_tcp.go
  16. +4 −4 agent/service/handle_agent_udp.go
  17. +1 −1 agent/service/handle_response.go
  18. +5 −5 agent/service/pinpoint.go
  19. +8 −8 agent/service/sync.go
  20. +3 −3 agent/service/system.go
  21. +10 −10 agent/service/tcp.go
  22. +1 −1 alert/alert.conf
  23. +2 −2 alert/cmd/root.go
  24. +1 −1 alert/main.go
  25. +2 −2 analyze/analyze.conf
  26. +2 −2 analyze/cmd/root.go
  27. +1 −1 analyze/main.go
  28. +3 −3 analyze/service/agent_stat.go
  29. +1 −1 analyze/service/analyze.go
  30. +1 −1 analyze/service/app_store.go
  31. +1 −1 analyze/service/etcd.go
  32. +1 −1 analyze/service/span_api.go
  33. +2 −2 analyze/service/span_counter.go
  34. +2 −2 analyze/service/span_events.go
  35. +2 −2 analyze/service/span_exception.go
  36. +2 −2 analyze/service/span_sql.go
  37. +3 −3 analyze/service/srv_map.go
  38. +1 −1 analyze/service/stats.go
  39. +1 −1 proto/pinpoint/proto/packet.go
  40. +3 −3 proto/pinpoint/thrift/header.go
  41. +1 −1 proto/pinpoint/thrift/pinpoint/Pinpoint-consts.go
  42. +1 −1 proto/pinpoint/thrift/pinpoint/Pinpoint.go
  43. +3 −3 sql/cassandra.cql
  44. BIN {vgo → tracing}/.DS_Store
  45. 0 {vgo → tracing}/LICENSE
  46. +2 −2 {vgo → tracing}/cmd/root.go
  47. 0 {vgo → tracing}/logger/field.go
  48. 0 {vgo → tracing}/logger/log.go
  49. 0 {vgo → tracing}/main.go
  50. 0 {vgo → tracing}/misc/config.go
  51. 0 {vgo → tracing}/misc/const.go
  52. 0 {vgo → tracing}/misc/data.go
  53. 0 {vgo → tracing}/misc/sql.go
  54. 0 {vgo → tracing}/service/app_store.go
  55. 0 {vgo → tracing}/service/cache.go
  56. 0 {vgo → tracing}/service/pinpoint.go
  57. 0 {vgo → tracing}/service/srv_discovery.go
  58. 0 {vgo → tracing}/service/storage.go
  59. 0 {vgo → tracing}/service/topic_store.go
  60. 0 {vgo → tracing}/service/vgo.go
  61. 0 {vgo → tracing}/vgo.conf
  62. +10 −10 util/packet.go
  63. +3 −3 web/cmd/root.go
  64. +1 −1 web/main.go
  65. +1 −1 web/service/alerts.go
  66. +1 −1 web/service/api_stats.go
  67. +1 −1 web/service/application.go
  68. +1 −1 web/service/login.go
  69. +1 −1 web/service/method.go
  70. +1 −1 web/service/service.go
  71. +1 −1 web/service/sql_stats.go
  72. +1 −1 web/service/tracing.go
  73. +1 −1 web/ui/package.json
  74. +2 −2 web/web.conf
@@ -1,6 +1,6 @@
.idea/
.bin/
vgo/vgo
tracing/tracing
agent/bin/agent
analyze/analyze
web/web
@@ -1,3 +1,3 @@
# vgo
# tracing
A distributed tracing and application monitoring platform

@@ -1,11 +1,11 @@
common:
version: 0.0.1
loglevel: debug
admintoken: "vgo.io"
admintoken: "tracing.dev"

agent:
# vgoaddr: "10.50.50.36:8081"
vgoaddr: "127.0.0.1:8081"
# tracingaddr: "10.50.50.36:8081"
tracingaddr: "127.0.0.1:8081"
keepliveinterval: 3
useenv: false
env: "APM_TEST"
@@ -1,10 +1,10 @@
common:
version: 0.0.1
loglevel: debug
admintoken: "vgo.io"
admintoken: "tracing.dev"

agent:
vgoaddr: "10.50.18.157:8081"
tracingaddr: "10.50.18.157:8081"
keepliveinterval: 3
useenv: false
env: "APM_TEST"
@@ -21,9 +21,9 @@ import (
"syscall"

"github.com/imdevlab/g"
"github.com/imdevlab/vgo/agent/misc"
_ "github.com/imdevlab/vgo/agent/plugins/collector/all"
"github.com/imdevlab/vgo/agent/service"
"github.com/imdevlab/tracing/agent/misc"
_ "github.com/imdevlab/tracing/agent/plugins/collector/all"
"github.com/imdevlab/tracing/agent/service"
"github.com/spf13/cobra"
"go.uber.org/zap"
)
@@ -14,7 +14,7 @@

package main

import "github.com/imdevlab/vgo/agent/cmd"
import "github.com/imdevlab/tracing/agent/cmd"

func main() {
cmd.Execute()
@@ -16,7 +16,7 @@ type Config struct {
}

Agent struct {
VgoAddr string
TracingAddr string
KeepLiveInterval int
UseEnv bool
ENV string
@@ -1,5 +1,5 @@
package all

import (
_ "github.com/imdevlab/vgo/agent/plugins/collector/system"
_ "github.com/imdevlab/tracing/agent/plugins/collector/system"
)
@@ -4,10 +4,10 @@ import (
"fmt"
"time"

"github.com/imdevlab/vgo/agent/misc"
"github.com/imdevlab/vgo/agent/service"
"github.com/imdevlab/tracing/agent/misc"
"github.com/imdevlab/tracing/agent/service"

"github.com/imdevlab/vgo/util"
"github.com/imdevlab/tracing/util"

"github.com/shirou/gopsutil/cpu"
)
@@ -4,9 +4,9 @@ import (
"fmt"
"time"

"github.com/imdevlab/vgo/agent/misc"
"github.com/imdevlab/vgo/agent/service"
"github.com/imdevlab/vgo/util"
"github.com/imdevlab/tracing/agent/misc"
"github.com/imdevlab/tracing/agent/service"
"github.com/imdevlab/tracing/util"
"github.com/shirou/gopsutil/net"
)

@@ -4,9 +4,9 @@ import (
"fmt"
"time"

"github.com/imdevlab/vgo/agent/misc"
"github.com/imdevlab/vgo/agent/service"
"github.com/imdevlab/vgo/util"
"github.com/imdevlab/tracing/agent/misc"
"github.com/imdevlab/tracing/agent/service"
"github.com/imdevlab/tracing/util"
)

// MemStats ...
@@ -3,10 +3,10 @@ package system
import (
"time"

"github.com/imdevlab/vgo/agent/misc"
"github.com/imdevlab/vgo/agent/service"
"github.com/imdevlab/tracing/agent/misc"
"github.com/imdevlab/tracing/agent/service"

"github.com/imdevlab/vgo/util"
"github.com/imdevlab/tracing/util"

"github.com/shirou/gopsutil/host"
"github.com/shirou/gopsutil/load"
@@ -7,12 +7,12 @@ import (
"sync/atomic"
"time"

"github.com/imdevlab/vgo/agent/misc"
"github.com/imdevlab/tracing/agent/misc"

"github.com/vmihailenco/msgpack"

"github.com/imdevlab/g"
"github.com/imdevlab/vgo/util"
"github.com/imdevlab/tracing/util"

"go.uber.org/zap"
)
@@ -24,8 +24,8 @@ type Agent struct {
syncID uint32
agentInfo *util.AgentInfo
quitC chan bool
uploadC chan *util.VgoPacket
downloadC chan *util.VgoPacket
uploadC chan *util.TracingPacket
downloadC chan *util.TracingPacket
pinpoint *Pinpoint
systemCollector *SystemCollector
isReportAgentInfo bool
@@ -41,8 +41,8 @@ func New() *Agent {
client: NewTCPClient(),
agentInfo: util.NewAgentInfo(),
quitC: make(chan bool, 1),
uploadC: make(chan *util.VgoPacket, 100),
downloadC: make(chan *util.VgoPacket, 100),
uploadC: make(chan *util.TracingPacket, 100),
downloadC: make(chan *util.TracingPacket, 100),
pinpoint: NewPinpoint(),
systemCollector: NewSystemCollector(),
}
@@ -153,7 +153,7 @@ func (a *Agent) reportAgentInfo() {

// 获取ID
id := gAgent.getSyncID()
packet := &util.VgoPacket{
packet := &util.TracingPacket{
Type: util.TypeOfPinpoint,
Version: util.VersionOf01,
IsSync: util.TypeOfSyncYes,
@@ -186,7 +186,7 @@ func (a *Agent) reportAgentInfo() {
}
}

func (a *Agent) write(data *util.VgoPacket) {
func (a *Agent) write(data *util.TracingPacket) {

}

@@ -3,7 +3,7 @@ package service
import (
"sync"

"github.com/imdevlab/vgo/util"
"github.com/imdevlab/tracing/util"
)

// Collectors ...
@@ -9,15 +9,15 @@ import (
"net"
"time"

"github.com/imdevlab/vgo/agent/misc"
"github.com/imdevlab/tracing/agent/misc"

"github.com/imdevlab/vgo/util"
"github.com/imdevlab/tracing/util"

"github.com/imdevlab/g"
"github.com/imdevlab/vgo/proto/pinpoint/proto"
"github.com/imdevlab/vgo/proto/pinpoint/thrift"
"github.com/imdevlab/vgo/proto/pinpoint/thrift/pinpoint"
"github.com/imdevlab/vgo/proto/pinpoint/thrift/trace"
"github.com/imdevlab/tracing/proto/pinpoint/proto"
"github.com/imdevlab/tracing/proto/pinpoint/thrift"
"github.com/imdevlab/tracing/proto/pinpoint/thrift/pinpoint"
"github.com/imdevlab/tracing/proto/pinpoint/thrift/trace"
"go.uber.org/zap"
)

@@ -4,10 +4,10 @@ import (
"fmt"

"github.com/imdevlab/g"
"github.com/imdevlab/vgo/proto/pinpoint/thrift"
"github.com/imdevlab/vgo/proto/pinpoint/thrift/pinpoint"
"github.com/imdevlab/vgo/proto/pinpoint/thrift/trace"
"github.com/imdevlab/vgo/util"
"github.com/imdevlab/tracing/proto/pinpoint/thrift"
"github.com/imdevlab/tracing/proto/pinpoint/thrift/pinpoint"
"github.com/imdevlab/tracing/proto/pinpoint/thrift/trace"
"github.com/imdevlab/tracing/util"
"go.uber.org/zap"
)

@@ -4,7 +4,7 @@ import (
"encoding/json"

"github.com/imdevlab/g"
"github.com/imdevlab/vgo/proto/pinpoint/proto"
"github.com/imdevlab/tracing/proto/pinpoint/proto"
"go.uber.org/zap"
)

@@ -4,12 +4,12 @@ import (
"net"
"time"

"github.com/imdevlab/vgo/agent/misc"
"github.com/imdevlab/vgo/util"
"github.com/imdevlab/tracing/agent/misc"
"github.com/imdevlab/tracing/util"
"github.com/vmihailenco/msgpack"

"github.com/imdevlab/g"
"github.com/imdevlab/vgo/proto/pinpoint/proto"
"github.com/imdevlab/tracing/proto/pinpoint/proto"
"go.uber.org/zap"
)

@@ -142,7 +142,7 @@ func (pinpoint *Pinpoint) tcpCollector() {
pinpointData.AppName = gAgent.agentInfo.AppName
pinpointData.AgentID = gAgent.agentInfo.AgentID

packet := &util.VgoPacket{
packet := &util.TracingPacket{
Type: util.TypeOfPinpoint,
Version: util.VersionOf01,
IsSync: util.TypeOfSyncNo,
@@ -191,7 +191,7 @@ func (pinpoint *Pinpoint) udpCollector() {
pinpointData.AppName = gAgent.agentInfo.AppName
pinpointData.AgentID = gAgent.agentInfo.AgentID

packet := &util.VgoPacket{
packet := &util.TracingPacket{
Type: util.TypeOfPinpoint,
Version: util.VersionOf01,
IsSync: util.TypeOfSyncNo,
@@ -8,39 +8,39 @@ import (
"github.com/imdevlab/g"
"go.uber.org/zap"

"github.com/imdevlab/vgo/util"
"github.com/imdevlab/tracing/util"
)

// SyncCall ...
type SyncCall struct {
sync.RWMutex
Chans map[uint32]chan *util.VgoPacket
Chans map[uint32]chan *util.TracingPacket
}

// NewSyncCall ...
func NewSyncCall() *SyncCall {
return &SyncCall{
Chans: make(map[uint32]chan *util.VgoPacket),
Chans: make(map[uint32]chan *util.TracingPacket),
}
}

// newChan 创建新的chan
func (sc *SyncCall) newChan(id uint32, length int) (chan *util.VgoPacket, bool) {
packC := make(chan *util.VgoPacket, length)
func (sc *SyncCall) newChan(id uint32, length int) (chan *util.TracingPacket, bool) {
packC := make(chan *util.TracingPacket, length)
sc.Lock()
defer sc.Unlock()
sc.Chans[id] = packC
return packC, true
}

func (sc *SyncCall) addChan(id uint32, packetC chan *util.VgoPacket) {
func (sc *SyncCall) addChan(id uint32, packetC chan *util.TracingPacket) {
sc.Lock()
defer sc.Unlock()
sc.Chans[id] = packetC
}

// syncRead 阻塞等待
func (sc *SyncCall) syncRead(id uint32, timeOut int, isStop bool) (*util.VgoPacket, error) {
func (sc *SyncCall) syncRead(id uint32, timeOut int, isStop bool) (*util.TracingPacket, error) {
sc.RLock()
packetC, ok := sc.Chans[id]
sc.RUnlock()
@@ -69,7 +69,7 @@ func (sc *SyncCall) syncRead(id uint32, timeOut int, isStop bool) (*util.VgoPack
}

// syncWrite 阻塞写
func (sc *SyncCall) syncWrite(id uint32, packet *util.VgoPacket) error {
func (sc *SyncCall) syncWrite(id uint32, packet *util.TracingPacket) error {
sc.RLock()
packetC, ok := sc.Chans[id]
sc.RUnlock()
@@ -4,8 +4,8 @@ import (
"time"

"github.com/imdevlab/g"
"github.com/imdevlab/vgo/agent/misc"
"github.com/imdevlab/vgo/util"
"github.com/imdevlab/tracing/agent/misc"
"github.com/imdevlab/tracing/util"
"github.com/vmihailenco/msgpack"
"go.uber.org/zap"
)
@@ -49,7 +49,7 @@ func (s *SystemCollector) Start() {
metrics := util.NewMetricData()
metrics.AppName = gAgent.agentInfo.AppName
metrics.AgentID = gAgent.agentInfo.AgentID
packet := &util.VgoPacket{
packet := &util.TracingPacket{
Type: util.TypeOfSystem,
Version: util.VersionOf01,
IsSync: util.TypeOfSyncNo,
Oops, something went wrong.

0 comments on commit cd611cc

Please sign in to comment.
You can’t perform that action at this time.