aws-sdk-ec2 1.402.0 → 1.547.0

data/lib/aws-sdk-ec2/instance.rb

@@ -35,137 +35,6 @@ module Aws::EC2
     end
     alias :instance_id :id
 
-    # The AMI launch index, which can be used to find this instance in the
-    # launch group.
-    # @return [Integer]
-    def ami_launch_index
-      data[:ami_launch_index]
-    end
-
-    # The ID of the AMI used to launch the instance.
-    # @return [String]
-    def image_id
-      data[:image_id]
-    end
-
-    # The instance type.
-    # @return [String]
-    def instance_type
-      data[:instance_type]
-    end
-
-    # The kernel associated with this instance, if applicable.
-    # @return [String]
-    def kernel_id
-      data[:kernel_id]
-    end
-
-    # The name of the key pair, if this instance was launched with an
-    # associated key pair.
-    # @return [String]
-    def key_name
-      data[:key_name]
-    end
-
-    # The time the instance was launched.
-    # @return [Time]
-    def launch_time
-      data[:launch_time]
-    end
-
-    # The monitoring for the instance.
-    # @return [Types::Monitoring]
-    def monitoring
-      data[:monitoring]
-    end
-
-    # The location where the instance launched, if applicable.
-    # @return [Types::Placement]
-    def placement
-      data[:placement]
-    end
-
-    # The value is `Windows` for Windows instances; otherwise blank.
-    # @return [String]
-    def platform
-      data[:platform]
-    end
-
-    # \[IPv4 only\] The private DNS hostname name assigned to the instance.
-    # This DNS hostname can only be used inside the Amazon EC2 network. This
-    # name is not available until the instance enters the `running` state.
-    #
-    # The Amazon-provided DNS server resolves Amazon-provided private DNS
-    # hostnames if you've enabled DNS resolution and DNS hostnames in your
-    # VPC. If you are not using the Amazon-provided DNS server in your VPC,
-    # your custom domain name servers must resolve the hostname as
-    # appropriate.
-    # @return [String]
-    def private_dns_name
-      data[:private_dns_name]
-    end
-
-    # The private IPv4 address assigned to the instance.
-    # @return [String]
-    def private_ip_address
-      data[:private_ip_address]
-    end
-
-    # The product codes attached to this instance, if applicable.
-    # @return [Array<Types::ProductCode>]
-    def product_codes
-      data[:product_codes]
-    end
-
-    # \[IPv4 only\] The public DNS name assigned to the instance. This name
-    # is not available until the instance enters the `running` state. This
-    # name is only available if you've enabled DNS hostnames for your VPC.
-    # @return [String]
-    def public_dns_name
-      data[:public_dns_name]
-    end
-
-    # The public IPv4 address, or the Carrier IP address assigned to the
-    # instance, if applicable.
-    #
-    # A Carrier IP address only applies to an instance launched in a subnet
-    # associated with a Wavelength Zone.
-    # @return [String]
-    def public_ip_address
-      data[:public_ip_address]
-    end
-
-    # The RAM disk associated with this instance, if applicable.
-    # @return [String]
-    def ramdisk_id
-      data[:ramdisk_id]
-    end
-
-    # The current state of the instance.
-    # @return [Types::InstanceState]
-    def state
-      data[:state]
-    end
-
-    # The reason for the most recent state transition. This might be an
-    # empty string.
-    # @return [String]
-    def state_transition_reason
-      data[:state_transition_reason]
-    end
-
-    # The ID of the subnet in which the instance is running.
-    # @return [String]
-    def subnet_id
-      data[:subnet_id]
-    end
-
-    # The ID of the VPC in which the instance is running.
-    # @return [String]
-    def vpc_id
-      data[:vpc_id]
-    end
-
     # The architecture of the image.
     # @return [String]
     def architecture
@@ -220,13 +89,21 @@ module Aws::EC2
       data[:instance_lifecycle]
     end
 
-    # The Elastic GPU associated with the instance.
+    # Deprecated.
+    #
+    # <note markdown="1"> Amazon Elastic Graphics reached end of life on January 8, 2024.
+    #
+    #  </note>
     # @return [Array<Types::ElasticGpuAssociation>]
     def elastic_gpu_associations
       data[:elastic_gpu_associations]
     end
 
-    # The elastic inference accelerator associated with the instance.
+    # Deprecated
+    #
+    # <note markdown="1"> Amazon Elastic Inference is no longer available.
+    #
+    #  </note>
     # @return [Array<Types::ElasticInferenceAcceleratorAssociation>]
     def elastic_inference_accelerator_associations
       data[:elastic_inference_accelerator_associations]
@@ -300,6 +177,17 @@ module Aws::EC2
       data[:cpu_options]
     end
 
+    # The ID of the Capacity Block.
+    #
+    # <note markdown="1"> For P5 instances, a Capacity Block ID refers to a group of instances.
+    # For Trn2u instances, a capacity block ID refers to an EC2 UltraServer.
+    #
+    #  </note>
+    # @return [String]
+    def capacity_block_id
+      data[:capacity_block_id]
+    end
+
     # The ID of the Capacity Reservation.
     # @return [String]
     def capacity_reservation_id
@@ -429,6 +317,158 @@ module Aws::EC2
       data[:current_instance_boot_mode]
     end
 
+    # Contains settings for the network performance options for your
+    # instance.
+    # @return [Types::InstanceNetworkPerformanceOptions]
+    def network_performance_options
+      data[:network_performance_options]
+    end
+
+    # The service provider that manages the instance.
+    # @return [Types::OperatorResponse]
+    def operator
+      data[:operator]
+    end
+
+    # The ID of the AMI used to launch the instance.
+    # @return [String]
+    def image_id
+      data[:image_id]
+    end
+
+    # The current state of the instance.
+    # @return [Types::InstanceState]
+    def state
+      data[:state]
+    end
+
+    # \[IPv4 only\] The private DNS hostname name assigned to the instance.
+    # This DNS hostname can only be used inside the Amazon EC2 network. This
+    # name is not available until the instance enters the `running` state.
+    #
+    # The Amazon-provided DNS server resolves Amazon-provided private DNS
+    # hostnames if you've enabled DNS resolution and DNS hostnames in your
+    # VPC. If you are not using the Amazon-provided DNS server in your VPC,
+    # your custom domain name servers must resolve the hostname as
+    # appropriate.
+    # @return [String]
+    def private_dns_name
+      data[:private_dns_name]
+    end
+
+    # The public DNS name assigned to the instance. This name is not
+    # available until the instance enters the `running` state. This name is
+    # only available if you've enabled DNS hostnames for your VPC. The
+    # format of this name depends on the [public hostname type][1].
+    #
+    #
+    #
+    # [1]: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/hostname-types.html#public-hostnames
+    # @return [String]
+    def public_dns_name
+      data[:public_dns_name]
+    end
+
+    # The reason for the most recent state transition. This might be an
+    # empty string.
+    # @return [String]
+    def state_transition_reason
+      data[:state_transition_reason]
+    end
+
+    # The name of the key pair, if this instance was launched with an
+    # associated key pair.
+    # @return [String]
+    def key_name
+      data[:key_name]
+    end
+
+    # The AMI launch index, which can be used to find this instance in the
+    # launch group.
+    # @return [Integer]
+    def ami_launch_index
+      data[:ami_launch_index]
+    end
+
+    # The product codes attached to this instance, if applicable.
+    # @return [Array<Types::ProductCode>]
+    def product_codes
+      data[:product_codes]
+    end
+
+    # The instance type.
+    # @return [String]
+    def instance_type
+      data[:instance_type]
+    end
+
+    # The time that the instance was last launched. To determine the time
+    # that instance was first launched, see the attachment time for the
+    # primary network interface.
+    # @return [Time]
+    def launch_time
+      data[:launch_time]
+    end
+
+    # The location where the instance launched, if applicable.
+    # @return [Types::Placement]
+    def placement
+      data[:placement]
+    end
+
+    # The kernel associated with this instance, if applicable.
+    # @return [String]
+    def kernel_id
+      data[:kernel_id]
+    end
+
+    # The RAM disk associated with this instance, if applicable.
+    # @return [String]
+    def ramdisk_id
+      data[:ramdisk_id]
+    end
+
+    # The platform. This value is `windows` for Windows instances;
+    # otherwise, it is empty.
+    # @return [String]
+    def platform
+      data[:platform]
+    end
+
+    # The monitoring for the instance.
+    # @return [Types::Monitoring]
+    def monitoring
+      data[:monitoring]
+    end
+
+    # The ID of the subnet in which the instance is running.
+    # @return [String]
+    def subnet_id
+      data[:subnet_id]
+    end
+
+    # The ID of the VPC in which the instance is running.
+    # @return [String]
+    def vpc_id
+      data[:vpc_id]
+    end
+
+    # The private IPv4 address assigned to the instance.
+    # @return [String]
+    def private_ip_address
+      data[:private_ip_address]
+    end
+
+    # The public IPv4 address, or the Carrier IP address assigned to the
+    # instance, if applicable.
+    #
+    # A Carrier IP address only applies to an instance launched in a subnet
+    # associated with a Wavelength Zone.
+    # @return [String]
+    def public_ip_address
+      data[:public_ip_address]
+    end
+
     # @!endgroup
 
     # @return [Client]
