refactor: get spans from context instead of passing as arguments

Argus-Labs · Dec 11, 2024 · 54557af · 54557af
1 parent c4cb253
commit 54557af
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 11 deletions.
diff --git a/relay/nakama/auth/argus_id.go b/relay/nakama/auth/argus_id.go
@@ -94,8 +94,9 @@ func authWithArgusID(
 	logger runtime.Logger,
 	_ runtime.NakamaModule,
 	in *api.AuthenticateCustomRequest,
-	span trace.Span,
 ) (*api.AuthenticateCustomRequest, error) {
+	span := trace.SpanFromContext(ctx)
+
 	jwtHash := in.GetAccount().GetId()
 	jwt := in.GetAccount().GetVars()["jwt"]
 	claims, err := validateAndParseJWT(ctx, jwtHash, jwt, GlobalJWTSecret)
@@ -129,8 +130,9 @@ func linkWithArgusID(
 	logger runtime.Logger,
 	_ runtime.NakamaModule,
 	in *api.AccountCustom,
-	span trace.Span,
 ) (*api.AccountCustom, error) {
+	span := trace.SpanFromContext(ctx)
+
 	jwtHash := in.GetId()
 	jwt := in.GetVars()["jwt"]
 	claims, err := validateAndParseJWT(ctx, jwtHash, jwt, GlobalJWTSecret)

diff --git a/relay/nakama/auth/custom.go b/relay/nakama/auth/custom.go
@@ -67,7 +67,7 @@ func handleCustomAuthentication(
 	// In the future, other authentication methods can be added here (e.g. Twitter)
 	if authType == signInWithEthereumType {
 		span.AddEvent("Handling custom auth with SIWE")
-		in, err := authWithSIWE(ctx, logger, nk, in, span)
+		in, err := authWithSIWE(ctx, logger, nk, in)
 		if err != nil {
 			span.RecordError(err)
 			span.SetStatus(otelcode.Error, "Failed to authenticate with SIWE")
@@ -78,7 +78,7 @@ func handleCustomAuthentication(
 	}
 	if authType == signInWithArgusIDType && GlobalJWTSecret != "" {
 		span.AddEvent("Handling custom auth with Argus ID")
-		in, err := authWithArgusID(ctx, logger, nk, in, span)
+		in, err := authWithArgusID(ctx, logger, nk, in)
 		if err != nil {
 			span.RecordError(err)
 			span.SetStatus(otelcode.Error, "Failed to authenticate with Argus ID")
@@ -114,7 +114,7 @@ func handleCustomLink(
 	defer span.End()
 	// In the future, other authentication methods can be added here (e.g. Twitter)
 	if authType == signInWithEthereumType {
-		in, err := linkWithSIWE(ctx, logger, nk, in, span)
+		in, err := linkWithSIWE(ctx, logger, nk, in)
 		if err != nil {
 			span.RecordError(err)
 			span.SetStatus(otelcode.Error, "Failed to link with SIWE")
@@ -124,7 +124,7 @@ func handleCustomLink(
 		return in, nil
 	}
 	if authType == signInWithArgusIDType && GlobalJWTSecret != "" {
-		in, err := linkWithArgusID(ctx, logger, nk, in, span)
+		in, err := linkWithArgusID(ctx, logger, nk, in)
 		if err != nil {
 			span.RecordError(err)
 			span.SetStatus(otelcode.Error, "Failed to link with Argus ID")

diff --git a/relay/nakama/auth/siwe.go b/relay/nakama/auth/siwe.go
@@ -40,8 +40,8 @@ func processSIWE(
 	logger runtime.Logger,
 	nk runtime.NakamaModule,
 	signerAddress, signature, message string,
-	span trace.Span,
 ) error {
+	span := trace.SpanFromContext(ctx)
 	span.AddEvent("Validating SIWE request")
 	isValidationRequest, err := validateSIWE(signerAddress, message, signature)
 	if err != nil {
@@ -86,13 +86,12 @@ func authWithSIWE(
 	logger runtime.Logger,
 	nk runtime.NakamaModule,
 	in *api.AuthenticateCustomRequest,
-	span trace.Span,
 ) (*api.AuthenticateCustomRequest, error) {
 	signerAddress := in.GetAccount().GetId()
 	signature := in.GetAccount().GetVars()["signature"]
 	message := in.GetAccount().GetVars()["message"]
 
-	err := processSIWE(ctx, logger, nk, signerAddress, signature, message, span)
+	err := processSIWE(ctx, logger, nk, signerAddress, signature, message)
 	if err != nil {
 		return nil, err
 	}
@@ -106,13 +105,12 @@ func linkWithSIWE(
 	logger runtime.Logger,
 	nk runtime.NakamaModule,
 	in *api.AccountCustom,
-	span trace.Span,
 ) (*api.AccountCustom, error) {
 	signerAddress := in.GetId()
 	signature := in.GetVars()["signature"]
 	message := in.GetVars()["message"]
 
-	err := processSIWE(ctx, logger, nk, signerAddress, signature, message, span)
+	err := processSIWE(ctx, logger, nk, signerAddress, signature, message)
 	if err != nil {
 		return nil, err
 	}