Przeglądaj źródła

Rename EventTelegramTraffic back to EventTraffic

tags/v2.0.0-rc1
9seconds 5 lat temu
rodzic
commit
db8614999a

+ 2
- 2
events/event_stream.go Wyświetl plik

73
 				observer.EventStart(typedEvt)
73
 				observer.EventStart(typedEvt)
74
 			case mtglib.EventConnectedToDC:
74
 			case mtglib.EventConnectedToDC:
75
 				observer.EventConnectedToDC(typedEvt)
75
 				observer.EventConnectedToDC(typedEvt)
76
-			case mtglib.EventTelegramTraffic:
77
-				observer.EventTelegramTraffic(typedEvt)
76
+			case mtglib.EventTraffic:
77
+				observer.EventTraffic(typedEvt)
78
 			case mtglib.EventFinish:
78
 			case mtglib.EventFinish:
79
 				observer.EventFinish(typedEvt)
79
 				observer.EventFinish(typedEvt)
80
 			case mtglib.EventIPBlocklisted:
80
 			case mtglib.EventIPBlocklisted:

+ 4
- 4
events/event_stream_test.go Wyświetl plik

90
 	time.Sleep(100 * time.Millisecond)
90
 	time.Sleep(100 * time.Millisecond)
91
 }
91
 }
92
 
92
 