@@ -443,7 +483,7 @@ module Aws::EC2
     #
     # @return [self]
     def load
-      resp = Aws::Plugins::UserAgent.feature('resource') do
+      resp = Aws::Plugins::UserAgent.metric('RESOURCE_MODEL') do
         @client.describe_instances(instance_ids: [@id])
       end
       @data = resp.reservations[0].instances[0]
@@ -490,7 +530,7 @@ module Aws::EC2
       options, params = separate_params_and_options(options)
       waiter = Waiters::InstanceExists.new(options)
       yield_waiter_and_warn(waiter, &block) if block_given?
-      resp = Aws::Plugins::UserAgent.feature('resource') do
+      resp = Aws::Plugins::UserAgent.metric('RESOURCE_MODEL') do
         waiter.wait(params.merge(instance_ids: [@id]))
       end
       Instance.new({
@@ -510,7 +550,7 @@ module Aws::EC2
       options, params = separate_params_and_options(options)
       waiter = Waiters::InstanceRunning.new(options)
       yield_waiter_and_warn(waiter, &block) if block_given?
-      resp = Aws::Plugins::UserAgent.feature('resource') do
+      resp = Aws::Plugins::UserAgent.metric('RESOURCE_MODEL') do
         waiter.wait(params.merge(instance_ids: [@id]))
       end
       Instance.new({
@@ -530,7 +570,7 @@ module Aws::EC2
       options, params = separate_params_and_options(options)
       waiter = Waiters::InstanceStopped.new(options)
       yield_waiter_and_warn(waiter, &block) if block_given?
-      resp = Aws::Plugins::UserAgent.feature('resource') do
+      resp = Aws::Plugins::UserAgent.metric('RESOURCE_MODEL') do
         waiter.wait(params.merge(instance_ids: [@id]))
       end
       Instance.new({
@@ -550,7 +590,7 @@ module Aws::EC2
       options, params = separate_params_and_options(options)
       waiter = Waiters::InstanceTerminated.new(options)
       yield_waiter_and_warn(waiter, &block) if block_given?
-      resp = Aws::Plugins::UserAgent.feature('resource') do
+      resp = Aws::Plugins::UserAgent.metric('RESOURCE_MODEL') do
         waiter.wait(params.merge(instance_ids: [@id]))
       end
       Instance.new({
@@ -654,7 +694,7 @@ module Aws::EC2
           :retry
         end
       end
-      Aws::Plugins::UserAgent.feature('resource') do
+      Aws::Plugins::UserAgent.metric('RESOURCE_MODEL') do
         Aws::Waiters::Waiter.new(options).wait({})
       end
     end
@@ -665,8 +705,8 @@ module Aws::EC2
     #
     #   instance.attach_classic_link_vpc({
     #     dry_run: false,
-    #     groups: ["SecurityGroupId"], # required
     #     vpc_id: "VpcId", # required
+    #     groups: ["SecurityGroupId"], # required
     #   })
     # @param [Hash] options ({})
     # @option options [Boolean] :dry_run
@@ -674,15 +714,15 @@ module Aws::EC2
     #   without actually making the request, and provides an error response.
     #   If you have the required permissions, the error response is
     #   `DryRunOperation`. Otherwise, it is `UnauthorizedOperation`.
+    # @option options [required, String] :vpc_id
+    #   The ID of the ClassicLink-enabled VPC.
     # @option options [required, Array<String>] :groups
     #   The IDs of the security groups. You cannot specify security groups
     #   from a different VPC.
-    # @option options [required, String] :vpc_id
-    #   The ID of the ClassicLink-enabled VPC.
     # @return [Types::AttachClassicLinkVpcResult]
     def attach_classic_link_vpc(options = {})
       options = options.merge(instance_id: @id)
-      resp = Aws::Plugins::UserAgent.feature('resource') do
+      resp = Aws::Plugins::UserAgent.metric('RESOURCE_MODEL') do
         @client.attach_classic_link_vpc(options)
       end
       resp.data
@@ -709,7 +749,7 @@ module Aws::EC2
     # @return [Types::VolumeAttachment]
     def attach_volume(options = {})
       options = options.merge(instance_id: @id)
-      resp = Aws::Plugins::UserAgent.feature('resource') do
+      resp = Aws::Plugins::UserAgent.metric('RESOURCE_MODEL') do
         @client.attach_volume(options)
       end
       resp.data
@@ -718,23 +758,23 @@ module Aws::EC2
     # @example Request syntax with placeholder values
     #
     #   instance.console_output({
-    #     dry_run: false,
     #     latest: false,
+    #     dry_run: false,
     #   })
     # @param [Hash] options ({})
-    # @option options [Boolean] :dry_run
-    #   Checks whether you have the required permissions for the action,
-    #   without actually making the request, and provides an error response.
-    #   If you have the required permissions, the error response is
-    #   `DryRunOperation`. Otherwise, it is `UnauthorizedOperation`.
     # @option options [Boolean] :latest
     #   When enabled, retrieves the latest console output for the instance.
     #
     #   Default: disabled (`false`)
+    # @option options [Boolean] :dry_run
+    #   Checks whether you have the required permissions for the operation,
+    #   without actually making the request, and provides an error response.
+    #   If you have the required permissions, the error response is
+    #   `DryRunOperation`. Otherwise, it is `UnauthorizedOperation`.
     # @return [Types::GetConsoleOutputResult]
     def console_output(options = {})
       options = options.merge(instance_id: @id)
-      resp = Aws::Plugins::UserAgent.feature('resource') do
+      resp = Aws::Plugins::UserAgent.metric('RESOURCE_MODEL') do
         @client.get_console_output(options)
       end
       resp.data
@@ -743,10 +783,24 @@ module Aws::EC2
     # @example Request syntax with placeholder values
     #
     #   image = instance.create_image({
+    #     tag_specifications: [
+    #       {
+    #         resource_type: "capacity-reservation", # accepts capacity-reservation, client-vpn-endpoint, customer-gateway, carrier-gateway, coip-pool, declarative-policies-report, dedicated-host, dhcp-options, egress-only-internet-gateway, elastic-ip, elastic-gpu, export-image-task, export-instance-task, fleet, fpga-image, host-reservation, image, import-image-task, import-snapshot-task, instance, instance-event-window, internet-gateway, ipam, ipam-pool, ipam-scope, ipv4pool-ec2, ipv6pool-ec2, key-pair, launch-template, local-gateway, local-gateway-route-table, local-gateway-virtual-interface, local-gateway-virtual-interface-group, local-gateway-route-table-vpc-association, local-gateway-route-table-virtual-interface-group-association, natgateway, network-acl, network-interface, network-insights-analysis, network-insights-path, network-insights-access-scope, network-insights-access-scope-analysis, outpost-lag, placement-group, prefix-list, replace-root-volume-task, reserved-instances, route-table, security-group, security-group-rule, service-link-virtual-interface, snapshot, spot-fleet-request, spot-instances-request, subnet, subnet-cidr-reservation, traffic-mirror-filter, traffic-mirror-session, traffic-mirror-target, transit-gateway, transit-gateway-attachment, transit-gateway-connect-peer, transit-gateway-multicast-domain, transit-gateway-policy-table, transit-gateway-route-table, transit-gateway-route-table-announcement, volume, vpc, vpc-endpoint, vpc-endpoint-connection, vpc-endpoint-service, vpc-endpoint-service-permission, vpc-peering-connection, vpn-connection, vpn-gateway, vpc-flow-log, capacity-reservation-fleet, traffic-mirror-filter-rule, vpc-endpoint-connection-device-type, verified-access-instance, verified-access-group, verified-access-endpoint, verified-access-policy, verified-access-trust-provider, vpn-connection-device-type, vpc-block-public-access-exclusion, route-server, route-server-endpoint, route-server-peer, ipam-resource-discovery, ipam-resource-discovery-association, instance-connect-endpoint, verified-access-endpoint-target, ipam-external-resource-verification-token, capacity-block, mac-modification-task
+    #         tags: [
+    #           {
+    #             key: "String",
+    #             value: "String",
+    #           },
+    #         ],
+    #       },
+    #     ],
+    #     snapshot_location: "regional", # accepts regional, local
+    #     dry_run: false,
+    #     name: "String", # required
+    #     description: "String",
+    #     no_reboot: false,
     #     block_device_mappings: [
     #       {
-    #         device_name: "String",
-    #         virtual_name: "String",
     #         ebs: {
     #           delete_on_termination: false,
     #           iops: 1,
@@ -756,34 +810,52 @@ module Aws::EC2
     #           kms_key_id: "String",
     #           throughput: 1,
     #           outpost_arn: "String",
+    #           availability_zone: "String",
     #           encrypted: false,
+    #           volume_initialization_rate: 1,
+    #           availability_zone_id: "String",
     #         },
     #         no_device: "String",
-    #       },
-    #     ],
-    #     description: "String",
-    #     dry_run: false,
-    #     name: "String", # required
-    #     no_reboot: false,
-    #     tag_specifications: [
-    #       {
-    #         resource_type: "capacity-reservation", # accepts capacity-reservation, client-vpn-endpoint, customer-gateway, carrier-gateway, coip-pool, dedicated-host, dhcp-options, egress-only-internet-gateway, elastic-ip, elastic-gpu, export-image-task, export-instance-task, fleet, fpga-image, host-reservation, image, import-image-task, import-snapshot-task, instance, instance-event-window, internet-gateway, ipam, ipam-pool, ipam-scope, ipv4pool-ec2, ipv6pool-ec2, key-pair, launch-template, local-gateway, local-gateway-route-table, local-gateway-virtual-interface, local-gateway-virtual-interface-group, local-gateway-route-table-vpc-association, local-gateway-route-table-virtual-interface-group-association, natgateway, network-acl, network-interface, network-insights-analysis, network-insights-path, network-insights-access-scope, network-insights-access-scope-analysis, placement-group, prefix-list, replace-root-volume-task, reserved-instances, route-table, security-group, security-group-rule, snapshot, spot-fleet-request, spot-instances-request, subnet, subnet-cidr-reservation, traffic-mirror-filter, traffic-mirror-session, traffic-mirror-target, transit-gateway, transit-gateway-attachment, transit-gateway-connect-peer, transit-gateway-multicast-domain, transit-gateway-policy-table, transit-gateway-route-table, transit-gateway-route-table-announcement, volume, vpc, vpc-endpoint, vpc-endpoint-connection, vpc-endpoint-service, vpc-endpoint-service-permission, vpc-peering-connection, vpn-connection, vpn-gateway, vpc-flow-log, capacity-reservation-fleet, traffic-mirror-filter-rule, vpc-endpoint-connection-device-type, verified-access-instance, verified-access-group, verified-access-endpoint, verified-access-policy, verified-access-trust-provider, vpn-connection-device-type, vpc-block-public-access-exclusion, ipam-resource-discovery, ipam-resource-discovery-association, instance-connect-endpoint
-    #         tags: [
-    #           {
-    #             key: "String",
-    #             value: "String",
-    #           },
-    #         ],
+    #         device_name: "String",
+    #         virtual_name: "String",
     #       },
     #     ],
     #   })
     # @param [Hash] options ({})
-    # @option options [Array<Types::BlockDeviceMapping>] :block_device_mappings
-    #   The block device mappings. This parameter cannot be used to modify the
-    #   encryption status of existing volumes or snapshots. To create an AMI
-    #   with encrypted snapshots, use the CopyImage action.
-    # @option options [String] :description
-    #   A description for the new image.
+    # @option options [Array<Types::TagSpecification>] :tag_specifications
+    #   The tags to apply to the AMI and snapshots on creation. You can tag
+    #   the AMI, the snapshots, or both.
+    #
+    #   * To tag the AMI, the value for `ResourceType` must be `image`.
+    #
+    #   * To tag the snapshots that are created of the root volume and of
+    #     other Amazon EBS volumes that are attached to the instance, the
+    #     value for `ResourceType` must be `snapshot`. The same tag is applied
+    #     to all of the snapshots that are created.
+    #
+    #   If you specify other values for `ResourceType`, the request fails.
+    #
+    #   To tag an AMI or snapshot after it has been created, see
+    #   [CreateTags][1].
+    #
+    #
+    #
+    #   [1]: https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_CreateTags.html
+    # @option options [String] :snapshot_location
+    #   <note markdown="1"> Only supported for instances in Local Zones. If the source instance is
+    #   not in a Local Zone, omit this parameter.
+    #
+    #    </note>
+    #
+    #   The Amazon S3 location where the snapshots will be stored.
+    #
+    #   * To create local snapshots in the same Local Zone as the source
+    #     instance, specify `local`.
+    #
+    #   * To create regional snapshots in the parent Region of the Local Zone,
+    #     specify `regional` or omit this parameter.
+    #
+    #   Default: `regional`
     # @option options [Boolean] :dry_run
     #   Checks whether you have the required permissions for the action,
     #   without actually making the request, and provides an error response.
@@ -795,6 +867,8 @@ module Aws::EC2
     #   Constraints: 3-128 alphanumeric characters, parentheses (()), square
     #   brackets (\[\]), spaces ( ), periods (.), slashes (/), dashes (-),
     #   single quotes ('), at-signs (@), or underscores(\_)
+    # @option options [String] :description
+    #   A description for the new image.
     # @option options [Boolean] :no_reboot
     #   Indicates whether or not the instance should be automatically rebooted
     #   before creating the image. Specify one of the following values:
@@ -810,29 +884,27 @@ module Aws::EC2
     #     volumes before the snapshots are created.
     #
     #   Default: `false`
-    # @option options [Array<Types::TagSpecification>] :tag_specifications
-    #   The tags to apply to the AMI and snapshots on creation. You can tag
-    #   the AMI, the snapshots, or both.
-    #
-    #   * To tag the AMI, the value for `ResourceType` must be `image`.
-    #
-    #   * To tag the snapshots that are created of the root volume and of
-    #     other Amazon EBS volumes that are attached to the instance, the
-    #     value for `ResourceType` must be `snapshot`. The same tag is applied
-    #     to all of the snapshots that are created.
-    #
-    #   If you specify other values for `ResourceType`, the request fails.
+    # @option options [Array<Types::BlockDeviceMapping>] :block_device_mappings
+    #   The block device mappings.
     #
-    #   To tag an AMI or snapshot after it has been created, see
-    #   [CreateTags][1].
+    #   When using the CreateImage action:
     #
+    #   * You can't change the volume size using the VolumeSize parameter. If
+    #     you want a different volume size, you must first change the volume
+    #     size of the source instance.
     #
+    #   * You can't modify the encryption status of existing volumes or
+    #     snapshots. To create an AMI with volumes or snapshots that have a
+    #     different encryption status (for example, where the source volume
+    #     and snapshots are unencrypted, and you want to create an AMI with
+    #     encrypted volumes or snapshots), use the CopyImage action.
     #
-    #   [1]: https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_CreateTags.html
+    #   * The only option that can be changed for existing mappings or
+    #     snapshots is `DeleteOnTermination`.
     # @return [Image]
     def create_image(options = {})
       options = options.merge(instance_id: @id)
-      resp = Aws::Plugins::UserAgent.feature('resource') do
+      resp = Aws::Plugins::UserAgent.metric('RESOURCE_MODEL') do
         @client.create_image(options)
       end
       Image.new(
@@ -866,7 +938,7 @@ module Aws::EC2
     def create_tags(options = {})
       batch = []
       options = Aws::Util.deep_merge(options, resources: [@id])
-      resp = Aws::Plugins::UserAgent.feature('resource') do
+      resp = Aws::Plugins::UserAgent.metric('RESOURCE_MODEL') do
         @client.create_tags(options)
       end
       options[:tags].each do |t|
@@ -913,7 +985,7 @@ module Aws::EC2
     def delete_tags(options = {})
       batch = []
       options = Aws::Util.deep_merge(options, resources: [@id])
-      resp = Aws::Plugins::UserAgent.feature('resource') do
+      resp = Aws::Plugins::UserAgent.metric('RESOURCE_MODEL') do
         @client.delete_tags(options)
       end
       options[:tags].each do |t|
@@ -930,23 +1002,23 @@ module Aws::EC2
     # @example Request syntax with placeholder values
     #
     #   instance.describe_attribute({
-    #     attribute: "instanceType", # required, accepts instanceType, kernel, ramdisk, userData, disableApiTermination, instanceInitiatedShutdownBehavior, rootDeviceName, blockDeviceMapping, productCodes, sourceDestCheck, groupSet, ebsOptimized, sriovNetSupport, enaSupport, enclaveOptions, disableApiStop
     #     dry_run: false,
+    #     attribute: "instanceType", # required, accepts instanceType, kernel, ramdisk, userData, disableApiTermination, instanceInitiatedShutdownBehavior, rootDeviceName, blockDeviceMapping, productCodes, sourceDestCheck, groupSet, ebsOptimized, sriovNetSupport, enaSupport, enclaveOptions, disableApiStop
     #   })
     # @param [Hash] options ({})
-    # @option options [required, String] :attribute
-    #   The instance attribute.
-    #
-    #   Note: The `enaSupport` attribute is not supported at this time.
     # @option options [Boolean] :dry_run
-    #   Checks whether you have the required permissions for the action,
+    #   Checks whether you have the required permissions for the operation,
     #   without actually making the request, and provides an error response.
     #   If you have the required permissions, the error response is
     #   `DryRunOperation`. Otherwise, it is `UnauthorizedOperation`.
+    # @option options [required, String] :attribute
+    #   The instance attribute.
+    #
+    #   Note that the `enaSupport` attribute is not supported.
     # @return [Types::InstanceAttribute]
     def describe_attribute(options = {})
       options = options.merge(instance_id: @id)
-      resp = Aws::Plugins::UserAgent.feature('resource') do
+      resp = Aws::Plugins::UserAgent.metric('RESOURCE_MODEL') do
         @client.describe_instance_attribute(options)
       end
       resp.data
@@ -969,7 +1041,7 @@ module Aws::EC2
     # @return [Types::DetachClassicLinkVpcResult]
     def detach_classic_link_vpc(options = {})
       options = options.merge(instance_id: @id)
-      resp = Aws::Plugins::UserAgent.feature('resource') do
+      resp = Aws::Plugins::UserAgent.metric('RESOURCE_MODEL') do
         @client.detach_classic_link_vpc(options)
       end
       resp.data
@@ -1005,7 +1077,7 @@ module Aws::EC2
     # @return [Types::VolumeAttachment]
     def detach_volume(options = {})
       options = options.merge(instance_id: @id)
-      resp = Aws::Plugins::UserAgent.feature('resource') do
+      resp = Aws::Plugins::UserAgent.metric('RESOURCE_MODEL') do
         @client.detach_volume(options)
       end
       resp.data
@@ -1017,39 +1089,39 @@ module Aws::EC2
     #     source_dest_check: {
     #       value: false,
     #     },
+    #     disable_api_stop: {
+    #       value: false,
+    #     },
+    #     dry_run: false,
     #     attribute: "instanceType", # accepts instanceType, kernel, ramdisk, userData, disableApiTermination, instanceInitiatedShutdownBehavior, rootDeviceName, blockDeviceMapping, productCodes, sourceDestCheck, groupSet, ebsOptimized, sriovNetSupport, enaSupport, enclaveOptions, disableApiStop
+    #     value: "String",
     #     block_device_mappings: [
     #       {
     #         device_name: "String",
     #         ebs: {
-    #           delete_on_termination: false,
     #           volume_id: "VolumeId",
+    #           delete_on_termination: false,
     #         },
-    #         no_device: "String",
     #         virtual_name: "String",
+    #         no_device: "String",
     #       },
     #     ],
     #     disable_api_termination: {
     #       value: false,
     #     },
-    #     dry_run: false,
-    #     ebs_optimized: {
-    #       value: false,
-    #     },
-    #     ena_support: {
-    #       value: false,
-    #     },
-    #     groups: ["SecurityGroupId"],
-    #     instance_initiated_shutdown_behavior: "value", # value <Hash,Array,String,Numeric,Boolean,IO,Set,nil>
     #     instance_type: "value", # value <Hash,Array,String,Numeric,Boolean,IO,Set,nil>
     #     kernel: "value", # value <Hash,Array,String,Numeric,Boolean,IO,Set,nil>
     #     ramdisk: "value", # value <Hash,Array,String,Numeric,Boolean,IO,Set,nil>
-    #     sriov_net_support: "value", # value <Hash,Array,String,Numeric,Boolean,IO,Set,nil>
     #     user_data: {
     #       value: "data",
     #     },
-    #     value: "String",
-    #     disable_api_stop: {
+    #     instance_initiated_shutdown_behavior: "value", # value <Hash,Array,String,Numeric,Boolean,IO,Set,nil>
+    #     groups: ["SecurityGroupId"],
+    #     ebs_optimized: {
+    #       value: false,
+    #     },
+    #     sriov_net_support: "value", # value <Hash,Array,String,Numeric,Boolean,IO,Set,nil>
+    #     ena_support: {
     #       value: false,
     #     },
     #   })
@@ -1061,20 +1133,48 @@ module Aws::EC2
     #   enabled; otherwise, they are disabled. The default value is `true`.
     #   You must disable source/destination checks if the instance runs
     #   services such as network address translation, routing, or firewalls.
+    # @option options [Types::AttributeBooleanValue] :disable_api_stop
+    #   Indicates whether an instance is enabled for stop protection. For more
+    #   information, see [Enable stop protection for your instance][1].
+    #
+    #
+    #
+    #
+    #
+    #   [1]: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ec2-stop-protection.html
+    # @option options [Boolean] :dry_run
+    #   Checks whether you have the required permissions for the operation,
+    #   without actually making the request, and provides an error response.
+    #   If you have the required permissions, the error response is
+    #   `DryRunOperation`. Otherwise, it is `UnauthorizedOperation`.
     # @option options [String] :attribute
     #   The name of the attribute to modify.
     #
+    #   <note markdown="1"> When changing the instance type: If the original instance type is
+    #   configured for configurable bandwidth, and the desired instance type
+    #   doesn't support configurable bandwidth, first set the existing
+    #   bandwidth configuration to `default` using the
+    #   ModifyInstanceNetworkPerformanceOptions operation.
+    #
+    #    </note>
+    #
     #   You can modify the following attributes only: `disableApiTermination`
     #   \| `instanceType` \| `kernel` \| `ramdisk` \|
     #   `instanceInitiatedShutdownBehavior` \| `blockDeviceMapping` \|
     #   `userData` \| `sourceDestCheck` \| `groupSet` \| `ebsOptimized` \|
     #   `sriovNetSupport` \| `enaSupport` \| `nvmeSupport` \| `disableApiStop`
     #   \| `enclaveOptions`
+    # @option options [String] :value
+    #   A new value for the attribute. Use only with the `kernel`, `ramdisk`,
+    #   `userData`, `disableApiTermination`, or
+    #   `instanceInitiatedShutdownBehavior` attribute.
     # @option options [Array<Types::InstanceBlockDeviceMappingSpecification>] :block_device_mappings
     #   Modifies the `DeleteOnTermination` attribute for volumes that are
     #   currently attached. The volume must be owned by the caller. If no
     #   value is specified for `DeleteOnTermination`, the default is `true`
-    #   and the volume is deleted when the instance is terminated.
+    #   and the volume is deleted when the instance is terminated. You can't
+    #   modify the `DeleteOnTermination` attribute for volumes that are
+    #   attached to Amazon Web Services-managed resources.
     #
     #   To add instance store volumes to an Amazon EBS-backed instance, you
     #   must add them when you launch the instance. For more information, see
@@ -1085,33 +1185,10 @@ module Aws::EC2
     #
     #   [1]: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/block-device-mapping-concepts.html#Using_OverridingAMIBDM
     # @option options [Types::AttributeBooleanValue] :disable_api_termination
-    #   If the value is `true`, you can't terminate the instance using the
-    #   Amazon EC2 console, CLI, or API; otherwise, you can. You cannot use
-    #   this parameter for Spot Instances.
-    # @option options [Boolean] :dry_run
-    #   Checks whether you have the required permissions for the action,
-    #   without actually making the request, and provides an error response.
-    #   If you have the required permissions, the error response is
-    #   `DryRunOperation`. Otherwise, it is `UnauthorizedOperation`.
-    # @option options [Types::AttributeBooleanValue] :ebs_optimized
-    #   Specifies whether the instance is optimized for Amazon EBS I/O. This
-    #   optimization provides dedicated throughput to Amazon EBS and an
-    #   optimized configuration stack to provide optimal EBS I/O performance.
-    #   This optimization isn't available with all instance types. Additional
-    #   usage charges apply when using an EBS Optimized instance.
-    # @option options [Types::AttributeBooleanValue] :ena_support
-    #   Set to `true` to enable enhanced networking with ENA for the instance.
-    #
-    #   This option is supported only for HVM instances. Specifying this
-    #   option with a PV instance can make it unreachable.
-    # @option options [Array<String>] :groups
-    #   Replaces the security groups of the instance with the specified
-    #   security groups. You must specify the ID of at least one security
-    #   group, even if it's just the default security group for the VPC.
-    # @option options [Types::AttributeValue] :instance_initiated_shutdown_behavior
-    #   Specifies whether an instance stops or terminates when you initiate
-    #   shutdown from the instance (using the operating system command for
-    #   system shutdown).
+    #   Enable or disable termination protection for the instance. If the
+    #   value is `true`, you can't terminate the instance using the Amazon
+    #   EC2 console, command line interface, or API. You can't enable
+    #   termination protection for Spot Instances.
     # @option options [Types::AttributeValue] :instance_type
     #   Changes the instance type to the specified value. For more
     #   information, see [Instance types][1] in the *Amazon EC2 User Guide*.
@@ -1137,6 +1214,29 @@ module Aws::EC2
     #
     #
     #   [1]: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/UserProvidedKernels.html
+    # @option options [Types::BlobAttributeValue] :user_data
+    #   Changes the instance's user data to the specified value. User data
+    #   must be base64-encoded. Depending on the tool or SDK that you're
+    #   using, the base64-encoding might be performed for you. For more
+    #   information, see [Work with instance user data][1].
+    #
+    #
+    #
+    #   [1]: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/instancedata-add-user-data.html
+    # @option options [Types::AttributeValue] :instance_initiated_shutdown_behavior
+    #   Specifies whether an instance stops or terminates when you initiate
+    #   shutdown from the instance (using the operating system command for
+    #   system shutdown).
+    # @option options [Array<String>] :groups
+    #   Replaces the security groups of the instance with the specified
+    #   security groups. You must specify the ID of at least one security
+    #   group, even if it's just the default security group for the VPC.
+    # @option options [Types::AttributeBooleanValue] :ebs_optimized
+    #   Specifies whether the instance is optimized for Amazon EBS I/O. This
+    #   optimization provides dedicated throughput to Amazon EBS and an
+    #   optimized configuration stack to provide optimal EBS I/O performance.
+    #   This optimization isn't available with all instance types. Additional
+    #   usage charges apply when using an EBS Optimized instance.
     # @option options [Types::AttributeValue] :sriov_net_support
     #   Set to `simple` to enable enhanced networking with the Intel 82599
     #   Virtual Function interface for the instance.
@@ -1146,28 +1246,15 @@ module Aws::EC2
     #
     #   This option is supported only for HVM instances. Specifying this
     #   option with a PV instance can make it unreachable.
-    # @option options [Types::BlobAttributeValue] :user_data
-    #   Changes the instance's user data to the specified value. If you are
-    #   using an Amazon Web Services SDK or command line tool, base64-encoding
-    #   is performed for you, and you can load the text from a file.
-    #   Otherwise, you must provide base64-encoded text.
-    # @option options [String] :value
-    #   A new value for the attribute. Use only with the `kernel`, `ramdisk`,
-    #   `userData`, `disableApiTermination`, or
-    #   `instanceInitiatedShutdownBehavior` attribute.
-    # @option options [Types::AttributeBooleanValue] :disable_api_stop
-    #   Indicates whether an instance is enabled for stop protection. For more
-    #   information, see [Stop Protection][1].
-    #
-    #
-    #
-    #
+    # @option options [Types::AttributeBooleanValue] :ena_support
+    #   Set to `true` to enable enhanced networking with ENA for the instance.
     #
-    #   [1]: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/Stop_Start.html#Using_StopProtection
+    #   This option is supported only for HVM instances. Specifying this
+    #   option with a PV instance can make it unreachable.
     # @return [EmptyStructure]
     def modify_attribute(options = {})
       options = options.merge(instance_id: @id)
-      resp = Aws::Plugins::UserAgent.feature('resource') do
+      resp = Aws::Plugins::UserAgent.metric('RESOURCE_MODEL') do
         @client.modify_instance_attribute(options)
       end
       resp.data
@@ -1180,14 +1267,14 @@ module Aws::EC2
     #   })
     # @param [Hash] options ({})
     # @option options [Boolean] :dry_run
-    #   Checks whether you have the required permissions for the action,
+    #   Checks whether you have the required permissions for the operation,
     #   without actually making the request, and provides an error response.
     #   If you have the required permissions, the error response is
     #   `DryRunOperation`. Otherwise, it is `UnauthorizedOperation`.
     # @return [Types::MonitorInstancesResult]
     def monitor(options = {})
       options = Aws::Util.deep_merge(options, instance_ids: [@id])
-      resp = Aws::Plugins::UserAgent.feature('resource') do
+      resp = Aws::Plugins::UserAgent.metric('RESOURCE_MODEL') do
         @client.monitor_instances(options)
       end
       resp.data
@@ -1200,14 +1287,14 @@ module Aws::EC2
     #   })
     # @param [Hash] options ({})
     # @option options [Boolean] :dry_run
-    #   Checks whether you have the required permissions for the action,
+    #   Checks whether you have the required permissions for the operation,
     #   without actually making the request, and provides an error response.
     #   If you have the required permissions, the error response is
     #   `DryRunOperation`. Otherwise, it is `UnauthorizedOperation`.
     # @return [Types::GetPasswordDataResult]
     def password_data(options = {})
       options = options.merge(instance_id: @id)
-      resp = Aws::Plugins::UserAgent.feature('resource') do
+      resp = Aws::Plugins::UserAgent.metric('RESOURCE_MODEL') do
         @client.get_password_data(options)
       end
       resp.data
@@ -1220,14 +1307,14 @@ module Aws::EC2
     #   })
     # @param [Hash] options ({})
     # @option options [Boolean] :dry_run
-    #   Checks whether you have the required permissions for the action,
+    #   Checks whether you have the required permissions for the operation,
     #   without actually making the request, and provides an error response.
     #   If you have the required permissions, the error response is
     #   `DryRunOperation`. Otherwise, it is `UnauthorizedOperation`.
     # @return [EmptyStructure]
     def reboot(options = {})
       options = Aws::Util.deep_merge(options, instance_ids: [@id])
-      resp = Aws::Plugins::UserAgent.feature('resource') do
+      resp = Aws::Plugins::UserAgent.metric('RESOURCE_MODEL') do
         @client.reboot_instances(options)
       end
       resp.data
@@ -1236,21 +1323,23 @@ module Aws::EC2
     # @example Request syntax with placeholder values
     #
     #   instance.report_status({
-    #     description: "String",
     #     dry_run: false,
+    #     status: "ok", # required, accepts ok, impaired
+    #     start_time: Time.now,
     #     end_time: Time.now,
     #     reason_codes: ["instance-stuck-in-state"], # required, accepts instance-stuck-in-state, unresponsive, not-accepting-credentials, password-not-available, performance-network, performance-instance-store, performance-ebs-volume, performance-other, other
-    #     start_time: Time.now,
-    #     status: "ok", # required, accepts ok, impaired
+    #     description: "ReportInstanceStatusRequestDescription",
     #   })
     # @param [Hash] options ({})
-    # @option options [String] :description
-    #   Descriptive text about the health state of your instance.
     # @option options [Boolean] :dry_run
-    #   Checks whether you have the required permissions for the action,
+    #   Checks whether you have the required permissions for the operation,
     #   without actually making the request, and provides an error response.
     #   If you have the required permissions, the error response is
     #   `DryRunOperation`. Otherwise, it is `UnauthorizedOperation`.
+    # @option options [required, String] :status
+    #   The status of all instances listed.
+    # @option options [Time,DateTime,Date,Integer,String] :start_time
+    #   The time at which the reported instance health state began.
     # @option options [Time,DateTime,Date,Integer,String] :end_time
     #   The time at which the reported instance health state ended.
     # @option options [required, Array<String>] :reason_codes
@@ -1280,14 +1369,12 @@ module Aws::EC2
     #     problems.
     #
     #   * `other`: \[explain using the description parameter\]
-    # @option options [Time,DateTime,Date,Integer,String] :start_time
-    #   The time at which the reported instance health state began.
-    # @option options [required, String] :status
-    #   The status of all instances listed.
+    # @option options [String] :description
+    #   Descriptive text about the health state of your instance.
     # @return [EmptyStructure]
     def report_status(options = {})
       options = Aws::Util.deep_merge(options, instances: [@id])
-      resp = Aws::Plugins::UserAgent.feature('resource') do
+      resp = Aws::Plugins::UserAgent.metric('RESOURCE_MODEL') do
         @client.report_instance_status(options)
       end
       resp.data
@@ -1296,24 +1383,24 @@ module Aws::EC2
     # @example Request syntax with placeholder values
     #
     #   instance.reset_attribute({
-    #     attribute: "instanceType", # required, accepts instanceType, kernel, ramdisk, userData, disableApiTermination, instanceInitiatedShutdownBehavior, rootDeviceName, blockDeviceMapping, productCodes, sourceDestCheck, groupSet, ebsOptimized, sriovNetSupport, enaSupport, enclaveOptions, disableApiStop
     #     dry_run: false,
+    #     attribute: "instanceType", # required, accepts instanceType, kernel, ramdisk, userData, disableApiTermination, instanceInitiatedShutdownBehavior, rootDeviceName, blockDeviceMapping, productCodes, sourceDestCheck, groupSet, ebsOptimized, sriovNetSupport, enaSupport, enclaveOptions, disableApiStop
     #   })
     # @param [Hash] options ({})
+    # @option options [Boolean] :dry_run
+    #   Checks whether you have the required permissions for the operation,
+    #   without actually making the request, and provides an error response.
+    #   If you have the required permissions, the error response is
+    #   `DryRunOperation`. Otherwise, it is `UnauthorizedOperation`.
     # @option options [required, String] :attribute
     #   The attribute to reset.
     #
     #   You can only reset the following attributes: `kernel` \| `ramdisk` \|
     #   `sourceDestCheck`.
-    # @option options [Boolean] :dry_run
-    #   Checks whether you have the required permissions for the action,
-    #   without actually making the request, and provides an error response.
-    #   If you have the required permissions, the error response is
-    #   `DryRunOperation`. Otherwise, it is `UnauthorizedOperation`.
     # @return [EmptyStructure]
     def reset_attribute(options = {})
       options = options.merge(instance_id: @id)
-      resp = Aws::Plugins::UserAgent.feature('resource') do
+      resp = Aws::Plugins::UserAgent.metric('RESOURCE_MODEL') do
         @client.reset_instance_attribute(options)
       end
       resp.data
@@ -1326,7 +1413,7 @@ module Aws::EC2
     #   })
     # @param [Hash] options ({})
     # @option options [Boolean] :dry_run
-    #   Checks whether you have the required permissions for the action,
+    #   Checks whether you have the required permissions for the operation,
     #   without actually making the request, and provides an error response.
     #   If you have the required permissions, the error response is
     #   `DryRunOperation`. Otherwise, it is `UnauthorizedOperation`.
@@ -1336,7 +1423,7 @@ module Aws::EC2
         instance_id: @id,
         attribute: "kernel"
       )
-      resp = Aws::Plugins::UserAgent.feature('resource') do
+      resp = Aws::Plugins::UserAgent.metric('RESOURCE_MODEL') do
         @client.reset_instance_attribute(options)
       end
       resp.data
@@ -1349,7 +1436,7 @@ module Aws::EC2
     #   })
     # @param [Hash] options ({})
     # @option options [Boolean] :dry_run
-    #   Checks whether you have the required permissions for the action,
+    #   Checks whether you have the required permissions for the operation,
     #   without actually making the request, and provides an error response.
     #   If you have the required permissions, the error response is
     #   `DryRunOperation`. Otherwise, it is `UnauthorizedOperation`.
@@ -1359,7 +1446,7 @@ module Aws::EC2
         instance_id: @id,
         attribute: "ramdisk"
       )
-      resp = Aws::Plugins::UserAgent.feature('resource') do
+      resp = Aws::Plugins::UserAgent.metric('RESOURCE_MODEL') do
         @client.reset_instance_attribute(options)
       end
       resp.data
@@ -1372,7 +1459,7 @@ module Aws::EC2
     #   })
     # @param [Hash] options ({})
     # @option options [Boolean] :dry_run
-    #   Checks whether you have the required permissions for the action,
+    #   Checks whether you have the required permissions for the operation,
     #   without actually making the request, and provides an error response.
     #   If you have the required permissions, the error response is
     #   `DryRunOperation`. Otherwise, it is `UnauthorizedOperation`.
@@ -1382,7 +1469,7 @@ module Aws::EC2
         instance_id: @id,
         attribute: "sourceDestCheck"
       )
-      resp = Aws::Plugins::UserAgent.feature('resource') do
+      resp = Aws::Plugins::UserAgent.metric('RESOURCE_MODEL') do
         @client.reset_instance_attribute(options)
       end
       resp.data
@@ -1398,14 +1485,14 @@ module Aws::EC2
     # @option options [String] :additional_info
     #   Reserved.
     # @option options [Boolean] :dry_run
-    #   Checks whether you have the required permissions for the action,
+    #   Checks whether you have the required permissions for the operation,
     #   without actually making the request, and provides an error response.
     #   If you have the required permissions, the error response is
     #   `DryRunOperation`. Otherwise, it is `UnauthorizedOperation`.
     # @return [Types::StartInstancesResult]
     def start(options = {})
       options = Aws::Util.deep_merge(options, instance_ids: [@id])
-      resp = Aws::Plugins::UserAgent.feature('resource') do
+      resp = Aws::Plugins::UserAgent.metric('RESOURCE_MODEL') do
         @client.start_instances(options)
       end
       resp.data
@@ -1415,6 +1502,7 @@ module Aws::EC2
     #
     #   instance.stop({
     #     hibernate: false,
+    #     skip_os_shutdown: false,
     #     dry_run: false,
     #     force: false,
     #   })
@@ -1422,7 +1510,7 @@ module Aws::EC2
     # @option options [Boolean] :hibernate
     #   Hibernates the instance if the instance was enabled for hibernation at
     #   launch. If the instance cannot hibernate successfully, a normal
-    #   shutdown occurs. For more information, see [Hibernate your
+    #   shutdown occurs. For more information, see [Hibernate your Amazon EC2
     #   instance][1] in the *Amazon EC2 User Guide*.
     #
     #   Default: `false`
@@ -1430,22 +1518,41 @@ module Aws::EC2
     #
     #
     #   [1]: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/Hibernate.html
+    # @option options [Boolean] :skip_os_shutdown
+    #   Specifies whether to bypass the graceful OS shutdown process when the
+    #   instance is stopped.
+    #
+    #   Bypassing the graceful OS shutdown might result in data loss or
+    #   corruption (for example, memory contents not flushed to disk or loss
+    #   of in-flight IOs) or skipped shutdown scripts.
+    #
+    #   Default: `false`
     # @option options [Boolean] :dry_run
-    #   Checks whether you have the required permissions for the action,
+    #   Checks whether you have the required permissions for the operation,
     #   without actually making the request, and provides an error response.
     #   If you have the required permissions, the error response is
     #   `DryRunOperation`. Otherwise, it is `UnauthorizedOperation`.
     # @option options [Boolean] :force
-    #   Forces the instances to stop. The instances do not have an opportunity
-    #   to flush file system caches or file system metadata. If you use this
-    #   option, you must perform file system check and repair procedures. This
-    #   option is not recommended for Windows instances.
+    #   Forces the instance to stop. The instance will first attempt a
+    #   graceful shutdown, which includes flushing file system caches and
+    #   metadata. If the graceful shutdown fails to complete within the
+    #   timeout period, the instance shuts down forcibly without flushing the
+    #   file system caches and metadata.
+    #
+    #   After using this option, you must perform file system check and repair
+    #   procedures. This option is not recommended for Windows instances. For
+    #   more information, see [Troubleshoot Amazon EC2 instance stop
+    #   issues][1] in the *Amazon EC2 User Guide*.
     #
     #   Default: `false`
+    #
+    #
+    #
+    #   [1]: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/TroubleshootingInstancesStopping.html
     # @return [Types::StopInstancesResult]
     def stop(options = {})
       options = Aws::Util.deep_merge(options, instance_ids: [@id])
-      resp = Aws::Plugins::UserAgent.feature('resource') do
+      resp = Aws::Plugins::UserAgent.metric('RESOURCE_MODEL') do
         @client.stop_instances(options)
       end
       resp.data
@@ -1454,18 +1561,31 @@ module Aws::EC2
     # @example Request syntax with placeholder values
     #
     #   instance.terminate({
+    #     force: false,
+    #     skip_os_shutdown: false,
     #     dry_run: false,
     #   })
     # @param [Hash] options ({})
+    # @option options [Boolean] :force
+    #   Forces the instances to terminate. The instance will first attempt a
+    #   graceful shutdown, which includes flushing file system caches and
+    #   metadata. If the graceful shutdown fails to complete within the
+    #   timeout period, the instance shuts down forcibly without flushing the
+    #   file system caches and metadata.
+    # @option options [Boolean] :skip_os_shutdown
+    #   Specifies whether to bypass the graceful OS shutdown process when the
+    #   instance is terminated.
+    #
+    #   Default: `false`
     # @option options [Boolean] :dry_run
-    #   Checks whether you have the required permissions for the action,
+    #   Checks whether you have the required permissions for the operation,
     #   without actually making the request, and provides an error response.
     #   If you have the required permissions, the error response is
     #   `DryRunOperation`. Otherwise, it is `UnauthorizedOperation`.
     # @return [Types::TerminateInstancesResult]
     def terminate(options = {})
       options = Aws::Util.deep_merge(options, instance_ids: [@id])
-      resp = Aws::Plugins::UserAgent.feature('resource') do
+      resp = Aws::Plugins::UserAgent.metric('RESOURCE_MODEL') do
         @client.terminate_instances(options)
       end
       resp.data
@@ -1478,14 +1598,14 @@ module Aws::EC2
     #   })
     # @param [Hash] options ({})
     # @option options [Boolean] :dry_run
-    #   Checks whether you have the required permissions for the action,
+    #   Checks whether you have the required permissions for the operation,
     #   without actually making the request, and provides an error response.
     #   If you have the required permissions, the error response is
     #   `DryRunOperation`. Otherwise, it is `UnauthorizedOperation`.
     # @return [Types::UnmonitorInstancesResult]
     def unmonitor(options = {})
       options = Aws::Util.deep_merge(options, instance_ids: [@id])
-      resp = Aws::Plugins::UserAgent.feature('resource') do
+      resp = Aws::Plugins::UserAgent.metric('RESOURCE_MODEL') do
         @client.unmonitor_instances(options)
       end
       resp.data
@@ -1569,16 +1689,24 @@ module Aws::EC2
     # @example Request syntax with placeholder values
     #
     #   volumes = instance.volumes({
+    #     volume_ids: ["VolumeId"],
+    #     dry_run: false,
     #     filters: [
     #       {
     #         name: "String",
     #         values: ["String"],
     #       },
     #     ],
-    #     volume_ids: ["VolumeId"],
-    #     dry_run: false,
     #   })
     # @param [Hash] options ({})
+    # @option options [Array<String>] :volume_ids
+    #   The volume IDs. If not specified, then all volumes are included in the
+    #   response.
+    # @option options [Boolean] :dry_run
+    #   Checks whether you have the required permissions for the action,
+    #   without actually making the request, and provides an error response.
+    #   If you have the required permissions, the error response is
+    #   `DryRunOperation`. Otherwise, it is `UnauthorizedOperation`.
     # @option options [Array<Types::Filter>] :filters
     #   The filters.
     #
@@ -1600,18 +1728,27 @@ module Aws::EC2
     #   * `availability-zone` - The Availability Zone in which the volume was
     #     created.
     #
+    #   * `availability-zone-id` - The ID of the Availability Zone in which
+    #     the volume was created.
+    #
     #   * `create-time` - The time stamp when the volume was created.
     #
     #   * `encrypted` - Indicates whether the volume is encrypted (`true` \|
     #     `false`)
     #
-    #   * `multi-attach-enabled` - Indicates whether the volume is enabled for
-    #     Multi-Attach (`true` \| `false`)
-    #
     #   * `fast-restored` - Indicates whether the volume was created from a
     #     snapshot that is enabled for fast snapshot restore (`true` \|
     #     `false`).
     #
+    #   * `multi-attach-enabled` - Indicates whether the volume is enabled for
+    #     Multi-Attach (`true` \| `false`)
+    #
+    #   * `operator.managed` - A Boolean that indicates whether this is a
+    #     managed volume.
+    #
+    #   * `operator.principal` - The principal that manages the volume. Only
+    #     valid for managed volumes, where `managed` is `true`.
+    #
     #   * `size` - The size of the volume, in GiB.
     #
     #   * `snapshot-id` - The snapshot from which the volume was created.
@@ -1633,13 +1770,6 @@ module Aws::EC2
     #
     #   * `volume-type` - The Amazon EBS volume type (`gp2` \| `gp3` \| `io1`
     #     \| `io2` \| `st1` \| `sc1`\| `standard`)
-    # @option options [Array<String>] :volume_ids
-    #   The volume IDs.
-    # @option options [Boolean] :dry_run
-    #   Checks whether you have the required permissions for the action,
-    #   without actually making the request, and provides an error response.
-    #   If you have the required permissions, the error response is
-    #   `DryRunOperation`. Otherwise, it is `UnauthorizedOperation`.
     # @return [Volume::Collection]
     def volumes(options = {})
       batches = Enumerator.new do |y|
@@ -1647,7 +1777,7 @@ module Aws::EC2
           name: "attachment.instance-id",
           values: [@id]
         }])
-        resp = Aws::Plugins::UserAgent.feature('resource') do
+        resp = Aws::Plugins::UserAgent.metric('RESOURCE_MODEL') do
           @client.describe_volumes(options)
         end
         resp.each_page do |page|
@@ -1680,17 +1810,26 @@ module Aws::EC2
     # @example Request syntax with placeholder values
     #
     #   vpc_addresses = instance.vpc_addresses({
+    #     public_ips: ["String"],
+    #     dry_run: false,
     #     filters: [
     #       {
     #         name: "String",
     #         values: ["String"],
     #       },
     #     ],
-    #     public_ips: ["String"],
     #     allocation_ids: ["AllocationId"],
-    #     dry_run: false,
     #   })
     # @param [Hash] options ({})
+    # @option options [Array<String>] :public_ips
+    #   One or more Elastic IP addresses.
+    #
+    #   Default: Describes all your Elastic IP addresses.
+    # @option options [Boolean] :dry_run
+    #   Checks whether you have the required permissions for the action,
+    #   without actually making the request, and provides an error response.
+    #   If you have the required permissions, the error response is
+    #   `DryRunOperation`. Otherwise, it is `UnauthorizedOperation`.
     # @option options [Array<Types::Filter>] :filters
     #   One or more filters. Filter names and values are case-sensitive.
     #
@@ -1725,17 +1864,8 @@ module Aws::EC2
     #   * `tag-key` - The key of a tag assigned to the resource. Use this
     #     filter to find all resources assigned a tag with a specific key,
     #     regardless of the tag value.
-    # @option options [Array<String>] :public_ips
-    #   One or more Elastic IP addresses.
-    #
-    #   Default: Describes all your Elastic IP addresses.
     # @option options [Array<String>] :allocation_ids
     #   Information about the allocation IDs.
-    # @option options [Boolean] :dry_run
-    #   Checks whether you have the required permissions for the action,
-    #   without actually making the request, and provides an error response.
-    #   If you have the required permissions, the error response is
-    #   `DryRunOperation`. Otherwise, it is `UnauthorizedOperation`.
     # @return [VpcAddress::Collection]
     def vpc_addresses(options = {})
       batches = Enumerator.new do |y|
@@ -1744,7 +1874,7 @@ module Aws::EC2
           name: "instance-id",
           values: [@id]
         }])
