feat: report connector version info

Author: qevolg

.github/workflows/taos-ws-py-compatibility.yml

@@ -103,6 +103,7 @@ jobs:
           TDENGINE_URL: localhost:6041
           WS_CLOUD_URL: ${{ secrets.WS_CLOUD_URL }}
           WS_CLOUD_TOKEN: ${{ secrets.WS_CLOUD_TOKEN }}
+          TEST_TD_3360: "true"
         run: |
           pip3 install pytest
           pytest ./taos-ws-py/tests/

taos-ws-py/Cargo.lock

@@ -27,13 +27,13 @@ version = "0.17.3"
 features = ["extension-module", "anyhow", "chrono", "abi3-py37"]
 
 [target.'cfg(windows)'.dependencies]
-taos = { git = "https://github.com/taosdata/taos-connector-rust.git", branch = "main", default-features = false, features = [
+taos = { git = "https://github.com/taosdata/taos-connector-rust.git", branch = "feat/30/TD-36924", default-features = false, features = [
 	"optin",
 	"ws-rustls",
 	"ws-rustls-aws-lc-crypto-provider",
 ] }
 [target.'cfg(unix)'.dependencies]
-taos = { git = "https://github.com/taosdata/taos-connector-rust.git", branch = "main", default-features = false, features = [
+taos = { git = "https://github.com/taosdata/taos-connector-rust.git", branch = "feat/30/TD-36924", default-features = false, features = [
 	"optin",
 	"ws-rustls",
 	"ws-rustls-ring-crypto-provider",

taos-ws-py/Cargo.toml

@@ -150,6 +150,8 @@ impl Consumer {
                 builder.set(key_str, value.extract::<String>()?);
             }
         }
+
+        builder.set("connector_info", crate::CONNECTOR_INFO);
         let builder = TmqBuilder::from_dsn(builder)
             .map_err(|err| ConsumerException::new_err(err.to_string()))?;
         Ok(Consumer(Some(builder.build().map_err(|err| {

taos-ws-py/src/consumer.rs

@@ -75,6 +75,8 @@ mod consumer;
 mod cursor;
 mod field;
 
+const CONNECTOR_INFO: &str = concat!("PythonWS-", env!("CARGO_PKG_VERSION"));
+
 #[pyclass]
 struct Connection {
     _builder: Option<TaosBuilder>,
@@ -298,6 +300,7 @@ fn connect(dsn: Option<&str>, args: Option<&PyDict>) -> PyResult<Connection> {
     let dsn = dsn.unwrap_or("taosws://");
 
     let mut dsn = Dsn::from_str(dsn).map_err(|err| ConnectionError::new_err(err.to_string()))?;
+    dsn.set("connector_info", CONNECTOR_INFO);
 
     if let Some(args) = args {
         const NONE_TAOS_CFG: &[&str] = &[

taos-ws-py/src/lib.rs

@@ -1,4 +1,6 @@
 import taosws
+import time
+import os
 
 
 def test_ws_connect():
@@ -39,6 +41,31 @@ def test_connect_invalid_user():
     print("-" * 40)
 
 
+def test_report_connector_info():
+    test = os.getenv("TEST_TD_3360")
+    if test is not None:
+        return
+
+    conn1 = taosws.connect()
+    time.sleep(2)
+    res = conn1.query("show connections")
+    assert any(isinstance(col, str) and "PythonWS" in col for row in res for col in row)
+
+    conn2 = taosws.connect(
+        user="root",
+        password="taosdata",
+        host="localhost",
+        port=6041,
+    )
+    time.sleep(2)
+    res = conn2.query("show connections")
+    cnt = sum(1 for row in res for col in row if isinstance(col, str) and "PythonWS" in col)
+    assert cnt == 2
+
+    conn1.close()
+    conn2.close()
+
+
 def show_env():
     import os
 
@@ -56,3 +83,4 @@ def show_env():
     test_ws_connect()
     test_default_connect()
     test_connect_invalid_user()
+    test_report_connector_info()

taos-ws-py/tests/test_conn.py

@@ -1,5 +1,8 @@
 from taosws import Consumer
 import taosws
+import time
+import pytest
+import os
 
 
 def init_topic():
@@ -60,3 +63,38 @@ def test_comsumer():
 
     consumer.unsubscribe()
     consumer.close()
+
+
+@pytest.mark.skip
+def test_report_connector_info():
+    test = os.getenv("TEST_TD_3360")
+    if test is not None:
+        return
+
+    init_topic()
+    conn = taosws.connect()
+
+    def count_connections():
+        res = conn.query("show connections")
+        return sum(1 for row in res for col in row if isinstance(col, str) and "PythonWS" in col)
+
+    conf = {
+        "group.id": "10",
+    }
+    consumer1 = Consumer(conf)
+    consumer1.subscribe(["test_topic_1"])
+    time.sleep(2)
+    assert count_connections() == 2
+
+    consumer2 = Consumer(dsn="ws://localhost:6041?group.id=10")
+    consumer2.subscribe(["test_topic_1"])
+    time.sleep(2)
+    assert count_connections() == 3
+
+    time.sleep(2)
+
+    consumer1.unsubscribe()
+    consumer2.unsubscribe()
+    consumer1.close()
+    consumer2.close()
+    conn.close()