Merge pull request #7681 from TheThingsNetwork/fix/gs-event-race-condition

Fix race condition on downlink attempt event registration

Author: vlasebian

config/messages.json

@@ -4841,15 +4841,6 @@
       "file": "pattern.go"
     }
   },
-  "error:pkg/events:marshal_data": {
-    "translations": {
-      "en": "marshal data"
-    },
-    "description": {
-      "package": "pkg/events",
-      "file": "events.go"
-    }
-  },
   "error:pkg/events:no_matching_events": {
     "translations": {
       "en": "no matching events for regexp `{regexp}`"

pkg/events/events.go

@@ -25,9 +25,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/getsentry/sentry-go"
 	"go.thethings.network/lorawan-stack/v3/pkg/errors"
-	sentryerrors "go.thethings.network/lorawan-stack/v3/pkg/errors/sentry"
 	"go.thethings.network/lorawan-stack/v3/pkg/goproto"
 	"go.thethings.network/lorawan-stack/v3/pkg/jsonpb"
 	"go.thethings.network/lorawan-stack/v3/pkg/ttnpb"
@@ -222,47 +220,14 @@ func Proto(e Event) (*ttnpb.Event, error) {
 	pb.Context = ctx
 	if evt.data != nil {
 		var err error
-		// TODO: uncomment masrshalData and remove mustMarshalEventData after the issue mentioned
-		// below (7632) is fixed.
-		// pb.Data, err = marshalData(e.Data())
-		pb.Data, err = mustMarshalEventData(e)
+		pb.Data, err = marshalData(e.Data())
 		if err != nil {
 			return nil, err
 		}
 	}
 	return pb, nil
 }
 
-// TODO: remove after issue is resolved
-// https://github.com/TheThingsNetwork/lorawan-stack/issues/7623
-var errMarshalData = errors.Define("marshal_data", "marshal data")
-
-func mustMarshalEventData(e Event) (*anypb.Any, error) {
-	defer func() {
-		if p := recover(); p != nil {
-			var err error
-			if pErr, ok := p.(error); ok {
-				err = errMarshalData.WithCause(pErr).WithAttributes(
-					"event_name", e.Name(),
-					"event_correlation_ids", e.CorrelationIds(),
-					"event_identifiers", e.Identifiers(),
-				)
-			} else {
-				err = errMarshalData.WithAttributes(
-					"panic", p,
-					"event_name", e.Name(),
-					"event_correlation_ids", e.CorrelationIds(),
-					"event_identifiers", e.Identifiers(),
-				)
-			}
-			event := sentryerrors.NewEvent(err)
-			sentry.CaptureEvent(event)
-		}
-	}()
-
-	return marshalData(e.Data())
-}
-
 // FromProto returns the event from its protobuf representation.
 func FromProto(pb *ttnpb.Event) (Event, error) {
 	ctx, err := unmarshalContext(context.Background(), pb.Context)

pkg/gatewayserver/grpc_nsgs.go

@@ -83,7 +83,7 @@ func (gs *GatewayServer) ScheduleDownlink(ctx context.Context, down *ttnpb.Downl
 		connDown.GetRequest().DownlinkPaths = nil // And do not leak the downlink paths to the gateway.
 		connDown.CorrelationIds = events.CorrelationIDsFromContext(ctx)
 
-		registerScheduleDownlinkAttempt(ctx, conn.Gateway(), connDown, conn.Frontend().Protocol())
+		registerScheduleDownlinkAttempt(ctx, conn.Gateway(), ttnpb.Clone(connDown), conn.Frontend().Protocol())
 
 		rx1, rx2, delay, err := conn.ScheduleDown(path, connDown)
 		if err != nil {

pkg/webui/locales/ja.json

@@ -2401,7 +2401,6 @@
   "error:pkg/events/redis:channel_closed": "チャネルが閉じています",
   "error:pkg/events/redis:unknown_encoding": "不明なエンコーディング",
   "error:pkg/events:invalid_regexp": "無効な正規表現",
-  "error:pkg/events:marshal_data": "",
   "error:pkg/events:no_matching_events": "正規表現`{regexp}`に一致するイベントがありません",
   "error:pkg/events:unknown_event_name": "不明なイベント`{name}`",
   "error:pkg/fetch:fetch_file": "ファイル `{filename}` を取得できません",