-        resp = Aws::Plugins::UserAgent.feature('resource') do
+        resp = Aws::Plugins::UserAgent.metric('RESOURCE_MODEL') do
           @client.describe_addresses(options)
         end
         resp.data.addresses.each do |a|
@@ -1839,7 +1969,7 @@ module Aws::EC2
           batch.each do |item|
             params[:resources] << item.id
           end
-          Aws::Plugins::UserAgent.feature('resource') do
+          Aws::Plugins::UserAgent.metric('RESOURCE_MODEL') do
             batch[0].client.create_tags(params)
           end
         end
@@ -1883,7 +2013,7 @@ module Aws::EC2
           batch.each do |item|
             params[:resources] << item.id
           end
-          Aws::Plugins::UserAgent.feature('resource') do
+          Aws::Plugins::UserAgent.metric('RESOURCE_MODEL') do
             batch[0].client.delete_tags(params)
           end
         end
@@ -1897,7 +2027,7 @@ module Aws::EC2
       #   })
       # @param options ({})
       # @option options [Boolean] :dry_run
-      #   Checks whether you have the required permissions for the action,
+      #   Checks whether you have the required permissions for the operation,
       #   without actually making the request, and provides an error response.
       #   If you have the required permissions, the error response is
       #   `DryRunOperation`. Otherwise, it is `UnauthorizedOperation`.
