Merge pull request #117 from arielb1/tombstone-fargate-cpu-count

make __unstable-fargate-cpu-count always on

Author: arielb1

Cargo.toml

@@ -50,8 +50,8 @@ s3-no-defaults = ["dep:aws-config", "dep:aws-sdk-s3"]
 aws-metadata = ["aws-metadata-no-defaults", "aws-config/default", "reqwest/rustls-tls"]
 # A version of the aws-metadata feature that does not enable AWS default features
 aws-metadata-no-defaults = ["dep:reqwest", "dep:aws-config", "dep:aws-arn"]
-# *Unstable* feature to allow Fargate CPU count. The feature will be stabilized
-# and removed soon.
+# Tombstone feature for __unstable-fargate-cpu-count. This feature can no
+# longer be disabled.
 __unstable-fargate-cpu-count = []
 
 [package.metadata.docs.rs]

DESIGN.md

@@ -246,4 +246,4 @@ than the default one and not have the default backend linked in to their executa
 - `s3-no-defaults`: S3 reporter without default features (for custom TLS)
 - `aws-metadata`: AWS metadata detection with default features
 - `aws-metadata-no-defaults`: AWS metadata without default features
-- `__unstable-fargate-cpu-count`: Experimental Fargate CPU metrics
+- `__unstable-fargate-cpu-count`: Tombstone for experimental Fargate CPU metrics

src/metadata/aws.rs

@@ -140,7 +140,6 @@ impl super::AgentMetadata {
             aws_account_id: imds_ec2_instance_metadata.account_id,
             aws_region_id: imds_ec2_instance_metadata.region,
             ec2_instance_id: imds_ec2_instance_metadata.instance_id,
-            #[cfg(feature = "__unstable-fargate-cpu-count")]
             ec2_instance_type: imds_ec2_instance_metadata.instance_type,
         }
     }
@@ -161,12 +160,10 @@ impl super::AgentMetadata {
                 .to_string(),
             ecs_task_arn: fargate_metadata.task_arn,
             ecs_cluster_arn: fargate_metadata.cluster,
-            #[cfg(feature = "__unstable-fargate-cpu-count")]
             cpu_limit: fargate_metadata
                 .limits
                 .as_ref()
                 .and_then(|limits| limits.cpu),
-            #[cfg(feature = "__unstable-fargate-cpu-count")]
             memory_limit: fargate_metadata
                 .limits
                 .as_ref()
@@ -397,9 +394,7 @@ mod tests {
                 aws_region_id: "us-east-1".to_owned(),
                 ecs_task_arn: "arn:aws:ecs:us-east-1:123456789012:task/profiler-metadata-cluster/5261e761e0e2a3d92da3f02c8e5bab1f".to_owned(),
                 ecs_cluster_arn: "arn:aws:ecs:us-east-1:123456789012:cluster/profiler-metadata-cluster".to_owned(),
-                #[cfg(feature = "__unstable-fargate-cpu-count")]
                 cpu_limit: _expected_cpu_limit,
-                #[cfg(feature = "__unstable-fargate-cpu-count")]
                 memory_limit: _expected_memory_limit,
             }
         )

src/metadata/mod.rs

@@ -43,22 +43,21 @@ pub enum AgentMetadata {
     /// Metadata for an [EC2] instance running on AWS
     ///
     /// [EC2]: https://aws.amazon.com/ec2
-    #[cfg_attr(feature = "__unstable-fargate-cpu-count", non_exhaustive)]
+    #[non_exhaustive]
     Ec2AgentMetadata {
         /// The AWS account id
         aws_account_id: String,
         /// The AWS region id
         aws_region_id: String,
         /// The EC2 instance id
         ec2_instance_id: String,
-        #[cfg(feature = "__unstable-fargate-cpu-count")]
         /// The EC2 instance type
         ec2_instance_type: String,
     },
     /// Metadata for a [Fargate] task running on AWS.
     ///
     /// [Fargate]: https://aws.amazon.com/fargate
-    #[cfg_attr(feature = "__unstable-fargate-cpu-count", non_exhaustive)]
+    #[non_exhaustive]
     FargateAgentMetadata {
         /// The AWS account id
         aws_account_id: String,
@@ -81,14 +80,12 @@ pub enum AgentMetadata {
         /// For example, `Some(0.25)`. This will be `None` if the CPU limit is not specified.
         ///
         /// See the ECS documentation for more details
-        #[cfg(feature = "__unstable-fargate-cpu-count")]
         cpu_limit: Option<OrderedF64>,
         /// The memory limit for the Fargate cluster (in megabytes)
         ///
         /// For example, `Some(2048)`. This will be `None` if the memory limit is not specified.
         ///
         /// See the ECS documentation for more details
-        #[cfg(feature = "__unstable-fargate-cpu-count")]
         memory_limit: Option<u64>,
     },
     /// Metadata for a host that is neither an EC2 nor a Fargate
@@ -204,7 +201,6 @@ impl Ec2AgentMetadataBuilder {
             aws_account_id: self.aws_account_id,
             aws_region_id: self.aws_region_id,
             ec2_instance_id: self.ec2_instance_id,
-            #[cfg(feature = "__unstable-fargate-cpu-count")]
             ec2_instance_type: self.ec2_instance_type.unwrap_or_default(),
         }
     }
@@ -241,9 +237,7 @@ impl FargateAgentMetadataBuilder {
             aws_region_id: self.aws_region_id,
             ecs_task_arn: self.ecs_task_arn,
             ecs_cluster_arn: self.ecs_cluster_arn,
-            #[cfg(feature = "__unstable-fargate-cpu-count")]
             cpu_limit: self.cpu_limit.map(Into::into),
-            #[cfg(feature = "__unstable-fargate-cpu-count")]
             memory_limit: self.memory_limit,
         }
     }

src/profiler.rs

@@ -1313,7 +1313,6 @@ mod tests {
                 aws_account_id: "0".into(),
                 aws_region_id: "us-east-1".into(),
                 ec2_instance_id: "i-fake".into(),
-                #[cfg(feature = "__unstable-fargate-cpu-count")]
                 ec2_instance_type: "t3.micro".into(),
             })
             .build();
@@ -1326,7 +1325,6 @@ mod tests {
             aws_account_id: "0".into(),
             aws_region_id: "us-east-1".into(),
             ec2_instance_id: "i-fake".into(),
-            #[cfg(feature = "__unstable-fargate-cpu-count")]
             ec2_instance_type: "t3.micro".into(),
         };
         let (agent, mut rx) = make_mock_profiler();
@@ -1351,7 +1349,6 @@ mod tests {
             aws_account_id: "0".into(),
             aws_region_id: "us-east-1".into(),
             ec2_instance_id: "i-fake".into(),
-            #[cfg(feature = "__unstable-fargate-cpu-count")]
             ec2_instance_type: "t3.micro".into(),
         };
         let (agent, mut rx) = make_mock_profiler();
@@ -1419,7 +1416,6 @@ mod tests {
             aws_account_id: "0".into(),
             aws_region_id: "us-east-1".into(),
             ec2_instance_id: "i-fake".into(),
-            #[cfg(feature = "__unstable-fargate-cpu-count")]
             ec2_instance_type: "t3.micro".into(),
         };
         let (agent, mut rx) = make_mock_profiler();