Skip to content

Commit 4b75b09

Browse files
committed
enhance doc (#565)
1 parent e0c6c8f commit 4b75b09

File tree

10 files changed

+62
-294
lines changed

10 files changed

+62
-294
lines changed

DOC/API/collector-agent/Readme.md

Lines changed: 1 addition & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,3 @@
11
## Json string map to Pinpoint item
22

3-
Json String | Pinpoint Name | Details
4-
:---|:---|:---
5-
tid|transactionId|Transaction ID
6-
sid|SpanId|Span ID
7-
S|startTime|Start time of request
8-
E|elapsed|Elapse time
9-
FT|front type|Language type(PHP:1500, Python:1700)
10-
appname|applicationName|Application name
11-
appid|agentId|Agent ID
12-
stp|serviceType|Service type([See details](https://github.com/naver/pinpoint/blob/master/commons/src/main/java/com/navercorp/pinpoint/common/trace/ServiceType.java))
13-
name| apids|Function name
14-
uri|rpc|URI
15-
clues|TAnnotation|-1:arguments<br>14:return<br>40:http url<br>41:http param<br>42:http param entity<br>45:cookies<br>46:http status code
16-
psid|parentSpanId|Parent span ID
17-
nsid|nextSpanId|Next span ID
18-
dst|destinationId|Destination ID
19-
client|remoteAddr|Client address
20-
server|endPoint|Server address
21-
ERR|err|Error
22-
EXP|exp|Exception
23-
pname|parentApplicationName|Parent application name
24-
ptype|parentApplicationType|Parent application type
25-
Ah|acceptorHost|Acceptor host
26-
NP|NginxProxy header|Nginx proxy header
27-
AP|ApacheProxy header|Apache proxy header
3+
Go to file https://github.com/pinpoint-apm/pinpoint-c-agent/blob/1992a082d370cac1496e48fbe8de3851016ef20a/collector-agent/agent/AgentRouter.go#L73

DOC/C-CPP/Readme.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ FetchContent_Declare(
3434
GIT_REPOSITORY https://github.com/pinpoint-c-agent/pinpoint-c-agent.git
3535
# GIT_TAG 74bc39d813d664cb56b78b1506d91932c8131396
3636
# not recommended, please use hash key like `74bc39d813d664cb56b78b1506d91932c8131396`
37-
GIT_TAG origin/dev
37+
GIT_TAG origin/v0.4.13
3838
)
3939

4040
FetchContent_GetProperties(pinpoint)

DOC/PHP/Readme.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ collector-agent| [installed ?](../collector-agent/readme.md)
4949

5050
1. Use `composer require`
5151
```
52-
composer require pinpoint-apm/pinpoint-php-aop
52+
composer require pinpoint-apm/pinpoint-php-aop:v2.1.0
5353
```
5454
2. Add the following constants in the index file of your project:
5555

DOC/PHP/User Manual-CN.md

Lines changed: 0 additions & 105 deletions
This file was deleted.

DOC/PHP/User Manual.md

Lines changed: 0 additions & 106 deletions
This file was deleted.

DOC/PY/Readme.md

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,13 @@
77
Dependency| Version| More
88
---|----|---
99
python |3+ | (async must 3.7.1+)
10-
GO | |
11-
gcc|gcc 4.7+| c++11
1210
*inux| | `windows` is on the way
13-
pinpoint| 2.0+(GRPC)|
1411
collector-agent| [installed ?](../collector-agent/readme.md)
1512

1613
### Installation
1714

1815
```shell
19-
$ pip install pinpointPy
16+
$ pip install pinpointPy==1.1.0
2017
```
2118

2219
### How to Use

DOC/collector-agent/readme.md

Lines changed: 33 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
## Install Collector Agent
2-
`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)
2+
`Collector-Agent` formats the span from PHP/Python/C/CPP-Agent and send to `Pinpoint-Collector`.
33

4-
### Steps
4+
### 1. build from source
55
1. Goto collector-agent(`pinpoint-c-agent/collector-agent`)
6-
2. Execute command `go build`
6+
2. Execute command `make`
77
3. Add environment variables:
88
```
99
export PP_COLLECTOR_AGENT_SPAN_IP=dev-pinpoint
@@ -24,11 +24,38 @@
2424
5. `PP_ADDRESS`: Set the address of `Collector-Agent`, then `PHP/Python-Agent` will connect Collector-Agent through this address.
2525
4. Run `Collector-Agent` by executing command `./CollectorAgent`
2626
27-
### Use docker images
27+
### 2. Use docker images
2828
2929
```sh
30-
docker run -itd -p 9999:9999 --env-file ./env.list ghcr.io/pinpoint-apm/pinpoint-c-agent/collector-agent:0.4.25
30+
docker run -itd -p 9999:9999 --env-file ./env.list ghcr.io/pinpoint-apm/pinpoint-c-agent/collector-agent:0.4.13
3131
```
32+
### 3. K8s side car
3233

34+
server.yaml sample
3335

34-
36+
``` yml
37+
- image: ghcr.io/pinpoint-apm/pinpoint-c-agent/collector-agent:0.4.13
38+
name: collector-agent
39+
args: ["-RecvBufSize=1048576"]
40+
securityContext:
41+
runAsUser: 0
42+
env:
43+
- name: "PP_COLLECTOR_AGENT_SPAN_IP"
44+
value: "pinpoint-collector.hostname"
45+
- name: "PP_COLLECTOR_AGENT_SPAN_PORT"
46+
value: "9993"
47+
- name: "PP_COLLECTOR_AGENT_AGENT_IP"
48+
value: "pinpoint-collector.hostname"
49+
- name: "PP_COLLECTOR_AGENT_AGENT_PORT"
50+
value: "9991"
51+
- name: "PP_COLLECTOR_AGENT_STAT_IP"
52+
value: "pinpoint-collector.hostname"
53+
- name: "PP_COLLECTOR_AGENT_STAT_PORT"
54+
value: "9992"
55+
- name: "PP_Log_Level"
56+
value: "INFO"
57+
- name: "PP_ADDRESS"
58+
value: "localhost@9999"
59+
- name: "PP_COLLECTOR_AGENT_ISDOCKER"
60+
value: "true"
61+
```

DOC/common/Readme.md

Lines changed: 0 additions & 44 deletions
This file was deleted.

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ language| tutorial
3232
php|[English](DOC/PHP/Readme.md) [中文](DOC/PHP/Readme-CN.md) [한국어](DOC/PHP/Readme-KR.md)
3333
python3|[English](DOC/PY/Readme.md) [中文](DOC/PY/Readme-CN.md) [한국어](DOC/PY/Readme-KR.md)
3434
c/cpp|[English](DOC/C-CPP/Readme.md)
35-
golang|[go-aop-agent](https://github.com/pinpoint-apm/go-aop-agent)
35+
golang|[go-aop-agent](https://github.com/pinpoint-apm/go-aop-agent) (_experiment_)
3636

3737
> [Try playground](/testapps/readme.md)
3838

0 commit comments

Comments
 (0)