@@ -1909,7 +2039,7 @@ module Aws::EC2
           batch.each do |item|
             params[:instance_ids] << item.id
           end
-          Aws::Plugins::UserAgent.feature('resource') do
+          Aws::Plugins::UserAgent.metric('RESOURCE_MODEL') do
             batch[0].client.monitor_instances(params)
           end
         end
@@ -1923,7 +2053,7 @@ module Aws::EC2
       #   })
       # @param options ({})
       # @option options [Boolean] :dry_run
-      #   Checks whether you have the required permissions for the action,
+      #   Checks whether you have the required permissions for the operation,
       #   without actually making the request, and provides an error response.
       #   If you have the required permissions, the error response is
       #   `DryRunOperation`. Otherwise, it is `UnauthorizedOperation`.
@@ -1935,7 +2065,7 @@ module Aws::EC2
           batch.each do |item|
             params[:instance_ids] << item.id
           end
-          Aws::Plugins::UserAgent.feature('resource') do
+          Aws::Plugins::UserAgent.metric('RESOURCE_MODEL') do
             batch[0].client.reboot_instances(params)
           end
         end
@@ -1952,7 +2082,7 @@ module Aws::EC2
       # @option options [String] :additional_info
       #   Reserved.
       # @option options [Boolean] :dry_run
