-
Notifications
You must be signed in to change notification settings - Fork 6.5k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' of https://github.com/apache/skywalking into re…
…factor-heatmap
- Loading branch information
Showing
22 changed files
with
681 additions
and
9 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,62 @@ | ||
| # 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. | ||
|
|
||
| name: docker-ci | ||
|
|
||
| on: [push, pull_request] | ||
| env: | ||
| SKIP_TEST: true | ||
| DOCKER_DIR: ./docker | ||
| LOG_DIR: /tmp/skywalking | ||
| jobs: | ||
| build: | ||
| runs-on: ubuntu-16.04 | ||
| steps: | ||
| - uses: actions/checkout@v1 | ||
| - uses: actions/cache@v1 | ||
| with: | ||
| path: ~/.m2/repository | ||
| key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} | ||
| restore-keys: | | ||
| ${{ runner.os }}-maven- | ||
| - name: Build docker image | ||
| run: make docker | ||
| - name: Bootstrap cluster | ||
| run: cd ${DOCKER_DIR} && docker-compose up -d | ||
| - name: Check port avaliable | ||
| run: | | ||
| source ./test/scripts/env.sh | ||
| echo "Waiting for OAP ready" | ||
| export PORT=11800 | ||
| check_sw_port | ||
| echo "OAP is ready" | ||
| echo "Waiting for UI ready" | ||
| PORT=8080 | ||
| check_sw_port | ||
| echo "UI is ready" | ||
| - name: Collect logs | ||
| run: | | ||
| mkdir -p ${LOG_DIR} | ||
| cd ${DOCKER_DIR} | ||
| docker-compose logs oap > ${LOG_DIR}/oap.txt | ||
| docker-compose logs ui > ${LOG_DIR}/ui.txt | ||
| docker-compose logs elasticsearch > ${LOG_DIR}/es.txt | ||
| continue-on-error: true | ||
| - uses: actions/upload-artifact@v1.0.0 | ||
| continue-on-error: true | ||
| with: | ||
| name: logs | ||
| path: /tmp/skywalking |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,21 @@ | ||
| #!/bin/bash | ||
| # | ||
| # 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. | ||
|
|
||
| home="$(cd "$(dirname $0)"; pwd)" | ||
|
|
||
| java -jar ${agent_opts} ${home}/../libs/okhttp-scenario.jar & |
119 changes: 119 additions & 0 deletions
119
test/plugin/scenarios/okhttp-scenario/config/expectedData.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,119 @@ | ||
| # 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: | ||
| - {okhttp-scenario: nq 0} | ||
| instances: | ||
| - {okhttp-scenario: 1} | ||
| operationNames: | ||
| - okhttp-scenario: [/case/receiveContext-0, /okhttp-case/case/receiveContext-0,/case/healthCheck, /case/okhttp-case, /case/receiveContext-1] | ||
| heartbeat: [] | ||
| segmentItems: | ||
| - applicationCode: okhttp-scenario | ||
| segmentSize: ge 5 | ||
| segments: | ||
| - segmentId: not null | ||
| spans: | ||
| - operationName: Async/okhttp-case/case/receiveContext-0 | ||
| operationId: 0 | ||
| parentSpanId: 0 | ||
| spanId: 1 | ||
| spanLayer: null | ||
| startTime: nq 0 | ||
| endTime: nq 0 | ||
| componentId: 0 | ||
| componentName: null | ||
| isError: false | ||
| spanType: Local | ||
| peer: null | ||
| peerId: 0 | ||
| - operationName: /case/okhttp-case | ||
| operationId: 0 | ||
| parentSpanId: -1 | ||
| spanId: 0 | ||
| spanLayer: Http | ||
| startTime: nq 0 | ||
| endTime: nq 0 | ||
| componentId: 14 | ||
| componentName: null | ||
| isError: false | ||
| spanType: Entry | ||
| peer: null | ||
| peerId: 0 | ||
| tags: | ||
| - {key: url, value: 'http://localhost:8080/okhttp-case/case/okhttp-case'} | ||
| - {key: http.method, value: GET} | ||
| - segmentId: not null | ||
| spans: | ||
| - operationName: /case/receiveContext-0 | ||
| operationId: 0 | ||
| parentSpanId: -1 | ||
| spanId: 0 | ||
| spanLayer: Http | ||
| startTime: nq 0 | ||
| endTime: nq 0 | ||
| componentId: 14 | ||
| componentName: null | ||
| isError: false | ||
| spanType: Entry | ||
| peer: null | ||
| peerId: 0 | ||
| tags: | ||
| - {key: url, value: 'http://127.0.0.1:8080/okhttp-case/case/receiveContext-0'} | ||
| - {key: http.method, value: GET} | ||
| refs: | ||
| - {parentEndpointId: 0, parentEndpoint: /okhttp-case/case/receiveContext-0, networkAddressId: 0, entryEndpointId: 0, refType: CrossProcess, parentSpanId: 0, parentTraceSegmentId: nq 0, parentServiceInstanceId: nq 0, networkAddress: '127.0.0.1:8080', entryEndpoint: /case/okhttp-case, entryServiceInstanceId: nq 0} | ||
| - segmentId: not null | ||
| spans: | ||
| - operationName: /case/receiveContext-1 | ||
| operationId: 0 | ||
| parentSpanId: -1 | ||
| spanId: 0 | ||
| spanLayer: Http | ||
| startTime: nq 0 | ||
| endTime: nq 0 | ||
| componentId: 14 | ||
| componentName: null | ||
| isError: false | ||
| spanType: Entry | ||
| peer: null | ||
| peerId: 0 | ||
| tags: | ||
| - {key: url, value: 'http://127.0.0.1:8080/okhttp-case/case/receiveContext-1'} | ||
| - {key: http.method, value: GET} | ||
| refs: | ||
| - {parentEndpointId: 0, parentEndpoint: /okhttp-case/case/receiveContext-0, networkAddressId: 0, entryEndpointId: 0, refType: CrossProcess, parentSpanId: 0, parentTraceSegmentId: nq 0, parentServiceInstanceId: nq 0, networkAddress: '127.0.0.1:8080', entryEndpoint: /case/okhttp-case, entryServiceInstanceId: nq 0} | ||
| - segmentId: not null | ||
| spans: | ||
| - operationName: /okhttp-case/case/receiveContext-0 | ||
| operationId: 0 | ||
| parentSpanId: -1 | ||
| spanId: 0 | ||
| spanLayer: Http | ||
| startTime: nq 0 | ||
| endTime: nq 0 | ||
| componentId: 12 | ||
| componentName: null | ||
| isError: false | ||
| spanType: Exit | ||
| peer: 127.0.0.1:8080 | ||
| peerId: 0 | ||
| tags: | ||
| - {key: http.method, value: GET} | ||
| - {key: url, value: 'http://127.0.0.1:8080/okhttp-case/case/receiveContext-0'} | ||
| refs: | ||
| - {parentEndpointId: 0, parentEndpoint: /case/okhttp-case, networkAddressId: 0, entryEndpointId: 0, refType: CrossThread, parentSpanId: 1, parentTraceSegmentId: nq 0, parentServiceInstanceId: nq 0, networkAddress: '', entryEndpoint: /case/okhttp-case, entryServiceInstanceId: nq 0} |
Oops, something went wrong.