Rename EventTelegramTraffic back to EventTraffic

events/event_stream.go

@@ -73,8 +73,8 @@ func eventStreamProcessor(ctx context.Context, eventChan <-chan mtglib.Event, ob
 				observer.EventStart(typedEvt)
 			case mtglib.EventConnectedToDC:
 				observer.EventConnectedToDC(typedEvt)
-			case mtglib.EventTelegramTraffic:
-				observer.EventTelegramTraffic(typedEvt)
+			case mtglib.EventTraffic:
+				observer.EventTraffic(typedEvt)
 			case mtglib.EventFinish:
 				observer.EventFinish(typedEvt)
 			case mtglib.EventIPBlocklisted:

events/event_stream_test.go

@@ -90,8 +90,8 @@ func (suite *EventStreamTestSuite) TestEventConnectedToDC() {
 	time.Sleep(100 * time.Millisecond)
 }
 
-func (suite *EventStreamTestSuite) TestEventTelegramTraffic() {
-	evt := mtglib.EventTelegramTraffic{
+func (suite *EventStreamTestSuite) TestEventTraffic() {
+	evt := mtglib.EventTraffic{
 		CreatedAt: time.Now(),
 		ConnID:    "connID",
 		Traffic:   1024,
@@ -100,10 +100,10 @@ func (suite *EventStreamTestSuite) TestEventTelegramTraffic() {
 
 	for _, v := range []*ObserverMock{suite.observerMock1, suite.observerMock2} {
 		v.
-			On("EventTelegramTraffic", mock.Anything).
+			On("EventTraffic", mock.Anything).
 			Once().
 			Run(func(args mock.Arguments) {
-				caught := args.Get(0).(mtglib.EventTelegramTraffic)
+				caught := args.Get(0).(mtglib.EventTraffic)
 
 				suite.Equal(evt.CreatedAt, caught.CreatedAt)
 				suite.Equal(evt.ConnID, caught.ConnID)

events/init.go

@@ -6,7 +6,7 @@ type Observer interface {
 	EventStart(mtglib.EventStart)
 	EventFinish(mtglib.EventFinish)
 	EventConnectedToDC(mtglib.EventConnectedToDC)
-	EventTelegramTraffic(mtglib.EventTelegramTraffic)
+	EventTraffic(mtglib.EventTraffic)
 	EventConcurrencyLimited(mtglib.EventConcurrencyLimited)
 	EventIPBlocklisted(mtglib.EventIPBlocklisted)
 

events/init_test.go

@@ -17,7 +17,7 @@ func (o *ObserverMock) EventConnectedToDC(evt mtglib.EventConnectedToDC) {
 	o.Called(evt)
 }
 
-func (o *ObserverMock) EventTelegramTraffic(evt mtglib.EventTelegramTraffic) {
+func (o *ObserverMock) EventTraffic(evt mtglib.EventTraffic) {
 	o.Called(evt)
 }
 

events/multi_observer.go

@@ -40,7 +40,7 @@ func (m multiObserver) EventConnectedToDC(evt mtglib.EventConnectedToDC) {
 	wg.Wait()
 }
 
-func (m multiObserver) EventTelegramTraffic(evt mtglib.EventTelegramTraffic) {
+func (m multiObserver) EventTraffic(evt mtglib.EventTraffic) {
 	wg := &sync.WaitGroup{}
 	wg.Add(len(m.observers))
 
@@ -48,7 +48,7 @@ func (m multiObserver) EventTelegramTraffic(evt mtglib.EventTelegramTraffic) {
 		go func(obs Observer) {
 			defer wg.Done()
 
-			obs.EventTelegramTraffic(evt)
+			obs.EventTraffic(evt)
 		}(v)
 	}
 

events/noop.go

@@ -19,7 +19,7 @@ type noopObserver struct{}
 
 func (n noopObserver) EventStart(_ mtglib.EventStart)                           {}
 func (n noopObserver) EventConnectedToDC(_ mtglib.EventConnectedToDC)           {}
-func (n noopObserver) EventTelegramTraffic(_ mtglib.EventTelegramTraffic)       {}
+func (n noopObserver) EventTraffic(_ mtglib.EventTraffic)                       {}
 func (n noopObserver) EventFinish(_ mtglib.EventFinish)                         {}
 func (n noopObserver) EventConcurrencyLimited(_ mtglib.EventConcurrencyLimited) {}
 func (n noopObserver) EventIPBlocklisted(_ mtglib.EventIPBlocklisted)           {}

events/noop_test.go

@@ -31,7 +31,7 @@ func (suite *NoopTestSuite) SetupSuite() {
 			RemoteIP:  net.ParseIP("127.1.0.1"),
 			DC:        2,
 		},
-		"telegram-traffic": mtglib.EventTelegramTraffic{
+		"traffic": mtglib.EventTraffic{
 			CreatedAt: time.Now(),
 			ConnID:    "connID",
 			Traffic:   1000,

mtglib/conns.go

@@ -21,7 +21,7 @@ func (c connTelegramTraffic) Read(b []byte) (int, error) {
 	n, err := c.Conn.Read(b)
 
 	if n > 0 {
-		c.stream.Send(c.ctx, EventTelegramTraffic{
+		c.stream.Send(c.ctx, EventTraffic{
 			CreatedAt: time.Now(),
 			ConnID:    c.connID,
 			Traffic:   uint(n),
@@ -36,7 +36,7 @@ func (c connTelegramTraffic) Write(b []byte) (int, error) {
 	n, err := c.Conn.Write(b)
 
 	if n > 0 {
-		c.stream.Send(c.ctx, EventTelegramTraffic{
+		c.stream.Send(c.ctx, EventTraffic{
 			CreatedAt: time.Now(),
 			ConnID:    c.connID,
 			Traffic:   uint(n),

mtglib/events.go

@@ -34,18 +34,18 @@ func (e EventConnectedToDC) Timestamp() time.Time {
 	return e.CreatedAt
 }
 
-type EventTelegramTraffic struct {
+type EventTraffic struct {
 	CreatedAt time.Time
 	ConnID    string
 	Traffic   uint
 	IsRead    bool
 }
 
-func (e EventTelegramTraffic) StreamID() string {
+func (e EventTraffic) StreamID() string {
 	return e.ConnID
 }
 
-func (e EventTelegramTraffic) Timestamp() time.Time {
+func (e EventTraffic) Timestamp() time.Time {
 	return e.CreatedAt
 }
 

mtglib/events_test.go

@@ -46,8 +46,8 @@ func (suite *EventsTestSuite) TestEventConnectedToDC() {
 	suite.WithinDuration(time.Now(), evt.Timestamp(), 10*time.Millisecond)
 }
 
-func (suite *EventsTestSuite) TestEventTelegramTraffic() {
-	evt := mtglib.EventTelegramTraffic{
+func (suite *EventsTestSuite) TestEventTraffic() {
+	evt := mtglib.EventTraffic{
 		CreatedAt: time.Now(),
 		ConnID:    "CONNID",
 		Traffic:   3,

stats/prometheus.go

@@ -41,7 +41,7 @@ func (p prometheusProcessor) EventConnectedToDC(evt mtglib.EventConnectedToDC) {
 		Inc()
 }
 
-func (p prometheusProcessor) EventTelegramTraffic(evt mtglib.EventTelegramTraffic) {
+func (p prometheusProcessor) EventTraffic(evt mtglib.EventTraffic) {
 	info, ok := p.streams[evt.StreamID()]
 	if !ok {
 		return

stats/prometheus_test.go

@@ -78,7 +78,7 @@ func (suite *PrometheusTestSuite) TestEventStartFinish() {
 	suite.NoError(err)
 	suite.Contains(data, `mtg_telegram_connections{dc="4",telegram_ip="10.0.0.1"} 1`)
 
-	suite.prometheus.EventTelegramTraffic(mtglib.EventTelegramTraffic{
+	suite.prometheus.EventTraffic(mtglib.EventTraffic{
 		CreatedAt: time.Now(),
 		ConnID:    "connID",
 		Traffic:   200,
@@ -90,7 +90,7 @@ func (suite *PrometheusTestSuite) TestEventStartFinish() {
 	suite.NoError(err)
 	suite.Contains(data, `mtg_telegram_traffic{dc="4",direction="to_client",telegram_ip="10.0.0.1"} 200`)
 
-	suite.prometheus.EventTelegramTraffic(mtglib.EventTelegramTraffic{
+	suite.prometheus.EventTraffic(mtglib.EventTraffic{
 		CreatedAt: time.Now(),
 		ConnID:    "connID",
 		Traffic:   100,

stats/statsd.go

@@ -42,7 +42,7 @@ func (s statsdProcessor) EventConnectedToDC(evt mtglib.EventConnectedToDC) {
 		info.TV(TagDC))
 }
 
-func (s statsdProcessor) EventTelegramTraffic(evt mtglib.EventTelegramTraffic) {
+func (s statsdProcessor) EventTraffic(evt mtglib.EventTraffic) {
 	info, ok := s.streams[evt.StreamID()]
 	if !ok {
 		return

stats/statsd_test.go

@@ -123,7 +123,7 @@ func (suite *StatsdTestSuite) TestEventStartFinish() {
 	suite.Contains(suite.statsdServer.String(),
 		"mtg.telegram_connections:+1|g|#telegram_ip:10.1.0.10,dc:2")
 
-	suite.statsd.EventTelegramTraffic(mtglib.EventTelegramTraffic{
+	suite.statsd.EventTraffic(mtglib.EventTraffic{
 		CreatedAt: time.Now(),
 		ConnID:    "connID",
 		Traffic:   30,
@@ -133,7 +133,7 @@ func (suite *StatsdTestSuite) TestEventStartFinish() {
 	suite.Contains(suite.statsdServer.String(),
 		"mtg.telegram_traffic:30|c|#telegram_ip:10.1.0.10,dc:2,direction:to_client")
 
-	suite.statsd.EventTelegramTraffic(mtglib.EventTelegramTraffic{
+	suite.statsd.EventTraffic(mtglib.EventTraffic{
 		CreatedAt: time.Now(),
 		ConnID:    "connID",
 		Traffic:   90,