@revenium/claude-code-metering 0.1.0 → 0.1.2

package/dist/cli/commands/backfill.js

@@ -3,6 +3,18 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.sleep = sleep;
+exports.sanitizeErrorMessage = sanitizeErrorMessage;
+exports.isRetryableError = isRetryableError;
+exports.sendBatchWithRetry = sendBatchWithRetry;
+exports.parseRelativeDate = parseRelativeDate;
+exports.parseSinceDate = parseSinceDate;
+exports.findJsonlFiles = findJsonlFiles;
+exports.calculateStatistics = calculateStatistics;
+exports.parseJsonlLine = parseJsonlLine;
+exports.streamJsonlRecords = streamJsonlRecords;
+exports.toUnixNano = toUnixNano;
+exports.createOtlpPayload = createOtlpPayload;
 exports.backfillCommand = backfillCommand;
 const node_fs_1 = require("node:fs");
 const promises_1 = require("node:fs/promises");
@@ -14,6 +26,83 @@ const ora_1 = __importDefault(require("ora"));
 const loader_js_1 = require("../../core/config/loader.js");
 const client_js_1 = require("../../core/api/client.js");
 const constants_js_1 = require("../../utils/constants.js");
+const hashing_js_1 = require("../../utils/hashing.js");
+/**
+ * Sleep for a specified number of milliseconds.
+ */
+function sleep(ms) {
+    return new Promise((resolve) => setTimeout(resolve, ms));
+}
+/**
+ * Sanitize error message to prevent API key leakage.
+ * Truncates long messages and removes potential sensitive data.
+ */
+function sanitizeErrorMessage(errorMsg) {
+    const maxLength = 500;
+    let sanitized = errorMsg;
+    if (sanitized.length > maxLength) {
+        sanitized = `${sanitized.substring(0, maxLength)}...`;
+    }
+    return sanitized;
+}
+/**
+ * Check if an error is retryable based on HTTP status code.
+ * 4xx errors (except 429) are not retryable as they indicate client errors.
+ */
+function isRetryableError(errorMsg) {
+    const statusMatch = errorMsg.match(/OTLP request failed: (\d{3})/);
+    if (!statusMatch) {
+        return true;
+    }
+    const statusCode = parseInt(statusMatch[1], 10);
+    if (statusCode === 429) {
+        return true;
+    }
+    if (statusCode >= 400 && statusCode < 500) {
+        return false;
+    }
+    return true;
+}
+/**
+ * Send a batch with retry logic and exponential backoff.
+ */
+async function sendBatchWithRetry(endpoint, apiKey, payload, maxRetries, verbose) {
+    for (let attempt = 0; attempt < maxRetries; attempt++) {
+        try {
+            await (0, client_js_1.sendOtlpLogs)(endpoint, apiKey, payload);
+            if (verbose && attempt > 0) {
+                console.log(chalk_1.default.green(`  ✓ Succeeded after ${attempt + 1} attempts`));
+            }
+            return { success: true, attempts: attempt + 1 };
+        }
+        catch (error) {
+            const rawErrorMsg = error instanceof Error ? error.message : "Unknown error";
+            const errorMsg = sanitizeErrorMessage(rawErrorMsg);
+            const isRetryable = isRetryableError(errorMsg);
+            if (!isRetryable) {
+                if (verbose) {
+                    console.log(chalk_1.default.red(`  ✗ Non-retryable error (client error): ${errorMsg}`));
+                }
+                return { success: false, attempts: attempt + 1, error: errorMsg };
+            }
+            if (attempt < maxRetries - 1) {
+                const backoffDelay = 1000 * Math.pow(2, attempt);
+                if (verbose) {
+                    console.log(chalk_1.default.yellow(`  ✗ Attempt ${attempt + 1} failed: ${errorMsg}`));
+                    console.log(chalk_1.default.blue(`  ⏳ Retrying in ${backoffDelay}ms...`));
+                }
+                await sleep(backoffDelay);
+            }
+            else {
+                if (verbose) {
+                    console.log(chalk_1.default.red(`  ✗ All ${maxRetries} attempts failed`));
+                }
+                return { success: false, attempts: maxRetries, error: errorMsg };
+            }
+        }
+    }
+    return { success: false, attempts: maxRetries };
+}
 /**
  * Parses a relative date string like "7d" or "1m" into a Date.
  */
