diff --git a/README.md b/README.md index 88e0a791b38764b043f7a8d3dec67eb53820af7f..42c8da1d5120871b1aa1f18a37098643d22f58bd 100644 --- a/README.md +++ b/README.md @@ -15,12 +15,13 @@ SkyWalking APM : https://github.com/apache/incubator-skywalking # Using and installing -* php extensions(https://github.com/SkywalkingContrib/skywalking-php-sdk/tree/songzhian/sky-php7ext) -* php classes (https://github.com/SkywalkingContrib/skywalking-php-sdk/tree/songzhian/sdk-php) +* php extensions(https://github.com/SkywalkingContrib/skywalking-php-sdk/tree/master/sky-php7ext) +* php classes (https://github.com/SkywalkingContrib/skywalking-php-sdk/tree/master/sdk-php) # Apply to * version 1.0 applies to Skywalking 3.1 . * version 2.0 applies to Skywalking 3.X . +* version 5.0 applies to Skywalking 5.X . # In the future. * more php versions. * more os. diff --git a/README_ZH.md b/README_ZH.md index 4f94b9e7dc3a66aba6edd22bb8c623aa48d2ccc1..2a306bbbe8664cb58aa4ae592120f518b7597cc7 100644 --- a/README_ZH.md +++ b/README_ZH.md @@ -17,12 +17,13 @@ SkyWalking APM : https://github.com/apache/incubator-skywalking # 使用安装 -* php扩展包(https://github.com/SkywalkingContrib/skywalking-php-sdk/blob/songzhian/sky-php7ext/README_ZH.md) -* php代码类包(https://github.com/SkywalkingContrib/skywalking-php-sdk/blob/songzhian/sdk-php/README_ZH.md) +* php扩展包(https://github.com/SkywalkingContrib/skywalking-php-sdk/blob/master/sky-php7ext/README_ZH.md) +* php代码类包(https://github.com/SkywalkingContrib/skywalking-php-sdk/blob/master/sdk-php/README_ZH.md) # 对应版本支持 * 1.0对应版本:Skywalking 3.1 * 2.0对应版本:Skywalking 3.x +* 5.0对应版本:Skywalking 5.x # 将要完成 * 其它php版本扩展支持 * 更多系统支持 diff --git a/sky-php7ext/components.h b/sky-php7ext/components.h new file mode 100644 index 0000000000000000000000000000000000000000..5fb1e00630c2559cf08928a54445792dc35ca918 --- /dev/null +++ b/sky-php7ext/components.h @@ -0,0 +1,72 @@ +/* + +----------------------------------------------------------------------+ + | PHP Version 7 | + +----------------------------------------------------------------------+ + | Copyright (c) 1997-2017 The PHP Group | + +----------------------------------------------------------------------+ + | This source file is subject to version 3.01 of the PHP license, | + | that is bundled with this package in the file LICENSE, and is | + | available through the world-wide-web at the following url: | + | http://www.php.net/license/3_01.txt | + | If you did not receive a copy of the PHP license and are unable to | + | obtain it through the world-wide-web, please send a note to | + | license@php.net so we can mail you a copy immediately. | + +----------------------------------------------------------------------+ + | Author: yanlong.hee@gmail.com | + +----------------------------------------------------------------------+ +*/ + +/* $Id$ */ + +#ifndef SKYWALKING_COMPONENTS_H +#define SKYWALKING_COMPONENTS_H + +#define COMPONENT_TOMCAT 1 +#define COMPONENT_HTTPCLIENT 2 +#define COMPONENT_DUBBO 3 +#define COMPONENT_MOTAN 8 +#define COMPONENT_RESIN 10 +#define COMPONENT_FEIGN 11 +#define COMPONENT_OKHTTP 12 +#define COMPONENT_SPRING_REST_TEMPLATE 13 +#define COMPONENT_SPRING_MVC_ANNOTATION 14 +#define COMPONENT_STRUTS2 15 +#define COMPONENT_NUTZ_MVC_ANNOTATION 16 +#define COMPONENT_NUTZ_HTTP 17 +#define COMPONENT_JETTY_CLIENT 18 +#define COMPONENT_JETTY_SERVER 19 +#define COMPONENT_SHARDING_JDBC 21 +#define COMPONENT_GRPC 23 +#define COMPONENT_ELASTIC_JOB 24 +#define COMPONENT_HTTP_ASYNC_CLIENT 26 +#define COMPONENT_SERVICECOMB 28 +#define COMPONENT_HYSTRIX 29 +#define COMPONENT_JEDIS 30 +#define COMPONENT_H2_JDBC_DRIVER 32 +#define COMPONENT_MYSQL_JDBC_DRIVER 33 +#define COMPONENT_OJDBC 34 +#define COMPONENT_SPYMEMCACHED 35 +#define COMPONENT_XMEMCACHED 36 +#define COMPONENT_POSTGRESQL_DRIVER 37 +#define COMPONENT_ROCKET_MQ_PRODUCER 38 +#define COMPONENT_ROCKET_MQ_CONSUMER 39 +#define COMPONENT_KAFKA_PRODUCER 40 +#define COMPONENT_KAFKA_CONSUMER 41 +#define COMPONENT_MONGO_DRIVER 42 +#define COMPONENT_SOFARPC 43 +#define COMPONENT_ACTIVEMQ_PRODUCER 45 +#define COMPONENT_ACTIVEMQ_CONSUMER 46 +#define COMPONENT_TRANSPORT_CLIENT 48 +#define COMPONENT_UNDERTOW 49 + + +#endif //SKYWALKING_COMPONENTS_H + +/* + * Local variables: + * tab-width: 4 + * c-basic-offset: 4 + * End: + * vim600: noet sw=4 ts=4 fdm=marker + * vim<600: noet sw=4 ts=4 + */ \ No newline at end of file diff --git a/sky-php7ext/php_skywalking.h b/sky-php7ext/php_skywalking.h index d26a185d1d2e43a3f017f6171d49032f2db56198..af9ddf62370e164644fab0b26face32d189492dd 100644 --- a/sky-php7ext/php_skywalking.h +++ b/sky-php7ext/php_skywalking.h @@ -24,7 +24,7 @@ extern zend_module_entry skywalking_module_entry; #define phpext_skywalking_ptr &skywalking_module_entry -#define PHP_SKYWALKING_VERSION "0.2.0" /* Replace with version number for your extension */ +#define PHP_SKYWALKING_VERSION "5.0.0" /* Replace with version number for your extension */ #ifdef PHP_WIN32 # define PHP_SKYWALKING_API __declspec(dllexport)