update doc

eeliu · Aug 8, 2024 · adcabb8 · adcabb8
1 parent 6e0f0ff
commit adcabb8
Show file tree

Hide file tree

Showing 9 changed files with 24 additions and 10 deletions.
diff --git a/DOC/collector-agent/readme.md b/DOC/collector-agent/readme.md
@@ -1,3 +1,9 @@
+## What's collector-agent
+
+A bridger to pinpoint-collector. 
+
+![collector-agent](../images/pinpoint_v0.5.x.png)
+
 ## Install Collector Agent
 `Collector-Agent` formats the span from PHP/Python/C/CPP-Agent and send to `Pinpoint-Collector`.
 
@@ -27,14 +33,14 @@
 ### 2. Use docker images
 
 ```sh
-docker run -itd -p 9999:9999  --env-file ./env.list ghcr.io/pinpoint-apm/pinpoint-c-agent/collector-agent:0.5.0
+docker run -itd -p 9999:9999  --env-file ./env.list ghcr.io/pinpoint-apm/pinpoint-c-agent/collector-agent:v0.6.4
 ```
 ### 3. K8s side car
 
 server.yaml sample
 
 ``` yml
-- image: ghcr.io/pinpoint-apm/pinpoint-c-agent/collector-agent:0.5.0
+- image: ghcr.io/pinpoint-apm/pinpoint-c-agent/collector-agent:v0.6.4
         name: collector-agent
         args: ["-RecvBufSize=1048576"]
         securityContext:

diff --git a/README.md b/README.md
@@ -68,6 +68,7 @@ Our advantage:
 - [Intro pinpoint php aop](https://github.com/pinpoint-apm/pinpoint-php-aop/wiki/Intro-pinpoint-php-aop)
 - [pinpoint php aop 内部原理](https://github.com/pinpoint-apm/pinpoint-php-aop/wiki/pinpoint-php-aop-%E5%86%85%E9%83%A8%E5%8E%9F%E7%90%86)
 - [pinpoint php aop 내부 원리](https://github.com/pinpoint-apm/pinpoint-php-aop/wiki/pinpoint-php-aop-%EB%82%B4%EB%B6%80-%EC%9B%90%EB%A6%AC)
+- [pinpoint php on phpmyadmin](https://github.com/pinpoint-apm/pinpoint-c-agent/wiki/phpmyadmin_en)
 
 
 ## Contact Us

diff --git a/collector-agent/readme.md b/collector-agent/readme.md
@@ -1,3 +1,5 @@
+＞　End of maintain: goto [DOC/collector-agent](../DOC/collector-agent/readme.md)
+
 ## Install Collector-Agent
 `Collector-Agent`, who formats the span from PHP/Python/C/CPP-Agent and send to `Pinpoint-Collector`, is an agent written by [golang](https://golang.google.cn/).Please install golang before the following steps.[Install GO](https://golang.google.cn/doc/install)
 

diff --git a/plugins/PHP/Readme.md b/plugins/PHP/Readme.md
@@ -1,3 +1,5 @@
+> end of maintain : goto https://github.com/pinpoint-apm/pinpoint-php-aop?tab=readme-ov-file#write-your-own-plugins
+
 # welcome to use pinpoint-php
 ## How to write your own plugins 
 

diff --git a/testapps/flarum/flarum.dockerfile b/testapps/flarum/flarum.dockerfile
@@ -3,14 +3,15 @@ FROM mondedie/flarum:latest
 RUN apk update && apk add php8-dev build-base
 
 # COPY config.m4 /pinpoint-c-agent/config.m4 
-# COPY src/PHP /pinpoint-c-agent/src/PHP
+# COPY pinpoint_php.cpp /pinpoint-c-agent/pinpoint_php.cpp 
+# COPY php_pinpoint_php.h /pinpoint-c-agent/php_pinpoint_php.h
 # COPY common /pinpoint-c-agent/common
 # COPY testapps/php_wordpress/pinpoint_php.ini /pinpoint-c-agent/pinpoint_php.ini
 
 # RUN cd /pinpoint-c-agent/ && phpize && ./configure && make install
 # RUN INI_DIR=`php-config --ini-dir` && cp /pinpoint-c-agent/pinpoint_php.ini $INI_DIR
 
-RUN curl -sL https://github.com/pinpoint-apm/pinpoint-c-agent/releases/download/v0.6.3/install_pinpoint_php.sh | sh
+RUN curl -sL https://github.com/pinpoint-apm/pinpoint-c-agent/releases/latest/download/install_pinpoint_php.sh | sh
 
 COPY testapps/flarum/site.php /flarum/app/site.php
 RUN cd /flarum/app/ && composer require -w pinpoint-apm/pinpoint-php-aop:v3.0.1
diff --git a/testapps/php_phpmyadmin/phpmyadmin.dockerfile b/testapps/php_phpmyadmin/phpmyadmin.dockerfile
@@ -7,14 +7,15 @@ RUN apt update && apt-get install -y \
     && docker-php-ext-install zip
 
 # COPY config.m4 /pinpoint-c-agent/config.m4 
-# COPY src/PHP /pinpoint-c-agent/src/PHP
+# COPY pinpoint_php.cpp /pinpoint-c-agent/pinpoint_php.cpp 
+# COPY php_pinpoint_php.h /pinpoint-c-agent/php_pinpoint_php.h
 # COPY common /pinpoint-c-agent/common
 # COPY testapps/php_wordpress/pinpoint_php.ini /pinpoint-c-agent/pinpoint_php.ini
 
 # RUN cd /pinpoint-c-agent/ && phpize && ./configure && make install
 # RUN INI_DIR=`php-config --ini-dir` && cp /pinpoint-c-agent/pinpoint_php.ini $INI_DIR
 
-RUN curl -sL https://github.com/pinpoint-apm/pinpoint-c-agent/releases/download/v0.6.3/install_pinpoint_php.sh | sh
+RUN curl -sL https://github.com/pinpoint-apm/pinpoint-c-agent/releases/latest/download/install_pinpoint_php.sh | sh
 
 COPY testapps/php_phpmyadmin/index.php /var/www/html/index.php
 ## install composer

diff --git a/testapps/php_wordpress/php-wordpress.dockerfile b/testapps/php_wordpress/php-wordpress.dockerfile
@@ -1,7 +1,8 @@
 FROM  wordpress:beta-php8.1-apache
 
 # COPY config.m4 /pinpoint-c-agent/config.m4 
-# COPY src/PHP /pinpoint-c-agent/src/PHP
+# COPY pinpoint_php.cpp /pinpoint-c-agent/pinpoint_php.cpp 
+# COPY php_pinpoint_php.h /pinpoint-c-agent/php_pinpoint_php.h
 # COPY common /pinpoint-c-agent/common
 # COPY testapps/php_wordpress/pinpoint_php.ini /pinpoint-c-agent/pinpoint_php.ini
 
@@ -11,7 +12,7 @@ FROM  wordpress:beta-php8.1-apache
 # COPY install_pinpoint_php.sh /tmp/
 # RUN sh /tmp/install_pinpoint_php.sh
 
-RUN curl -sL https://github.com/pinpoint-apm/pinpoint-c-agent/releases/download/v0.6.3/install_pinpoint_php.sh | sh
+RUN curl -sL https://github.com/pinpoint-apm/pinpoint-c-agent/releases/latest/download/install_pinpoint_php.sh | sh
 
 COPY testapps/php_wordpress/wp-config.php /usr/src/wordpress/wp-config.php
 #  install composer

diff --git a/testapps/shopware/shopware.dockerfile b/testapps/shopware/shopware.dockerfile
@@ -2,7 +2,7 @@ FROM shyim/shopware:6.4.20-php8.2
 
 RUN apk update && apk add --virtual build-dependencies build-base git autoconf
 
-RUN curl -sL https://github.com/pinpoint-apm/pinpoint-c-agent/releases/download/v0.6.3/install_pinpoint_php.sh | sh
+RUN curl -sL https://github.com/pinpoint-apm/pinpoint-c-agent/releases/latest/download/install_pinpoint_php.sh | sh
 
 ## install composer
 RUN composer self-update 2.4.4

diff --git a/testapps/thinkphp-php/thinkphp.dockerfile b/testapps/thinkphp-php/thinkphp.dockerfile
@@ -7,7 +7,7 @@ RUN apt update && apt-get install -y \
     git \
     && docker-php-ext-install zip pdo pdo_mysql
 
-RUN curl -sL https://github.com/pinpoint-apm/pinpoint-c-agent/releases/download/v0.6.3/install_pinpoint_php.sh | sh
+RUN curl -sL https://github.com/pinpoint-apm/pinpoint-c-agent/releases/latest/download/install_pinpoint_php.sh | sh
 
 COPY testapps/thinkphp-php/tp /app