Add plugin for phpredis. (#29)

apache · Nov 10, 2022 · c550167 · c550167
1 parent d3afbd4
commit c550167
Show file tree

Hide file tree

Showing 15 changed files with 707 additions and 7 deletions.
diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
@@ -85,8 +85,9 @@ jobs:
           tools: php-config, composer:v2
           extensions: >
             bcmath, calendar, ctype, dom, exif, gettext, iconv, intl, json, mbstring,
-            mysqli, mysqlnd, opcache, pdo, pdo_mysql, phar, posix, readline, memcached,
-            swoole-${{ matrix.version.swoole }}, xml, xmlreader, xmlwriter, yaml, zip
+            mysqli, mysqlnd, opcache, pdo, pdo_mysql, phar, posix, readline, redis,
+            memcached, swoole-${{ matrix.version.swoole }}, xml, xmlreader, xmlwriter,
+            yaml, zip
 
       - name: Setup php-fpm for Linux
         if: matrix.os == 'ubuntu-20.04'

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -46,6 +46,7 @@ libc = "0.2.132"
 once_cell = "1.14.0"
 phper = "0.5.1"
 prost = "0.11.0"
+serde_json = { version = "1.0.87", features = ["preserve_order"] }
 skywalking = "0.4.0"
 systemstat = "0.2.0"
 tempfile = "3.3.0"

diff --git a/README.md b/README.md
@@ -29,7 +29,7 @@ SkyWalking PHP Agent requires SkyWalking 8.4+ and PHP 7.2+
   * [x] [PDO](https://www.php.net/manual/en/book.pdo.php)
   * [x] [MySQL Improved](https://www.php.net/manual/en/book.mysqli.php)
   * [x] [Memcached](https://www.php.net/manual/en/book.memcached.php)
-  * [ ] [phpredis](https://github.com/phpredis/phpredis)
+  * [x] [phpredis](https://github.com/phpredis/phpredis)
   * [ ] [php-amqp](https://github.com/php-amqp/php-amqp)
   * [ ] [php-rdkafka](https://github.com/arnaud-lb/php-rdkafka)
   * [x] [predis](https://github.com/predis/predis)

diff --git a/docs/en/setup/service-agent/php-agent/Supported-list.md b/docs/en/setup/service-agent/php-agent/Supported-list.md
@@ -13,6 +13,7 @@ The following plugins provide the distributed tracing capability.
 * [PDO](https://www.php.net/manual/en/book.pdo.php)
 * [MySQL Improved](https://www.php.net/manual/en/book.mysqli.php)
 * [Memcached](https://www.php.net/manual/en/book.memcached.php)
+* [phpredis](https://github.com/phpredis/phpredis)
 
 ## Support PHP library
 

diff --git a/src/component.rs b/src/component.rs
@@ -23,3 +23,4 @@ pub const COMPONENT_PHP_PDO_ID: i32 = 8003;
 pub const COMPONENT_PHP_MYSQLI_ID: i32 = 8004;
 pub const COMPONENT_PHP_PREDIS_ID: i32 = 8006;
 pub const COMPONENT_PHP_MEMCACHED_ID: i32 = 20;
+pub const COMPONENT_PHP_REDIS_ID: i32 = 7;
diff --git a/src/lib.rs b/src/lib.rs
@@ -25,6 +25,7 @@ mod execute;
 mod module;
 mod plugin;
 mod request;
+mod tag;
 mod util;
 mod worker;
 

diff --git a/src/plugin/mod.rs b/src/plugin/mod.rs
@@ -18,6 +18,7 @@ mod plugin_memcached;
 mod plugin_mysqli;
 mod plugin_pdo;
 mod plugin_predis;
+mod plugin_redis;
 mod plugin_swoole;
 
 use crate::execute::{AfterExecuteHook, BeforeExecuteHook};
@@ -33,6 +34,7 @@ static PLUGINS: Lazy<Vec<Box<DynPlugin>>> = Lazy::new(|| {
         Box::new(plugin_swoole::SwooleHttpResponsePlugin::default()),
         Box::new(plugin_predis::PredisPlugin::default()),
         Box::new(plugin_memcached::MemcachedPlugin::default()),
+        Box::new(plugin_redis::RedisPlugin::default()),
     ]
 });