-      #   Checks whether you have the required permissions for the action,
+      #   Checks whether you have the required permissions for the operation,
       #   without actually making the request, and provides an error response.
       #   If you have the required permissions, the error response is
       #   `DryRunOperation`. Otherwise, it is `UnauthorizedOperation`.
@@ -1964,7 +2094,7 @@ module Aws::EC2
           batch.each do |item|
             params[:instance_ids] << item.id
           end
-          Aws::Plugins::UserAgent.feature('resource') do
+          Aws::Plugins::UserAgent.metric('RESOURCE_MODEL') do
             batch[0].client.start_instances(params)
           end
         end
@@ -1975,6 +2105,7 @@ module Aws::EC2
       #
       #   instance.batch_stop({
       #     hibernate: false,
+      #     skip_os_shutdown: false,
       #     dry_run: false,
       #     force: false,
       #   })
@@ -1982,7 +2113,7 @@ module Aws::EC2
       # @option options [Boolean] :hibernate
       #   Hibernates the instance if the instance was enabled for hibernation at
       #   launch. If the instance cannot hibernate successfully, a normal
-      #   shutdown occurs. For more information, see [Hibernate your
+      #   shutdown occurs. For more information, see [Hibernate your Amazon EC2
       #   instance][1] in the *Amazon EC2 User Guide*.
       #
       #   Default: `false`
