Merge pull request #1227 from maximhq/01-03-fix_set_request_id_before_prehooks

fix: ensure request ID is set in context before PreHooks

Author: akshaydeo

core/bifrost.go

@@ -2217,6 +2217,11 @@ func (bifrost *Bifrost) handleRequest(ctx context.Context, req *schemas.BifrostR
 
 	// Try the primary provider first
 	ctx = context.WithValue(ctx, schemas.BifrostContextKeyFallbackIndex, 0)
+	// Ensure request ID is set in context before PreHooks
+	if _, ok := ctx.Value(schemas.BifrostContextKeyRequestID).(string); !ok {
+		requestID := uuid.New().String()
+		ctx = context.WithValue(ctx, schemas.BifrostContextKeyRequestID, requestID)
+	}
 	primaryResult, primaryErr := bifrost.tryRequest(ctx, req)
 	if primaryErr != nil {
 		if primaryErr.Error != nil {
@@ -2310,6 +2315,11 @@ func (bifrost *Bifrost) handleStreamRequest(ctx context.Context, req *schemas.Bi
 
 	// Try the primary provider first
 	ctx = context.WithValue(ctx, schemas.BifrostContextKeyFallbackIndex, 0)
+	// Ensure request ID is set in context before PreHooks
+	if _, ok := ctx.Value(schemas.BifrostContextKeyRequestID).(string); !ok {
+		requestID := uuid.New().String()
+		ctx = context.WithValue(ctx, schemas.BifrostContextKeyRequestID, requestID)
+	}
 	primaryResult, primaryErr := bifrost.tryStreamRequest(ctx, req)
 
 	// Check if we should proceed with fallbacks

core/changelog.md

@@ -0,0 +1 @@
+- fix: ensure request ID is consistently set in context before PreHooks are executed

core/schemas/context.go

@@ -19,7 +19,6 @@ var reservedKeys = []any{
 	BifrostContextKeySelectedKeyName,
 	BifrostContextKeyNumberOfRetries,
 	BifrostContextKeyFallbackIndex,
-	BifrostContextKeyStreamEndIndicator,
 	BifrostContextKeySkipKeySelection,
 	BifrostContextKeyExtraHeaders,
 	BifrostContextKeyURLPath,

plugins/maxim/main.go

@@ -398,11 +398,11 @@ func (plugin *Plugin) PreHook(ctx *schemas.BifrostContext, req *schemas.BifrostR
 		ctx.SetValue(GenerationIDKey, generationID)
 
 		// Extract request ID from context, if not present, create a new one
-		var ok bool
-		requestID, ok = ctx.Value(schemas.BifrostContextKeyRequestID).(string)
+		requestID, ok := ctx.Value(schemas.BifrostContextKeyRequestID).(string)
 		if !ok || requestID == "" {
+			// This should never happen since core/bifrost.go guarantees it's set before PreHooks
 			requestID = uuid.New().String()
-			ctx.SetValue(schemas.BifrostContextKeyRequestID, requestID)
+			plugin.logger.Warn("%s request ID missing in PreHook, using fallback: %s", PluginLoggerPrefix, requestID)
 		}
 	}
 

transports/changelog.md

@@ -1 +1,2 @@
-- fix: added missing logs filter checks in ui for live updates
+- fix: added missing logs filter checks in ui for live updates
+- fix: ensure request ID is consistently set in context before PreHooks are executed