Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions CHANGES.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,12 @@ Release Notes.
* Rename `JDBI` to `JDBC`
* Support collecting dubbo thread pool metrics
* Bump up byte-buddy to 1.12.19
* Upgrade agent test tools

#### Documentation

* Update `Plugin-test.md`, support string operators `start with` and `end with`



All issues and pull requests are [here](https://github.com/apache/skywalking/milestone/161?closed=1)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@ public void onConstruct(EnhancedInstance objInst, Object[] allArguments) throws
return;
}
ThreadPoolExecutor threadPoolExecutor = (ThreadPoolExecutor) executor;
// TODO String.format("DubboServerHandler-%s:%s", host, port) will be better
String threadPoolName = String.format("DubboServerHandler-%s", port);

MeterFactory.gauge(METER_NAME, () -> (double) (threadPoolExecutor.getCorePoolSize()))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@ public void onConstruct(EnhancedInstance objInst, Object[] allArguments) throws
return;
}
ThreadPoolExecutor threadPoolExecutor = (ThreadPoolExecutor) executor;
// TODO String.format("DubboServerHandler-%s:%s", host, port) will be better
String threadPoolName = String.format("DubboServerHandler-%s", port);

MeterFactory.gauge(METER_NAME, () -> (double) (threadPoolExecutor.getCorePoolSize()))
Expand Down
16 changes: 9 additions & 7 deletions docs/en/setup/service-agent/java-agent/Plugin-test.md
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ The following files are required in every test case.
File Name | Descriptions
---|---
`configuration.yml` | Declare the basic case information, including case name, entrance endpoints, mode, and dependencies.
`expectedData.yaml` | Describe the expected segmentItems.
`expectedData.yaml` | Describe the expected segmentItems, meterItems or logItems.
`support-version.list` | List the target versions for this case.
`startup.sh` |`JVM-container` only. This is not required when using `Tomcat-container`.

Expand Down Expand Up @@ -202,12 +202,14 @@ as the version number, which will be changed in the test for each version.

**Operator for String**

| Operator | Description |
|:------------|:--------------------------------------------------------------------------------------------------------------|
| `not null` | Not null |
| `not blank` | Not blank ,it's recommended for String type field as the default value maybe blank string, such as span tags |
| `null` | Null or empty String |
| `eq` | Equal(default) |
| Operator | Description |
|:-------------|:--------------------------------------------------------------------------------------------------------------|
| `not null` | Not null |
| `not blank` | Not blank ,it's recommended for String type field as the default value maybe blank string, such as span tags |
| `null` | Null or empty String |
| `eq` | Equal(default) |
| `start with` | Tests if this string starts with the specified prefix. DO NOT use it with meterItem tags value |
| `end with` | Tests if this string ends with the specified suffix. DO NOT use it with meterItem tags value |

**Expected Data Format Of The Segment**
```yml
Expand Down
2 changes: 1 addition & 1 deletion test/plugin/agent-test-tools/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
<packaging>pom</packaging>

<properties>
<agent-test-tools.version>7f20775e0631356c4823d9372b09d653db0e6540</agent-test-tools.version>
<agent-test-tools.version>1c0bef2dd1d828e07889302bea980b24900b0db5</agent-test-tools.version>
<agent-test-tools.workingDirectory>${project.basedir}/target/agent-test-tools</agent-test-tools.workingDirectory>
<agent-test-tools.repos>https://github.com/apache/skywalking-agent-test-tool.git</agent-test-tools.repos>
</properties>
Expand Down
4 changes: 2 additions & 2 deletions tools/plugin/check-javaagent-plugin-list.sh
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ WORK_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" &&cd ../.. && pwd)"
GENERNATE_PLUGINS_LIST=${SRC_DIR}/genernate-javaagent-plugin-list.txt
MD_PLUGINS_LIST=${SRC_DIR}/md-javaagent-plugin-list.txt

function genernateJavaagentPluginList() {
function generateJavaagentPluginList() {
position_file="javaagent-position.txt"
find ${WORK_DIR}/apm-sniffer -name "skywalking-plugin.def"|grep "src/main/resources" > ${position_file}
cat ${position_file} | while read line
Expand All @@ -38,7 +38,7 @@ function getMdJavaagentPluginList() {
cat ${md_javaagent_plugins_file}|grep -v "#" |awk -F " " '{ print $2}'|grep -E '^[a-z].*'|sort|uniq|awk NF >${MD_PLUGINS_LIST}
}

genernateJavaagentPluginList
generateJavaagentPluginList
getMdJavaagentPluginList
diff -w -bB -U0 ${MD_PLUGINS_LIST} ${GENERNATE_PLUGINS_LIST}

Expand Down