feat(stats)!: implement additional metric tags in libdd-trace-stats

.github/workflows/verify-proto-files.yml

@@ -3,7 +3,7 @@ on:
   pull_request:
     types: [ opened, synchronize, reopened ]
 env:
-  DATADOG_AGENT_TAG: "bdcdd8cf1ba4090a29b96d5669cfab5dd81814b1"
+  DATADOG_AGENT_TAG: "fdc29d4428db855950228a642c43a5595e56bb09"
   CARGO_TERM_COLOR: always
   CARGO_INCREMENTAL: 0
 jobs:

datadog-ipc/src/shm_stats.rs

@@ -818,6 +818,7 @@ impl ShmSpanConcentrator {
                 .unwrap_or_default(),
             service_source: read_str!(f.service_source),
             span_derived_primary_tags: vec![],
+            additional_metric_tags: vec![],
         }
     }
 }

libdd-data-pipeline/src/trace_exporter/builder.rs

@@ -667,6 +667,7 @@ impl<R: SharedRuntime> TraceExporterBuilder<R> {
                 std::time::SystemTime::now(),
                 span_kinds,
                 self.peer_tags.clone(),
+                vec![],
                 #[cfg(feature = "stats-obfuscation")]
                 None,
             )));

libdd-data-pipeline/src/trace_exporter/stats.rs

@@ -135,6 +135,7 @@ pub(crate) fn start_stats_computation<
             std::time::SystemTime::now(),
             span_kinds,
             peer_tags,
+            vec![],
             #[cfg(feature = "stats-obfuscation")]
             Some(client_side_stats.obfuscation_config.clone()),
         )));

libdd-trace-protobuf/src/pb.rs

@@ -659,13 +659,15 @@ pub struct ClientGroupedStats {
     #[serde(rename = "srv_src")]
     pub service_source: ::prost::alloc::string::String,
     /// used to identify service override origin
-    /// span_derived_primary_tags are user-configured tags that are extracted from spans and used for stats aggregation
-    /// E.g., `aws.s3.bucket`, `http.url`, or any custom tag
+    /// Deprecated: use additional_metric_tags (field 23) instead.
     #[prost(string, repeated, tag = "22")]
     #[serde(default)]
     pub span_derived_primary_tags: ::prost::alloc::vec::Vec<
         ::prost::alloc::string::String,
     >,
+    /// additional_metric_tags are tags sent by tracers to be used as additional dimensions for stats aggregation
+    #[prost(string, repeated, tag = "23")]
+    pub additional_metric_tags: ::prost::alloc::vec::Vec<::prost::alloc::string::String>,
 }
 /// Trilean is an expanded boolean type that is meant to differentiate between being unset and false.
 #[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, PartialOrd, Ord, ::prost::Enumeration)]

libdd-trace-protobuf/src/pb/stats.proto

@@ -105,7 +105,8 @@ message ClientGroupedStats {
 	string HTTP_endpoint = 20; // Http route or quantized/simplified URL path
 	string service_source = 21; // @inject_tag: msg:"srv_src"
 	// used to identify service override origin
-	// span_derived_primary_tags are user-configured tags that are extracted from spans and used for stats aggregation
-	// E.g., `aws.s3.bucket`, `http.url`, or any custom tag
+	// Deprecated: use additional_metric_tags (field 23) instead.
 	repeated string span_derived_primary_tags = 22;
+	// additional_metric_tags are tags sent by tracers to be used as additional dimensions for stats aggregation
+	repeated string additional_metric_tags = 23;
 }

libdd-trace-protobuf/src/pb_test.rs

@@ -72,7 +72,8 @@ mod tests {
                             ],
                             "HTTPMethod": "GET",
                             "HTTPEndpoint": "/test",
-                            "GRPCStatusCode": "0"
+                            "GRPCStatusCode": "0",
+                            "AdditionalMetricTags": []
                         }
                     ]
                 }
@@ -114,6 +115,7 @@ mod tests {
                     http_method: "GET".to_string(),
                     service_source: "".to_string(),
                     span_derived_primary_tags: vec![],
+                    additional_metric_tags: vec![],
                 }],
                 agent_time_shift: 0,
             }],

libdd-trace-stats/README.md

@@ -76,6 +76,7 @@ let mut concentrator = SpanConcentrator::new(
     SystemTime::now(),
     vec!["client".to_string(), "server".to_string()], // eligible span kinds
     vec!["peer.service".to_string()], // peer tag keys
+    vec!["example.key".to_string()], // additional metric tag keys
 );
 
 // Add spans

libdd-trace-stats/benches/span_concentrator_bench.rs

@@ -44,6 +44,7 @@ pub fn criterion_benchmark(c: &mut Criterion) {
         now,
         vec![],
         vec!["db_name".into(), "bucket_s3".into()],
+        vec![],
         #[cfg(feature = "stats-obfuscation")]
         None,
     );