Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions integration-tests/tests/otlp.test.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { invokeLambdaAndGetDatadogData, LambdaInvocationDatadogData } from './utils/util';
import { invokeLambdaAndGetDatadogData, LambdaInvocationDatadogData, DATADOG_INDEXING_WAIT_5_MIN_MS } from './utils/util';
import { getIdentifier } from '../config';
import { LambdaClient, InvokeCommand } from '@aws-sdk/client-lambda';

Expand All @@ -16,12 +16,12 @@ describe('OTLP Integration Tests', () => {

console.log('Invoking all OTLP Lambda functions in parallel...');

// Invoke all Lambdas in parallel
// Invoke all Lambdas in parallel (using 5 minute wait for OTLP indexing)
const invocationResults = await Promise.all([
invokeLambdaAndGetDatadogData(functions.node, {}, true),
invokeLambdaAndGetDatadogData(functions.python, {}, true),
invokeLambdaAndGetDatadogData(functions.java, {}, true),
invokeLambdaAndGetDatadogData(functions.dotnet, {}, true),
invokeLambdaAndGetDatadogData(functions.node, {}, true, true, DATADOG_INDEXING_WAIT_5_MIN_MS),
invokeLambdaAndGetDatadogData(functions.python, {}, true, true, DATADOG_INDEXING_WAIT_5_MIN_MS),
invokeLambdaAndGetDatadogData(functions.java, {}, true, true, DATADOG_INDEXING_WAIT_5_MIN_MS),
invokeLambdaAndGetDatadogData(functions.dotnet, {}, true, true, DATADOG_INDEXING_WAIT_5_MIN_MS),
]);

// Store results
Expand Down
18 changes: 15 additions & 3 deletions integration-tests/tests/utils/util.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@
import { DatadogLog, DatadogTrace, getTraces, getLogs } from "./datadog";
import { invokeLambda } from "./lambda";

// Default wait time for Datadog to index logs and traces after Lambda invocation
const DEFAULT_DATADOG_INDEXING_WAIT_MS = 60 * 1000; // 60 seconds

// Extended wait time for tests that need more time (e.g., OTLP tests)
export const DATADOG_INDEXING_WAIT_5_MIN_MS = 5 * 60 * 1000; // 5 minutes

export interface LambdaInvocationDatadogData {
requestId: string;
statusCode: number;
Expand All @@ -9,11 +15,17 @@ export interface LambdaInvocationDatadogData {
logs?: DatadogLog[];
}

export async function invokeLambdaAndGetDatadogData(functionName: string, payload: any = {}, coldStart: boolean = false, useTailLogs: boolean = true): Promise<LambdaInvocationDatadogData> {
export async function invokeLambdaAndGetDatadogData(
functionName: string,
payload: any = {},
coldStart: boolean = false,
useTailLogs: boolean = true,
datadogIndexingWaitMs: number = DEFAULT_DATADOG_INDEXING_WAIT_MS
): Promise<LambdaInvocationDatadogData> {
const result = await invokeLambda(functionName, payload, coldStart, useTailLogs);

console.log('Waiting for logs and traces to be indexed in Datadog...');
await new Promise(resolve => setTimeout(resolve, 60_000));
console.log(`Waiting ${datadogIndexingWaitMs / 1000}s for logs and traces to be indexed in Datadog...`);
await new Promise(resolve => setTimeout(resolve, datadogIndexingWaitMs));

// Strip alias suffix (e.g., ":snapstart") for Datadog queries since service name doesn't include it
const baseFunctionName = functionName.split(':')[0];
Expand Down
Loading