From 4e439354c34b73d7d9d9eba4ab0ee9cc271acfcf Mon Sep 17 00:00:00 2001 From: Alex Kaminskii Date: Fri, 24 Jun 2022 16:32:46 +0200 Subject: [PATCH] style(backend): rename RawErrorEvent to IntegrationEvent --- backend/cmd/ender/main.go | 2 +- backend/cmd/integrations/main.go | 4 ++-- backend/internal/db/datasaver/messages.go | 2 +- backend/internal/integrations/integration/bugsnag.go | 2 +- backend/internal/integrations/integration/client.go | 2 +- backend/internal/integrations/integration/cloudwatch.go | 2 +- backend/internal/integrations/integration/datadog.go | 2 +- .../internal/integrations/integration/elasticsearch.go | 2 +- backend/internal/integrations/integration/newrelic.go | 2 +- backend/internal/integrations/integration/rollbar.go | 2 +- backend/internal/integrations/integration/sentry.go | 2 +- backend/internal/integrations/integration/stackdriver.go | 2 +- backend/internal/integrations/integration/sumologic.go | 2 +- backend/pkg/messages/messages.go | 8 ++++---- backend/pkg/messages/read-message.go | 2 +- 15 files changed, 19 insertions(+), 19 deletions(-) diff --git a/backend/cmd/ender/main.go b/backend/cmd/ender/main.go index 8271e6e38..6898b6f27 100644 --- a/backend/cmd/ender/main.go +++ b/backend/cmd/ender/main.go @@ -50,7 +50,7 @@ func main() { }, func(sessionID uint64, msg messages.Message, meta *types.Meta) { switch msg.(type) { - case *messages.SessionStart, *messages.SessionEnd, *messages.RawErrorEvent: + case *messages.SessionStart, *messages.SessionEnd: // Skip several message types return } diff --git a/backend/cmd/integrations/main.go b/backend/cmd/integrations/main.go index e25c1690f..90137b5b8 100644 --- a/backend/cmd/integrations/main.go +++ b/backend/cmd/integrations/main.go @@ -74,7 +74,7 @@ func main() { log.Printf("Requesting all...\n") manager.RequestAll() case event := <-manager.Events: - log.Printf("New integration event: %+v\n", *event.RawErrorEvent) + log.Printf("New integration event: %+v\n", *event.IntegrationEvent) sessionID := event.SessionID if sessionID == 0 { sessData, err := tokenizer.Parse(event.Token) @@ -85,7 +85,7 @@ func main() { sessionID = sessData.ID } // TODO: send to ready-events topic. Otherwise it have to go through the events worker. - producer.Produce(cfg.TopicRawWeb, sessionID, messages.Encode(event.RawErrorEvent)) + producer.Produce(cfg.TopicRawWeb, sessionID, messages.Encode(event.IntegrationEvent)) case err := <-manager.Errors: log.Printf("Integration error: %v\n", err) case i := <-manager.RequestDataUpdates: diff --git a/backend/internal/db/datasaver/messages.go b/backend/internal/db/datasaver/messages.go index 112559fb1..43b960140 100644 --- a/backend/internal/db/datasaver/messages.go +++ b/backend/internal/db/datasaver/messages.go @@ -66,7 +66,7 @@ func (mi *Saver) InsertMessage(sessionID uint64, msg Message) error { case *IOSCrash: return mi.pg.InsertIOSCrash(sessionID, m) - case *RawErrorEvent: + case *IntegrationEvent: return mi.pg.InsertWebErrorEvent(sessionID, &ErrorEvent{ MessageID: m.Meta().Index, // TODO: is it possible to catch panic here??? Timestamp: m.Timestamp, diff --git a/backend/internal/integrations/integration/bugsnag.go b/backend/internal/integrations/integration/bugsnag.go index 118cdb84d..ae8657c39 100644 --- a/backend/internal/integrations/integration/bugsnag.go +++ b/backend/internal/integrations/integration/bugsnag.go @@ -97,7 +97,7 @@ func (b *bugsnag) Request(c *client) error { c.evChan <- &SessionErrorEvent{ SessionID: sessionID, Token: token, - RawErrorEvent: &messages.RawErrorEvent{ + IntegrationEvent: &messages.IntegrationEvent{ Source: "bugsnag", Timestamp: timestamp, Name: e.Exceptions[0].Message, diff --git a/backend/internal/integrations/integration/client.go b/backend/internal/integrations/integration/client.go index 315bfe4e9..632861607 100644 --- a/backend/internal/integrations/integration/client.go +++ b/backend/internal/integrations/integration/client.go @@ -40,7 +40,7 @@ type client struct { type SessionErrorEvent struct { SessionID uint64 Token string - *messages.RawErrorEvent + *messages.IntegrationEvent } type ClientMap map[string]*client diff --git a/backend/internal/integrations/integration/cloudwatch.go b/backend/internal/integrations/integration/cloudwatch.go index 9974f485b..a069b18cb 100644 --- a/backend/internal/integrations/integration/cloudwatch.go +++ b/backend/internal/integrations/integration/cloudwatch.go @@ -68,7 +68,7 @@ func (cw *cloudwatch) Request(c *client) error { c.evChan <- &SessionErrorEvent{ //SessionID: sessionID, Token: token, - RawErrorEvent: &messages.RawErrorEvent{ + IntegrationEvent: &messages.IntegrationEvent{ Source: "cloudwatch", Timestamp: timestamp, // e.IngestionTime ?? Name: name, diff --git a/backend/internal/integrations/integration/datadog.go b/backend/internal/integrations/integration/datadog.go index 096c3b822..edbbd6d83 100644 --- a/backend/internal/integrations/integration/datadog.go +++ b/backend/internal/integrations/integration/datadog.go @@ -115,7 +115,7 @@ func (d *datadog) Request(c *client) error { c.evChan <- &SessionErrorEvent{ //SessionID: sessionID, Token: token, - RawErrorEvent: &messages.RawErrorEvent{ + IntegrationEvent: &messages.IntegrationEvent{ Source: "datadog", Timestamp: timestamp, Name: ddLog.Content.Attributes.Error.Message, diff --git a/backend/internal/integrations/integration/elasticsearch.go b/backend/internal/integrations/integration/elasticsearch.go index 6b8181073..5331f850e 100644 --- a/backend/internal/integrations/integration/elasticsearch.go +++ b/backend/internal/integrations/integration/elasticsearch.go @@ -181,7 +181,7 @@ func (es *elasticsearch) Request(c *client) error { //SessionID: sessionID, SessionID: sessionID, Token: token, - RawErrorEvent: &messages.RawErrorEvent{ + IntegrationEvent: &messages.IntegrationEvent{ Source: "elasticsearch", Timestamp: timestamp, Name: fmt.Sprintf("%v", docID), diff --git a/backend/internal/integrations/integration/newrelic.go b/backend/internal/integrations/integration/newrelic.go index 2dce79aa5..97426de22 100644 --- a/backend/internal/integrations/integration/newrelic.go +++ b/backend/internal/integrations/integration/newrelic.go @@ -89,7 +89,7 @@ func (nr *newrelic) Request(c *client) error { c.setLastMessageTimestamp(e.Timestamp) c.evChan <- &SessionErrorEvent{ Token: e.OpenReplaySessionToken, - RawErrorEvent: &messages.RawErrorEvent{ + IntegrationEvent: &messages.IntegrationEvent{ Source: "newrelic", Timestamp: e.Timestamp, Name: e.ErrorClass, diff --git a/backend/internal/integrations/integration/rollbar.go b/backend/internal/integrations/integration/rollbar.go index 53a5c6d5b..a683a687c 100644 --- a/backend/internal/integrations/integration/rollbar.go +++ b/backend/internal/integrations/integration/rollbar.go @@ -156,7 +156,7 @@ func (rb *rollbar) Request(c *client) error { c.setLastMessageTimestamp(timestamp) c.evChan <- &SessionErrorEvent{ Token: e["body.message.openReplaySessionToken"], - RawErrorEvent: &messages.RawErrorEvent{ + IntegrationEvent: &messages.IntegrationEvent{ Source: "rollbar", Timestamp: timestamp, Name: e["item.title"], diff --git a/backend/internal/integrations/integration/sentry.go b/backend/internal/integrations/integration/sentry.go index 1c5bfdaad..ea3118449 100644 --- a/backend/internal/integrations/integration/sentry.go +++ b/backend/internal/integrations/integration/sentry.go @@ -115,7 +115,7 @@ PageLoop: c.evChan <- &SessionErrorEvent{ SessionID: sessionID, Token: token, - RawErrorEvent: &messages.RawErrorEvent{ + IntegrationEvent: &messages.IntegrationEvent{ Source: "sentry", Timestamp: timestamp, Name: e.Title, diff --git a/backend/internal/integrations/integration/stackdriver.go b/backend/internal/integrations/integration/stackdriver.go index e852d5d36..45b769aa7 100644 --- a/backend/internal/integrations/integration/stackdriver.go +++ b/backend/internal/integrations/integration/stackdriver.go @@ -89,7 +89,7 @@ func (sd *stackdriver) Request(c *client) error { c.evChan <- &SessionErrorEvent{ //SessionID: sessionID, Token: token, - RawErrorEvent: &messages.RawErrorEvent{ + IntegrationEvent: &messages.IntegrationEvent{ Source: "stackdriver", Timestamp: timestamp, Name: e.InsertID, // not sure about that diff --git a/backend/internal/integrations/integration/sumologic.go b/backend/internal/integrations/integration/sumologic.go index 8ff39ec9e..c5ee63249 100644 --- a/backend/internal/integrations/integration/sumologic.go +++ b/backend/internal/integrations/integration/sumologic.go @@ -193,7 +193,7 @@ func (sl *sumologic) Request(c *client) error { c.evChan <- &SessionErrorEvent{ //SessionID: sessionID, Token: token, - RawErrorEvent: &messages.RawErrorEvent{ + IntegrationEvent: &messages.IntegrationEvent{ Source: "sumologic", Timestamp: e.Timestamp, Name: name, diff --git a/backend/pkg/messages/messages.go b/backend/pkg/messages/messages.go index ba10eb026..6c4d75bfc 100644 --- a/backend/pkg/messages/messages.go +++ b/backend/pkg/messages/messages.go @@ -571,7 +571,7 @@ func (msg *JSException) TypeID() int { return 25 } -type RawErrorEvent struct { +type IntegrationEvent struct { message Timestamp uint64 Source string @@ -580,7 +580,7 @@ type RawErrorEvent struct { Payload string } -func (msg *RawErrorEvent) Encode() []byte { +func (msg *IntegrationEvent) Encode() []byte { buf := make([]byte, 51+len(msg.Source)+len(msg.Name)+len(msg.Message)+len(msg.Payload)) buf[0] = 26 p := 1 @@ -592,7 +592,7 @@ func (msg *RawErrorEvent) Encode() []byte { return buf[:p] } -func (msg *RawErrorEvent) TypeID() int { +func (msg *IntegrationEvent) TypeID() int { return 26 } @@ -1396,7 +1396,7 @@ type IssueEvent struct { Type string ContextString string Context string - Payload string // TODO: check, maybe it's better to use empty interface here + Payload string } func (msg *IssueEvent) Encode() []byte { diff --git a/backend/pkg/messages/read-message.go b/backend/pkg/messages/read-message.go index 59c8e739c..5009994f5 100644 --- a/backend/pkg/messages/read-message.go +++ b/backend/pkg/messages/read-message.go @@ -369,7 +369,7 @@ func ReadMessage(reader io.Reader) (Message, error) { return msg, nil case 26: - msg := &RawErrorEvent{} + msg := &IntegrationEvent{} if msg.Timestamp, err = ReadUint(reader); err != nil { return nil, err }