Merge branch 'main' into hotswap-agentcore-runtime

Author: go-to-k

packages/@aws-cdk-testing/cli-integ/tests/telemetry-integ-tests/cdk-cli-telemetry-disable-sends-no-data.integtest.ts

@@ -1,12 +1,11 @@
-import { TELEMETRY_ENDPOINT } from './constants';
 import { integTest, withDefaultFixture } from '../../lib';
 
 jest.setTimeout(2 * 60 * 60_000); // Includes the time to acquire locks, worst-case single-threaded runtime
 
 integTest(
   'CLI Telemetry --disable does not send to endpoint',
   withDefaultFixture(async (fixture) => {
-    const output = await fixture.cdk(['cli-telemetry', '--disable'], { verboseLevel: 3, modEnv: { TELEMETRY_ENDPOINT: TELEMETRY_ENDPOINT } });
+    const output = await fixture.cdk(['cli-telemetry', '--disable'], { verboseLevel: 3 });
 
     // Check the trace that telemetry was not executed successfully
     expect(output).not.toContain('Telemetry Sent Successfully');

packages/@aws-cdk-testing/cli-integ/tests/telemetry-integ-tests/cdk-deploy-telemetry.integtest.ts

@@ -1,6 +1,5 @@
 import * as path from 'path';
 import * as fs from 'fs-extra';
-import { TELEMETRY_ENDPOINT } from './constants';
 import { integTest, withDefaultFixture } from '../../lib';
 
 jest.setTimeout(2 * 60 * 60_000); // Includes the time to acquire locks, worst-case single-threaded runtime
@@ -14,7 +13,6 @@ integTest(
     const deployOutput = await fixture.cdkDeploy('test-1', {
       telemetryFile,
       verboseLevel: 3, // trace mode
-      modEnv: { TELEMETRY_ENDPOINT: TELEMETRY_ENDPOINT },
     });
 
     // Check the trace that telemetry was executed successfully

packages/@aws-cdk-testing/cli-integ/tests/telemetry-integ-tests/cdk-synth-telemetry-with-errors.integtest.ts

@@ -1,6 +1,5 @@
 import * as path from 'path';
 import * as fs from 'fs-extra';
-import { TELEMETRY_ENDPOINT } from './constants';
 import { integTest, withDefaultFixture } from '../../lib';
 
 jest.setTimeout(2 * 60 * 60_000); // Includes the time to acquire locks, worst-case single-threaded runtime
@@ -13,7 +12,6 @@ integTest(
       allowErrExit: true,
       modEnv: {
         INTEG_STACK_SET: 'stage-with-errors',
-        TELEMETRY_ENDPOINT: TELEMETRY_ENDPOINT,
       },
       verboseLevel: 3, // trace mode
     });

packages/@aws-cdk-testing/cli-integ/tests/telemetry-integ-tests/cdk-synth-telemetry.integtest.ts

@@ -1,6 +1,5 @@
 import * as path from 'path';
 import * as fs from 'fs-extra';
-import { TELEMETRY_ENDPOINT } from './constants';
 import { integTest, withDefaultFixture } from '../../lib';
 
 jest.setTimeout(2 * 60 * 60_000); // Includes the time to acquire locks, worst-case single-threaded runtime
@@ -12,7 +11,7 @@ integTest(
 
     const synthOutput = await fixture.cdk(
       ['synth', fixture.fullStackName('test-1'), `--telemetry-file=${telemetryFile}`],
-      { modEnv: { TELEMETRY_ENDPOINT: TELEMETRY_ENDPOINT }, verboseLevel: 3 }, // trace mode
+      { verboseLevel: 3 }, // trace mode
     );
 
     // Check the trace that telemetry was executed successfully

packages/@aws-cdk-testing/cli-integ/tests/telemetry-integ-tests/constants.ts

@@ -191,6 +191,11 @@ export enum DiagnosticReason {
    */
   TEST_ERROR = 'TEST_ERROR',
 
+  /**
+   * A non-failing warning from the integration test run
+   */
+  TEST_WARNING = 'TEST_WARNING',
+
   /**
    * The snapshot test failed because the actual
    * snapshot was different than the expected snapshot
@@ -294,6 +299,9 @@ export function printResults(diagnostic: Diagnostic): void {
     case DiagnosticReason.SNAPSHOT_FAILED:
       logger.error('  CHANGED    %s %s\n%s', diagnostic.testName, chalk.gray(`${diagnostic.duration}s`), indentLines(diagnostic.message, 6));
       break;
+    case DiagnosticReason.TEST_WARNING:
+      logger.warning('  WARN       %s %s\n%s', diagnostic.testName, chalk.gray(`${diagnostic.duration}s`), indentLines(diagnostic.message, 6));
+      break;
     case DiagnosticReason.SNAPSHOT_ERROR:
     case DiagnosticReason.TEST_ERROR:
       logger.error('  ERROR      %s %s\n%s', diagnostic.testName, chalk.gray(`${diagnostic.duration}s`), indentLines(diagnostic.message, 6));

packages/@aws-cdk/integ-runner/lib/workers/common.ts

@@ -132,7 +132,7 @@ export async function snapshotTestWorker(testInfo: IntegTestInfo, options: Snaps
 
   const timer = setTimeout(() => {
     workerpool.workerEmit({
-      reason: DiagnosticReason.SNAPSHOT_ERROR,
+      reason: DiagnosticReason.TEST_WARNING,
       testName: test.testName,
       message: 'Test is taking a very long time',
       duration: (Date.now() - start) / 1000,

packages/@aws-cdk/integ-runner/lib/workers/extract/extract_worker.ts

@@ -203,7 +203,7 @@ export class CliIoHost implements IIoHost {
       }
     }
 
-    const telemetryEndpoint = process.env.TELEMETRY_ENDPOINT;
+    const telemetryEndpoint = process.env.TELEMETRY_ENDPOINT ?? 'https://cdk-cli-telemetry.us-east-1.api.aws/metrics';
     if (canCollectTelemetry(args, context) && telemetryEndpoint) {
       try {
         sinks.push(new EndpointTelemetrySink({