refactored getMessagesFromRequest

Author: amychisholm03

lib/instrumentation/openai.js

@@ -60,30 +60,22 @@ function getMessagesFromRequest(request, shim) {
   // For `responses.create`, messages are passed as an array of objects
   // with `content` and `role` properties OR as a single string (implied
   // to be a user message) to the `input` field of the request.
+  let messages = []
 
   if (Array.isArray(request?.input)) {
-    return request.input
-      .filter(msg => msg?.content && msg?.role)
-      .map(msg => ({
-        content: msg.content,
-        role: msg.role
-      }))
+    // Handle array of input messages
+    messages = request.input.filter(msg => msg?.content && msg?.role)
   } else if (typeof request?.input === 'string') {
-    return [{
-      content: request.input,
-      role: 'user'
-    }]
+    // Handle single string input as a user message
+    messages = [{ content: request.input, role: 'user' }]
   } else if (Array.isArray(request?.messages)) {
-    return request.messages
-      .filter(msg => msg?.content && msg?.role)
-      .map(msg => ({
-        content: msg.content,
-        role: msg.role
-      }))
+    // Handle array of messages
+    messages = request.messages.filter(msg => msg?.content && msg?.role)
   } else {
     shim.logger.warn('No valid messages found in OpenAI request object.')
-    return []
   }
+
+  return messages
 }
 
 /**