Merge pull request #29 from heyanlong/master

release
SkyAPM · Jan 4, 2019 · f4f0507 · f4f0507
2 parents bfd6f85 + 4fbb217
commit f4f0507
Show file tree

Hide file tree

Showing 61 changed files with 94 additions and 225 deletions.
diff --git a/.gitignore b/.gitignore
@@ -2,41 +2,41 @@
 .idea
 cmake-build-debug
 CMakeLists.txt
-sky-php7ext/grpc/*
-sky-php7ext/configure.ac
-sky-php7ext/skywalking.loT
-sky-php7ext\.idea
-sky-php7ext\*.lo
-sky-php7ext\*.la
-sky-php7ext\.libs
-sky-php7ext\acinclude.m4
-sky-php7ext\aclocal.m4
-sky-php7ext\autom4te.cache
-sky-php7ext\build
-sky-php7ext\config.guess
-sky-php7ext\config.h
-sky-php7ext\config.h.in
-sky-php7ext\config.log
-sky-php7ext\config.nice
-sky-php7ext\config.status
-sky-php7ext\config.sub
-sky-php7ext\configure
-sky-php7ext\configure.in
-sky-php7ext\include
-sky-php7ext\install-sh
-sky-php7ext\libtool
-sky-php7ext\ltmain.sh
-sky-php7ext\Makefile
-sky-php7ext\Makefile.fragments
-sky-php7ext\Makefile.global
-sky-php7ext\Makefile.objects
-sky-php7ext\missing
-sky-php7ext\mkinstalldirs
-sky-php7ext\modules
-sky-php7ext\run-tests.php
-sky-php7ext\tests/*/*.diff
-sky-php7ext\tests/*/*.out
-sky-php7ext\tests/*/*.php
-sky-php7ext\tests/*/*.exp
-sky-php7ext\tests/*/*.log
-sky-php7ext\tests/*/*.sh
+grpc/*
+configure.ac
+skywalking.loT
+.idea
+*.lo
+*.la
+.libs
+acinclude.m4
+aclocal.m4
+autom4te.cache
+build
+config.guess
+config.h
+config.h.in
+config.log
+config.nice
+config.status
+config.sub
+configure
+configure.in
+include
+install-sh
+libtool
+ltmain.sh
+Makefile
+Makefile.fragments
+Makefile.global
+Makefile.objects
+missing
+mkinstalldirs
+modules
+run-tests.php
+tests/*/*.diff
+tests/*/*.out
+tests/*/*.php
+tests/*/*.exp
+tests/*/*.log
+tests/*/*.sh
diff --git a/.gitmodules b/.gitmodules
@@ -1,3 +1,3 @@
-[submodule "sky-php7ext/protos"]
-	path = sky-php7ext/src/protos
+[submodule "apache/incubator-skywalking-data-collect-protocol"]
+	path = src/protos
 	url = https://github.com/apache/incubator-skywalking-data-collect-protocol.git
diff --git a/sky-php7ext/CREDITS → CREDITS b/sky-php7ext/CREDITS → CREDITS
diff --git a/sky-php7ext/EXPERIMENTAL → EXPERIMENTAL b/sky-php7ext/EXPERIMENTAL → EXPERIMENTAL
diff --git a/README.md b/README.md
@@ -1,61 +1,17 @@
-Sky Walking for php SDK| [中文](README_ZH.md)
-==========
-**SkyWalking php SDK**: A client tool developed for PHP using SkyWalking APM tools. (It is a pity that it only supports checking curl currently.)
-SkyWalking APM : https://github.com/apache/incubator-skywalking
+# SkyWalking PHP
 
-* Automatic probe for PHP. **You don't need to modify the application code.**        
-  * It is a PHP extension developed by zendAPI.
-  * It can hook automatically for monnitoring nodes and collecting logs.
-  * It transfers with header informations automatically.
-* Manual probe.
-  * It is a php extension and contains some php classes. 
-  * It can compatible any versions of php.You can look over the codes in the class 'SkyWalking'.
-  * You need to add  business codes to monnitor.
+<img src="https://skywalkingtest.github.io/page-resources/3.0/skywalking.png" alt="Sky Walking logo" height="90px" align="right" />
 
-# Dep
-* libuuid
-* gcc 4.9+
-* pkg-config
-* grpc
-* protoc
-* php 7+
+SkyWalking PHP is the PHP instrumentation agent, which is compatible with [Apache SkyWalking(Incubating) APM](https://github.com/apache/incubator-skywalking) backend and others compatible agents/SDKs
 
+## Documents
+* [Document in English](docs/README.md)
 
-# Install
-1. build php extension
-```shell
-git clone --recurse-submodules https://github.com/SkywalkingContrib/skywalking-php-sdk.git
-cd sky-php7ext
-phpize && ./configure && make && make install
-```
+## Support List
+1. CURL
 
-2. make report_client
-```shell
-cd sky-php7ext/report
-make
-```
-
-# Config
-* php.ini
-```shell
-extension=skywalking.so
-skywalking.app_code = app_code
-skywalking.grpc = 127.0.0.1:11800
-```
-
-# Run
-```shell
-php-fpm
-./report_client 120.0.0.1:11800 /tmp
-```
-
-# 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.
 # Contact Us
-  * Submit an issue
-  * QQ Group: 155841680
+* Submit an issue
+* Mail list: dev@skywalking.apache.org
+* [Gitter](https://gitter.im/openskywalking/Lobby)
+* QQ Group: 155841680, 392443393
diff --git a/README_ZH.md b/README_ZH.md
diff --git a/sdk-php/.gitignore → bak/.gitignore b/sdk-php/.gitignore → bak/.gitignore
diff --git a/sdk-php/README.md → bak/README.md b/sdk-php/README.md → bak/README.md
diff --git a/sdk-php/README_ZH.md → bak/README_ZH.md b/sdk-php/README_ZH.md → bak/README_ZH.md
diff --git a/sdk-php/SkyWalking.php → bak/SkyWalking.php b/sdk-php/SkyWalking.php → bak/SkyWalking.php
diff --git a/sdk-php/demo.php → bak/demo.php b/sdk-php/demo.php → bak/demo.php
diff --git a/sky-php7ext/config.m4 → config.m4 b/sky-php7ext/config.m4 → config.m4
diff --git a/sky-php7ext/config.w32 → config.w32 b/sky-php7ext/config.w32 → config.w32
diff --git a/docs/README.md b/docs/README.md
@@ -0,0 +1,5 @@
+# Documents
+
+  * Quick Start
+    * [Quick start](quick-start.md)
+    * [Install php agent](install-agent.md)
diff --git a/docs/install-agent.md b/docs/install-agent.md
@@ -0,0 +1,37 @@
+When building directly from Git sources or after custom modifications you might also need:
+* libuuid
+* gcc 4.9+
+* pkg-config
+* grpc
+* protoc
+* php 7+
+
+
+# Build
+
+1. build php extension
+```shell
+git clone --recurse-submodules https://github.com/SkywalkingContrib/skywalking-php-sdk.git
+phpize && ./configure && make && make install
+```
+
+2. build report_client
+```shell
+cd src/report
+make
+```
+
+# Config
+php.ini example
+```shell
+extension=skywalking.so
+skywalking.version = 5
+skywalking.app_code = app_code
+skywalking.grpc = 127.0.0.1:11800
+```
+
+# Run
+restart and run report_client
+```shell
+./report_client 120.0.0.1:11800 /tmp
+```
diff --git a/docs/quick-start.md b/docs/quick-start.md
@@ -0,0 +1 @@
+# todo
diff --git a/sky-php7ext/php.ini → php.ini b/sky-php7ext/php.ini → php.ini
diff --git a/sky-php7ext/php_skywalking.h → php_skywalking.h b/sky-php7ext/php_skywalking.h → php_skywalking.h
diff --git a/sky-php7ext/.gitignore b/sky-php7ext/.gitignore
diff --git a/sky-php7ext/README.md b/sky-php7ext/README.md
diff --git a/sky-php7ext/README_ZH.md b/sky-php7ext/README_ZH.md
diff --git a/sky-php7ext/skywalking.c → skywalking.c b/sky-php7ext/skywalking.c → skywalking.c
diff --git a/sky-php7ext/skywalking.php → skywalking.php b/sky-php7ext/skywalking.php → skywalking.php
diff --git a/sky-php7ext/src/components.h → src/components.h b/sky-php7ext/src/components.h → src/components.h
diff --git a/sky-php7ext/src/greeter_client.cc → src/greeter_client.cc b/sky-php7ext/src/greeter_client.cc → src/greeter_client.cc
diff --git a/sky-php7ext/src/protos → src/protos b/sky-php7ext/src/protos → src/protos
diff --git a/sky-php7ext/src/report/Makefile → src/report/Makefile b/sky-php7ext/src/report/Makefile → src/report/Makefile
diff --git a/sky-php7ext/src/report/json.hpp → src/report/json.hpp b/sky-php7ext/src/report/json.hpp → src/report/json.hpp
diff --git a/sky-php7ext/src/report/report_client.cpp → src/report/report_client.cpp b/sky-php7ext/src/report/report_client.cpp → src/report/report_client.cpp
diff --git a/sky-php7ext/tests/c.phpt → tests/c.phpt b/sky-php7ext/tests/c.phpt → tests/c.phpt
diff --git a/sky-php7ext/tests/curl_001.phpt → tests/curl_001.phpt b/sky-php7ext/tests/curl_001.phpt → tests/curl_001.phpt
diff --git a/sky-php7ext/tests/curl_002.phpt → tests/curl_002.phpt b/sky-php7ext/tests/curl_002.phpt → tests/curl_002.phpt
diff --git a/sky-php7ext/tests/curl_003.phpt → tests/curl_003.phpt b/sky-php7ext/tests/curl_003.phpt → tests/curl_003.phpt
diff --git a/sky-php7ext/tests/curl_004.phpt → tests/curl_004.phpt b/sky-php7ext/tests/curl_004.phpt → tests/curl_004.phpt
diff --git a/sky-php7ext/tests/curl_005.phpt → tests/curl_005.phpt b/sky-php7ext/tests/curl_005.phpt → tests/curl_005.phpt
diff --git a/sky-php7ext/tests/curl_006.phpt → tests/curl_006.phpt b/sky-php7ext/tests/curl_006.phpt → tests/curl_006.phpt
diff --git a/sky-php7ext/tests/curl_007.phpt → tests/curl_007.phpt b/sky-php7ext/tests/curl_007.phpt → tests/curl_007.phpt
diff --git a/sky-php7ext/tests/curl_008.phpt → tests/curl_008.phpt b/sky-php7ext/tests/curl_008.phpt → tests/curl_008.phpt
diff --git a/sky-php7ext/tests/curl_009.phpt → tests/curl_009.phpt b/sky-php7ext/tests/curl_009.phpt → tests/curl_009.phpt
diff --git a/sky-php7ext/tests/curl_010.phpt → tests/curl_010.phpt b/sky-php7ext/tests/curl_010.phpt → tests/curl_010.phpt
diff --git a/sky-php7ext/tests/curl_011.phpt → tests/curl_011.phpt b/sky-php7ext/tests/curl_011.phpt → tests/curl_011.phpt
diff --git a/sky-php7ext/tests/curl_012.phpt → tests/curl_012.phpt b/sky-php7ext/tests/curl_012.phpt → tests/curl_012.phpt
diff --git a/sky-php7ext/tests/curl_013.phpt → tests/curl_013.phpt b/sky-php7ext/tests/curl_013.phpt → tests/curl_013.phpt
diff --git a/sky-php7ext/tests/curl_014.phpt → tests/curl_014.phpt b/sky-php7ext/tests/curl_014.phpt → tests/curl_014.phpt
diff --git a/sky-php7ext/tests/curl_015.phpt → tests/curl_015.phpt b/sky-php7ext/tests/curl_015.phpt → tests/curl_015.phpt
diff --git a/sky-php7ext/tests/curl_016.phpt → tests/curl_016.phpt b/sky-php7ext/tests/curl_016.phpt → tests/curl_016.phpt
diff --git a/sky-php7ext/tests/curl_017.phpt → tests/curl_017.phpt b/sky-php7ext/tests/curl_017.phpt → tests/curl_017.phpt
diff --git a/sky-php7ext/tests/curl_018.phpt → tests/curl_018.phpt b/sky-php7ext/tests/curl_018.phpt → tests/curl_018.phpt
diff --git a/sky-php7ext/tests/curl_019.phpt → tests/curl_019.phpt b/sky-php7ext/tests/curl_019.phpt → tests/curl_019.phpt
diff --git a/sky-php7ext/tests/curl_020.phpt → tests/curl_020.phpt b/sky-php7ext/tests/curl_020.phpt → tests/curl_020.phpt
diff --git a/sky-php7ext/tests/curl_021.phpt → tests/curl_021.phpt b/sky-php7ext/tests/curl_021.phpt → tests/curl_021.phpt
diff --git a/sky-php7ext/tests/curl_022.phpt → tests/curl_022.phpt b/sky-php7ext/tests/curl_022.phpt → tests/curl_022.phpt
diff --git a/sky-php7ext/tests/curl_023.phpt → tests/curl_023.phpt b/sky-php7ext/tests/curl_023.phpt → tests/curl_023.phpt
diff --git a/sky-php7ext/tests/curl_024.phpt → tests/curl_024.phpt b/sky-php7ext/tests/curl_024.phpt → tests/curl_024.phpt
diff --git a/sky-php7ext/tests/curl_025.phpt → tests/curl_025.phpt b/sky-php7ext/tests/curl_025.phpt → tests/curl_025.phpt
diff --git a/sky-php7ext/tests/curl_testdata1.txt → tests/curl_testdata1.txt b/sky-php7ext/tests/curl_testdata1.txt → tests/curl_testdata1.txt
diff --git a/sky-php7ext/tests/curl_testdata2.txt → tests/curl_testdata2.txt b/sky-php7ext/tests/curl_testdata2.txt → tests/curl_testdata2.txt
diff --git a/sky-php7ext/tests/d.phpt → tests/d.phpt b/sky-php7ext/tests/d.phpt → tests/d.phpt
diff --git a/sky-php7ext/tests/explain.txt → tests/explain.txt b/sky-php7ext/tests/explain.txt → tests/explain.txt
diff --git a/sky-php7ext/tests/server.inc → tests/server.inc b/sky-php7ext/tests/server.inc → tests/server.inc
diff --git a/sky-php7ext/tests/skywalking.20171027.log → tests/skywalking.20171027.log b/sky-php7ext/tests/skywalking.20171027.log → tests/skywalking.20171027.log