93
-func (suite *EventStreamTestSuite) TestEventTelegramTraffic() {
94
-	evt := mtglib.EventTelegramTraffic{
93
+func (suite *EventStreamTestSuite) TestEventTraffic() {
94
+	evt := mtglib.EventTraffic{
95
 		CreatedAt: time.Now(),
95
 		CreatedAt: time.Now(),
96
 		ConnID:    "connID",
96
 		ConnID:    "connID",
97
 		Traffic:   1024,
97
 		Traffic:   1024,
100
 
100
 
101
 	for _, v := range []*ObserverMock{suite.observerMock1, suite.observerMock2} {
101
 	for _, v := range []*ObserverMock{suite.observerMock1, suite.observerMock2} {
102
 		v.
102
 		v.
103
-			On("EventTelegramTraffic", mock.Anything).
103
+			On("EventTraffic", mock.Anything).
104
 			Once().
104
 			Once().
105
 			Run(func(args mock.Arguments) {
105
 			Run(func(args mock.Arguments) {
106
-				caught := args.Get(0).(mtglib.EventTelegramTraffic)
106
+				caught := args.Get(0).(mtglib.EventTraffic)
107
 
107
 
108
 				suite.Equal(evt.CreatedAt, caught.CreatedAt)
108
 				suite.Equal(evt.CreatedAt, caught.CreatedAt)
109
 				suite.Equal(evt.ConnID, caught.ConnID)
109
 				suite.Equal(evt.ConnID, caught.ConnID)

+ 1
- 1
events/init.go Wyświetl plik

6
 	EventStart(mtglib.EventStart)
6
 	EventStart(mtglib.EventStart)
7
 	EventFinish(mtglib.EventFinish)
7
 	EventFinish(mtglib.EventFinish)
8
 	EventConnectedToDC(mtglib.EventConnectedToDC)
8
 	EventConnectedToDC(mtglib.EventConnectedToDC)
9
-	EventTelegramTraffic(mtglib.EventTelegramTraffic)
9
+	EventTraffic(mtglib.EventTraffic)
10
 	EventConcurrencyLimited(mtglib.EventConcurrencyLimited)
10
 	EventConcurrencyLimited(mtglib.EventConcurrencyLimited)
11
 	EventIPBlocklisted(mtglib.EventIPBlocklisted)
11
 	EventIPBlocklisted(mtglib.EventIPBlocklisted)
12
 
12
 

+ 1
- 1
events/init_test.go Wyświetl plik

17
 	o.Called(evt)
17
 	o.Called(evt)
18
 }
18
 }
19
 
19
 
20
-func (o *ObserverMock) EventTelegramTraffic(evt mtglib.EventTelegramTraffic) {
20
+func (o *ObserverMock) EventTraffic(evt mtglib.EventTraffic) {
21
 	o.Called(evt)
21
 	o.Called(evt)
22
 }
22
 }
23
 
23
 

+ 2
- 2
events/multi_observer.go Wyświetl plik

40
 	wg.Wait()
40
 	wg.Wait()
41
 }
41
 }
42
 
42
 
43
-func (m multiObserver) EventTelegramTraffic(evt mtglib.EventTelegramTraffic) {
43
+func (m multiObserver) EventTraffic(evt mtglib.EventTraffic) {
44
 	wg := &sync.WaitGroup{}
44
 	wg := &sync.WaitGroup{}
45
 	wg.Add(len(m.observers))
45
 	wg.Add(len(m.observers))
46
 
46
 
48
 		go func(obs Observer) {
48
 		go func(obs Observer) {
49
 			defer wg.Done()
49
 			defer wg.Done()
50
 
50
 
51
-			obs.EventTelegramTraffic(evt)
51
+			obs.EventTraffic(evt)
52
 		}(v)
52
 		}(v)
53
 	}
53
 	}
54
 
54
 

+ 1
- 1
events/noop.go Wyświetl plik

19
 
19
 
20
 func (n noopObserver) EventStart(_ mtglib.EventStart)                           {}
20
 func (n noopObserver) EventStart(_ mtglib.EventStart)                           {}
21
 func (n noopObserver) EventConnectedToDC(_ mtglib.EventConnectedToDC)           {}
21
 func (n noopObserver) EventConnectedToDC(_ mtglib.EventConnectedToDC)           {}
22
-func (n noopObserver) EventTelegramTraffic(_ mtglib.EventTelegramTraffic)       {}
22
+func (n noopObserver) EventTraffic(_ mtglib.EventTraffic)                       {}
23
 func (n noopObserver) EventFinish(_ mtglib.EventFinish)                         {}
23
 func (n noopObserver) EventFinish(_ mtglib.EventFinish)                         {}
24
 func (n noopObserver) EventConcurrencyLimited(_ mtglib.EventConcurrencyLimited) {}
24
 func (n noopObserver) EventConcurrencyLimited(_ mtglib.EventConcurrencyLimited) {}
25
 func (n noopObserver) EventIPBlocklisted(_ mtglib.EventIPBlocklisted)           {}
25
 func (n noopObserver) EventIPBlocklisted(_ mtglib.EventIPBlocklisted)           {}

+ 1
- 1
events/noop_test.go Wyświetl plik

31
 			RemoteIP:  net.ParseIP("127.1.0.1"),
31
 			RemoteIP:  net.ParseIP("127.1.0.1"),
32
 			DC:        2,
32
 			DC:        2,
33
 		},
33
 		},
34
-		"telegram-traffic": mtglib.EventTelegramTraffic{
34
+		"traffic": mtglib.EventTraffic{
35
 			CreatedAt: time.Now(),
35
 			CreatedAt: time.Now(),
36
 			ConnID:    "connID",
36
 			ConnID:    "connID",
37
 			Traffic:   1000,
37
 			Traffic:   1000,

+ 2
- 2
mtglib/conns.go Wyświetl plik

21
 	n, err := c.Conn.Read(b)
21
 	n, err := c.Conn.Read(b)
22
 
22
 
23
 	if n > 0 {
23
 	if n > 0 {
24
-		c.stream.Send(c.ctx, EventTelegramTraffic{
24
+		c.stream.Send(c.ctx, EventTraffic{
25
 			CreatedAt: time.Now(),
25
 			CreatedAt: time.Now(),
26
 			ConnID:    c.connID,
26
 			ConnID:    c.connID,
27
 			Traffic:   uint(n),
27
 			Traffic:   uint(n),
36
 	n, err := c.Conn.Write(b)
36
 	n, err := c.Conn.Write(b)
37
 
37
 
38
 	if n > 0 {
38
 	if n > 0 {
39
-		c.stream.Send(c.ctx, EventTelegramTraffic{
39
+		c.stream.Send(c.ctx, EventTraffic{
40
 			CreatedAt: time.Now(),
40
 			CreatedAt: time.Now(),
41
 			ConnID:    c.connID,
41
 			ConnID:    c.connID,
42
 			Traffic:   uint(n),
42
 			Traffic:   uint(n),

+ 3
- 3
mtglib/events.go Wyświetl plik

34
 	return e.CreatedAt
34
 	return e.CreatedAt
35
 }
35
 }
36
 
36
 
37
-type EventTelegramTraffic struct {
37
+type EventTraffic struct {
38
 	CreatedAt time.Time
38
 	CreatedAt time.Time
39
 	ConnID    string
39
 	ConnID    string
40
 	Traffic   uint
40
 	Traffic   uint
41
 	IsRead    bool
41
 	IsRead    bool
42
 }
42
 }
43
 
43
 
44
-func (e EventTelegramTraffic) StreamID() string {
44
+func (e EventTraffic) StreamID() string {
45
 	return e.ConnID
45
 	return e.ConnID
46
 }
46
 }
47
 
47
 
48
-func (e EventTelegramTraffic) Timestamp() time.Time {
48
+func (e EventTraffic) Timestamp() time.Time {
49
 	return e.CreatedAt
49
 	return e.CreatedAt
50
 }
50
 }
51
 
51
 

+ 2
- 2
mtglib/events_test.go Wyświetl plik

46
 	suite.WithinDuration(time.Now(), evt.Timestamp(), 10*time.Millisecond)
46
 	suite.WithinDuration(time.Now(), evt.Timestamp(), 10*time.Millisecond)
47
 }
47
 }
48
 
48
 
49
-func (suite *EventsTestSuite) TestEventTelegramTraffic() {
50
-	evt := mtglib.EventTelegramTraffic{
49
+func (suite *EventsTestSuite) TestEventTraffic() {
50
+	evt := mtglib.EventTraffic{
51
 		CreatedAt: time.Now(),
51
 		CreatedAt: time.Now(),
52
 		ConnID:    "CONNID",
52
 		ConnID:    "CONNID",
53
 		Traffic:   3,
53
 		Traffic:   3,

+ 1
- 1
stats/prometheus.go Wyświetl plik

41
 		Inc()
41
 		Inc()
42
 }
42
 }
43
 
43
 
44
-func (p prometheusProcessor) EventTelegramTraffic(evt mtglib.EventTelegramTraffic) {
44
+func (p prometheusProcessor) EventTraffic(evt mtglib.EventTraffic) {
45
 	info, ok := p.streams[evt.StreamID()]
45
 	info, ok := p.streams[evt.StreamID()]
46
 	if !ok {
46
 	if !ok {
47
 		return
47
 		return

+ 2
- 2
stats/prometheus_test.go Wyświetl plik

78
 	suite.NoError(err)
78
 	suite.NoError(err)
79
 	suite.Contains(data, `mtg_telegram_connections{dc="4",telegram_ip="10.0.0.1"} 1`)
79
 	suite.Contains(data, `mtg_telegram_connections{dc="4",telegram_ip="10.0.0.1"} 1`)
80
 
80
 
81
-	suite.prometheus.EventTelegramTraffic(mtglib.EventTelegramTraffic{
81
+	suite.prometheus.EventTraffic(mtglib.EventTraffic{
82
 		CreatedAt: time.Now(),
82
 		CreatedAt: time.Now(),
83
 		ConnID:    "connID",
83
 		ConnID:    "connID",
84
 		Traffic:   200,
84
 		Traffic:   200,
90
 	suite.NoError(err)
90
 	suite.NoError(err)
91
 	suite.Contains(data, `mtg_telegram_traffic{dc="4",direction="to_client",telegram_ip="10.0.0.1"} 200`)
91
 	suite.Contains(data, `mtg_telegram_traffic{dc="4",direction="to_client",telegram_ip="10.0.0.1"} 200`)
92
 
92
 
93
-	suite.prometheus.EventTelegramTraffic(mtglib.EventTelegramTraffic{
93
+	suite.prometheus.EventTraffic(mtglib.EventTraffic{
94
 		CreatedAt: time.Now(),
94
 		CreatedAt: time.Now(),
95
 		ConnID:    "connID",
95
 		ConnID:    "connID",
96
 		Traffic:   100,
96
 		Traffic:   100,

+ 1
- 1
stats/statsd.go Wyświetl plik

42
 		info.TV(TagDC))
42
 		info.TV(TagDC))
43
 }
43
 }
44
 
44
 
45
-func (s statsdProcessor) EventTelegramTraffic(evt mtglib.EventTelegramTraffic) {
45
+func (s statsdProcessor) EventTraffic(evt mtglib.EventTraffic) {
46
 	info, ok := s.streams[evt.StreamID()]
46
 	info, ok := s.streams[evt.StreamID()]
47
 	if !ok {
47
 	if !ok {
48
 		return
48
 		return

+ 2
- 2
stats/statsd_test.go Wyświetl plik

123
 	suite.Contains(suite.statsdServer.String(),
123
 	suite.Contains(suite.statsdServer.String(),
124
 		"mtg.telegram_connections:+1|g|#telegram_ip:10.1.0.10,dc:2")
124
 		"mtg.telegram_connections:+1|g|#telegram_ip:10.1.0.10,dc:2")
125
 
125
 
126
-	suite.statsd.EventTelegramTraffic(mtglib.EventTelegramTraffic{
126
+	suite.statsd.EventTraffic(mtglib.EventTraffic{
127
 		CreatedAt: time.Now(),
127
 		CreatedAt: time.Now(),
128
 		ConnID:    "connID",
128
 		ConnID:    "connID",
129
 		Traffic:   30,
129
 		Traffic:   30,
133
 	suite.Contains(suite.statsdServer.String(),
133
 	suite.Contains(suite.statsdServer.String(),
134
 		"mtg.telegram_traffic:30|c|#telegram_ip:10.1.0.10,dc:2,direction:to_client")
134
 		"mtg.telegram_traffic:30|c|#telegram_ip:10.1.0.10,dc:2,direction:to_client")
135
 
135
 
136
-	suite.statsd.EventTelegramTraffic(mtglib.EventTelegramTraffic{
136
+	suite.statsd.EventTraffic(mtglib.EventTraffic{
137
 		CreatedAt: time.Now(),
137
 		CreatedAt: time.Now(),
138
 		ConnID:    "connID",
138
 		ConnID:    "connID",
139
 		Traffic:   90,
139
 		Traffic:   90,

Ładowanie…
Anuluj
Zapisz