Merge branch 'main' into merge-back/2.209.1

Author: mergify[bot]

packages/@aws-cdk/aws-bedrock-alpha/bedrock/inference-profiles/application-inference-profile.ts

@@ -1,8 +1,6 @@
 import { Arn, ArnFormat, ValidationError } from 'aws-cdk-lib';
 import * as bedrock from 'aws-cdk-lib/aws-bedrock';
 import { Grant, IGrantable } from 'aws-cdk-lib/aws-iam';
-import { addConstructMetadata, MethodMetadata } from 'aws-cdk-lib/core/lib/metadata-resource';
-import { propertyInjectable } from 'aws-cdk-lib/core/lib/prop-injectable';
 import { Construct } from 'constructs';
 import { IInferenceProfile, InferenceProfileBase, InferenceProfileType } from './inference-profile';
 import { IBedrockInvokable } from '../models';
@@ -94,11 +92,7 @@ export interface ApplicationInferenceProfileAttributes {
  * @cloudformationResource AWS::Bedrock::ApplicationInferenceProfile
  * @see https://docs.aws.amazon.com/bedrock/latest/userguide/inference-profiles-create.html
  */
-@propertyInjectable
 export class ApplicationInferenceProfile extends InferenceProfileBase implements IBedrockInvokable {
-  /** Uniquely identifies this class. */
-  public static readonly PROPERTY_INJECTION_ID: string = '@aws-cdk.aws-bedrock-alpha.ApplicationInferenceProfile';
-
   /**
    * Import an Application Inference Profile given its attributes.
    *
@@ -231,8 +225,6 @@ export class ApplicationInferenceProfile extends InferenceProfileBase implements
   // ------------------------------------------------------
   constructor(scope: Construct, id: string, props: ApplicationInferenceProfileProps) {
     super(scope, id);
-    // Enhanced CDK Analytics Telemetry
-    addConstructMetadata(this, props);
 
     // ------------------------------------------------------
     // Validate props
@@ -329,7 +321,6 @@ export class ApplicationInferenceProfile extends InferenceProfileBase implements
    * @param grantee - The IAM principal to grant permissions to
    * @returns An IAM Grant object representing the granted permissions
    */
-  @MethodMetadata()
   public grantInvoke(grantee: IGrantable): Grant {
     // This method ensures the appropriate permissions are given
     // to use either the inference profile or the vanilla foundation model
@@ -351,7 +342,6 @@ export class ApplicationInferenceProfile extends InferenceProfileBase implements
    * @param grantee - The IAM principal to grant permissions to
    * @returns An IAM Grant object representing the granted permissions
    */
-  @MethodMetadata()
   public grantProfileUsage(grantee: IGrantable): Grant {
     return Grant.addToPrincipal({
       grantee: grantee,

packages/@aws-cdk/aws-glue-alpha/README.md

@@ -343,6 +343,36 @@ new glue.RayJob(stack, 'ImportedJob', {
 });
 ```
 
+### Metrics Control
+
+By default, Glue jobs enable CloudWatch metrics (`--enable-metrics`) and observability metrics (`--enable-observability-metrics`) for monitoring and debugging. You can disable these metrics to reduce CloudWatch costs:
+
+```ts
+import * as cdk from 'aws-cdk-lib';
+import * as iam from 'aws-cdk-lib/aws-iam';
+declare const stack: cdk.Stack;
+declare const role: iam.IRole;
+declare const script: glue.Code;
+
+// Disable both metrics for cost optimization
+new glue.PySparkEtlJob(stack, 'CostOptimizedJob', {
+  role,
+  script,
+  enableMetrics: false,
+  enableObservabilityMetrics: false,
+});
+
+// Selective control - keep observability, disable profiling
+new glue.PySparkEtlJob(stack, 'SelectiveJob', {
+  role,
+  script,
+  enableMetrics: false,
+  // enableObservabilityMetrics defaults to true
+});
+```
+
+This feature is available for all Spark job types (ETL, Streaming, Flex) and Ray jobs.
+
 ### Enable Job Run Queuing
 
 AWS Glue job queuing monitors your account level quotas and limits. If quotas or limits are insufficient to start a Glue job run, AWS Glue will automatically queue the job and wait for limits to free up. Once limits become available, AWS Glue will retry the job run. Glue jobs will queue for limits like max concurrent job runs per account, max concurrent Data Processing Units (DPU), and resource unavailable due to IP address exhaustion in Amazon Virtual Private Cloud (Amazon VPC).

packages/@aws-cdk/aws-glue-alpha/lib/jobs/ray-job.ts

@@ -29,6 +29,24 @@ export interface RayJobProps extends JobProps {
    * @default - no job run queuing
    */
   readonly jobRunQueuingEnabled?: boolean;
+
+  /**
+   * Enable profiling metrics for the Glue job.
+   *
+   * When enabled, adds '--enable-metrics' to job arguments.
+   *
+   * @default true
+   */
+  readonly enableMetrics?: boolean;
+
+  /**
+   * Enable observability metrics for the Glue job.
+   *
+   * When enabled, adds '--enable-observability-metrics': 'true' to job arguments.
+   *
+   * @default true
+   */
+  readonly enableObservabilityMetrics?: boolean;
 }
 
 /**
@@ -66,8 +84,10 @@ export class RayJob extends Job {
 
     // Enable CloudWatch metrics and continuous logging by default as a best practice
     const continuousLoggingArgs = this.setupContinuousLogging(this.role, props.continuousLogging);
-    const profilingMetricsArgs = { '--enable-metrics': '' };
-    const observabilityMetricsArgs = { '--enable-observability-metrics': 'true' };
+
+    // Conditionally include metrics arguments (default to enabled for backward compatibility)
+    const profilingMetricsArgs = (props.enableMetrics ?? true) ? { '--enable-metrics': '' } : {};
+    const observabilityMetricsArgs = (props.enableObservabilityMetrics ?? true) ? { '--enable-observability-metrics': 'true' } : {};
 
     // Combine command line arguments into a single line item
     const defaultArguments = {

packages/@aws-cdk/aws-glue-alpha/lib/jobs/spark-job.ts

@@ -101,6 +101,24 @@ export interface SparkJobProps extends JobProps {
    * @see https://docs.aws.amazon.com/glue/latest/dg/aws-glue-programming-etl-glue-arguments.html
    */
   readonly sparkUI?: SparkUIProps;
+
+  /**
+   * Enable profiling metrics for the Glue job.
+   *
+   * When enabled, adds '--enable-metrics' to job arguments.
+   *
+   * @default true
+   */
+  readonly enableMetrics?: boolean;
+
+  /**
+   * Enable observability metrics for the Glue job.
+   *
+   * When enabled, adds '--enable-observability-metrics': 'true' to job arguments.
+   *
+   * @default true
+   */
+  readonly enableObservabilityMetrics?: boolean;
 }
 
 /**
@@ -134,8 +152,10 @@ export abstract class SparkJob extends Job {
   protected nonExecutableCommonArguments(props: SparkJobProps): {[key: string]: string} {
     // Enable CloudWatch metrics and continuous logging by default as a best practice
     const continuousLoggingArgs = this.setupContinuousLogging(this.role, props.continuousLogging);
-    const profilingMetricsArgs = { '--enable-metrics': '' };
-    const observabilityMetricsArgs = { '--enable-observability-metrics': 'true' };
+
+    // Conditionally include metrics arguments (default to enabled for backward compatibility)
+    const profilingMetricsArgs = (props.enableMetrics ?? true) ? { '--enable-metrics': '' } : {};
+    const observabilityMetricsArgs = (props.enableObservabilityMetrics ?? true) ? { '--enable-observability-metrics': 'true' } : {};
 
     // Set spark ui args, if spark ui logging had been setup
     const sparkUIArgs = this.sparkUILoggingLocation ? ({