(apisix) branch master updated: fix(datadog): report consumer username tag (#11354)

[wenming]

This is an automated email from the ASF dual-hosted git repository.

wenming pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/apisix.git


The following commit(s) were added to refs/heads/master by this push:
     new 1a45d1da8 fix(datadog): report consumer username tag (#11354)
1a45d1da8 is described below

commit 1a45d1da896d22048b08b1bdc1218a84468a98a2
Author: Zeping Bai <bzp2...@apache.org>
AuthorDate: Mon Jun 17 09:31:59 2024 +0800

    fix(datadog): report consumer username tag (#11354)
---
 apisix/plugins/datadog.lua |  4 ++--
 t/plugin/datadog.t         | 37 +++++++++++++++++++++++++++++++++++++
 2 files changed, 39 insertions(+), 2 deletions(-)

diff --git a/apisix/plugins/datadog.lua b/apisix/plugins/datadog.lua
index 7f0ed8ab9..972c0a2c7 100644
--- a/apisix/plugins/datadog.lua
+++ b/apisix/plugins/datadog.lua
@@ -88,8 +88,8 @@ local function generate_tag(entry, const_tags)
         core.table.insert(tags, "service_name:" .. entry.service_id)
     end
 
-    if entry.consumer and entry.consumer ~= "" then
-        core.table.insert(tags, "consumer:" .. entry.consumer)
+    if entry.consumer and entry.consumer.username then
+        core.table.insert(tags, "consumer:" .. entry.consumer.username)
     end
     if entry.balancer_ip ~= "" then
         core.table.insert(tags, "balancer_ip:" .. entry.balancer_ip)
diff --git a/t/plugin/datadog.t b/t/plugin/datadog.t
index 8dade74a6..506abcc0f 100644
--- a/t/plugin/datadog.t
+++ b/t/plugin/datadog.t
@@ -498,3 +498,40 @@ message received: 
apisix\.apisix\.latency:[\d.]+\|h\|#source:apisix,new_tag:must
 message received: 
apisix\.ingress\.size:[\d]+\|ms\|#source:apisix,new_tag:must,route_name:1,service_name:1,balancer_ip:[\d.]+,response_status:200,scheme:http
 message received: 
apisix\.egress\.size:[\d]+\|ms\|#source:apisix,new_tag:must,route_name:1,service_name:1,balancer_ip:[\d.]+,response_status:200,scheme:http
 /
+
+
+
+=== TEST 10: testing behaviour with consumer
+--- apisix_yaml
+consumers:
+  - username: user0
+    plugins:
+      key-auth:
+        key: user0
+routes:
+  - uri: /opentracing
+    name: datadog
+    upstream:
+      nodes:
+        "127.0.0.1:1982": 1
+    plugins:
+      datadog:
+        batch_max_size: 1
+        max_retry_count: 0
+      key-auth: {}
+#END
+--- request
+GET /opentracing?apikey=user0
+--- response_body
+opentracing
+--- wait: 0.5
+--- grep_error_log eval
+qr/message received: apisix(.+?(?=, ))/
+--- grep_error_log_out eval
+qr/message received: 
apisix\.request\.counter:1\|c\|#source:apisix,route_name:datadog,consumer:user0,balancer_ip:[\d.]+,response_status:200,scheme:http
+message received: 
apisix\.request\.latency:[\d.]+\|h\|#source:apisix,route_name:datadog,consumer:user0,balancer_ip:[\d.]+,response_status:200,scheme:http
+message received: 
apisix\.upstream\.latency:[\d.]+\|h\|#source:apisix,route_name:datadog,consumer:user0,balancer_ip:[\d.]+,response_status:200,scheme:http
+message received: 
apisix\.apisix\.latency:[\d.]+\|h\|#source:apisix,route_name:datadog,consumer:user0,balancer_ip:[\d.]+,response_status:200,scheme:http
+message received: 
apisix\.ingress\.size:[\d]+\|ms\|#source:apisix,route_name:datadog,consumer:user0,balancer_ip:[\d.]+,response_status:200,scheme:http
+message received: 
apisix\.egress\.size:[\d]+\|ms\|#source:apisix,route_name:datadog,consumer:user0,balancer_ip:[\d.]+,response_status:200,scheme:http
+/