@@ -1990,18 +2121,37 @@ module Aws::EC2
       #
       #
       #   [1]: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/Hibernate.html
+      # @option options [Boolean] :skip_os_shutdown
+      #   Specifies whether to bypass the graceful OS shutdown process when the
+      #   instance is stopped.
+      #
+      #   Bypassing the graceful OS shutdown might result in data loss or
+      #   corruption (for example, memory contents not flushed to disk or loss
+      #   of in-flight IOs) or skipped shutdown scripts.
+      #
+      #   Default: `false`
       # @option options [Boolean] :dry_run
-      #   Checks whether you have the required permissions for the action,
+      #   Checks whether you have the required permissions for the operation,
       #   without actually making the request, and provides an error response.
       #   If you have the required permissions, the error response is
       #   `DryRunOperation`. Otherwise, it is `UnauthorizedOperation`.
       # @option options [Boolean] :force
-      #   Forces the instances to stop. The instances do not have an opportunity
-      #   to flush file system caches or file system metadata. If you use this
-      #   option, you must perform file system check and repair procedures. This
-      #   option is not recommended for Windows instances.
+      #   Forces the instance to stop. The instance will first attempt a
+      #   graceful shutdown, which includes flushing file system caches and
+      #   metadata. If the graceful shutdown fails to complete within the
+      #   timeout period, the instance shuts down forcibly without flushing the
+      #   file system caches and metadata.
+      #
+      #   After using this option, you must perform file system check and repair
+      #   procedures. This option is not recommended for Windows instances. For
+      #   more information, see [Troubleshoot Amazon EC2 instance stop
+      #   issues][1] in the *Amazon EC2 User Guide*.
       #
       #   Default: `false`