@@ -25,19 +114,19 @@ function parseRelativeDate(input) {
     const unit = match[2];
     const now = new Date();
     switch (unit) {
-        case 'd':
+        case "d":
             now.setDate(now.getDate() - amount);
             break;
-        case 'w':
+        case "w":
             now.setDate(now.getDate() - amount * 7);
             break;
-        case 'm':
+        case "m":
             now.setMonth(now.getMonth() - amount);
             break;
-        case 'M':
+        case "M":
             now.setMonth(now.getMonth() - amount);
             break;
-        case 'y':
+        case "y":
             now.setFullYear(now.getFullYear() - amount);
             break;
         default:
@@ -73,7 +162,7 @@ async function findJsonlFiles(dir, errors = []) {
                 const result = await findJsonlFiles(fullPath, errors);
                 files.push(...result.files);
             }
-            else if (entry.isFile() && entry.name.endsWith('.jsonl')) {
+            else if (entry.isFile() && entry.name.endsWith(".jsonl")) {
                 files.push(fullPath);
             }
         }
@@ -84,6 +173,76 @@ async function findJsonlFiles(dir, errors = []) {
     }
     return { files, errors };
 }
+function calculateStatistics(records) {
+    if (records.length === 0) {
+        return {
+            totalRecords: 0,
+            oldestTimestamp: "",
+            newestTimestamp: "",
+            totalInputTokens: 0,
+            totalOutputTokens: 0,
+            totalCacheReadTokens: 0,
+            totalCacheCreationTokens: 0,
+        };
+    }
+    const sortedRecords = [...records].sort((a, b) => new Date(a.timestamp).getTime() - new Date(b.timestamp).getTime());
+    return {
+        totalRecords: records.length,
+        oldestTimestamp: sortedRecords[0].timestamp,
+        newestTimestamp: sortedRecords[sortedRecords.length - 1].timestamp,
+        totalInputTokens: records.reduce((sum, r) => sum + r.inputTokens, 0),
+        totalOutputTokens: records.reduce((sum, r) => sum + r.outputTokens, 0),
+        totalCacheReadTokens: records.reduce((sum, r) => sum + r.cacheReadTokens, 0),
+        totalCacheCreationTokens: records.reduce((sum, r) => sum + r.cacheCreationTokens, 0),
+    };
+}
+function parseJsonlLine(line, sinceDate) {
+    if (!line.trim()) {
+        return {};
+    }
+    let entry;
+    try {
+        entry = JSON.parse(line);
+    }
+    catch {
+        return { parseError: true };
+    }
+    if (entry.type !== "assistant" || !entry.message?.usage) {
+        return {};
+    }
+    const usage = entry.message.usage;
+    const timestamp = entry.timestamp;
+    const sessionId = entry.sessionId;
+    const model = entry.message.model;
+    if (!timestamp || !sessionId || !model) {
+        return { missingFields: true };
+    }
+    const entryDate = new Date(timestamp);
+    if (!Number.isFinite(entryDate.getTime())) {
+        return {};
+    }
+    if (sinceDate && entryDate < sinceDate) {
+        return {};
+    }
+    const totalTokens = (usage.input_tokens || 0) +
+        (usage.output_tokens || 0) +
+        (usage.cache_read_input_tokens || 0) +
+        (usage.cache_creation_input_tokens || 0);
+    if (totalTokens === 0) {
+        return {};
+    }
+    return {
+        record: {
+            sessionId,
+            timestamp,
+            model,
+            inputTokens: usage.input_tokens || 0,
+            outputTokens: usage.output_tokens || 0,
+            cacheReadTokens: usage.cache_read_input_tokens || 0,
+            cacheCreationTokens: usage.cache_creation_input_tokens || 0,
+        },
+    };
+}
 /**
  * Streams a JSONL file and extracts records with usage data.
  * Yields objects indicating either a valid record or a parse error.
@@ -96,56 +255,13 @@ async function* streamJsonlRecords(filePath, sinceDate) {
     });
     try {
         for await (const line of rl) {
-            if (!line.trim())
-                continue;
-            try {
-                const entry = JSON.parse(line);
-                // Only process assistant messages with usage data
-                if (entry.type !== 'assistant' || !entry.message?.usage)
-                    continue;
-                const usage = entry.message.usage;
-                const timestamp = entry.timestamp;
-                const sessionId = entry.sessionId;
-                const model = entry.message.model;
-                // Skip if missing required fields
-                if (!timestamp || !sessionId || !model)
-                    continue;
-                // Validate timestamp is a valid date
-                const entryDate = new Date(timestamp);
-                if (!Number.isFinite(entryDate.getTime()))
-                    continue;
-                // Check date filter
-                if (sinceDate) {
-                    if (entryDate < sinceDate)
-                        continue;
-                }
-                // Skip entries with no actual token usage
-                const totalTokens = (usage.input_tokens || 0) +
-                    (usage.output_tokens || 0) +
-                    (usage.cache_read_input_tokens || 0) +
-                    (usage.cache_creation_input_tokens || 0);
-                if (totalTokens === 0)
-                    continue;
-                yield {
-                    record: {
-                        sessionId,
-                        timestamp,
-                        model,
-                        inputTokens: usage.input_tokens || 0,
-                        outputTokens: usage.output_tokens || 0,
-                        cacheReadTokens: usage.cache_read_input_tokens || 0,
-                        cacheCreationTokens: usage.cache_creation_input_tokens || 0,
-                    },
-                };
-            }
-            catch {
-                // Invalid JSON line, signal parse error
-                yield { parseError: true };
+            const result = parseJsonlLine(line, sinceDate);
+            if (result.record || result.parseError || result.missingFields) {
+                yield result;
             }
         }
     }
     finally {
-        // Ensure file stream is properly closed even on early exit
         fileStream.destroy();
         rl.close();
     }
@@ -162,55 +278,95 @@ function toUnixNano(timestamp) {
     }
     return (BigInt(ms) * BigInt(1_000_000)).toString();
 }
-/**
- * Creates an OTEL metrics payload from parsed records.
- * Each record generates multiple metrics (input_tokens, output_tokens, etc.)
- */
-function createOtlpPayload(records, costMultiplier) {
-    // Build metrics for all records
-    const allMetrics = [];
-    for (const record of records) {
+function createOtlpPayload(records, options) {
+    const { costMultiplier, email, organizationName, organizationId, productName, productId, } = options;
+    // Support both new and old field names with fallback
+    const organizationValue = organizationName || organizationId;
+    const productValue = productName || productId;
+    // Filter and map records, skipping any with invalid timestamps
+    const logRecords = records
+        .map((record) => {
         const timeUnixNano = toUnixNano(record.timestamp);
-        if (timeUnixNano === null)
-            continue;
-        // Common attributes for this record
+        if (timeUnixNano === null) {
+            return null;
+        }
+        // Build attributes array with required fields
         const attributes = [
-            { key: 'ai.transaction_id', value: { stringValue: record.sessionId } },
-            { key: 'ai.model', value: { stringValue: record.model } },
-            { key: 'ai.provider', value: { stringValue: 'anthropic' } },
-            { key: 'cost_multiplier', value: { doubleValue: costMultiplier } },
-        ];
-        // Create metrics for each token type
-        const tokenMetrics = [
-            { name: 'ai.tokens.input', value: record.inputTokens },
-            { name: 'ai.tokens.output', value: record.outputTokens },
-            { name: 'ai.tokens.cache_read', value: record.cacheReadTokens },
-            { name: 'ai.tokens.cache_creation', value: record.cacheCreationTokens },
+            {
+                key: "transaction_id",
+                value: { stringValue: (0, hashing_js_1.generateTransactionId)(record) },
+            },
+            {
+                key: "session.id",
+                value: { stringValue: record.sessionId },
+            },
+            {
+                key: "model",
+                value: { stringValue: record.model },
+            },
+            {
+                key: "input_tokens",
+                value: { intValue: record.inputTokens },
+            },
+            {
+                key: "output_tokens",
+                value: { intValue: record.outputTokens },
+            },
+            {
+                key: "cache_read_tokens",
+                value: { intValue: record.cacheReadTokens },
+            },
+            {
+                key: "cache_creation_tokens",
+                value: { intValue: record.cacheCreationTokens },
+            },
         ];
-        for (const metric of tokenMetrics) {
-            allMetrics.push({
-                name: metric.name,
-                sum: {
-                    dataPoints: [{
-                            attributes,
-                            timeUnixNano,
-                            asInt: metric.value,
-                        }],
-                },
+        // Add optional subscriber/attribution attributes at log record level
+        // (backend ClaudeCodeMapper reads these from log record attrs, not resource attrs)
+        if (email) {
+            attributes.push({ key: "user.email", value: { stringValue: email } });
+        }
+        if (organizationValue) {
+            attributes.push({
+                key: "organization.name",
+                value: { stringValue: organizationValue },
             });
         }
-    }
+        if (productValue) {
+            attributes.push({
+                key: "product.name",
+                value: { stringValue: productValue },
+            });
+        }
+        return {
+            timeUnixNano,
+            body: { stringValue: "claude_code.api_request" },
+            attributes,
+        };
+    })
+        .filter((record) => record !== null);
     return {
-        resourceMetrics: [
+        resourceLogs: [
             {
                 resource: {
                     attributes: [
-                        { key: 'service.name', value: { stringValue: 'claude-code' } },
+                        {
+                            key: "service.name",
+                            value: { stringValue: "claude-code" },
+                        },
+                        {
+                            key: "cost_multiplier",
+                            value: { doubleValue: costMultiplier },
+                        },
                     ],
                 },
-                scopeMetrics: [
+                scopeLogs: [
                     {
-                        metrics: allMetrics,
+                        scope: {
+                            name: "claude-code",
+                            version: "1.0.0",
+                        },
+                        logRecords,
                     },
                 ],
             },
@@ -220,17 +376,18 @@ function createOtlpPayload(records, costMultiplier) {
 /**
  * Backfill command - imports historical Claude Code usage data.
  */
-async function backfillCommand(options = {}) {
-    const { since, dryRun = false, batchSize = 100, verbose = false } = options;
-    console.log(chalk_1.default.bold('\nRevenium Claude Code Backfill\n'));
+async function backfillCommand(options = {}, deps = {}) {
+    const { since, dryRun = false, batchSize = 100, delay = 100, verbose = false, } = options;
+    const { loadConfig: getConfig = loader_js_1.loadConfig, findJsonlFiles: findFiles = findJsonlFiles, streamJsonlRecords: streamRecords = streamJsonlRecords, sendBatchWithRetry: sendBatch = sendBatchWithRetry, homedir: getHomedir = node_os_1.homedir, } = deps;
+    console.log(chalk_1.default.bold("\nRevenium Claude Code Backfill\n"));
     if (dryRun) {
-        console.log(chalk_1.default.yellow('Running in dry-run mode - no data will be sent\n'));
+        console.log(chalk_1.default.yellow("Running in dry-run mode - no data will be sent\n"));
     }
     // Load configuration
-    const config = await (0, loader_js_1.loadConfig)();
+    const config = await getConfig();
     if (!config) {
-        console.log(chalk_1.default.red('Configuration not found'));
-        console.log(chalk_1.default.yellow('\nRun `revenium-metering setup` to configure Claude Code metering.'));
+        console.log(chalk_1.default.red("Configuration not found"));
+        console.log(chalk_1.default.yellow("\nRun `revenium-metering setup` to configure Claude Code metering."));
         process.exit(1);
     }
     // Parse since date
@@ -239,21 +396,23 @@ async function backfillCommand(options = {}) {
         sinceDate = parseSinceDate(since);
         if (!sinceDate) {
             console.log(chalk_1.default.red(`Invalid --since value: ${since}`));
-            console.log(chalk_1.default.dim('Use ISO format (2024-01-15) or relative format (7d, 1m, 1y)'));
+            console.log(chalk_1.default.dim("Use ISO format (2024-01-15) or relative format (7d, 1m, 1y)"));
             process.exit(1);
         }
         console.log(chalk_1.default.dim(`Filtering records since: ${sinceDate.toISOString()}\n`));
     }
     // Get cost multiplier (use ?? to allow explicit 0 override for free tier/testing)
     const costMultiplier = config.costMultiplierOverride ??
-        (config.subscriptionTier ? (0, constants_js_1.getCostMultiplier)(config.subscriptionTier) : 0.08);
+        (config.subscriptionTier
+            ? (0, constants_js_1.getCostMultiplier)(config.subscriptionTier)
+            : 0.08);
     // Discover JSONL files
-    const projectsDir = (0, node_path_1.join)((0, node_os_1.homedir)(), '.claude', 'projects');
-    const discoverSpinner = (0, ora_1.default)('Discovering JSONL files...').start();
-    const { files: jsonlFiles, errors: discoveryErrors } = await findJsonlFiles(projectsDir);
+    const projectsDir = (0, node_path_1.join)(getHomedir(), ".claude", "projects");
+    const discoverSpinner = (0, ora_1.default)("Discovering JSONL files...").start();
+    const { files: jsonlFiles, errors: discoveryErrors } = await findFiles(projectsDir);
     if (discoveryErrors.length > 0 && verbose) {
         discoverSpinner.warn(`Found ${jsonlFiles.length} JSONL file(s) with ${discoveryErrors.length} directory error(s)`);
-        console.log(chalk_1.default.yellow('\nDirectory access errors:'));
+        console.log(chalk_1.default.yellow("\nDirectory access errors:"));
         for (const error of discoveryErrors.slice(0, 5)) {
             console.log(chalk_1.default.yellow(`  ${error}`));
         }
@@ -262,10 +421,10 @@ async function backfillCommand(options = {}) {
         }
     }
     else if (jsonlFiles.length === 0) {
-        discoverSpinner.fail('No JSONL files found');
+        discoverSpinner.fail("No JSONL files found");
         console.log(chalk_1.default.dim(`Searched in: ${projectsDir}`));
         if (discoveryErrors.length > 0) {
-            console.log(chalk_1.default.yellow('\nDirectory access errors:'));
+            console.log(chalk_1.default.yellow("\nDirectory access errors:"));
             for (const error of discoveryErrors) {
                 console.log(chalk_1.default.yellow(`  ${error}`));
             }
@@ -276,27 +435,31 @@ async function backfillCommand(options = {}) {
         discoverSpinner.succeed(`Found ${jsonlFiles.length} JSONL file(s)`);
     }
     if (verbose) {
-        console.log(chalk_1.default.dim('\nFiles:'));
+        console.log(chalk_1.default.dim("\nFiles:"));
         for (const file of jsonlFiles.slice(0, 10)) {
             console.log(chalk_1.default.dim(`  ${file}`));
         }
         if (jsonlFiles.length > 10) {
             console.log(chalk_1.default.dim(`  ... and ${jsonlFiles.length - 10} more`));
         }
-        console.log('');
+        console.log("");
     }
     // Process files and collect records
-    const processSpinner = (0, ora_1.default)('Processing files...').start();
+    const processSpinner = (0, ora_1.default)("Processing files...").start();
     const allRecords = [];
     let processedFiles = 0;
     let skippedLines = 0;
     let skippedFiles = 0;
+    let skippedMissingFields = 0;
     for (const file of jsonlFiles) {
         try {
-            for await (const result of streamJsonlRecords(file, sinceDate)) {
+            for await (const result of streamRecords(file, sinceDate)) {
                 if (result.parseError) {
                     skippedLines++;
                 }
+                else if (result.missingFields) {
+                    skippedMissingFields++;
+                }
                 else if (result.record) {
                     allRecords.push(result.record);
                 }
@@ -315,76 +478,126 @@ async function backfillCommand(options = {}) {
     // Build status message with skipped line info
     let statusMessage = `Processed ${processedFiles} files, found ${allRecords.length} usage records`;
     if (skippedLines > 0) {
-        statusMessage += chalk_1.default.yellow(` (${skippedLines} malformed line${skippedLines > 1 ? 's' : ''} skipped)`);
+        statusMessage += chalk_1.default.yellow(` (${skippedLines} malformed line${skippedLines > 1 ? "s" : ""} skipped)`);
+    }
+    if (skippedMissingFields > 0) {
+        statusMessage += chalk_1.default.yellow(` (${skippedMissingFields} record${skippedMissingFields > 1 ? "s" : ""} missing required fields)`);
     }
     if (skippedFiles > 0) {
-        statusMessage += chalk_1.default.yellow(` (${skippedFiles} file${skippedFiles > 1 ? 's' : ''} failed)`);
+        statusMessage += chalk_1.default.yellow(` (${skippedFiles} file${skippedFiles > 1 ? "s" : ""} failed)`);
     }
     processSpinner.succeed(statusMessage);
     if (allRecords.length === 0) {
-        console.log(chalk_1.default.yellow('\nNo usage records found to backfill.'));
+        console.log(chalk_1.default.yellow("\nNo usage records found to backfill."));
+        if (skippedMissingFields > 0) {
+            console.log(chalk_1.default.dim(`${skippedMissingFields} record${skippedMissingFields > 1 ? "s were" : " was"} skipped due to missing required fields (timestamp, sessionId, or model).`));
+        }
         if (since) {
             console.log(chalk_1.default.dim(`Try a broader date range or remove the --since filter.`));
         }
         return;
     }
-    // Sort records by timestamp
-    allRecords.sort((a, b) => new Date(a.timestamp).getTime() - new Date(b.timestamp).getTime());
-    // Show summary
-    const oldestRecord = allRecords[0];
-    const newestRecord = allRecords[allRecords.length - 1];
-    const totalInputTokens = allRecords.reduce((sum, r) => sum + r.inputTokens, 0);
-    const totalOutputTokens = allRecords.reduce((sum, r) => sum + r.outputTokens, 0);
-    const totalCacheReadTokens = allRecords.reduce((sum, r) => sum + r.cacheReadTokens, 0);
-    const totalCacheCreationTokens = allRecords.reduce((sum, r) => sum + r.cacheCreationTokens, 0);
-    console.log('\n' + chalk_1.default.bold('Summary:'));
-    console.log(`  Records:              ${allRecords.length.toLocaleString()}`);
-    console.log(`  Date range:           ${oldestRecord.timestamp.split('T')[0]} to ${newestRecord.timestamp.split('T')[0]}`);
-    console.log(`  Input tokens:         ${totalInputTokens.toLocaleString()}`);
-    console.log(`  Output tokens:        ${totalOutputTokens.toLocaleString()}`);
-    console.log(`  Cache read tokens:    ${totalCacheReadTokens.toLocaleString()}`);
-    console.log(`  Cache creation:       ${totalCacheCreationTokens.toLocaleString()}`);
+    // Calculate statistics
+    const stats = calculateStatistics(allRecords);
+    console.log("\n" + chalk_1.default.bold("Summary:"));
+    console.log(`  Records:              ${stats.totalRecords.toLocaleString()}`);
+    console.log(`  Date range:           ${stats.oldestTimestamp.split("T")[0]} to ${stats.newestTimestamp.split("T")[0]}`);
+    console.log(`  Input tokens:         ${stats.totalInputTokens.toLocaleString()}`);
+    console.log(`  Output tokens:        ${stats.totalOutputTokens.toLocaleString()}`);
+    console.log(`  Cache read tokens:    ${stats.totalCacheReadTokens.toLocaleString()}`);
+    console.log(`  Cache creation:       ${stats.totalCacheCreationTokens.toLocaleString()}`);
     console.log(`  Cost multiplier:      ${costMultiplier}`);
+    if (verbose &&
+        (skippedLines > 0 || skippedMissingFields > 0 || skippedFiles > 0)) {
+        console.log("\n" + chalk_1.default.dim("Skipped records:"));
+        if (skippedLines > 0) {
+            console.log(chalk_1.default.dim(`  Malformed JSON:       ${skippedLines.toLocaleString()}`));
+        }
+        if (skippedMissingFields > 0) {
+            console.log(chalk_1.default.dim(`  Missing fields:       ${skippedMissingFields.toLocaleString()} (timestamp, sessionId, or model)`));
+        }
+        if (skippedFiles > 0) {
+            console.log(chalk_1.default.dim(`  Failed files:         ${skippedFiles.toLocaleString()}`));
+        }
+    }
     if (dryRun) {
-        console.log('\n' + chalk_1.default.yellow('Dry run complete. Use without --dry-run to send data.'));
+        console.log("\n" +
+            chalk_1.default.yellow("Dry run complete. Use without --dry-run to send data."));
         if (verbose) {
-            console.log('\n' + chalk_1.default.dim('Sample OTLP payload (first batch):'));
+            console.log("\n" + chalk_1.default.dim("Sample OTLP payload (first batch):"));
             const sampleRecords = allRecords.slice(0, Math.min(batchSize, 3));
-            const samplePayload = createOtlpPayload(sampleRecords, costMultiplier);
+            const samplePayload = createOtlpPayload(sampleRecords, {
+                costMultiplier,
+                email: config.email,
+                organizationName: config.organizationName || config.organizationId,
+                productName: config.productName || config.productId,
+            });
             console.log(chalk_1.default.dim(JSON.stringify(samplePayload, null, 2)));
         }
         return;
     }
     // Send data in batches
     const totalBatches = Math.ceil(allRecords.length / batchSize);
-    const sendSpinner = (0, ora_1.default)(`Sending data... (0/${totalBatches} batches)`).start();
+    const sendSpinner = (0, ora_1.default)(`Sending data... (0/${totalBatches} batches, ~${delay}ms delay)`).start();
     let sentBatches = 0;
     let sentRecords = 0;
-    let failedBatches = 0;
+    let permanentlyFailedBatches = 0;
+    let totalRetryAttempts = 0;
+    const failedBatchDetails = [];
+    const maxRetries = 3;
     for (let i = 0; i < allRecords.length; i += batchSize) {
+        const batchNumber = Math.floor(i / batchSize) + 1;
         const batch = allRecords.slice(i, i + batchSize);
-        const payload = createOtlpPayload(batch, costMultiplier);
-        try {
-            await (0, client_js_1.sendOtlpMetrics)(config.endpoint, config.apiKey, payload);
+        const payload = createOtlpPayload(batch, {
+            costMultiplier,
+            email: config.email,
+            organizationName: config.organizationName || config.organizationId,
+            productName: config.productName || config.productId,
+        });
+        sendSpinner.text = `Sending batch ${batchNumber}/${totalBatches}...`;
+        const result = await sendBatch(config.endpoint, config.apiKey, payload, maxRetries, verbose);
+        totalRetryAttempts += result.attempts;
+        if (result.success) {
             sentBatches++;
             sentRecords += batch.length;
-            sendSpinner.text = `Sending data... (${sentBatches}/${totalBatches} batches)`;
+            sendSpinner.text = `Sending data... (${sentBatches}/${totalBatches} batches, ~${delay}ms delay)`;
         }
-        catch (error) {
-            failedBatches++;
-            if (verbose) {
-                const batchNumber = Math.floor(i / batchSize) + 1;
-                console.log(chalk_1.default.yellow(`\nBatch ${batchNumber} failed: ${error instanceof Error ? error.message : 'Unknown error'}`));
-            }
+        else {
+            permanentlyFailedBatches++;
+            failedBatchDetails.push({
+                batchNumber,
+                error: result.error || "Unknown error",
+            });
+        }
+        // Apply rate limiting delay between batches (except after the last batch)
+        if (i + batchSize < allRecords.length) {
+            sendSpinner.text = `Waiting ${delay}ms before next batch...`;
+            await sleep(delay);
         }
     }
-    if (failedBatches === 0) {
+    if (permanentlyFailedBatches === 0) {
         sendSpinner.succeed(`Sent ${sentRecords.toLocaleString()} records in ${sentBatches} batches`);
     }
     else {
-        sendSpinner.warn(`Sent ${sentRecords.toLocaleString()} records in ${sentBatches} batches (${failedBatches} failed)`);
+        sendSpinner.warn(`Sent ${sentRecords.toLocaleString()} records in ${sentBatches} batches (${permanentlyFailedBatches} permanently failed)`);
+    }
+    // Show retry statistics if there were retries
+    const retriedBatches = totalRetryAttempts - totalBatches;
+    if (retriedBatches > 0 && verbose) {
+        console.log("\n" + chalk_1.default.bold("Retry Statistics:"));
+        console.log(`  Total retry attempts:     ${retriedBatches}`);
+        console.log(`  Average attempts/batch:   ${(totalRetryAttempts / totalBatches).toFixed(2)}`);
+    }
+    // Show permanently failed batches details
+    if (permanentlyFailedBatches > 0) {
+        console.log("\n" + chalk_1.default.red.bold("Permanently Failed Batches:"));
+        for (const failed of failedBatchDetails) {
+            console.log(chalk_1.default.red(`  Batch ${failed.batchNumber}: ${failed.error}`));
+        }
+        console.log("\n" +
+            chalk_1.default.yellow("Tip: You can re-run the backfill command to retry failed batches."));
     }
-    console.log('\n' + chalk_1.default.green.bold('Backfill complete!'));
-    console.log(chalk_1.default.dim('Check your Revenium dashboard to see the imported data.'));
+    console.log("\n" + chalk_1.default.green.bold("Backfill complete!"));
+    console.log(chalk_1.default.dim("Check your Revenium dashboard to see the imported data."));
 }
 //# sourceMappingURL=backfill.js.map