Merge branch 'blackout/Phase-1' into chore/replace-cpp-bracket-code

Author: jamesnrokt

IntegrationTests/README.md

@@ -10,6 +10,21 @@ Before getting started, install Tuist:
 brew install tuist
 ```
 
+### Environment Variables
+
+mParticle API credentials are required **only for recording** new API interactions:
+
+```bash
+export MPARTICLE_API_KEY="your-api-key"
+export MPARTICLE_API_SECRET="your-api-secret"
+```
+
+**Recording mode (`run_wiremock_recorder.sh`):** Real API keys are required to record actual API responses from mParticle servers.
+
+**Verification mode (`run_clean_integration_tests.sh`):** API keys are **optional**. If not set, the tests will automatically use fake keys (`us1-00000000000000000000000000000000`) that match the WireMock URL patterns. This allows running integration tests without exposing real credentials.
+
+**Note:** Fake keys must match the pattern `us1-[a-f0-9]+` to work with WireMock mappings.
+
 Then generate the Xcode project:
 
 ```bash

IntegrationTests/Sources/main.swift

@@ -158,6 +158,18 @@ install_application() {
 
 launch_application() {
   echo "▶️ Launching application..."
+  
+  # Launch with environment variables using SIMCTL_CHILD_ prefix
+  # If not set, the app will use fake keys for verification mode
+  local launch_cmd="xcrun simctl launch \"$DEVICE_ID\" \"$BUNDLE_ID\""
+  
+  if [ -n "$MPARTICLE_API_KEY" ]; then
+    export SIMCTL_CHILD_MPARTICLE_API_KEY="$MPARTICLE_API_KEY"
+  fi
+  if [ -n "$MPARTICLE_API_SECRET" ]; then
+    export SIMCTL_CHILD_MPARTICLE_API_SECRET="$MPARTICLE_API_SECRET"
+  fi
+  
   LAUNCH_OUTPUT=$(xcrun simctl launch "$DEVICE_ID" "$BUNDLE_ID")
   APP_PID=$(echo "$LAUNCH_OUTPUT" | awk -F': ' '{print $2}')
 
@@ -171,7 +183,7 @@ launch_application() {
 
 wait_for_app_completion() {
   echo "⏳ Waiting for app to complete execution..."
-  local MAX_WAIT=60
+  local MAX_WAIT=120
   local WAIT_COUNT=0
   while kill -0 "$APP_PID" 2>/dev/null; do
     sleep 1
@@ -262,3 +274,47 @@ stop_wiremock_with_logs() {
   stop_wiremock
 }
 
+create_proxy_mappings() {
+  echo "📝 Creating proxy mappings for recording mode..."
+  
+  local PROXY_DIR="${MAPPINGS_DIR}/mappings"
+  mkdir -p "$PROXY_DIR"
+  
+  # Create proxy-identify.json
+  cat > "${PROXY_DIR}/proxy-identify.json" << 'EOF'
+{
+  "priority": 1,
+  "request": {
+    "urlPathPattern": "/v1/identify"
+  },
+  "response": {
+    "proxyBaseUrl": "https://identity.mparticle.com"
+  }
+}
+EOF
+
+  # Create proxy-events.json
+  cat > "${PROXY_DIR}/proxy-events.json" << 'EOF'
+{
+  "priority": 1,
+  "request": {
+    "urlPathPattern": "/v2/events"
+  },
+  "response": {
+    "proxyBaseUrl": "https://nativesdks.mparticle.com"
+  }
+}
+EOF
+
+  echo "✅ Proxy mappings created"
+}
+
+remove_proxy_mappings() {
+  echo "🗑️  Removing proxy mappings for verification mode..."
+  
+  rm -f "${MAPPINGS_DIR}/mappings/proxy-identify.json" 2>/dev/null || true
+  rm -f "${MAPPINGS_DIR}/mappings/proxy-events.json" 2>/dev/null || true
+  
+  echo "✅ Proxy mappings removed"
+}
+

IntegrationTests/common.sh

@@ -167,6 +167,7 @@ find_app_path
 reset_simulators
 find_available_device
 find_device
+remove_proxy_mappings
 escape_mapping_bodies
 start_wiremock "verify"
 wait_for_wiremock

IntegrationTests/run_clean_integration_tests.sh

@@ -10,6 +10,13 @@ TARGET_URL=${4:-"https://config2.mparticle.com"}
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 source "${SCRIPT_DIR}/common.sh"
 
+# === Check required environment variables for recording ===
+if [ -z "$MPARTICLE_API_KEY" ] || [ -z "$MPARTICLE_API_SECRET" ]; then
+  echo "❌ Error: MPARTICLE_API_KEY and MPARTICLE_API_SECRET environment variables must be set for recording mode"
+  echo "   Real API keys are required to record actual API responses from mParticle servers"
+  exit 1
+fi
+
 # === Build framework and generate project ===
 build_framework
 
@@ -23,6 +30,9 @@ CONTAINER_NAME="wiremock-recorder"
 mkdir -p "${MAPPINGS_DIR}/mappings"
 mkdir -p "${MAPPINGS_DIR}/__files"
 
+# Create proxy mappings for recording
+create_proxy_mappings
+
 # Trap to ensure cleanup on exit
 trap stop_wiremock EXIT INT TERM
 

IntegrationTests/run_wiremock_recorder.sh

@@ -41,8 +41,10 @@
     'dlc',     # Device Locale
     'dn',      # Device Name
     'dosv',    # Device OS Version
+    'el',      # Event Length (duration in milliseconds for timed events)
     'en',      # Event Number (position in session, e.g., 0, 1, 2...)
     'est',     # Event Start Time
+    'iba',     # Instruction Base Address (memory address for errors)
     'ict',     # Init Config Time
     'id',      # ID (various message/event IDs)
     'lud',     # Last Update Date

IntegrationTests/transform_mapping_body.py

@@ -0,0 +1 @@
+{"dt":"rh","id":"e3d7fc9b-15d2-4109-b90b-1dc892641c97","ct":1764796657912,"msgs":[],"ci":{"mpid":6504934091054997508,"ck":{"uid":{"c":"g=7f6d2e60-d81a-4edf-a5d6-996c6f15fa70","e":"2035-11-04T19:37:06.7933933Z"}},"das":"7f6d2e60-d81a-4edf-a5d6-996c6f15fa70"}}

IntegrationTests/wiremock-recordings/__files/body-ccpa-consent.json

@@ -0,0 +1 @@
+{"dt":"rh","id":"a7c8f4d7-aeb2-4f55-91e5-91a267afc382","ct":1764858535905,"err":[{"dt":"err","id":"92e1921b-09d0-434c-a3ef-0484baa5c2c3","ct":1764858535905,"msg":"Invalid Consent State provided - please verify the Consent Purposes that you have defined for this workspace.","code":"invalid_consent"}]}

IntegrationTests/wiremock-recordings/__files/body-gdpr-consent.json

@@ -0,0 +1 @@
+{"audience_memberships":[{"audience_id":12345,"audience_name":"Test Audience 1"},{"audience_id":67890,"audience_name":"Test Audience 2"}]}

IntegrationTests/wiremock-recordings/__files/body-get-user-audiences.json

@@ -0,0 +1 @@
+{"dt":"rh","id":"71a50897-9ff8-4b56-9a73-9ff4281cf33a","ct":1764789344543,"msgs":[],"ci":{"mpid":6504934091054997508,"ck":{"uid":{"c":"g=a6af0b2e-86ae-4d5f-a0d2-2e5d6d71fcb4","e":"2035-11-04T19:37:06.7933933Z"}},"das":"a6af0b2e-86ae-4d5f-a0d2-2e5d6d71fcb4"}}