Skip to content

Commit

Permalink
add dubbo 2.7.x
Browse files Browse the repository at this point in the history
  • Loading branch information
arugal committed Oct 10, 2019
1 parent 91b4500 commit b43b47a
Show file tree
Hide file tree
Showing 20 changed files with 478 additions and 57 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -15,19 +15,19 @@
# limitations under the License.
registryItems:
applications:
- {dubbo-scenario: 2}
- {dubbo-2.5.x-scenario: 2}
instances:
- {dubbo-scenario: 1}
- {dubbo-2.5.x-scenario: 1}
operationNames:
- dubbo-scenario: [/dubbo-scenario/healthCheck, /dubbo-scenario/case/dubbo, org.apache.skywalking.apm.testcase.dubbo.services.GreetService.doBusiness()]
- dubbo-2.5.x-scenario: [/dubbo-2.5.x-scenario/healthCheck, /dubbo-2.5.x-scenario/case/dubbo, org.apache.skywalking.apm.testcase.dubbo.services.GreetService.doBusiness()]
heartbeat: []
segmentItems:
- applicationCode: dubbo-scenario
- applicationCode: dubbo-2.5.x-scenario
segmentSize: 3
segments:
- segmentId: not null
spans:
- operationName: /dubbo-scenario/healthCheck
- operationName: /dubbo-2.5.x-scenario/healthCheck
operationId: 0
parentSpanId: -1
spanId: 0
Expand All @@ -41,7 +41,7 @@ segmentItems:
peer: ''
peerId: 0
tags:
- {key: url, value: 'http://localhost:8080/dubbo-scenario/healthCheck'}
- {key: url, value: 'http://localhost:8080/dubbo-2.5.x-scenario/healthCheck'}
- {key: http.method, value: HEAD}
- segmentId: not null
spans:
Expand All @@ -61,9 +61,9 @@ segmentItems:
tags:
- {key: url, value: not null}
refs:
- {parentEndpointId: 0, parentEndpoint: /dubbo-scenario/case/dubbo, networkAddressId: 0,
- {parentEndpointId: 0, parentEndpoint: /dubbo-2.5.x-scenario/case/dubbo, networkAddressId: 0,
entryEndpointId: 0, refType: CrossProcess, parentSpanId: 1, parentTraceSegmentId: not null,
parentServiceInstanceId: 1, networkAddress: 'localhost:20080', entryEndpoint: /dubbo-scenario/case/dubbo,
parentServiceInstanceId: 1, networkAddress: 'localhost:20080', entryEndpoint: /dubbo-2.5.x-scenario/case/dubbo,
entryServiceInstanceId: 1}
- segmentId: not null
spans:
Expand All @@ -82,7 +82,7 @@ segmentItems:
peerId: 0
tags:
- {key: url, value: 'dubbo://localhost:20080/org.apache.skywalking.apm.testcase.dubbo.services.GreetService.doBusiness()'}
- operationName: /dubbo-scenario/case/dubbo
- operationName: /dubbo-2.5.x-scenario/case/dubbo
operationId: 0
parentSpanId: -1
spanId: 0
Expand All @@ -96,5 +96,5 @@ segmentItems:
peer: ''
peerId: 0
tags:
- {key: url, value: 'http://localhost:8080/dubbo-scenario/case/dubbo'}
- {key: url, value: 'http://localhost:8080/dubbo-2.5.x-scenario/case/dubbo'}
- {key: http.method, value: GET}
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,6 @@
# limitations under the License.

type: tomcat
entryService: http://localhost:8080/dubbo-scenario/case/dubbo
healthCheck: http://localhost:8080/dubbo-scenario/healthCheck
entryService: http://localhost:8080/dubbo-2.5.x-scenario/case/dubbo
healthCheck: http://localhost:8080/dubbo-2.5.x-scenario/healthCheck
framework: dubbo
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<modelVersion>4.0.0</modelVersion>

<groupId>org.apache.skywalking</groupId>
<artifactId>dubbo-scenario</artifactId>
<artifactId>dubbo-2.5.x-scenario</artifactId>
<version>5.0.0</version>
<packaging>war</packaging>

Expand All @@ -31,10 +31,10 @@
<compiler.version>1.8</compiler.version>

<test.framework>dubbo</test.framework>
<test.framework.version>2.5.5</test.framework.version>
<test.framework.version>2.5.4</test.framework.version>
</properties>

<name>skywalking-dubbo-scenario</name>
<name>skywalking-dubbo-2.5.x-scenario</name>

<dependencies>
<dependency>
Expand Down Expand Up @@ -62,47 +62,8 @@
</dependency>
</dependencies>

<profiles>
<profile>
<id>dubbo-scenario-2.5.4</id>
<properties>
<test.framework.version>2.5.4</test.framework.version>
</properties>
</profile>
<profile>
<id>dubbo-scenario-2.5.5</id>
<properties>
<test.framework.version>2.5.5</test.framework.version>
</properties>
</profile>
<profile>
<id>dubbo-scenario-2.5.6</id>
<properties>
<test.framework.version>2.5.6</test.framework.version>
</properties>
</profile>
<profile>
<id>dubbo-scenario-2.5.7</id>
<properties>
<test.framework.version>2.5.7</test.framework.version>
</properties>
</profile>
<profile>
<id>dubbo-scenario-2.5.8</id>
<properties>
<test.framework.version>2.5.8</test.framework.version>
</properties>
</profile>
<profile>
<id>dubbo-scenario-2.6.0</id>
<properties>
<test.framework.version>2.6.0</test.framework.version>
</properties>
</profile>
</profiles>

<build>
<finalName>dubbo-scenario</finalName>
<finalName>dubbo-2.5.x-scenario</finalName>
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee
http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd"
version="3.1">
<display-name>skywalking-dubbo-scenario</display-name>
<display-name>skywalking-dubbo-2.5.x-scenario</display-name>

<servlet>
<servlet-name>caseServlet</servlet-name>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,5 @@
2.5.6
2.5.7
2.5.8
2.6.0
2.6.0
2.6.2
102 changes: 102 additions & 0 deletions test/plugin/scenarios/dubbo-2.7.x-scenario/config/expectedData.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,102 @@
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
# regarding copyright ownership. The ASF licenses this file
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
registryItems:
applications:
- {dubbo-2.7.x-scenario: 2}
instances:
- {dubbo-2.7.x-scenario: 1}
operationNames:
- dubbo-2.7.x-scenario: [/dubbo-2.7.x-scenario/healthCheck,
/dubbo-2.7.x-scenario/case/dubbo,
org.apache.skywalking.apm.testcase.dubbo.services.GreetService.doBusiness()]
heartbeat: []
segmentItems:
- applicationCode: dubbo-2.7.x-scenario
segmentSize: 3
segments:
- segmentId: not null
spans:
- operationName: /dubbo-2.7.x-scenario/healthCheck
operationId: 0
parentSpanId: -1
spanId: 0
spanLayer: Http
startTime: nq 0
endTime: nq 0
componentId: 1
componentName: ''
isError: false
spanType: Entry
peer: ''
peerId: 0
tags:
- {key: url, value: 'http://localhost:8080/dubbo-2.7.x-scenario/healthCheck'}
- {key: http.method, value: HEAD}
- segmentId: not null
spans:
- operationName: org.apache.skywalking.apm.testcase.dubbo.services.GreetService.doBusiness()
operationId: 0
parentSpanId: -1
spanId: 0
spanLayer: RPCFramework
startTime: nq 0
endTime: nq 0
componentId: 3
componentName: ''
isError: false
spanType: Entry
peer: ''
peerId: 0
tags:
- {key: url, value: not null}
refs:
- {parentEndpointId: 0, parentEndpoint: /dubbo-2.7.x-scenario/case/dubbo, networkAddressId: 0,
entryEndpointId: 0, refType: CrossProcess, parentSpanId: 1, parentTraceSegmentId: not null,
parentServiceInstanceId: 1, networkAddress: 'localhost:20080', entryEndpoint: /dubbo-2.7.x-scenario/case/dubbo,
entryServiceInstanceId: 1}
- segmentId: not null
spans:
- operationName: org.apache.skywalking.apm.testcase.dubbo.services.GreetService.doBusiness()
operationId: 0
parentSpanId: 0
spanId: 1
spanLayer: RPCFramework
startTime: nq 0
endTime: nq 0
componentId: 3
componentName: ''
isError: false
spanType: Exit
peer: localhost:20080
peerId: 0
tags:
- {key: url, value: 'dubbo://localhost:20080/org.apache.skywalking.apm.testcase.dubbo.services.GreetService.doBusiness()'}
- operationName: /dubbo-2.7.x-scenario/case/dubbo
operationId: 0
parentSpanId: -1
spanId: 0
spanLayer: Http
startTime: nq 0
endTime: nq 0
componentId: 1
componentName: ''
isError: false
spanType: Entry
peer: ''
peerId: 0
tags:
- {key: url, value: 'http://localhost:8080/dubbo-2.7.x-scenario/case/dubbo'}
- {key: http.method, value: GET}
20 changes: 20 additions & 0 deletions test/plugin/scenarios/dubbo-2.7.x-scenario/configuration.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
# regarding copyright ownership. The ASF licenses this file
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.

type: tomcat
entryService: http://localhost:8080/dubbo-2.7.x-scenario/case/dubbo
healthCheck: http://localhost:8080/dubbo-2.7.x-scenario/healthCheck
framework: dubbo
78 changes: 78 additions & 0 deletions test/plugin/scenarios/dubbo-2.7.x-scenario/pom.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,78 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
~ Licensed to the Apache Software Foundation (ASF) under one or more
~ contributor license agreements. See the NOTICE file distributed with
~ this work for additional information regarding copyright ownership.
~ The ASF licenses this file to You under the Apache License, Version 2.0
~ (the "License"); you may not use this file except in compliance with
~ the License. You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
~
-->
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<groupId>org.apache.skywalking</groupId>
<artifactId>dubbo-2.7.x-scenario</artifactId>
<version>5.0.0</version>
<packaging>war</packaging>

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<compiler.version>1.8</compiler.version>

<test.framework>dubbo</test.framework>
<test.framework.version>2.7.0</test.framework.version>
</properties>

<name>skywalking-dubbo-2.7.x-scenario</name>

<dependencies>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<version>3.1.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-api</artifactId>
<version>2.8.1</version>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>2.8.1</version>
</dependency>

<!-- dubbo -->
<dependency>
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo</artifactId>
<version>${test.framework.version}</version>
</dependency>
</dependencies>

<build>
<finalName>dubbo-2.7.x-scenario</finalName>
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>${compiler.version}</source>
<target>${compiler.version}</target>
<encoding>${project.build.sourceEncoding}</encoding>
</configuration>
</plugin>
</plugins>
</build>
</project>
Loading

0 comments on commit b43b47a

Please sign in to comment.