+      #
+      #
+      #
+      #   [1]: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/TroubleshootingInstancesStopping.html
       # @return [void]
       def batch_stop(options = {})
         batch_enum.each do |batch|
@@ -2010,7 +2160,7 @@ module Aws::EC2
           batch.each do |item|
             params[:instance_ids] << item.id
           end
-          Aws::Plugins::UserAgent.feature('resource') do
+          Aws::Plugins::UserAgent.metric('RESOURCE_MODEL') do
             batch[0].client.stop_instances(params)
           end
         end
@@ -2020,11 +2170,24 @@ module Aws::EC2
       # @example Request syntax with placeholder values
       #
       #   instance.batch_terminate!({
+      #     force: false,
+      #     skip_os_shutdown: false,
       #     dry_run: false,
       #   })
       # @param options ({})
+      # @option options [Boolean] :force
+      #   Forces the instances to terminate. The instance will first attempt a
+      #   graceful shutdown, which includes flushing file system caches and
+      #   metadata. If the graceful shutdown fails to complete within the
+      #   timeout period, the instance shuts down forcibly without flushing the
+      #   file system caches and metadata.
+      # @option options [Boolean] :skip_os_shutdown
+      #   Specifies whether to bypass the graceful OS shutdown process when the
+      #   instance is terminated.
+      #
+      #   Default: `false`
       # @option options [Boolean] :dry_run
-      #   Checks whether you have the required permissions for the action,
+      #   Checks whether you have the required permissions for the operation,
       #   without actually making the request, and provides an error response.
       #   If you have the required permissions, the error response is
       #   `DryRunOperation`. Otherwise, it is `UnauthorizedOperation`.
@@ -2036,7 +2199,7 @@ module Aws::EC2
           batch.each do |item|
             params[:instance_ids] << item.id
           end
-          Aws::Plugins::UserAgent.feature('resource') do
+          Aws::Plugins::UserAgent.metric('RESOURCE_MODEL') do
             batch[0].client.terminate_instances(params)
           end
         end
@@ -2050,7 +2213,7 @@ module Aws::EC2
       #   })
       # @param options ({})
       # @option options [Boolean] :dry_run
-      #   Checks whether you have the required permissions for the action,
+      #   Checks whether you have the required permissions for the operation,
       #   without actually making the request, and provides an error response.
       #   If you have the required permissions, the error response is
       #   `DryRunOperation`. Otherwise, it is `UnauthorizedOperation`.
@@ -2062,7 +2225,7 @@ module Aws::EC2
           batch.each do |item|
             params[:instance_ids] << item.id
           end
-          Aws::Plugins::UserAgent.feature('resource') do
+          Aws::Plugins::UserAgent.metric('RESOURCE_MODEL') do
             batch[0].client.unmonitor_instances(params)
           end
         end
@@ -2074,3 +2237,6 @@ module Aws::EC2
     end
   end
 end
+
+# Load customizations if they exist
+require 'aws-sdk-ec2/customizations/instance'